From dca49fe9aaa1bc1975eb92c8f0333cb51a9c34f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 31 Mar 2018 00:09:23 +0200 Subject: [PATCH] Please cherry-pick: - _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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/generic_de_DE.properties | 40 +++++++++---------- .../localization/generic_en_US.properties | 40 +++++++++---------- .../basic_data/admin_basic_data_links.tpl | 6 +-- .../admin/panel_grids/fax/admin_fax_data.tpl | 2 +- .../landline/admin_landline_data.tpl | 2 +- .../panel_grids/mobile/admin_mobile_data.tpl | 2 +- .../admin/contact/admin_contact_data_mini.tpl | 2 +- .../admin/contact/admin_show_contact_data.tpl | 2 +- .../admin/user/admin_show_user_data.tpl | 2 +- .../admin/user/admin_show_user_data_mini.tpl | 2 +- .../basic_data/admin_basic_data_list.xhtml | 18 ++++----- .../admin_branch_office_list.xhtml | 12 +++--- web/admin/contact/admin_contact_list.xhtml | 4 +- web/admin/country/admin_country_list.xhtml | 4 +- .../department/admin_department_list.xhtml | 12 +++--- web/admin/employee/admin_employee_list.xhtml | 10 ++--- web/admin/fax/admin_fax_list.xhtml | 2 +- web/admin/fax/admin_fax_show.xhtml | 2 +- .../headquarter/admin_headquarter_list.xhtml | 10 ++--- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_list.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 2 +- .../admin_mobile_provider_list.xhtml | 6 +-- .../admin_opening_time_list.xhtml | 4 +- web/admin/user/admin_user_list.xhtml | 4 +- 26 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index e7498fcb..58bbed44 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -287,7 +287,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: @@ -319,7 +319,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: @@ -343,7 +343,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: @@ -372,7 +372,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: @@ -393,7 +393,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: @@ -426,7 +426,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. @@ -634,10 +634,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: @@ -686,7 +686,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? @@ -789,16 +789,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! @@ -842,7 +841,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! @@ -909,10 +908,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 @@ -1023,7 +1022,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 @@ -1165,3 +1164,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}) diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index e6c50760..dfa9c56f 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -265,7 +265,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: @@ -297,7 +297,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: @@ -318,7 +318,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: @@ -347,7 +347,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: @@ -368,7 +368,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: @@ -400,7 +400,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=Kontakt l\u00f6schen ADMIN_LINK_DELETE_CONTACT_TITLE=Deletes contact data, a confirmation is needed. @@ -619,10 +619,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: @@ -671,7 +671,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? @@ -768,14 +768,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. @@ -805,7 +804,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. @@ -858,9 +857,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 @@ -944,7 +943,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 @@ -1053,3 +1052,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}) diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl index b0612aaf..3057d185 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl @@ -10,21 +10,21 @@