filter/source/msfilter/countryid.cxx | 2 +- i18npool/inc/i18npool/lang.h | 2 +- i18npool/source/isolang/isolang.cxx | 2 +- i18npool/source/isolang/mslangid.cxx | 2 +- shell/source/win32/shlxthandler/util/utilities.cxx | 2 +- svtools/source/misc/langtab.src | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 828dfdd4fb9fc133f4e3241e9722f23f3778db08 Author: Andras Timar <ati...@suse.com> Date: Sat Jan 26 11:17:10 2013 +0100 unify the spelling of 'Kazakh' language name While 'Kazakh' can be written as 'Kazak' or 'Qazaq', the 'Kazakh' form is the most widespread according to online sources (Wikipedia, LCID list from Microsoft). Also the 'Kazakh' form is preferred by a Kazakh contributor, see http://listarchives.libreoffice.org/global/l10n/msg05444.html In LibreOffice both 'Kazak' and 'Kazakh' was used at different places. Change-Id: Ief83eb05e92af16cb5b795f2bbb1e3d6f7c9659a diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index 31915d3..eac02e5 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -84,7 +84,7 @@ static const CountryEntry pTable[] = { COUNTRY_CANADA, LANGUAGE_ENGLISH_CAN, true }, { COUNTRY_CANADA, LANGUAGE_FRENCH_CANADIAN, true }, { COUNTRY_RUSSIA, LANGUAGE_RUSSIAN, false }, - { COUNTRY_KAZAKHSTAN, LANGUAGE_KAZAK, false }, + { COUNTRY_KAZAKHSTAN, LANGUAGE_KAZAKH, false }, { COUNTRY_TATARSTAN, LANGUAGE_TATAR, false }, { COUNTRY_EGYPT, LANGUAGE_ARABIC_EGYPT, true }, { COUNTRY_SOUTH_AFRICA, LANGUAGE_AFRIKAANS, false }, diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 932f92b..dc55f3f 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -234,7 +234,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_KANURI_NIGERIA 0x0471 #define LANGUAGE_KASHMIRI 0x0460 #define LANGUAGE_KASHMIRI_INDIA 0x0860 -#define LANGUAGE_KAZAK 0x043F +#define LANGUAGE_KAZAKH 0x043F #define LANGUAGE_KHMER 0x0453 #define LANGUAGE_KICHE_GUATEMALA 0x0486 /* AKA K'iche', West Central Quiche, */ #define LANGUAGE_KINYARWANDA_RWANDA 0x0487 /* obsoletes LANGUAGE_USER_KINYARWANDA 0x0621 */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index bbe3e0f..1ae850d 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -248,7 +248,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_BENGALI_BANGLADESH, "bn", "BD" }, { LANGUAGE_BENGALI, "bn", "IN" }, { LANGUAGE_BURMESE, "my", "MM" }, - { LANGUAGE_KAZAK, "kk", "KZ" }, + { LANGUAGE_KAZAKH, "kk", "KZ" }, { LANGUAGE_ENGLISH_INDIA, "en", "IN" }, { LANGUAGE_URDU, "ur", "" }, { LANGUAGE_URDU_INDIA, "ur", "IN" }, diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 2395d35..b3319aa 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -389,7 +389,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang ) /* #define LANGUAGE_ARMENIAN 0x042B #define LANGUAGE_INDONESIAN 0x0421 -#define LANGUAGE_KAZAK 0x043F +#define LANGUAGE_KAZAKH 0x043F #define LANGUAGE_KONKANI 0x0457 #define LANGUAGE_MACEDONIAN 0x042F #define LANGUAGE_TATAR 0x0444 diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index c62ec83..6fc7800 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -519,7 +519,7 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) usSubLang = SUBLANG_DEFAULT; //default sub language } else if ( wsLanguage == L"kk" ) - usPrimaryLang = LANG_KAZAK; //Kazak + usPrimaryLang = LANG_KAZAK; //Kazakh else if ( wsLanguage == L"ky" ) usPrimaryLang = LANG_KYRGYZ; //Kyrgyz else if ( wsLanguage == L"sw" ) diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 316b3d6..23cb311 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -124,7 +124,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Kannada" ; LANGUAGE_KANNADA ; > ; < "Kashmiri (Kashmir)" ; LANGUAGE_KASHMIRI ; > ; < "Kashmiri (India)" ; LANGUAGE_KASHMIRI_INDIA ; > ; - < "Kazak" ; LANGUAGE_KAZAK ; > ; + < "Kazakh" ; LANGUAGE_KAZAKH ; > ; < "Konkani" ; LANGUAGE_KONKANI ; > ; < "Korean (RoK)" ; LANGUAGE_KOREAN ; > ; < "Latvian" ; LANGUAGE_LATVIAN ; > ; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits