[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - i18nlangtag/source include/i18nlangtag svtools/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |    1 +
 include/i18nlangtag/lang.h             |    1 +
 svtools/source/misc/langtab.src        |    3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d4c7fd0d9647c91bc98523184a6a54a00bcb6e24
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jun 19 19:25:15 2017 +0200

    Add Kituba (Democratic Republic of the Congo) [ktu-CD] to language list
    
    Change-Id: I9ba7a9d104dd6a5e47aa62058d0602101053e9af
    (cherry picked from commit ecf88f83f877fd08a6d5a418c17fdf36b82a8369)
    Reviewed-on: https://gerrit.libreoffice.org/38975
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 9ee33709f041..87bc329e9596 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -668,6 +668,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_SILESIAN,              "szl", "PL", k0     },
     { LANGUAGE_USER_MANCHU,                "mnc", "CN", k0     },
     { LANGUAGE_USER_XIBE,                  "sjo", "CN", k0     },
+    { LANGUAGE_USER_KITUBA_DRCONGO,        "ktu", "CD", k0     },
     { LANGUAGE_MULTIPLE,                   "mul", ""  , k0     },    // multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""  , k0     },    // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""  , k0     },    // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index e5d4a1f42b3f..660284c52c90 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -737,6 +737,7 @@ namespace o3tl
 #define LANGUAGE_USER_HUNGARIAN_ROVAS       LanguageType(0x800E)  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 #define LANGUAGE_USER_MANCHU                LanguageType(0x069A)
 #define LANGUAGE_USER_XIBE                  LanguageType(0x069B)
+#define LANGUAGE_USER_KITUBA_DRCONGO        LanguageType(0x069C)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ec44fb76be1c..e5a2228346a3 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -321,7 +321,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
         < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ;
         < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ;
-        < "Kituba" ; LANGUAGE_USER_KITUBA ; > ;
+        < "Kituba (Congo)" ; LANGUAGE_USER_KITUBA ; > ;
         < "Lari" ; LANGUAGE_USER_LARI ; > ;
         < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ;
         < "Teke-Eboo" ; LANGUAGE_USER_TEKE_EBOO ; > ;
@@ -402,6 +402,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
         < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
         < "Xibe" ; LANGUAGE_USER_XIBE ; > ;
+        < "Kituba (Democratic Republic of the Congo)" ; LANGUAGE_USER_KITUBA_DRCONGO ; > ;
     };
 };