[Libreoffice-commits] core.git: sw/inc sw/source

[Johnny_M (via logerrit)]

 sw/inc/strings.hrc                |   24 ++++++++++++------------
 sw/source/uibase/fldui/fldmgr.cxx |   24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit e3e51c9e04d5a73ddfce959f718f7549f9fdd834
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sat May 4 13:17:55 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon May 6 11:06:11 2019 +0200

    Translate German variable names
    
    Translated the defines, but kept the their NC_(...) translation
    references to prevent a need to update translations.
    
    Standardized terms from http://www.upu.int/en/activities/addressing/s42-standard.html
    were used, although textual strings use US English terms.
    
    Change-Id: Ic5b13d21f9552d3e8b2adce92cca36f651eaa7eb
    Reviewed-on: https://gerrit.libreoffice.org/71792
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 5ee7196700e5..621e139b8262 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -916,21 +916,21 @@
 /*--------------------------------------------------------------------
     Description: SubType Extuser
  --------------------------------------------------------------------*/
-#define FLD_EU_FIRMA                            NC_("FLD_EU_FIRMA", "Company")
-#define FLD_EU_VORNAME                          NC_("FLD_EU_VORNAME", "First Name")
-#define FLD_EU_NAME                             NC_("FLD_EU_NAME", "Last Name")
-#define FLD_EU_ABK                              NC_("FLD_EU_ABK", "Initials")
-#define FLD_EU_STRASSE                          NC_("FLD_EU_STRASSE", "Street")
-#define FLD_EU_LAND                             NC_("FLD_EU_LAND", "Country")
-#define FLD_EU_PLZ                              NC_("FLD_EU_PLZ", "Zip code")
-#define FLD_EU_ORT                              NC_("FLD_EU_ORT", "City")
-#define FLD_EU_TITEL                            NC_("FLD_EU_TITEL", "Title")
+#define FLD_EU_COMPANY                          NC_("FLD_EU_FIRMA", "Company")
+#define FLD_EU_GIVENNAME                        NC_("FLD_EU_VORNAME", "First Name")
+#define FLD_EU_SURNAME                          NC_("FLD_EU_NAME", "Last Name")
+#define FLD_EU_INITIALS                         NC_("FLD_EU_ABK", "Initials")
+#define FLD_EU_STREET                           NC_("FLD_EU_STRASSE", "Street")
+#define FLD_EU_COUNTRY                          NC_("FLD_EU_LAND", "Country")
+#define FLD_EU_POSTCODE                         NC_("FLD_EU_PLZ", "Zip code")
+#define FLD_EU_TOWN                             NC_("FLD_EU_ORT", "City")
+#define FLD_EU_TITLE                            NC_("FLD_EU_TITEL", "Title")
 #define FLD_EU_POS                              NC_("FLD_EU_POS", "Position")
-#define FLD_EU_TELPRIV                          NC_("FLD_EU_TELPRIV", "Tel. (Home)")
-#define FLD_EU_TELFIRMA                         NC_("FLD_EU_TELFIRMA", "Tel. (Work)")
+#define FLD_EU_TELPERSONAL                      NC_("FLD_EU_TELPRIV", "Tel. (Home)")
+#define FLD_EU_TELWORK                          NC_("FLD_EU_TELFIRMA", "Tel. (Work)")
 #define FLD_EU_FAX                              NC_("FLD_EU_FAX", "Fax")
 #define FLD_EU_EMAIL                            NC_("FLD_EU_EMAIL", "Email")
-#define FLD_EU_STATE                            NC_("FLD_EU_STATE", "State")
+#define FLD_EU_REGION                           NC_("FLD_EU_STATE", "State")
 #define FLD_PAGEREF_OFF                         NC_("FLD_PAGEREF_OFF", "off")
 #define FLD_PAGEREF_ON                          NC_("FLD_PAGEREF_ON", "on")
 /*--------------------------------------------------------------------
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 5e3194623f11..d7ccd768723b 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -139,21 +139,21 @@ static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT }
 
 static const char* FLD_EU_ARY[] =
 {
-    FLD_EU_FIRMA,
-    FLD_EU_VORNAME,
-    FLD_EU_NAME,
-    FLD_EU_ABK,
-    FLD_EU_STRASSE,
-    FLD_EU_LAND,
-    FLD_EU_PLZ,
-    FLD_EU_ORT,
-    FLD_EU_TITEL,
+    FLD_EU_COMPANY,
+    FLD_EU_GIVENNAME,
+    FLD_EU_SURNAME,
+    FLD_EU_INITIALS,
+    FLD_EU_STREET,
+    FLD_EU_COUNTRY,
+    FLD_EU_POSTCODE,
+    FLD_EU_TOWN,
+    FLD_EU_TITLE,
     FLD_EU_POS,
-    FLD_EU_TELPRIV,
-    FLD_EU_TELFIRMA,
+    FLD_EU_TELPERSONAL,
+    FLD_EU_TELWORK,
     FLD_EU_FAX,
     FLD_EU_EMAIL,
-    FLD_EU_STATE
+    FLD_EU_REGION
 };
 
 static const char* FMT_AUTHOR_ARY[] =