From 74e7a2581cd0b35d8a9e377bae710ee56fe0d913 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Aug 2016 14:54:01 +0200 Subject: [PATCH] Please cherry-pick: - renamed/added some i18n strings --- .../org/mxchange/localization/bundle_de_DE.properties | 9 ++++++++- .../org/mxchange/localization/bundle_en_US.properties | 9 ++++++++- web/admin/contact/unlink/admin_contact_fax_unlink.xhtml | 2 +- .../contact/unlink/admin_contact_landline_unlink.xhtml | 2 +- .../contact/unlink/admin_contact_mobile_unlink.xhtml | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 1d051d58..37d91d33 100644 --- 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 dc366a94..0586d99f 100644 --- 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 5cece116..010c67a1 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -45,7 +45,7 @@
- +
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index d2832fa0..7a4ca02c 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -45,7 +45,7 @@
- +
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index db3eb0be..717388eb 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -45,7 +45,7 @@
- +
-- 2.39.5