Please cherry-pick:

- renamed/added some i18n strings

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 1d051d58ec190756c5072edbd502d42a516db9ef..37d91d3396721060ef63e294137b6556883e3f60 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -622,7 +622,7 @@ 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_NUMBER_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen?
-BUTTON_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Mobilfunknummer vom Kontakt abtrennen
+BUTTON_ADMIN_UNLINK_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.
@@ -682,3 +682,10 @@ PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Festnetznummer vom Kontakt abtr
 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.
+ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE=Wollen Sie wirklich die Festnetznummer vom Kontakt abtrennen?
+BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER=Festnetznummer abtrennen
+BUTTON_ADMIN_UNLINK_FAX_NUMBER=Faxnummer abtrennen
+ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET=Fehler: Instanz 'faxNumber' in Bean-Helper nicht gesetzt.
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Faxnummer vom Kontakt abtrennen
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Faxnummer vom Kontakt abtrennen:
+ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE=Wollen Sie wirklich die Faxnummer vom Kontakt abtrennen?

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index dc366a944893ebb6b5965dbe32cddf7b8831cc2a..0586d99f53a33f702ef047596fbcc2f49808227a 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -622,7 +622,7 @@ 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_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
+BUTTON_ADMIN_UNLINK_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.
@@ -682,3 +682,10 @@ PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER=Unlink land-line number from co
 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}.
+ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE=Do you really want to unlink the land-line number from contact?
+BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER=Unlink land-line number
+BUTTON_ADMIN_UNLINK_FAX_NUMBER=Unlink fax number
+ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET=Error: Instance 'faxNumber' not set in bean helper.
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Unlink fax number from contact
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Unlink fax number from contact:
+ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE=Do you really want to unlink the fax number from contact?

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 5cece1167fc370f9362c3b4d26dfe41628023328..010c67a1da357be5ac79b4acb5791d5472c4c5c3 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -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_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index d2832fa093a91bdc230d02287b19b3b07bde9df1..7a4ca02cf8d2bd6a2ff6957cb8f6ebc8a9e4bbd3 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -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_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index db3eb0be713a0beebbb323f5fc509bc86395e317..717388eb5199bb7a47d56bbccd654744faa56b05 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -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_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>