From 19a92cc58c73059b38c601ac1d501439b48468e2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 17:48:40 +0200
Subject: [PATCH] Renamed strings for better wording

---
 .../mxchange/localization/bundle_de_DE.properties    | 12 ++++++------
 .../mxchange/localization/bundle_en_US.properties    | 12 ++++++------
 .../admin/country/admin_form_country_data.tpl        |  4 ++--
 web/WEB-INF/templates/guest/guest_privacy_terms.tpl  |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index ff9bb004..3d57fab0 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -17,8 +17,8 @@
 GENDER_UNKNOWN=Unbekannt
 GENDER_MALE=Herr
 GENDER_FEMALE=Frau
-YES=Ja
-NO=Nein
+CHOICE_YES=Ja
+CHOICE_NO=Nein
 PAGE_TITLE_INDEX_WELCOME=Willkommen!
 CONTENT_TITLE_INDEX_WELCOME=Willkommen zum Addressbook:
 PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich
@@ -146,10 +146,10 @@ MENU_EDIT_PROFILE_TITLE=Daten \u00e4ndern
 PAGE_TITLE_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern
 CONTENT_TITLE_LOGIN_EDIT_USER_DATA=\u00c4ndern Sie Ihre Benutzerdaten:
 LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen
-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
 PAGE_TITLE_LOGIN_AREA=Benuzterbereich
 TABLE_HEADER_LIST_OWN_ADDRESSBOOKS=Meine eigenen Adressb\u00fccher:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index f9ed6da5..2975f99b 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -17,8 +17,8 @@
 GENDER_UNKNOWN=Unknown
 GENDER_MALE=Mr.
 GENDER_FEMALE=Mrs.
-YES=Yes
-NO=No
+CHOICE_YES=Yes
+CHOICE_NO=No
 PAGE_TITLE_INDEX_WELCOME=Welcome!
 CONTENT_TITLE_INDEX_WELCOME=Welcome to Addressbook
 PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area
@@ -146,10 +146,10 @@ MENU_EDIT_PROFILE_TITLE=Edit data
 PAGE_TITLE_LOGIN_EDIT_USER_DATA=Change user data
 CONTENT_TITLE_LOGIN_EDIT_USER_DATA=Change your user data:
 LINK_GUEST_PRIVACY_STATEMENTS=privacy statements
-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
 PAGE_TITLE_LOGIN_AREA=User area
 TABLE_HEADER_LIST_OWN_ADDRESSBOOKS=My own address books:
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 47299fdc..e6234dc4 100644
--- 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 aa7ee666..744848d4 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 @@
 				</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>
-- 
2.39.5