summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-04-19 19:13:16 +0200
committerEike Rathke <erack@redhat.com>2012-04-19 19:14:06 +0200
commit46f64f062319aff17e97ce7af9825a352b01d4e4 (patch)
tree419a8516d921101b1009f4084d88f700bc7cef13
parentac7f7b04627c9ee8321b1696fa609d9632763b8b (diff)
fdo#48917 added Eryza [myv-RU] and Meadow Mari [mhr-RU] to language list
-rw-r--r--i18npool/inc/i18npool/lang.h2
-rw-r--r--i18npool/source/isolang/isolang.cxx2
-rw-r--r--svtools/source/misc/langtab.src2
3 files changed, 6 insertions, 0 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 4fb9eca7d251..311db27fd4ae 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -542,6 +542,8 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_KOMI_PERMYAK 0x066A
#define LANGUAGE_USER_PITJANTJATJARA 0x066B
#define LANGUAGE_USER_ENGLISH_MALAWI 0x8809 /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ERYZA 0x066C
+#define LANGUAGE_USER_MARI_MEADOW 0x066D
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 9586b7bc655b..c24df3bc765b 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -487,6 +487,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU" },
{ LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU" },
{ LANGUAGE_USER_PITJANTJATJARA, "pjt", "AU" },
+ { LANGUAGE_USER_ERYZA, "myv", "RU" },
+ { LANGUAGE_USER_MARI_MEADOW, "mhr", "RU" },
{ LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW, "", "" } // marks end of table
};
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index d2794758060d..b1d83de71477 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -348,6 +348,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ;
< "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ;
< "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ;
+ < "Eryza" ; LANGUAGE_USER_ERYZA ; > ;
+ < "Mari, Meadow" ; LANGUAGE_USER_MARI_MEADOW ; > ;
};
};