]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 30 Mar 2018 22:09:23 +0000 (00:09 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 21 Jul 2019 06:05:57 +0000 (08:05 +0200)
- _HEADER is now everwhere a suffix, not 2nd prefix of i18n keys
- *_BASIC_COMPANY_DATA_* was nice to read, still the POJI is named BasicData
  where this i18n key belongs to, so let's remove the _COMPANY from all strings
- ID_NUMBER_HEADER is generic and okay for "Id number:" string

Signed-off-by: Roland Häder <roland@mxchange.org>
26 files changed:
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/admin/basic_data/admin_basic_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/headquarter/admin_headquarter_list.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_list.xhtml

index afb1f3ab8f3c40902e2fa8c0fcd1602ea67d743d..50f04abce1576a05cb28932d1a6ed13b91418687 100644 (file)
@@ -290,7 +290,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl f\u00fcr Gespr\u00e4che ausserh
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Vorwahl f\u00fcr das Land:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Beispiel: 49 f\u00fcr Deutschland)
 BUTTON_ADMIN_ADD_COUNTRY=L\u00e4nderdaten hinzuf\u00fcgen
-ADMIN_HEADER_ID_NUMBER=Id-Nummer:
+ID_NUMBER_HEADER=Id-Nummer:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=L\u00e4ndercode:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
@@ -322,7 +322,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Beispiel: %s@smsmail.anbieter.examp
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Vorwahl:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Land:
-ADMIN_HEADER_ENTRY_CREATED=Erstellt:
+ENTRY_CREATED_HEADER=Erstellt:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Editieren oder l\u00f6schen des Handyanbieters
 ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
@@ -346,7 +346,7 @@ CONTENT_TITLE_ADMIN_SHOW_USER=Profil eines Benutzers anzeigen:
 ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: userId).
 ERROR_USER_NOT_FOUND=Fehler: Benutzereintrag nicht gefunden.
 ADMIN_TABLE_SUMMARY_SHOW_USER_DATA=Diese Tabelle zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an.
-ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}):
+ADMIN_SHOW_USER_HEADER=Benutzer {0} (Nummer {1}):
 ADMIN_USER_ID=Benutzer-Id:
 ADMIN_USER_NAME=Benutzername:
 ADMIN_USER_CREATED=Wann Benutzer erstellt:
@@ -375,7 +375,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_NUMBER_DATA=Daten des Mobiltelefons:
+ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER=Daten des Mobiltelefons:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links:
@@ -396,7 +396,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_NUMBER_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
+ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER=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:
@@ -429,7 +429,7 @@ ADMIN_MENU_CONTACT_TITLE=Kontaktdaten
 ADMIN_LINK_LIST_CONTACT=Kontaktdaten auflisten
 ADMIN_LINK_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an.
-ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}:
+ADMIN_SHOW_CONTACT_HEADER=Kontaktdaten f\u00fcr {0}:
 ADMIN_CONTACT_UPDATED=Kontaktdaten aktualisiert:
 ADMIN_LINK_DELETE_CONTACT=Kontaktdaten l\u00f6schen
 ADMIN_LINK_DELETE_CONTACT_TITLE=L\u00f6scht die Kontaktdaten, es wird eine Best\u00e4tigung verlangt.
@@ -637,10 +637,10 @@ ADMIN_SHOW_LAND_LINE_NUMBER=Festnetznummer:
 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_NUMBER_LINKS=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
-ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA=Daten der Festnetznummer:
+ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
+ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER=Daten der Festnetznummer:
 ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Vollst\u00e4ndige Festnetznummer:
-ADMIN_HEADER_SHOW_FAX_NUMBER_DATA=Daten der Faxnummer:
+ADMIN_SHOW_FAX_NUMBER_DATA_HEADER=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:
@@ -689,7 +689,7 @@ ERROR_ADMIN_NO_CHANGE_ENTERED=Selben Daten wurden abgeschickt, keine \u00c4nderu
 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}:
+ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER=Alle Faxnummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
 PAGE_TITLE_ADMIN_DELETE_FAX_NUMBER=Faxnummer l\u00f6schen
 CONTENT_TITLE_ADMIN_DELETE_FAX_NUMBER=Faxnummer l\u00f6schen:
 ADMIN_DELETE_FAX_NUMBER_TITLE=Wollen Sie wirklich die folgende Faxnummer l\u00f6schen?
@@ -796,16 +796,15 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_DATA=Auflisten von Stammdaten
 ADMIN_EMPTY_LIST_BASIC_DATA=Es befinden sich keine Stammdaten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=Diese Tabelle listet Stammdaten auf.
-ADMIN_HEADER_BASIC_DATA_ID=Id-Nummer:
 #@TODO Please fix German umlauts!
-ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
-ADMIN_HEADER_ASSIGNED_USER=Zugew. Benutzer:
+ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
+ADMIN_ASSIGNED_USER_HEADER=Zugew. Benutzer:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des der Filiale zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen.
-ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Firmenname:
-ADMIN_HEADER_COMPANY_CONTACT_PERSON=Ansprechpartner:
+ADMIN_BASIC_DATA_COMPANY_NAME_HEADER=Firmenname:
+ADMIN_COMPANY_CONTACT_PERSON_HEADER=Ansprechpartner:
 ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist.
 ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON=Zuweisen
 #@TODO Please fix German umlauts!
@@ -849,7 +848,7 @@ ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE=Mitarbeiter als Kontaktperson a
 ADMIN_SELECT_BASIC_DATA_COMPANY_HEADQUARTER=Daten des Hauptsitzesz auswaehlen:
 LINK_COMPANY_WEBSITE_URL_TITLE=Link zur Unternehmenswebseite (neues Fenster)
 #@TODO Please fix German umlauts!
-ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Gruender
+ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER=Gruender
 #@TODO Please fix German umlauts!
 ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmensgruenders anzeigen.
 #@TODO Please fix German umlauts!
@@ -916,10 +915,10 @@ ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Editieren der Mobilfunknummer.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Loescht die Faxnummer.
 ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer.
-ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Editieren von Grunddaten des Unternehmens.
+ADMIN_LINK_EDIT_BASIC_DATA_TITLE=Editieren von Grunddaten des Unternehmens.
 #@TODO Please fix German umlauts!
-ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens.
-ADMIN_HEADER_ACTION_LINKS=Aktionen:
+ADMIN_LINK_DELETE_BASIC_DATA_TITLE=Loescht Grunddaten des Unternehmens.
+ADMIN_ACTION_LINKS_HEADER=Aktionen:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Erneut
 ADMIN_LINK_UNLOCK_SHORT=Entsperren
 ADMIN_LINK_LOCK_SHORT=Sperren
@@ -1030,7 +1029,7 @@ ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Loescht die Abteilung.
 ADMIN_DEPARTMENT_ALREADY_CREATED=Die Abteilung existiert bereits im ausgewaehlten Unternehmen.
 ADMIN_LIST_DEPARTMENTS_HEADER=Alle Abteilungen auflisten
 #@TODO Please fix German umlauts!
-ADMIN_HEADER_I18N_KEY=Sprachschluessel:
+ADMIN_I18N_KEY_HEADER=Sprachschluessel:
 ADMIN_ENTER_DEPARTMENT_I18N_KEY=Sprachschluessel fuer Abteilung:
 ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Abteilungsleiter:
 ADMIN_ADD_DEPARTMENT_TITLE=Neue Abteilung hinzuf\u00fcgen
@@ -1172,3 +1171,4 @@ ADMIN_FAX_NUMBER_REQUIRED=Bitte geben Sie die Rufnummer zur Faxnummer ein.
 CHOICE_ALL=Alle/s
 ENTER_KEYWORD=Stichwort eingeben ...
 SEARCH_ALL_FIELDS=Alle Felder durchsuchen:
+BASIC_DATA_LINK_MASK={0} (Nr. {1})
index 8a2e37569a051c05bd8fca757a9a9b550aaecf6f..cf5feef36e4a77d0b1d18e643ce96bf301976095 100644 (file)
@@ -273,7 +273,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Prefix for calls outside local city: (m
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Dial prefix for this country:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Example: 1 for U.S.A.)
 BUTTON_ADMIN_ADD_COUNTRY=Add country data
-ADMIN_HEADER_ID_NUMBER=Id number:
+ID_NUMBER_HEADER=Id number:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=Country code:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
@@ -305,7 +305,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Example: %s@smsmail.provider.exampl
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Dial prefix:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Country:
-ADMIN_HEADER_ENTRY_CREATED=Created:
+ENTRY_CREATED_HEADER=Created:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Edit or delete mobile provider
 ADMIN_USER_DATA_ENTER_PASSWORD=Enter password:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
@@ -326,7 +326,7 @@ CONTENT_TITLE_ADMIN_SHOW_USER=Show profile of a user:
 ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId).
 ERROR_USER_NOT_FOUND=Error: User entry not found.
 ADMIN_TABLE_SUMMARY_SHOW_USER_DATA=This table shows a single user profile for administrative purposes.
-ADMIN_HEADER_SHOW_USER=User {0} (id {1}):
+ADMIN_SHOW_USER_HEADER=User {0} (id {1}):
 ADMIN_USER_ID=User id:
 ADMIN_USER_NAME=User name:
 ADMIN_USER_CREATED=When user created:
@@ -355,7 +355,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_NUMBER_DATA=Data of mobile phone:
+ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER=Data of mobile phone:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links:
@@ -376,7 +376,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_NUMBER_LINKS=All links for mobile number id {0}:
+ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER=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:
@@ -408,7 +408,7 @@ ADMIN_MENU_CONTACT_TITLE=Manage contact data
 ADMIN_LINK_LIST_CONTACT=List contact data
 ADMIN_LINK_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least salutation, first name and family name.
-ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}:
+ADMIN_SHOW_CONTACT_HEADER=Contact data for {0}:
 ADMIN_CONTACT_UPDATED=Contact data updated:
 ADMIN_LINK_DELETE_CONTACT=Delete contact data
 ADMIN_LINK_DELETE_CONTACT_TITLE=Deletes contact data, a confirmation is needed.
@@ -628,10 +628,10 @@ ADMIN_SHOW_LAND_LINE_NUMBER=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_NUMBER_LINKS=All links for land-line number id number {0}:
-ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA=Data of land-line number:
+ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER=All links for land-line number id number {0}:
+ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER=Data of land-line number:
 ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Complete land-line number:
-ADMIN_HEADER_SHOW_FAX_NUMBER_DATA=Data of fax number:
+ADMIN_SHOW_FAX_NUMBER_DATA_HEADER=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:
@@ -680,7 +680,7 @@ 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}:
+ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER=All links for fax number id {0}:
 PAGE_TITLE_ADMIN_DELETE_FAX_NUMBER=Delete fax number
 CONTENT_TITLE_ADMIN_DELETE_FAX_NUMBER=Delete fax number:
 ADMIN_DELETE_FAX_NUMBER_TITLE=Dou you really want to delete following fax number?
@@ -781,14 +781,13 @@ PAGE_TITLE_ADMIN_LIST_BASIC_DATA=List basic company data
 CONTENT_TITLE_ADMIN_LIST_BASIC_DATA=Lists basic company data
 ADMIN_EMPTY_LIST_BASIC_DATA=There are no basic company data in database. Or your search criteria doesn't match anything.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=This table lists all basic company data.
-ADMIN_HEADER_BASIC_DATA_ID=Id Number:
-ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Show details of this business contact.
-ADMIN_HEADER_ASSIGNED_USER=Assigned user:
+ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Show details of this business contact.
+ADMIN_ASSIGNED_USER_HEADER=Assigned user:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Shows branch office's assigned user profile.
 ADMIN_LINK_ASSIGN=Assign
 ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account.
-ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Company name:
-ADMIN_HEADER_COMPANY_CONTACT_PERSON=Contact person:
+ADMIN_BASIC_DATA_COMPANY_NAME_HEADER=Company name:
+ADMIN_COMPANY_CONTACT_PERSON_HEADER=Contact person:
 ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE=Shows a single employee entry who has been assigned as contact person.
 ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON=Assign
 ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON_TITLE=Assigns an employee as a contact person for given business contact.
@@ -818,7 +817,7 @@ URL_NOT_MATCHING_REGULAR_EXPRESSION=The entered URL does not match the common fo
 ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE=Choose employee as contact person:
 ADMIN_SELECT_BASIC_DATA_COMPANY_HEADQUARTER=Choose headquarter:
 LINK_COMPANY_WEBSITE_URL_TITLE=Link to company's web site (new window)
-ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Founder
+ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER=Founder
 ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder.
 ADMIN_LINK_ASSIGN_BASIC_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry.
 ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique.
@@ -871,9 +870,9 @@ ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE=Deletes a mobile mobile.
 ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Edit of a mobile number
 ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Deletes a fax number.
 ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of a fax number.
-ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company.
-ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company.
-ADMIN_HEADER_ACTION_LINKS=Actions:
+ADMIN_LINK_EDIT_BASIC_DATA_TITLE=Edit of basic data of company.
+ADMIN_LINK_DELETE_BASIC_DATA_TITLE=Deletes basic data of company.
+ADMIN_ACTION_LINKS_HEADER=Actions:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Resend
 ADMIN_LINK_UNLOCK_SHORT=Unlock
 ADMIN_LINK_LOCK_SHORT=Lock
@@ -957,7 +956,7 @@ ADMIN_LINK_EDIT_DEPARTMENT_TITLE=Edit of a department
 ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Deletes a department.
 ADMIN_DEPARTMENT_ALREADY_CREATED=A department already exists in selected company.
 ADMIN_LIST_DEPARTMENTS_HEADER=List all departments
-ADMIN_HEADER_I18N_KEY=I18n key:
+ADMIN_I18N_KEY_HEADER=I18n key:
 ADMIN_ENTER_DEPARTMENT_I18N_KEY=I18n key for department:
 ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Department leader:
 ADMIN_ADD_DEPARTMENT_TITLE=Add new department
@@ -1066,3 +1065,4 @@ ADMIN_FAX_NUMBER_REQUIRED=Please enter caller number for fax number.
 CHOICE_ALL=All
 ENTER_KEYWORD=Enter keyword ...
 SEARCH_ALL_FIELDS=Search all fields:
+BASIC_DATA_LINK_MASK={0} (No. {1})
index b0612aaf070fb244d2320fc523609c80a7b5bd2c..3057d1856fece12b54a2537fee469bc0d5c22dde 100644 (file)
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
+                                       <p:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
+                               <p:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_DATA_TITLE}">
                                        <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                </p:link>
                        </li>
 
                        <li class="navlink-mini">
                                <p:link outcome="admin_delete_basic_data">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_DATA_TITLE}" />
                                        <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                </p:link>
                        </li>
index f6dace4c60ef89d22a334fd579505d13ae6163a4..f2d28a72f059f3d1c6e79d47572c7dbe2f92ec47 100644 (file)
@@ -13,7 +13,7 @@
        -->
        <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_SHOW_FAX_NUMBER_DATA_HEADER}" />
                </f:facet>
 
                <h:column>
index b29634e1f38db9c5bd1bd1f3d11e8f5a63a4293c..06da89709991e8c3e3937b7f2e597e3a5ba16364 100644 (file)
@@ -13,7 +13,7 @@
        -->
        <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER}" />
                </f:facet>
 
                <h:column>
index 9152d8fa3f43ccd9b1090ea092d75988069ca5fb..d9e70dd4a0d32b908bff2bd5f666dcdc1c3e013e 100644 (file)
@@ -13,7 +13,7 @@
        -->
        <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER}" />
                </f:facet>
 
                <h:column>
index be7534305b086e148e579963d913482fbe9075a9..9fc462c429a5b6dea025c4232afd879b0a758e50 100644 (file)
@@ -8,7 +8,7 @@
 
        <p:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
index 16811c693c8ce821f62e7511a6bddb8b1bb75935..a80df3f4247297fac76b0c10e89ea1783f3f7872 100644 (file)
@@ -13,7 +13,7 @@
        -->
        <p:panelGrid id="show_contact" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
index 35a5cc83bc84c3cfb281daa67864edc7fd0b7be9..b0d5f7b2a1f6920dbacee74686e6a3620ad190d9 100644 (file)
@@ -12,7 +12,7 @@
        -->
        <p:panelGrid styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                                <f:param value="#{beanHelper.user.userId}" />
                        </h:outputFormat>
index f4e7041474c429baf72380fb1c04eda015d5afdc..d828ab1a25024973f235ea0e4c2798a20e094e40 100644 (file)
@@ -12,7 +12,7 @@
        -->
        <p:panelGrid styleClass="table table-full" columns="2" rendered="#{not empty beanHelper.user}">
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                                <f:param value="#{beanHelper.user.userId}" />
                        </h:outputFormat>
index 66b62555f810dbf3554f66381ab5fdcf7573af4f..9e982d7a221a421d2c27c1f59a2dc0032d5a23f5 100644 (file)
@@ -32,7 +32,7 @@
                                rowsPerPageTemplate="5,10,20,50,100"
                                sortMode="multiple"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA}"
-                               emptyMessage="#{msg.ADMIN__EMPTY_LIST_BASIC_DATA}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_BASIC_DATA}"
                                widgetVar="basicDataList"
                                >
 
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_ID}" sortBy="#{basicData.basicDataId}" filterable="false">
-                                       <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{basicData.basicDataId}" filterable="false">
+                                       <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" value="#{basicData.basicDataId}">
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
                                        <h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
                                                <h:outputText value="#{basicData.companyName}" />
                                        </h:outputLink>
@@ -86,7 +86,7 @@
                                        <h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{basicData.companyCreated}">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{basicData.companyCreated}">
                                        <h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
                                                <f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
                                </p:column>
                        </p:dataTable>
index 58a045dce068d499a7bddc209270c20747121274..fe196f4f1cd93fab1c591aed058451d38c4ca1d3 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterable="false">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{branchOffice.branchId}" filterable="false">
                                        <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{beanHelper.renderBranchOffice(branchOffice)}" title="#{beanHelper.renderBranchOffice(branchOffice)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{branchOffice.branchContactEmployee}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{branchOffice.branchCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{branchOffice.branchCreated}" filterable="false">
                                        <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
                                                <f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
                                </p:column>
                        </p:dataTable>
index 76e2b39dbc44d8a2aa9a978c8e94ee80cff03d72..17c399fca4994fa0018d7aaa26f7ecbe8134ce6f 100644 (file)
@@ -73,7 +73,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ENTRY_CREATED}" />
+                                               <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                        </f:facet>
 
                                        <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
@@ -83,7 +83,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ACTION_LINKS}" />
+                                               <h:outputText value="#{msg.ADMIN_ACTION_LINKS_HEADER}" />
                                        </f:facet>
 
                                        <links:outputContactAdminMiniLinks contact="#{contact}" />
index fff0ddc2d95bdbc180c0d3f7d0a1ad4aff745c57..c215b0ee01ee7597caa2bf797d41c6e7e92cf2e7 100644 (file)
@@ -30,7 +30,7 @@
                                >
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
+                                               <h:outputText value="#{msg.ID_NUMBER_HEADER}" />
                                        </f:facet>
 
                                        <p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
@@ -64,7 +64,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ACTION_LINKS}" />
+                                               <h:outputText value="#{msg.ADMIN_ACTION_LINKS_HEADER}" />
                                        </f:facet>
 
                                        <links:outputCountryAdminMiniLinks country="#{country}" />
index d42e6ff69168d3653af92f578a77c2669887d402..64ee433ebd83c54b2cdf0aca8ebb0b8a669f2bc1 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{department.departmentId}" filterable="false">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{department.departmentId}" filterable="false">
                                        <p:link outcome="admin_show_department" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{department.departmentId}">
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_I18N_KEY}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+                               <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
                                        <h:outputText value="#{local[department.departmentI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{department.departmentCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{department.departmentCreated}" filterable="false">
                                        <h:outputText id="departmentCreated" value="#{department.departmentCreated.time}">
                                                <f:convertDateTime for="departmentCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputDepartmentAdminMiniLinks department="#{department}" />
                                </p:column>
                        </p:dataTable>
index 3d3bf3c66642c0483fa465d97d2c2545d81b2861..7d3ea7d79e7d8b54c69e98ab8229f2f4a84cc55b 100644 (file)
@@ -47,7 +47,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{employee.employeeId}" filterable="false">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{employee.employeeId}" filterable="false">
                                        <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" value="#{employee.employeeId}">
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{employee.employeeCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{employee.employeeCreated}" filterable="false">
                                        <h:outputText id="employeeCreated" value="#{employee.employeeCreated.time}">
                                                <f:convertDateTime for="employeeCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputEmployeeAdminMiniLinks employee="#{employee}" />
                                </p:column>
                        </p:dataTable>
index c97371136faa0ee81bf2290587866e9e38df5f36..ce5b904565cd9e49b3bda59aee9d0e2d3ca54d9e 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_NUMBER_HEADER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
index 14a323dfaf71c3260dd2a57a8a003b21383e7e44..c870e6a8c772454ca493226130df101c887b20d7 100644 (file)
@@ -27,7 +27,7 @@
 
                <p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
index 2efe6c1543d7a053e9a545bbcdd343aab7996bb5..60a8fe3916d3781e73e5bbfb66413e7e47bf9956 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{headquarter.headquarterId}" filterable="false">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{headquarter.headquarterId}" filterable="false">
                                        <p:link outcome="admin_show_headquarter" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}" value="#{headquarter.headquarterId}">
                                                <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -87,7 +87,7 @@
                                        <h:outputText value="#{beanHelper.renderHeadquarter(headquarter)}" title="#{beanHelper.renderHeadquarter(headquarter)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
                                        <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated.time}">
                                                <f:convertDateTime for="headquarterCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputHeadquarterAdminMiniLinks headquarter="#{headquarter}" />
                                </p:column>
                        </p:dataTable>
index f7c681176767df186ed67394cd67b6c505c40ac9..49368aea26d94c18b7948cf1fed942efc48dfe77 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_NUMBER_HEADER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
index fb6a95fb0352cf3f1246635dbc802de657aedeb4..b5f1d6ca1c19373d307f188706ae73916de8616f 100644 (file)
@@ -27,7 +27,7 @@
 
                <p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
index 41d969e84f86fd05aa06626fecc2308b6f2d3f22..34317e0ebb0cada02a0ab0cc8261e130a0f2b8b0 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_NUMBER_HEADER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
index ec6f62bf3a614dbc037179d73ccbbbeb7938ae74..3fcfb98e6b45415225f8e7aea0262f63e4810b2c 100644 (file)
@@ -27,7 +27,7 @@
 
                <p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
index 1fabd811018d6e940e98f051db309d3d07b00c4d..58f0cb51b59a8edf7a70a64c42672460d78b3e5c 100644 (file)
@@ -44,7 +44,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
                                        <p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
                                                <f:param name="providerId" value="#{mobileProvider.providerId}" />
                                        </p:link>
                                        <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{mobileProvider.providerEntryCreated}">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{mobileProvider.providerEntryCreated}">
                                        <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}">
                                                <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
                                        <links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
                                </p:column>
                        </p:dataTable>
index b396bfecfff7aab9cd91c339d223b4c13af1e56e..9f646c9249639f6cf9be24b16638a07a85dbcb36 100644 (file)
@@ -47,7 +47,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{openingTime.openingId}" filterable="false">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{openingTime.openingId}" filterable="false">
                                        <p:link outcome="admin_show_opening_time" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{openingTime.openingId}">
                                                <f:param name="openingId" value="#{openingTime.openingId}" />
                                        </p:link>
@@ -99,7 +99,7 @@
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputOpeningTimeAdminMiniLinks openingTime="#{openingTime}" />
                                </p:column>
                        </p:dataTable>
index eab3af0762706696b24ab9022d3f01d99697fedb..68f37a2fef708d6bd677f7edf81cd3381c61fba4 100644 (file)
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
                                        <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputUserAdminMiniLinks user="#{user}" />
                                </p:column>
                        </p:dataTable>