From f14505095523b85df72e49d2a6c5193ed6294eeb Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 8 Oct 2015 20:41:17 +0200 Subject: [PATCH] Continued: - translated more strings + fixed some. - fixed CSS so the content title is now grey-underlayed and not with content --- nbproject/faces-config.NavData | 62 ++++++++++--------- .../localization/bundle_de_DE.properties | 23 ++++--- .../localization/bundle_en_US.properties | 55 +++++++++------- web/WEB-INF/faces-config.xml | 2 +- .../templates/guest/guest_privacy_terms.tpl | 12 ++-- web/WEB-INF/templates/login/login_base.tpl | 2 +- web/resources/css/cssLayout.css | 2 +- web/user/register_done.xhtml | 2 +- 8 files changed, 90 insertions(+), 70 deletions(-) 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..155cc221 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -34,7 +34,7 @@ GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ei GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein. GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben: ENTER_PASSWORD=Passwort: -LINK_GUEST_HOME_TITLE=Eingangsseite +LINK_GUEST_HOME_TITLE=Eingangsseite aufrufen LINK_GUEST_HOME=Home LINK_CLOSE_SESSION_TITLE=Sitzung beennden LINK_CLOSE_SESSION=Sitzung beenden @@ -99,9 +99,9 @@ LINK_ADMIN_FOOTER_TO_WEBPAGE=Zur Webseite LINK_GUEST_IMPRINT=Impressum LINK_GUEST_TERMS=AGBs LINK_GUEST_PRIVACY=Datenschutz -LINK_GUEST_IMPRINT_TITLE=Impressum +LINK_GUEST_IMPRINT_TITLE=Impressum aufrufen LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen -LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen +LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen ansehen MENU_USER_TITLE=Benutzer ENTER_USER_NAME=Benutzernamen: BUTTON_USER_LOGIN=Einloggen @@ -128,24 +128,31 @@ CONTENT_TITLE_LOGIN_HOME=\u00dcbersicht Ihrer Addressb\u00fccher: LINK_LOGIN_LOGOUT=Ausloggen LINK_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher LINK_LOGIN_LOGOUT_TITLE=Aus dem Benutzerbereich ausloggen -LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Meine Adressb\u00fccher verwalten -LINK_LOGIN_OTHER_ADDRESSBOOKS=Andere Adressb\u00fccher +LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Meine eigenen Adressb\u00fccher verwalten +LINK_LOGIN_OTHER_ADDRESSBOOKS=Mit mir geteilt LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=Von anderen Benutzern freigegebene Adressb\u00fccher MENU_ADDRESSBOOKS_TITLE=Adressb\u00fccher verwalten -PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Eigene Adressb\u00fccher verwalten +PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher verwalten CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Verwalten Sie Ihre eigenen Adressb\u00fccher: LINK_LOGIN_USER_LIST=Benutzerliste LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer PAGE_TITLE_LOGIN_USER_LIST=Benutzerliste CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer: -PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Freigegebene Adressnb\u00fccher anderer Mitglieder +PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Von anderen Benutzern mir freigegeben Adressb\u00fccher CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Von anderen Benutzern freigegebene Adressb\u00fccher auflisten: LINK_LOGIN_EDIT_ADDRESS=Kontaktdaten \u00e4ndern LINK_LOGIN_EDIT_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre eigenen Kontaktdaten. LINK_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern LINK_LOGIN_EDIT_USER_DATA_TITLE=\u00c4ndern Sie hier Ihre eigenen Benutzerdaten. -MENU_EDIT_PROFILE_TITLE=Mein Profil +MENU_EDIT_PROFILE_TITLE=Daten \u00e4ndern 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 und nehme sie hiermit an. +GUEST_YES_READ_TERMS_CONDITIONS_1=Ja, ich habe die +GUEST_YES_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an. +TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen +PAGE_TITLE_LOGIN_AREA=Benuzterbereich diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7e9c7c40..f01d2fd8 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,18 +90,18 @@ 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_GUEST_TERMS=AGBs -LINK_GUEST_PRIVACY=Datenschutz -LINK_GUEST_IMPRINT_TITLE=Impressum -LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen -LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen +LINK_ADMIN_LOGOUT=Logout +LINK_ADMIN_TO_WEBPAGE=Call website +LINK_ADMIN_FOOTER_TO_WEBPAGE=To website +LINK_GUEST_IMPRINT=Imprint +LINK_GUEST_TERMS=T&C +LINK_GUEST_PRIVACY=Privacy +LINK_GUEST_IMPRINT_TITLE=Go to imprint page +LINK_GUEST_TERMS_TITLE=View terms & conditions +LINK_GUEST_PRIVACY_TITLE=View privacy statement MENU_USER_TITLE=User ENTER_USER_NAME=User name: BUTTON_USER_LOGIN=Login @@ -128,24 +128,31 @@ CONTENT_TITLE_LOGIN_HOME=Overview of your address books: LINK_LOGIN_LOGOUT=Logout LINK_LOGIN_OWN_ADDRESSBOOKS=My address books LINK_LOGIN_LOGOUT_TITLE=Logout from user area -LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Manage own address books -LINK_LOGIN_OTHER_ADDRESSBOOKS=Other's address books +LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Manage my own address books +LINK_LOGIN_OTHER_ADDRESSBOOKS=Shared with me 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 +PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage my 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=Other user's addressbooks shared with me CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Manage other's shared address books -LINK_LOGIN_EDIT_ADDRESS=Change address data +LINK_LOGIN_EDIT_ADDRESS=Personal 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. -MENU_EDIT_PROFILE_TITLE=My profile +LINK_LOGIN_EDIT_USER_DATA=Profile data +LINK_LOGIN_EDIT_USER_DATA_TITLE=Change your own user account data here. +MENU_EDIT_PROFILE_TITLE=Edit data 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=and I accept them with this. +GUEST_YES_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the +GUEST_YES_READ_TERMS_CONDITIONS_2=and I accept them with this. +TERMS_CONDITIONS=Terms & Conditions +PAGE_TITLE_LOGIN_AREA=User area 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..d1d2db0c 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -17,9 +17,9 @@
- - Ja, ich habe die gelesen und - auch verstanden. + #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_1} + + #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_2}
@@ -33,9 +33,9 @@
- - Ja, ich habe die gelesen und - auch verstanden. + #{msg.GUEST_YES_READ_TERMS_CONDITIONS_1} + + #{msg.GUEST_YES_READ_TERMS_CONDITIONS_2}
diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl index 4ea5d85f..bca3e79a 100644 --- a/web/WEB-INF/templates/login/login_base.tpl +++ b/web/WEB-INF/templates/login/login_base.tpl @@ -4,7 +4,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"> - Benutzerbereich - + #{msg.PAGE_TITLE_LOGIN_AREA} -