From: Roland Haeder Date: Thu, 8 Oct 2015 18:41:17 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5addd0305c4f5739c314430ed38bc38c433fcf2d;p=addressbook-war.git Continued: - translated more strings + fixed some. - fixed CSS so the content title is now grey-underlayed and not with content Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 8107f5ad..b4a27a42 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -1,49 +1,55 @@ - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 1dd6c41b..ddc8310d 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -149,3 +149,6 @@ PAGE_TITLE_LOGIN_EDIT_ADDRESS=Meine Kontaktdaten \u00e4ndern CONTENT_TITLE_LOGIN_EDIT_ADDRESS=\u00c4ndern Sie Ihre Adressdaten: PAGE_TITLE_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern CONTENT_TITLE_LOGIN_EDIT_USER_DATA=\u00c4ndern Sie Ihre Benutzerdaten: +GUEST_YES_READ_PRIVACY_STATEMENT_1=Ja, ich habe die +PRIVACY_STATEMENTS=Datenschutzbestimmungen +GUEST_YES_READ_PRIVACY_STATEMENT_2=gelesen und auch verstanden. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7e9c7c40..15dc3f0d 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -34,10 +34,10 @@ GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your login name and password: GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned login name and password. GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data: ENTER_PASSWORD=Password: -LINK_GUEST_HOME_TITLE=Home page +LINK_GUEST_HOME_TITLE=Go to home page LINK_GUEST_HOME=Home -LINK_CLOSE_SESSION_TITLE=Close session -LINK_CLOSE_SESSION=Close session +LINK_CLOSE_SESSION_TITLE=Invalidate all session data +LINK_CLOSE_SESSION=Invalidate session MENU_HOME_TITLE=Home LINK_GUEST_LOGIN_TITLE=Login for existing users LINK_GUEST_LOGIN=Login @@ -90,17 +90,17 @@ CONTENT_TITLE_INDEX_PRIVACY=Privacy: ADMIN_MENU_MAIN_TITLE=Main ADMIN_MENU_LOGOUT_TITLE=Logout LINK_ADMIN_INDEX_TITLE=To welcome page -LINK_ADMIN_LOGOUT_TITLE=Ausloggen -LINK_ADMIN_TO_WEBPAGE_TITLE=Zur Webseite, aber eingeloggt bleiben +LINK_ADMIN_LOGOUT_TITLE=Logout from admin area +LINK_ADMIN_TO_WEBPAGE_TITLE=Go to website but stay logged-in LINK_ADMIN_INDEX=Home -LINK_ADMIN_LOGOUT=Ausloggen -LINK_ADMIN_TO_WEBPAGE=Webseite aufrufen -LINK_ADMIN_FOOTER_TO_WEBPAGE=Zur Webseite -LINK_GUEST_IMPRINT=Impressum +LINK_ADMIN_LOGOUT=Logout +LINK_ADMIN_TO_WEBPAGE=Call website +LINK_ADMIN_FOOTER_TO_WEBPAGE=To website +LINK_GUEST_IMPRINT=Imprint LINK_GUEST_TERMS=AGBs LINK_GUEST_PRIVACY=Datenschutz -LINK_GUEST_IMPRINT_TITLE=Impressum -LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen +LINK_GUEST_IMPRINT_TITLE=Go to imprint page +LINK_GUEST_TERMS_TITLE=View terms & conditions LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen MENU_USER_TITLE=User ENTER_USER_NAME=User name: @@ -134,18 +134,21 @@ LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=From other users shared address books MENU_ADDRESSBOOKS_TITLE=Manage address books PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage own address books CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage your own address books: -LINK_LOGIN_USER_LIST=Benutzerliste +LINK_LOGIN_USER_LIST=User list LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer -PAGE_TITLE_LOGIN_USER_LIST=Benutzerliste +PAGE_TITLE_LOGIN_USER_LIST=User list CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer: -PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Freigegebene Adressnb\u00fccher anderer Mitglieder +PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Shared addressbooks of other users CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Manage other's shared address books LINK_LOGIN_EDIT_ADDRESS=Change address data LINK_LOGIN_EDIT_ADDRESS_TITLE=Change your own address data here. -LINK_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern -LINK_LOGIN_EDIT_USER_DATA_TITLE=Change your own user data here. +LINK_LOGIN_EDIT_USER_DATA=Change user data +LINK_LOGIN_EDIT_USER_DATA_TITLE=Change your own user account data here. MENU_EDIT_PROFILE_TITLE=My profile PAGE_TITLE_LOGIN_EDIT_ADDRESS=Change my address data CONTENT_TITLE_LOGIN_EDIT_ADDRESS=Change your address data: PAGE_TITLE_LOGIN_EDIT_USER_DATA=Change user data CONTENT_TITLE_LOGIN_EDIT_USER_DATA=Change your user data: +GUEST_YES_READ_PRIVACY_STATEMENT_1=Yes, I have read and understand the +PRIVACY_STATEMENTS=privacy statements +GUEST_YES_READ_PRIVACY_STATEMENT_2=. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 7bf7a250..9a78bf5c 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -54,7 +54,7 @@ /login/login_index.xhtml - resend_link + user_resend_link /user/resend_link.xhtml diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index b9e8cd70..03a9767f 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -18,8 +18,9 @@
- Ja, ich habe die gelesen und - auch verstanden. + #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_1} + + #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_2}
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 84bdff8a..38ebbf28 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -134,7 +134,7 @@ ul.footer_nav li.footer_copyright { background-color: #dddddd; font-weight: bold; font-size: 18px; - padding-bottom: 20px; + margin-bottom: 20px; } .table_header_column { diff --git a/web/user/register_done.xhtml b/web/user/register_done.xhtml index f4d595a0..99839087 100644 --- a/web/user/register_done.xhtml +++ b/web/user/register_done.xhtml @@ -20,7 +20,7 @@
- +