From 0877c8a8a3da6b5e870cdff5f44a6c41ee66d241 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 15 Sep 2015 11:35:03 +0200 Subject: [PATCH] =?utf8?q?Even=20more=20strings=20have=20been=20internatio?= =?utf8?q?nalized=20and=20translated=20to=20English.=20Signed-off-by:Rolan?= =?utf8?q?d=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../localization/bundle_de_DE.properties | 40 ++++++++++++++++--- .../localization/bundle_en_US.properties | 40 ++++++++++++++++--- .../templates/guest/guest_login_form.tpl | 4 +- .../templates/guest/guest_personal_data.tpl | 26 ++++++------ .../templates/guest/guest_privacy_terms.tpl | 8 ++-- .../guest/guest_registration_form.tpl | 16 ++++---- web/admin/category.xhtml | 6 +-- web/admin/product.xhtml | 6 +-- web/customer/checkout2.xhtml | 2 +- web/customer/lost_passwd.xhtml | 2 +- 10 files changed, 104 insertions(+), 46 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index d162f45d..642caa7e 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -30,8 +30,8 @@ ADMIN_CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgew\u00e4hlt werden. ERROR_AMOUNT_IS_NULL=Die Bestellmenge ist nicht gesetzt. BUTTON_TITLE_ADD_ITEM_TO_BASKET=F\u00fcgt das Produkt dem Warenkorb hinzu. INPUT_TITLE_ENTER_ITEM_AMOUNT=Geben Sie hier die Bestellmenge ein. -NO_EMAIL_ADDRESS_ENTERED=Sie haben keine EMail-Adresse eingegeben. -NO_PASSWORD_ENTERED=Sie haben kein Passwort eingegeben. +LOGIN_NO_CUSTOMER_NUMBER_MESSAGE=Sie haben keine EMail-Adresse eingegeben. +LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. ERROR_AMOUNT_IS_NOT_LONG=Die eingegebene Menge ist keine Zahl. PAGE_TITLE_INDEX_WELCOME=Willkommen! SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service @@ -58,17 +58,17 @@ ADMIN_PARENT_CATEGORY=Elternkategorie: SUB_TITLE_ADMIN_PRODUCTS=Diese Produkte sind erstellt worden: PAGE_TITLE_ADMIN_PRODUCTS=Produkte BUTTON_RESET_FORM=Formular zur\u00fccksetzen -BUTTON_EDIT_ENTRIES=\u00c4ndern -BUTTON_ADMIN_DELETE_ENTRIES=L\u00f6schen +ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern +ADMIN_BUTTON_DELETE_ENTRIES=L\u00f6schen ADMIN_ADD_PRODUCT_TITLE=Neues Produkt hinzuf\u00fcgen: ADMIN_ADD_CATEGORY_TITLE=Neue Kategorie hinzuf\u00fcgen: CATEGORY=Kategorie: PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen: -BUTTON_ADMIN_ADD_CATEGORY=Kategorie hinzuf\u00fcgen +ADMIN_BUTTON_ADD_CATEGORY=Kategorie hinzuf\u00fcgen ADMIN_ENTER_PRODUCT_TITLE=Produktbezeichnung: ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(z.B. Pizza Italia) IS_AVAILABLE=Verf\u00fcgbar: -BUTTON_ADMIN_ADD_PRODUCT=Produkt hinzuf\u00fcgen +ADMIN_BUTTON_ADD_PRODUCT=Produkt hinzuf\u00fcgen ADMIN_ADD_PRODUCT_NOTICE_TITLE=Hinweise zum Hinzuf\u00fcgen von Produkten: ADMIN_ADD_PRODUCT_NOTICE_LINE1=Beim Preis keine W\u00e4hrungszeichen (wie \u20ac usw.) eingeben. ADMIN_ADD_PRODUCT_NOTICE_LINE2=Kommastellen mit Punkt, nicht mit Komma abtrennen. @@ -114,3 +114,31 @@ LINK_CHECKOUT_OPTION_LOGIN=Weiter zum Kundenlogin LINK_CHECKOUT_OPTION_REGISTRATION=Weiter zum neuen Kundenkonto anmelden LINK_CHECKOUT_OPTION_GUEST=Ohne Anmeldung bezahlen BUTTON_COMPLETE_ORDER=Bestellung verbindlich abschicken +GUEST_REGISTRATION_TITLE=Anmelden als Neukunde +GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Kundennummer und Passwort. +GUEST_REGISTRATION_EMAIL_LEGEND=Email-Adresse und Passwort: +GUEST_REGISTRATION_ENTER_EMAIL1=Email-Adresse eingeben: +GUEST_REGISTRATION_ENTER_EMAIL2=Email-Adresse wiederholen: +GUEST_REGISTRATION_ENTER_PASSWORD1=Passwort eingeben: +GUEST_REGISTRATION_ENTER_PASSWORD2=Passwort wiederholen: +GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE=Die Kundennummer wird Ihnen sp\u00e4ter vergeben. +BUTTON_FINISH_REGISTRATION=Anmelden +PRIVACY_TERMS_LEGEND_TITLE=Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren. +PRIVACY_TERMS_LEGEND=Rechtliches: +PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen. +TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen. +PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: +PERSONAL_DATA_GENDER=Anrede: +PERSONAL_DATA_COMPANY_NAME=Firmenname: +PERSONAL_DATA_FIRST_NAME=Vorname: +PERSONAL_DATA_FAMILY_NAME=Nachname: +PERSONAL_DATA_STREET=Stra\u00dfe: +PERSONAL_DATA_HOUSE_NUMBER=Hausnummer: +PERSONAL_DATA_ZIP_CODE=Postleitzahl: +PERSONAL_DATA_PHONE_NUMBER=Telefon: +PERSONAL_DATA_FAX_NUMBER=Faxnummer: +PERSONAL_DATA_CELLPHONE_NUMBER=Mobil: +PERSONAL_DATA_CITY=Ort: +PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein. +PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben: +GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Bezahlung ohne Anmeldung diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index ad4203a1..b53afcb0 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -28,8 +28,8 @@ ADMIN_CATEGORY_MUST_BE_SELECTED=You have to select a category. ERROR_AMOUNT_IS_NULL=Order amount is not set. BUTTON_TITLE_ADD_ITEM_TO_BASKET=Adds the product to the basket. INPUT_TITLE_ENTER_ITEM_AMOUNT=Enter order amount here. -NO_EMAIL_ADDRESS_ENTERED=You have entered no email address. -NO_PASSWORD_ENTERED=You have entered no password. +LOGIN_NO_CUSTOMER_NUMBER_MESSAGE=You have entered no email address. +LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. ERROR_AMOUNT_IS_NOT_LONG=The entered amount is not a number. PAGE_TITLE_INDEX_WELCOME=Welcome! SUB_TITLE_INDEX_WELCOME=Welcome to Pizza-Service @@ -56,17 +56,17 @@ ADMIN_PARENT_CATEGORY=Parent category: SUB_TITLE_ADMIN_PRODUCTS=These products has been created: PAGE_TITLE_ADMIN_PRODUCTS=Products BUTTON_RESET_FORM=Reset form -BUTTON_EDIT_ENTRIES=Edit -BUTTON_ADMIN_DELETE_ENTRIES=Delete +ADMIN_BUTTON_EDIT_ENTRIES=Edit +ADMIN_BUTTON_DELETE_ENTRIES=Delete ADMIN_ADD_PRODUCT_TITLE=Add a new product: ADMIN_ADD_CATEGORY_TITLE=Add a new category: CATEGORY=Category: PLEASE_FILL_ALL_FIELDS=Please fill out all fields: -BUTTON_ADMIN_ADD_CATEGORY=Add category +ADMIN_BUTTON_ADD_CATEGORY=Add category ADMIN_ENTER_PRODUCT_TITLE=Product title: ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=e.g. Pizza Italia IS_AVAILABLE=Available: -BUTTON_ADMIN_ADD_PRODUCT=Add product +ADMIN_BUTTON_ADD_PRODUCT=Add product ADMIN_ADD_PRODUCT_NOTICE_TITLE=Notices for adding new product: ADMIN_ADD_PRODUCT_NOTICE_LINE1=Please don't use currency symbol, such as \u20ac. ADMIN_ADD_PRODUCT_NOTICE_LINE2=Separte with dot, not with comma (usual in Germany). @@ -112,3 +112,31 @@ LINK_CHECKOUT_OPTION_LOGIN=Continue to customer login LINK_CHECKOUT_OPTION_REGISTRATION=Continue with new customer registration LINK_CHECKOUT_OPTION_GUEST=Checkout without registration BUTTON_COMPLETE_ORDER=Bestellung verbindlich abschicken +GUEST_REGISTRATION_TITLE=Register a new customer account +GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your customer number and password are required. +GUEST_REGISTRATION_EMAIL_LEGEND=Email address and password: +GUEST_REGISTRATION_ENTER_EMAIL1=Enter your email address: +GUEST_REGISTRATION_ENTER_EMAIL2=Repeat your email address: +GUEST_REGISTRATION_ENTER_PASSWORD1=Enter a password: +GUEST_REGISTRATION_ENTER_PASSWORD2=Repeat your password: +GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE=A customer number is later assigned to your account. +BUTTON_FINISH_REGISTRATION=Register +PRIVACY_TERMS_LEGEND_TITLE=Please read and accept terms and privacy policy. +PRIVACY_TERMS_LEGEND=Terms & privacy policy: +PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy. +TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions. +PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number. +PERSONAL_DATA_GENDER=Salutation: +PERSONAL_DATA_COMPANY_NAME=Company name: +PERSONAL_DATA_FIRST_NAME=First name: +PERSONAL_DATA_FAMILY_NAME=Family name: +PERSONAL_DATA_STREET=Street: +PERSONAL_DATA_HOUSE_NUMBER=House number: +PERSONAL_DATA_ZIP_CODE=ZIP code: +PERSONAL_DATA_PHONE_NUMBER=Phone: +PERSONAL_DATA_FAX_NUMBER=Fax: +PERSONAL_DATA_CELLPHONE_NUMBER=Mobile: +PERSONAL_DATA_CITY=City: +PERSONAL_DATA_LEGEND_TITLE=Please enter your data. +PERSONAL_DATA_LEGEND=Please enter your data: +GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Payment without registration diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl index 93eeb4c3..16ce9729 100644 --- a/web/WEB-INF/templates/guest/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/guest_login_form.tpl @@ -20,7 +20,7 @@
- +
@@ -32,7 +32,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/guest_personal_data.tpl b/web/WEB-INF/templates/guest/guest_personal_data.tpl index f4da04c8..a3f11e83 100644 --- a/web/WEB-INF/templates/guest/guest_personal_data.tpl +++ b/web/WEB-INF/templates/guest/guest_personal_data.tpl @@ -6,16 +6,16 @@ xmlns:ui="http://java.sun.com/jsf/facelets">
- Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: + #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
- Bitte Ihre Daten eingeben: + #{msg.PERSONAL_DATA_LEGEND}
- +
@@ -27,7 +27,7 @@
- +
@@ -39,7 +39,7 @@
- +
@@ -53,7 +53,7 @@
- +
@@ -67,7 +67,7 @@
- +
@@ -81,7 +81,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -107,7 +107,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -133,7 +133,7 @@
- +
@@ -145,7 +145,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index 981c8f37..81b83971 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -7,16 +7,17 @@
- Rechtliches: + #{msg.PRIVACY_TERMS_LEGEND}
- +
+ Ja, ich habe die gelesen und auch verstanden.
@@ -26,12 +27,13 @@
- +
+ Ja, ich habe die gelesen und auch verstanden.
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl index d8845ac3..b293fee7 100644 --- a/web/WEB-INF/templates/guest/guest_registration_form.tpl +++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl @@ -9,18 +9,18 @@
- Anmelden als Neukunde + #{msg.GUEST_REGISTRATION_TITLE}
- Email-Adresse und Passwort: + #{msg.GUEST_REGISTRATION_EMAIL_LEGEND}
- +
@@ -32,7 +32,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -58,7 +58,7 @@
- +
@@ -69,7 +69,7 @@
- Die Kundennummer wird Ihnen später vergeben. + #{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}
@@ -78,7 +78,7 @@
- +
diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml index 1bc8004d..5785d733 100644 --- a/web/admin/category.xhtml +++ b/web/admin/category.xhtml @@ -40,8 +40,8 @@
- - + +
@@ -84,7 +84,7 @@
- +
diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml index 5d38fdb6..6f485bb5 100644 --- a/web/admin/product.xhtml +++ b/web/admin/product.xhtml @@ -49,8 +49,8 @@
- - + +
@@ -121,7 +121,7 @@
- +
diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml index e6391348..d0dc5a07 100644 --- a/web/customer/checkout2.xhtml +++ b/web/customer/checkout2.xhtml @@ -33,7 +33,7 @@
- Bezahlung ohne Anmeldung + #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml index 9b47c621..4a76c6fd 100644 --- a/web/customer/lost_passwd.xhtml +++ b/web/customer/lost_passwd.xhtml @@ -47,7 +47,7 @@
- +
-- 2.39.5