added Kyrgyz (China) [ky-CN] to language list

8 files changed, 13 insertions, 3 deletions

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index c2b733aaac4a..177d2a753095 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -537,6 +537,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ARAGONESE             0x0665
 #define LANGUAGE_USER_KEYID                 0x0666  /* key id pseudolanguage */
 #define LANGUAGE_USER_PALI_LATIN            0x0667
+#define LANGUAGE_USER_KYRGYZ_CHINA          0x0668  /* not derived from LANGUAGE_KIRGHIZ as these may be different scripts, see http://www.omniglot.com/writing/kirghiz.htm */
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index f9f7b4946517..610ea7fe5540 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -482,6 +482,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_ARAGONESE,              "an", "ES" },
     { LANGUAGE_USER_KEYID,                 "qtz", ""   },   // key id pseudolanguage used for UI testing
     { LANGUAGE_USER_PALI_LATIN,            "pli", ""   },   // Pali with Latin script
+    { LANGUAGE_USER_KYRGYZ_CHINA,           "ky", "CN" },
     { 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/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 59a37ed4f1ad..3cd877e4c91b 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -240,6 +240,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
         case LANGUAGE_KASHMIRI            & LANGUAGE_MASK_PRIMARY :
         case LANGUAGE_SINDHI              & LANGUAGE_MASK_PRIMARY :
         case LANGUAGE_UIGHUR_CHINA        & LANGUAGE_MASK_PRIMARY :
+        case LANGUAGE_USER_KYRGYZ_CHINA   & LANGUAGE_MASK_PRIMARY :
             return true;
 
         default:
@@ -344,6 +345,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_USER_MAITHILI_INDIA:
         case LANGUAGE_UIGHUR_CHINA:
         case LANGUAGE_USER_LIMBU:
+        case LANGUAGE_USER_KYRGYZ_CHINA:
             nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd2222f134..48766141e997 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -683,6 +683,7 @@ File gid_File_Share_Registry_Ctl_Xcd
     Name (he) = "ctl.xcd";
     Name (hi) = "ctl.xcd";
     Name (km) = "ctl.xcd";
+    Name (ky-CN) = "ctl.xcd";
     Name (lo) = "ctl.xcd";
     Name (my) = "ctl.xcd";
     Name (ne) = "ctl.xcd";
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index ed21cac6bf3f..936adb4ec2e5 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -64,7 +64,8 @@ ko     949  1042
 kok      0  1111   # Konkani
 ks       0  1120   # Kashmiri
 ku       0  1574
-ky       0  2100
+ky       0  1088   # Kyrgyz
+ky-CN    0  1640   # Kyrgyz (China)
 lb    1252  1134
 lo       0  1108   # Lao
 lt    1257  1063   # Lithuanian
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 8c08f437fdab..ea352ba910fd 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -95,10 +95,11 @@ BEGIN
         "ny",
         "so",
         "kab",
-        "tk"
+        "tk",
+        "ky-CN"
     );
     @items_at_modules = ("Files", "Dirs", "Unixlinks");
-    @rtllanguages = ("ar", "fa", "he", "ug");
+    @rtllanguages = ("ar", "fa", "he", "ug", "ky-CN");
 
     $ziplistname = "";
     $pathfilename = "";
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index f044711918b7..aa4e9ed3773d 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -76,6 +76,8 @@ ko \
 kok \
 ks \
 ku \
+ky \
+ky-CN \
 lb \
 lo \
 lt \
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index b82e0f467763..01b284601084 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -343,6 +343,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Vili" ; LANGUAGE_USER_VILI ; > ;
         < "KeyID" ; LANGUAGE_USER_KEYID ; > ;
         < "Pali Latin" ; LANGUAGE_USER_PALI_LATIN ; > ;
+        < "Kyrgyz (China)" ; LANGUAGE_USER_KYRGYZ_CHINA ; > ;
     };
 };