Renamed strings for better wording

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index c10ff61b3e7b24fc7d99159dd1d427dc75cbb5de..7d04ae90e034367960ebe12f165d21bbff146d0c 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -22,8 +22,8 @@ MINI_BASKET_LAST_ITEM=Zuletzt hinzugefuegt: {0}
 MINI_BASKET_ADDITIONAL_ITEMS=Es befinden sich noch {0} weitere Produkte im Warenkorb.
 MINI_BASKET_TITLE=Warenkorb
 ADMIN_CATEGORY_HAS_NO_PARENT=Keine Elternkategorie
-YES=Ja
-NO=Nein
+CHOICE_YES=Ja
+CHOICE_NO=Nein
 ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL=Elternkategorie darf nicht leer sein.
 ADMIN_CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgew\u00e4hlt werden.
 BUTTON_TITLE_ADD_ITEM_TO_BASKET=F\u00fcgt das Produkt dem Warenkorb hinzu.
@@ -195,10 +195,10 @@ TABLE_SUMMARY_ADMIN_CATEGORY=Diese Tabelle listet alle angelegten Artikelkategor
 TABLE_SUMMARY_SHOW_BASKET=Diese Tabelle listet die im Warenkorb befindlichen Artikel einfach auf.
 TABLE_SUMMARY_ADMIN_PRODUCTS=Diese Tabelle listet alle angelegten Produkte im Administrationsbereich auf.
 TABLE_SUMMARY_INDEX_PRODUCTS=Diese Tabelle listet alle verf\u00fcgbaren Produkte in der Eingangsseite auf.
-GUEST_YES_READ_PRIVACY_STATEMENT_1=Ja, ich habe die
-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.
+GUEST_AGREE_READ_PRIVACY_STATEMENT_1=Ja, ich habe die
+GUEST_AGREE_READ_PRIVACY_STATEMENT_2=gelesen und auch verstanden und nehme sie hiermit an.
+GUEST_AGREE_READ_TERMS_CONDITIONS_1=Ja, ich habe die
+GUEST_AGREE_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an.
 TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen
 NONE_SELECTED=k.A.
 ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index d88af651f03a70712af539bf09e1911ac3ff0c0b..8d537dc6a6230cdd92dbdf953412f9fa29cc104c 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -22,8 +22,8 @@ MINI_BASKET_LAST_ITEM=Last added item: {0}
 MINI_BASKET_ADDITIONAL_ITEMS=There are {0} items in the basket.
 MINI_BASKET_TITLE=Basket
 ADMIN_CATEGORY_HAS_NO_PARENT=No parent category
-YES=Yes
-NO=No
+CHOICE_YES=Yes
+CHOICE_NO=No
 ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL=Parent category cannot be empty.
 ADMIN_CATEGORY_MUST_BE_SELECTED=You have to select a category.
 BUTTON_TITLE_ADD_ITEM_TO_BASKET=Adds the product to the basket.
@@ -198,10 +198,10 @@ TABLE_SUMMARY_ADMIN_CATEGORY=This table lists all in admin area created article
 TABLE_SUMMARY_SHOW_BASKET=This table lists all to the basket added articles.
 TABLE_SUMMARY_ADMIN_PRODUCTS=This table lists all in admin area created products.
 TABLE_SUMMARY_INDEX_PRODUCTS=This table lists all available products in index page.
-GUEST_YES_READ_PRIVACY_STATEMENT_1=Yes, I have read and understand the
-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.
+GUEST_AGREE_READ_PRIVACY_STATEMENT_1=Yes, I have read and understand the
+GUEST_AGREE_READ_PRIVACY_STATEMENT_2=and I accept them with this.
+GUEST_AGREE_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the
+GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this.
 TERMS_CONDITIONS=Terms & Conditions
 NONE_SELECTED=Empty
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index 47299fdcbd307cea43ca679d8108c4232a964fb7..e6234dc451b9dbf84bf23a43a813d8d1ff520e4e 100644 (file)
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -64,8 +64,8 @@
 
                                <div class="table_right_medium">
                                        <h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
-                                               <f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
-                                               <f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
+                                               <f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
+                                               <f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
                                        </h:selectOneListbox>
                                </div>
 

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index aa7ee66637edd242bd8d314801e0f0d19ce1ff73..744848d4304081754848b20046558e51f0077f73 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -17,9 +17,9 @@
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_1}
+                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
-                                       #{msg.GUEST_YES_READ_PRIVACY_STATEMENT_2}
+                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
                                </div>
 
                                <div class="clear"></div>
@@ -33,9 +33,9 @@
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_YES_READ_TERMS_CONDITIONS_1}
+                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}
                                        <h:link outcome="terms" target="_blank" value="#{msg.TERMS_CONDITIONS}" />
-                                       #{msg.GUEST_YES_READ_TERMS_CONDITIONS_2}
+                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/admin/product/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
index 8e92a519cb78a04cdaa27902b40494a198bc6819..11588dee9b2ccb38c4eb88bc9acfb7efad67fefb 100644 (file)
--- a/web/admin/product/admin_product_list.xhtml
+++ b/web/admin/product/admin_product_list.xhtml
@@ -100,8 +100,8 @@
 
                                                                <div class="table_right">
                                                                        <h:selectOneListbox required="true" id="available" value="#{adminProductController.productAvailability}" size="1" class="select">
-                                                                               <f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
-                                                                               <f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
+                                                                               <f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
+                                                                               <f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
                                                                        </h:selectOneListbox>
                                                                </div>