diff options
| author | Eike Rathke <erack@redhat.com> | 2024-12-06 16:46:24 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2024-12-06 18:26:13 +0100 |
| commit | 2d249798c57fdad38bbe9ade3acdf8fcafce6e29 (patch) | |
| tree | 74052742acadc7767a71dafdf3e2cfb029f62f32 | |
| parent | da87646c4f407532b41e288f3ddac9f09e42be47 (diff) | |
Revert "Related: tdf#163903 Add French (Republic of Guinea) {fr-GN} [0x940C]"
This reverts commit c79b2bfc433ba45450802f02e10d7e13e4938207.
Reason for revert: broke string freeze that's only acceptable for security or emergency issues.
Change-Id: I5f43dfd7ab0ad19e44dae72ad1b683250808202e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177985
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 1 | ||||
| -rw-r--r-- | include/i18nlangtag/lang.h | 1 | ||||
| -rw-r--r-- | svtools/inc/langtab.hrc | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 88521f1587c5..1ce95c43c731 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -682,7 +682,6 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0 }, { LANGUAGE_USER_SARAIKI, "skr", "PK", k0 }, { LANGUAGE_USER_MORISYEN, "mfe", "MU", k0 }, - { LANGUAGE_USER_FRENCH_GUINEA, "fr", "GN", k0 }, // Add new languages ^^^ there. { LANGUAGE_MULTIPLE, "mul", "" , k0 }, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, "und", "" , k0 }, // undetermined language, language cannot be identified diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index e430fd193311..442df43d859f 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -786,7 +786,6 @@ namespace o3tl #define LANGUAGE_USER_ROHINGYA_HANIFI LanguageType(0x06B1) #define LANGUAGE_USER_MORISYEN LanguageType(0x06B2) #define LANGUAGE_USER_SANTALI_OLCHIKI_INDIA LanguageType(0x06B3) -#define LANGUAGE_USER_FRENCH_GUINEA LanguageType(0x940C) /* makeLangID( 0x25, getPrimaryLanguage( LANGUAGE_FRENCH)) */ /* XXX Add new user defined LCIDs ^^^ there. diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc index e2a3e82d016a..eba0db6d1b3a 100644 --- a/svtools/inc/langtab.hrc +++ b/svtools/inc/langtab.hrc @@ -445,8 +445,7 @@ const std::pair<TranslateId, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] = { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI }, { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rohingya Hanifi") , LANGUAGE_USER_ROHINGYA_HANIFI }, { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Morisyen") , LANGUAGE_USER_MORISYEN }, - { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Santali, Ol Chiki") , LANGUAGE_USER_SANTALI_OLCHIKI_INDIA }, - { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Republic of Guinea)") , LANGUAGE_USER_FRENCH_GUINEA } + { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Santali, Ol Chiki") , LANGUAGE_USER_SANTALI_OLCHIKI_INDIA } }; |