From: Roland Häder <roland@mxchange.org>
Date: Wed, 17 Aug 2016 12:16:46 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bf3e6bbf1f505b48dcf346437be689731e05e0ec;p=jjobs-war.git

Please cherry-pick:
- added missing 18n strings
- renamed some i18n strings to make them more clear (generic and added _NUMBER)
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 5bf67b88..1d051d58 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -412,8 +412,8 @@ PAGE_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren
 CONTENT_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren:
 PAGE_TITLE_ADMIN_SHOW_MOBILE=Mobiletelefoneintrag anzeigen
 CONTENT_TITLE_ADMIN_SHOW_MOBILE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes:
-PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen
-CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon:
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon:
 ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt.
 PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen:
@@ -621,8 +621,8 @@ ADMIN_DELETE_MOBILE_DATA_NOTICE=Wenn Sie die Mobilfunknummer l\u00f6schen, steht
 ADMIN_DELETE_MOBILE_TITLE=Wollen Sie die Mobilfunknummer wirklich l\u00f6schen?
 ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI=Die Tabelle enth\u00e4lt die wichtigsten Daten zum Konakt (minimalisierte Ansicht).
 ADMIN_SHOW_FULL_CONTACT_DATA=Gesamte Kontaktdaten anzeigen
-ADMIN_UNLINK_CONTACT_MOBILE_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen?
-BUTTON_ADMIN_UNLINK_CONTACT_MOBILE=Mobilfunknummer vom Kontakt abtrennen
+ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen?
+BUTTON_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Mobilfunknummer vom Kontakt abtrennen
 ADMIN_LOCK_USER_TITLE=Wollen Sie diesen Benutzer wirklich sperren?
 ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Kann den Benutzer {0} ({1}) nicht entsperren, da er bereits entsperrt ist.
 ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Kann den Benutzer {0} ({1}) nicht sperren, da er bereits gesperrt ist.
@@ -640,7 +640,7 @@ ERROR_USER_PASSWORD_MISMATCH=Ihr eingegebenes Passwort ist falsch.
 ERROR_USER_NAME_ALREADY_USED=Benutzername bereits verwendet. Bitte geben Sie einen anderen ein.
 ERROR_EMAIL_ADDRESSES_MISMATCHING=Die eingegebenen  Email-Addressen stimmen nicht \u00fcberein.
 ERROR_EMAIL_ADDRESS_ALREADY_USED=Die eingegebene Email-Adresse wird bereits verwendet und kann nicht erneut verwendet werden.
-ERROR_MOBILE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
+ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
 ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Mobilfunknummer diesem Kontakt hinzuf\u00fcgen
 ADMIN_SELECT_MOBILE_NUMBER=Mobilfunknummer ausw\u00e4hlen:
 BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
@@ -678,3 +678,7 @@ ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA=Diese Tabelle zeigt alle Daten des aufgeru
 ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA=Diese Tabelle zeigt alle Daten zur Faxnummer an.
 ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA=Diese Tabelle zeigt alle Daten zur Mobilfunknummer an.
 ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA=Diese Tabelle zeigt alle Daten zur Festnetznummer an.
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Festnetznummer vom Kontakt abtrennen
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Festnetznummer vom Kontakt abtrennen:
+ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED=Fehler: Festnetz-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
+ERROR_FAX_NUMBER_CONTACT_NOT_LINKED=Fehler: Fax-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index de8a172a..dc366a94 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -395,8 +395,8 @@ PAGE_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry
 CONTENT_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry:
 PAGE_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry
 CONTENT_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry:
-PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Remove link contact-mobile
-CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Remove link between contact-mobile:
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Remove link contact-mobile
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Remove link between contact-mobile:
 ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set.
 PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider:
@@ -621,8 +621,8 @@ ADMIN_DELETE_MOBILE_DATA_NOTICE=If you delete the mobile number, it won't be ava
 ADMIN_DELETE_MOBILE_TITLE=Do you really want to delete the mobile number?
 ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI=The table contains the most important data from contact (minimalized view).
 ADMIN_SHOW_FULL_CONTACT_DATA=Show all contact data
-ADMIN_UNLINK_CONTACT_MOBILE_TITLE=Do you really want to unlink the shown mobile number from the contact?
-BUTTON_ADMIN_UNLINK_CONTACT_MOBILE=Unlink mobile number from contact
+ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE=Do you really want to unlink the shown mobile number from the contact?
+BUTTON_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Unlink mobile number from contact
 ADMIN_LOCK_USER_TITLE=Do You really want to lock this user?
 ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Cannot unlock user {0} ({1}) because he is already unlocked.
 ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Cannot lock user {0} ({1}) because he is already locked.
@@ -640,7 +640,7 @@ ERROR_USER_PASSWORD_MISMATCH=You have entered a wrong password.
 ERROR_USER_NAME_ALREADY_USED=User name already used. Please enter another name.
 ERROR_EMAIL_ADDRESSES_MISMATCHING=Both entered email addresses are not the same.
 ERROR_EMAIL_ADDRESS_ALREADY_USED=Your entered email address is already used. Please enter another and try again.
-ERROR_MOBILE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}.
+ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}.
 ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Add mobile number to this contact
 ADMIN_SELECT_MOBILE_NUMBER=Choose mobile number:
 BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Add mobile number to contact
@@ -678,3 +678,7 @@ ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA=This table shows all data from requested c
 ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA=This table shows all data from given fax number.
 ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA=This table shows all data from given mobile number.
 ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA=This table shows all data from given land-line number.
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Unlink land-line number from contact
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Unlink land-line number from contact:
+ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED=Error: Land-line id {0} is not linked with contact id {1}.
+ERROR_FAX_NUMBER_CONTACT_NOT_LINKED=Error: fax id {0} is not linked with contact id {1}.
diff --git a/web/admin/fax/admin_contact_fax_unlink.xhtml b/web/admin/fax/admin_contact_fax_unlink.xhtml
index af4884fc..65bac3a5 100644
--- a/web/admin/fax/admin_contact_fax_unlink.xhtml
+++ b/web/admin/fax/admin_contact_fax_unlink.xhtml
@@ -13,17 +13,17 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX}</ui:define>
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX}
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}
 		</ui:define>
 
 		<ui:define name="content">
 			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.faxNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_TITLE}" />
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
 					</div>
 
 					<div class="para">
@@ -45,7 +45,7 @@
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
@@ -54,7 +54,7 @@
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.faxNumber}">
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.faxNumber}">
 				<f:param value="#{beanHelper.faxNumber.phoneId}" />
 				<f:param value="#{beanHelper.contact.contactId}" />
 			</h:outputFormat>
diff --git a/web/admin/landline/admin_contact_landline_unlink.xhtml b/web/admin/landline/admin_contact_landline_unlink.xhtml
index 9cbc290a..639004d1 100644
--- a/web/admin/landline/admin_contact_landline_unlink.xhtml
+++ b/web/admin/landline/admin_contact_landline_unlink.xhtml
@@ -13,17 +13,17 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE}</ui:define>
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE}
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}
 		</ui:define>
 
 		<ui:define name="content">
 			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.landLineNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_TITLE}" />
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
 					</div>
 
 					<div class="para">
@@ -45,7 +45,7 @@
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
@@ -54,7 +54,7 @@
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.landLineNumber}">
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.landLineNumber}">
 				<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 				<f:param value="#{beanHelper.contact.contactId}" />
 			</h:outputFormat>
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 0da682c4..db3eb0be 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -13,17 +13,17 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}</ui:define>
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}
 		</ui:define>
 
 		<ui:define name="content">
 			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
 					</div>
 
 					<div class="para">
@@ -45,7 +45,7 @@
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
@@ -54,7 +54,7 @@
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
 				<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 				<f:param value="#{beanHelper.contact.contactId}" />
 			</h:outputFormat>