summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-06-12 00:08:38 +0200
committerEike Rathke <erack@redhat.com>2020-06-12 23:15:33 +0200
commite1873e961169f6a90820bb6d26a16f3fd32ccaca (patch)
treede5465bf69565e6ce0f2165614ae56cdb19c251f
parent601cd8dcb0a856c1892af4139bec6991cba6db5b (diff)
Language list: + Aka (CAR); Yaka -> Yaka (Congo), + Yaka (DRC) [yaf-CD]
Change-Id: I4bf1e1affa046fcc9c7f06c8bbf6a40fc9c26cf9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96167 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx1
-rw-r--r--include/i18nlangtag/lang.h1
-rw-r--r--svtools/inc/langtab.hrc4
3 files changed, 5 insertions, 1 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index c9e623b390de..8151d5e29640 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -688,6 +688,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_LIGURIAN, "lij", "IT", k0 },
{ LANGUAGE_USER_MINANGKABAU, "min", "ID", k0 },
{ LANGUAGE_USER_SUNDANESE, "sun", "ID", k0 },
+ { LANGUAGE_USER_YAKA_DRCONGO, "yaf", "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 f4d1266a3e0d..96df56181159 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -760,6 +760,7 @@ namespace o3tl
#define LANGUAGE_USER_LIGURIAN LanguageType(0x06A6)
#define LANGUAGE_USER_MINANGKABAU LanguageType(0x06A7)
#define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
+#define LANGUAGE_USER_YAKA_DRCONGO LanguageType(0x06A9)
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 33002f07e51d..5242b7ec116f 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -350,6 +350,7 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Veps") , LANGUAGE_USER_VEPS },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "V├Áro") , LANGUAGE_USER_VORO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nenets") , LANGUAGE_USER_NENETS },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aka (Central African Republic)") , LANGUAGE_USER_AKA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aka (Congo)") , LANGUAGE_USER_AKA_CONGO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dibole") , LANGUAGE_USER_DIBOLE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Doondo") , LANGUAGE_USER_DOONDO },
@@ -362,7 +363,8 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Suundi") , LANGUAGE_USER_SUUNDI },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Kukuya") , LANGUAGE_USER_TEKE_KUKUYA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tsaangi") , LANGUAGE_USER_TSAANGI },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka") , LANGUAGE_USER_YAKA },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka (Congo)") , LANGUAGE_USER_YAKA },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka (Democratic Republic of the Congo)") , LANGUAGE_USER_YAKA_DRCONGO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yombe (Congo)") , LANGUAGE_USER_YOMBE_CONGO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "N'ko") , LANGUAGE_USER_NKO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Udmurt") , LANGUAGE_USER_UDMURT },