Please cherry-pick:

- renamed i18n strings more towards _NUMBER as they are all numbers ...
- added missing 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 ac0bc648eb032b5888deed7ae7361c75ad968fb1..dba5adfcc19c68a9c5efeb1825b37f11fa0323b9 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -392,7 +392,7 @@ ADMIN_LINK_DELETE_USER=Benutzeraccount l\u00f6schen
 ADMIN_LINK_DELETE_USER_TITLE=L\u00f6scht das Benutzeraccount (nach Best\u00e4tigung).
 CONTENT_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen:
 PAGE_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen
-ADMIN_HEADER_SHOW_MOBILE_DATA=Daten des Mobiltelefons:
+ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA=Daten des Mobiltelefons:
 ADMIN_SHOW_PHONE_ID=Id-Nummer:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
@@ -419,7 +419,7 @@ PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen:
 TABLE_SUMMARY_ADMIN_SHOW_MOBILE_NUMBER=Ein einzelner Mobiletelefoneintrag.
 TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an.
-ADMIN_HEADER_SHOW_MOBILE_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
+ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
 ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt.
 ADMIN_UNLINK_DATA=Trennen:
 ADMIN_CONTACT_ID=Kontakt-Id:
@@ -650,20 +650,20 @@ LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Festnetznummern ...
 LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE=Listet alle Festnetznummern auf.
 LINK_ADMIN_LIST_FAX_PHONE_NUMBERS=Faxnummern ...
 LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE=Listet alle Faxnummern auf.
-ADMIN_LIST_FAX_EMPTY=Es sind keine Faxnummern gelistet.
-PAGE_TITLE_ADMIN_LIST_CONTACT_FAX=Faxnummern auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX=Faxnummern auflisten:
-PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE=Festnetznummern auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE=Festnetznummern auflisten:
+ADMIN_LIST_FAX_NUMBER_EMPTY=Es sind keine Faxnummern gelistet.
+PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=Faxnummern auflisten
+CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=Faxnummern auflisten:
+PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=Festnetznummern auflisten
+CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=Festnetznummern auflisten:
 ADMIN_SHOW_PHONE_NUMBER=Festnetznummer:
-PAGE_TITLE_ADMIN_SHOW_LAND_LINE=Festnetznummer anzeigen
-CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Festnetznummer anzeigen:
+PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Festnetznummer anzeigen
+CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Festnetznummer anzeigen:
 ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Fehler: Instanz 'landLine' nicht in Bean-Helper gesetzt.
-ADMIN_HEADER_SHOW_LAND_LINE_LINKS=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
+ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
 ADMIN_LIST_LAND_LINE_EMPTY=Es sind keine Festnetznummern gelistet.
-ADMIN_HEADER_SHOW_LAND_LINE_DATA=Daten der Festnetznummer:
+ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA=Daten der Festnetznummer:
 ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Vollst\u00e4ndige Festnetznummer:
-ADMIN_HEADER_SHOW_FAX_DATA=Daten der Faxnummer:
+ADMIN_HEADER_SHOW_FAX_NUMBER_DATA=Daten der Faxnummer:
 ADMIN_SHOW_FAX_NUMBER_COMPLETE=Komplette Faxnummer:
 ADMIN_SELECT_LAND_LINE_NUMBER=Festnetznummer ausw\u00e4hlen:
 ADMIN_SELECT_FAX_NUMBER=Faxnummer ausw\u00e4hlen:
@@ -710,3 +710,6 @@ ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Festnetznummer:
 PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Mobilfunknummern auflisten
 ERROR_ADMIN_NO_CHANGE_ENTERED=Selben Daten wurden abgeschickt, keine \u00c4nderung durchfgef\u00fchrt.
 ADMIN_PERSONAL_DATA_BIRTHDAY=Geburtsdatum: (tt.mm.jjjj)
+PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER=Faxnummer anzeigen
+CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER=Faxnummer anzeigen:
+ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS=Alle Faxnummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index e2911ca1949d0f542c4b84dea83986bf4b33d0a3..66d8fce399e662b63ce5c730d96ff7c682b9ff28 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -375,7 +375,7 @@ ADMIN_LINK_DELETE_USER=Delete user account
 ADMIN_LINK_DELETE_USER_TITLE=Deletes user account (after confirmation).
 CONTENT_TITLE_ADMIN_DELETE_USER=Delete user account:
 PAGE_TITLE_ADMIN_DELETE_USER=Delete user account
-ADMIN_HEADER_SHOW_MOBILE_DATA=Data of mobile phone:
+ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA=Data of mobile phone:
 ADMIN_SHOW_PHONE_ID=Id number:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
@@ -402,7 +402,7 @@ PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider:
 TABLE_SUMMARY_ADMIN_SHOW_MOBILE_NUMBER=A single mobile entry.
 TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=This table shows links of of this mobile number to all contacts.
-ADMIN_HEADER_SHOW_MOBILE_LINKS=All links for mobile number id {0}:
+ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS=All links for mobile number id {0}:
 ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set.
 ADMIN_UNLINK_DATA=Unlink:
 ADMIN_CONTACT_ID=Contact id:
@@ -650,20 +650,20 @@ LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Land-line numbers ...
 LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE=Lists all land-line numbers.
 LINK_ADMIN_LIST_FAX_PHONE_NUMBERS=Fax numbers ...
 LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE=Lists all fax numbers.
-ADMIN_LIST_FAX_EMPTY=There are no fax numbers listed.
-PAGE_TITLE_ADMIN_LIST_CONTACT_FAX=List fax numbers
-CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX=List fax numbers:
-PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE=List land-line numbers
-CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE=List land-line numbers:
+ADMIN_LIST_FAX_NUMBER_EMPTY=There are no fax numbers listed.
+PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=List fax numbers
+CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=List fax numbers:
+PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=List land-line numbers
+CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=List land-line numbers:
 ADMIN_SHOW_PHONE_NUMBER=Land-line number:
-PAGE_TITLE_ADMIN_SHOW_LAND_LINE=Show land-line number
-CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Show land-line number:
+PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Show land-line number
+CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Show land-line number:
 ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Error: Instance 'landLine' not set in bean helper.
-ADMIN_HEADER_SHOW_LAND_LINE_LINKS=All links for land-line number id number {0}:
+ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS=All links for land-line number id number {0}:
 ADMIN_LIST_LAND_LINE_EMPTY=There are no land-line numbers listed.
-ADMIN_HEADER_SHOW_LAND_LINE_DATA=Data of land-line number:
+ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA=Data of land-line number:
 ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Complete land-line number:
-ADMIN_HEADER_SHOW_FAX_DATA=Data of fax number:
+ADMIN_HEADER_SHOW_FAX_NUMBER_DATA=Data of fax number:
 ADMIN_SHOW_FAX_NUMBER_COMPLETE=Complete fax number:
 ADMIN_SELECT_LAND_LINE_NUMBER=Choose land-line number:
 ADMIN_SELECT_FAX_NUMBER=Choose fax number:
@@ -710,3 +710,6 @@ ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Land-line number:
 PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=List mobile numbers
 ERROR_ADMIN_NO_CHANGE_ENTERED=Same data has been sent, no change done.
 ADMIN_PERSONAL_DATA_BIRTHDAY=Birthday: (mm-dd-yyyy)
+PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER=Show fax number
+CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER=Show fax number:
+ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS=All links for fax number id {0}:

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 1afe26ba6bc45668891669664334c412e7941e36..3f3e22f18db16ccfd8996acede2d6b4839d68a01 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -9,7 +9,7 @@
 
        <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index f5ab1a67ff5b8b3af4a10136c3d2240279bff342..8b7c5a03150237b14ced44df90ced03e2e3a6fc4 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -9,7 +9,7 @@
 
        <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index f12c011bc22cf3b156803de95da612c56d1897b7..f7648aab9ca23e87c902ec9fdf67fd36b57124c5 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -9,7 +9,7 @@
 
        <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 97a897c3c54c2eae980d4b0929a0da9d30f49843..96c527c193b6f75b3398964720cdb7136f012536 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -9,11 +9,11 @@
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX}" />
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX}" />
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
@@ -58,7 +58,7 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_FAX_EMPTY}" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+                       <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index d630c0f6ecf0b2210e9bf67419156efe3956b36f..ed53fa10e37b671b2cf07bbbd5563a3c95e1ae45 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -15,11 +15,11 @@
                </ui:define>
 
                <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}" />
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}" />
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index ebf79527df0e9ec1dca42d55bf56ad7ac32744b2..f03f6baefd33c010bd3083f93b7741158706f341 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -9,11 +9,11 @@
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 6b1c00511c82434cdde7a1ddebf049b406cf84e7..e14c2bc71976555dc1ea9ce15535f424250c2ff2 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -15,11 +15,11 @@
                </ui:define>
 
                <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}" />
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}" />
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
@@ -29,7 +29,7 @@
 
                        <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_LINKS}">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:outputFormat>
                                </f:facet>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index ee3d99c12dfa391cccf51ddece621cd54d15909f..8332a7c1890b37857389e2fcc96e09f4dc650915 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -29,7 +29,7 @@
 
                        <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
                                                <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                                        </h:outputFormat>
                                </f:facet>