[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx |    2 +-
 include/i18nlangtag/lang.h             |    2 +-
 svtools/inc/langtab.hrc                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 647060ece2df49e2655a4015c581543ac9ad1e19
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Jul 18 14:11:11 2019 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu Jul 18 20:42:20 2019 +0200

    It's Classical Armenian, not Classic [xcl-AM]
    
    Change-Id: I1c714c8a9ecfd3cf73e645e1693101e7fce433e4
    Reviewed-on: https://gerrit.libreoffice.org/75856
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index be183839fb59..ca511f9989df 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -673,7 +673,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_FON,                   "fon", "BJ", k0    },
     { LANGUAGE_USER_PLAUTDIETSCH,          "pdt", "CA", k0    },
     { LANGUAGE_USER_ARMENIAN_WESTERN,      "hyw", "AM", k0    },
-    { LANGUAGE_USER_ARMENIAN_CLASSIC,      "xcl", "AM", k0    },
+    { LANGUAGE_USER_ARMENIAN_CLASSICAL,    "xcl", "AM", k0    },
     { LANGUAGE_USER_JUHOAN,                "ktz", "NA", k0    },
     { LANGUAGE_USER_NARO,                  "nhr", "BW", k0    },
     { LANGUAGE_USER_ILOKO,                 "ilo", "PH", k0    },
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0863e5a1a9ae..37dba1cc5123 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -743,7 +743,7 @@ namespace o3tl
 #define LANGUAGE_USER_ARMENIAN_RUSSIA       LanguageType(0x802B)  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #define LANGUAGE_USER_ARMENIAN_IRAN         LanguageType(0x842B)  /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #define LANGUAGE_USER_ARMENIAN_WESTERN      LanguageType(0x069F)
-#define LANGUAGE_USER_ARMENIAN_CLASSIC      LanguageType(0x06A0)
+#define LANGUAGE_USER_ARMENIAN_CLASSICAL    LanguageType(0x06A0)
 #define LANGUAGE_USER_MALAY_ARABIC_MALAYSIA LanguageType(0x803E)  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_MALAY_MALAYSIA)) */
 #define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
 #define LANGUAGE_USER_JUHOAN                LanguageType(0x06A1)
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 43394d03e2a1..13fb8a89070a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -411,7 +411,7 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Russia)") , LANGUAGE_USER_ARMENIAN_RUSSIA },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Iran)") , LANGUAGE_USER_ARMENIAN_IRAN },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , LANGUAGE_USER_ARMENIAN_WESTERN },
-    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classical (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSICAL },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Malaysia)") , LANGUAGE_USER_MALAY_ARABIC_MALAYSIA },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , LANGUAGE_USER_MALAY_ARABIC_BRUNEI },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Juǀ’hoan") , LANGUAGE_USER_JUHOAN },