]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Even more strings have been internationalized and translated to English.
authorRoland Haeder <roland@mxchange.org>
Tue, 15 Sep 2015 09:35:03 +0000 (11:35 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 15 Sep 2015 10:39:50 +0000 (12:39 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/guest/guest_login_form.tpl
web/WEB-INF/templates/guest/guest_personal_data.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/guest_registration_form.tpl
web/admin/category.xhtml
web/admin/product.xhtml
web/customer/checkout2.xhtml
web/customer/lost_passwd.xhtml

index d162f45d00dbe7f9fbcfc6afc604ab5d91a1ec92..642caa7e68051c612214e9ad0e5fa4ba624ac9a6 100644 (file)
@@ -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. <em>Pizza Italia</em>)
 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
index ad4203a16f7077f6ba73bfb99b7e10b2fedaed77..b53afcb089a78df021cda13a76696210ab2acc49 100644 (file)
@@ -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. <em>Pizza Italia</em>
 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
index 93eeb4c30a6ec0cb8bf05af9a40d12e1fc7dc013..16ce97292587817f6edb6f0d6792a94fbfd90978 100644 (file)
@@ -20,7 +20,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="id" size="10" maxlength="20" required="true" requiredMessage="#{msg.NO_EMAIL_ADDRESS_ENTERED}" />
+                                                       <h:inputText class="input" id="id" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_CUSTOMER_NUMBER_MESSAGE}" />
                                                </div>
                                        </div>
 
@@ -32,7 +32,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="password" size="10" maxlength="255" required="true" requiredMessage="#{msg.NO_PASSWORD_ENTERED}" />
+                                                       <h:inputSecret class="input" id="password" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
                                        </div>
 
index f4da04c8a572a5c9d4ccd509ce8ba087d42d688f..a3f11e838bd883c12c1615d62605428a9d6805c7 100644 (file)
@@ -6,16 +6,16 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <div class="para notice">
-               Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein:
+               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
        </div>
 
        <div class="para">
                <fieldset id="personal_data">
-                       <legend title="Bitte geben Sie Ihre Daten ein.">Bitte Ihre Daten eingeben:</legend>
+                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="gender" value="Anrede:" />
+                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
                                </div>
 
                                <div class="table_right">
@@ -27,7 +27,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="companyname" value="Firmenname:" />
+                                       <h:outputLabel for="companyname" value="#{msg.PERSONAL_DATA_COMPANY_NAME}" />
                                </div>
 
                                <div class="table_right">
@@ -39,7 +39,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="firstName" value="Vorname:" />
+                                       <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                </div>
 
                                <div class="table_right">
@@ -53,7 +53,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="familyName" value="Nachname:" />
+                                       <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
 
                                <div class="table_right">
@@ -67,7 +67,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="street" value="Straße:" />
+                                       <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
                                </div>
 
                                <div class="table_right">
@@ -81,7 +81,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="houseNumber" value="Hausnummer:" />
+                                       <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
 
                                <div class="table_right">
@@ -95,7 +95,7 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="zipCode" value="Postleitzahl:" />
+                                       <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
                                </div>
 
                                <div class="table_right">
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="city" value="Ort:" />
+                                       <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
                                </div>
 
                                <div class="table_right">
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="phoneNumber" value="Telefon:" />
+                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
                                <div class="table_right">
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="faxNumber" value="Faxnummer:" />
+                                       <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right">
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="cellphoneNumber" value="Handy:" />
+                                       <h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
                                </div>
 
                                <div class="table_right">
index 981c8f373ee7d587b1a41d0de136db9127fe4b63..81b839717ebcba87cd4d916c2a119958f1c580a2 100644 (file)
@@ -7,16 +7,17 @@
 
        <div class="para">
                <fieldset id="terms_privacy">
-                       <legend title="Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.">Rechtliches:</legend>
+                       <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">#{msg.PRIVACY_TERMS_LEGEND}</legend>
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="Bitte den Datenschutzbestimmungen zustimmen.">
+                                       <h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="#{PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
                                <div class="table_right75">
+                                       <!-- TODO Need to internationalize: //-->
                                        Ja, ich habe die <h:link outcome="privacy" target="_blank" value="Datenschutzbestimmungen" /> gelesen und
                                        auch verstanden.
                                </div>
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="Bitte den AGBs zustimmen.">
+                                       <h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
                                <div class="table_right75">
+                                       <!-- TODO Need to internationalize: //-->
                                        Ja, ich habe die <h:link outcome="terms" target="_blank" value="Allgemeinen Geschäftsbedingungen" /> gelesen und
                                        auch verstanden.
                                </div>
index d8845ac377adc856074be1e28bc460c1873a969d..b293fee77ed1c172038318f30ca969fc7e0a4513 100644 (file)
@@ -9,18 +9,18 @@
        <h:form acceptcharset="utf-8" id="register_form">
                <div class="table">
                        <div class="table_header">
-                               Anmelden als Neukunde
+                               #{msg.GUEST_REGISTRATION_TITLE}
                        </div>
 
                        <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
 
                        <div class="para">
                                <fieldset id="login_data">
-                                       <legend title="Zum Bestätigen wird Ihre Email-Adresse benötigt, für den Login Kundennummer und Passwort.">Email-Adresse und Passwort:</legend>
+                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="emailAddress1" value="eMail-Adresse eingeben:" />
+                                                       <h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
                                                </div>
 
                                                <div class="table_right">
@@ -32,7 +32,7 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="emailAddress2" value="eMail-Adresse wiederholen:" />
+                                                       <h:outputLabel for="emailAddress2" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL2}" />
                                                </div>
 
                                                <div class="table_right">
@@ -46,7 +46,7 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="password1" value="Passwort eingeben:" />
+                                                       <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
                                                </div>
 
                                                <div class="table_right">
@@ -58,7 +58,7 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="password2" value="Passwort wiederholen:" />
+                                                       <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
                                                </div>
 
                                                <div class="table_right">
@@ -69,7 +69,7 @@
                                        </div>
 
                                        <div class="para notice">
-                                               Die Kundennummer wird Ihnen später vergeben.
+                                               #{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}
                                        </div>
                                </fieldset>
                        </div>
@@ -78,7 +78,7 @@
 
                        <div class="table_footer">
                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton class="submit" type="submit" id="register" value="Anmelden" action="#{controller.doRegister()}" />
+                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{controller.doRegister()}" />
                        </div>
                </div>
        </h:form>
index 1bc8004d8aa269d0d02a6d48162593781c77cf93..5785d733ea7a003e11059205c1a0a0b64e2b137e 100644 (file)
@@ -40,8 +40,8 @@
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(cat)}" value="#{msg.BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.BUTTON_ADMIN_DELETE_ENTRIES}" />
+                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(cat)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
                                        </div>
                                </h:form>
                        </div>
@@ -84,7 +84,7 @@
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.BUTTON_ADMIN_ADD_CATEGORY}" />
+                                               <h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
                                        </div>
                                </div>
                                </h:form>
index 5d38fdb667237d21d13d7060f369fb52d9319747..6f485bb54944ea746d3d1a781461df7fdaa1b24b 100644 (file)
@@ -49,8 +49,8 @@
 
                                        <div  class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_product.editProduct(product)}" value="#{msg.BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteProduct(product)}" value="#{msg.BUTTON_ADMIN_DELETE_ENTRIES}" />
+                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_product.editProduct(product)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteProduct(product)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
                                        </div>
                                </h:form>
                        </div>
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="add" action="#{admin_product.addProduct()}" value="#{msg.BUTTON_ADMIN_ADD_PRODUCT}" />
+                                               <h:commandButton class="submit" type="submit" id="add" action="#{admin_product.addProduct()}" value="#{msg.ADMIN_BUTTON_ADD_PRODUCT}" />
                                        </div>
                                </div>
                                </h:form>
index e63913484844ca8675cfbcb7365f7489900a3c1e..d0dc5a073b5fb63fa3528d91aabbfeba0718ed06 100644 (file)
@@ -33,7 +33,7 @@
                                        <h:form acceptcharset="utf-8" id="checkout_form">
                                                <div class="table">
                                                        <div class="table_header">
-                                                               Bezahlung ohne Anmeldung
+                                                               #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
                                                        </div>
 
                                                        <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
index 9b47c621f511ba05579fbba5eb47706e7954e917..4a76c6fd5019dffffb5eae9f701aebac6ab38f54 100644 (file)
@@ -47,7 +47,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       <h:outputLabel for="email" value="eMail-Adresse:" />
+                                                                       <h:outputLabel for="email" value="Email-Adresse:" />
                                                                </div>
 
                                                                <div class="table_right">