[Libreoffice-commits] core.git: 2 commits - i18nlangtag/README i18npool/Library_localedata_others.mk i18npool/source instsetoo_native/util l10ntools/source scp2/source setup_native/source solenv/inc
Eike Rathke
erack at redhat.com
Mon Nov 18 13:24:08 PST 2013
i18nlangtag/README | 2
i18npool/Library_localedata_others.mk | 2
i18npool/source/localedata/data/kmr_Latn_TR.xml | 442 +++++++++++++++
i18npool/source/localedata/data/ku_TR.xml | 441 --------------
i18npool/source/localedata/localedata.cxx | 2
instsetoo_native/util/pack.lst | 2
l10ntools/source/ulfconv/msi-encodinglist.txt | 2
scp2/source/accessories/module_samples_accessories.ulf | 4
scp2/source/accessories/module_templates_accessories.ulf | 4
scp2/source/ooo/module_langpack.ulf | 4
setup_native/source/packinfo/spellchecker_selection.txt | 2
solenv/inc/langlist.mk | 2
12 files changed, 455 insertions(+), 454 deletions(-)
New commits:
commit 45d4b9b5e354578a81960c1b4b56e934f1e4b704
Author: Eike Rathke <erack at redhat.com>
Date: Mon Nov 18 22:23:10 2013 +0100
renamed ku* to kmr-Latn*, fdo#63460
Change-Id: I8069657d8829a0315c704e884a1cf15b26e02eb8
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index e80b8e7..f71d8d4 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -61,10 +61,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_kk_KZ \
CustomTarget/i18npool/localedata/localedata_kkw_CG \
CustomTarget/i18npool/localedata/localedata_km_KH \
+ CustomTarget/i18npool/localedata/localedata_kmr_Latn_TR \
CustomTarget/i18npool/localedata/localedata_kn_IN \
CustomTarget/i18npool/localedata/localedata_kng_CG \
CustomTarget/i18npool/localedata/localedata_ko_KR \
- CustomTarget/i18npool/localedata/localedata_ku_TR \
CustomTarget/i18npool/localedata/localedata_ky_KG \
CustomTarget/i18npool/localedata/localedata_ldi_CG \
CustomTarget/i18npool/localedata/localedata_lg_UG \
diff --git a/i18npool/source/localedata/data/ku_TR.xml b/i18npool/source/localedata/data/kmr_Latn_TR.xml
similarity index 99%
rename from i18npool/source/localedata/data/ku_TR.xml
rename to i18npool/source/localedata/data/kmr_Latn_TR.xml
index 53f19ed..5b32766 100644
--- a/i18npool/source/localedata/data/ku_TR.xml
+++ b/i18npool/source/localedata/data/kmr_Latn_TR.xml
@@ -20,13 +20,14 @@
<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
<LC_INFO>
<Language>
- <LangID>ku</LangID>
+ <LangID>qlt</LangID>
<DefaultName>Kurdish</DefaultName>
</Language>
<Country>
<CountryID>TR</CountryID>
<DefaultName>Turkey</DefaultName>
</Country>
+ <Variant>kmr-Latn-TR</Variant>
</LC_INFO>
<LC_CTYPE>
<Separators>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index a8a6d3f..75edcf7 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -221,7 +221,7 @@ static const struct {
{ "ve_ZA", lcl_DATA_OTHERS },
{ "nr_ZA", lcl_DATA_OTHERS },
{ "ts_ZA", lcl_DATA_OTHERS },
- { "ku_TR", lcl_DATA_OTHERS },
+ { "kmr_Latn_TR", lcl_DATA_OTHERS },
{ "ak_GH", lcl_DATA_OTHERS },
{ "af_NA", lcl_DATA_OTHERS },
{ "am_ET", lcl_DATA_OTHERS },
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 762721d..c728515 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -12,7 +12,7 @@ LibreOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntm
#LibreOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev
LibreOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US sdkoo
#LibreOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US sdkoodev
-LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
+LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kmr-Latn|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
#LibreOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack
#LibreOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|km|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|vi|zh-CN|zh-TW ooodevlanguagepack
diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt
index efa66c0..f18b2cc 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -79,12 +79,12 @@ ka 0 1079 # Georgian
kab 0 1625
kk 0 1087
km 0 1107 # Khmer
+kmr-Latn 0 1574
kn 0 1099 # Kannada
kn-IN 0 1099 # Kannada
ko 0 1042
kok 0 1111 # Konkani
ks 0 1120 # Kashmiri
-ku 0 1574
ky 0 1088 # Kyrgyz
ky-CN 0 1640 # Kyrgyz (China)
lb 0 1134
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
index 3893c92..fa43ca3 100644
--- a/scp2/source/accessories/module_samples_accessories.ulf
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -594,10 +594,10 @@ en-US = "Tajik"
[STR_DESC_MODULE_LANGPACK_TG]
en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-[STR_NAME_MODULE_LANGPACK_KU]
+[STR_NAME_MODULE_LANGPACK_KMR_LATN]
en-US = "Kurdish"
-[STR_DESC_MODULE_LANGPACK_KU]
+[STR_DESC_MODULE_LANGPACK_KMR_LATN]
en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_DZ]
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
index caf880e..ff390e6 100644
--- a/scp2/source/accessories/module_templates_accessories.ulf
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -589,10 +589,10 @@ en-US = "Tajik"
[STR_DESC_MODULE_LANGPACK_TG]
en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-[STR_NAME_MODULE_LANGPACK_KU]
+[STR_NAME_MODULE_LANGPACK_KMR_LATN]
en-US = "Kurdish"
-[STR_DESC_MODULE_LANGPACK_KU]
+[STR_DESC_MODULE_LANGPACK_KMR_LATN]
en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_DZ]
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index cbe6a93..e146fda 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -496,10 +496,10 @@ en-US = "Tajik"
[STR_DESC_MODULE_LANGPACK_TG]
en-US = "Installs the Tajik user interface"
-[STR_NAME_MODULE_LANGPACK_KU]
+[STR_NAME_MODULE_LANGPACK_KMR_LATN]
en-US = "Kurdish"
-[STR_DESC_MODULE_LANGPACK_KU]
+[STR_DESC_MODULE_LANGPACK_KMR_LATN]
en-US = "Installs the Kurdish user interface"
[STR_NAME_MODULE_LANGPACK_DZ]
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 6799ba5..bc5d182 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -55,8 +55,8 @@ hr = "hr,de"
is = "is"
it = "it,de,fr"
ja = "EMPTY"
+kmr-Latn = "kmr-Latn-TR"
ko = "EMPTY"
-ku = "ku-TR"
lt = "lt,de,pl,ru"
lv = "lv"
nb = "no,fr,de,es"
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 57234e3..5d2448b 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -64,11 +64,11 @@ ja \
ka \
kk \
km \
+kmr-Latn \
kn \
ko \
kok \
ks \
-ku \
lb \
lo \
lt \
commit ecc174737a1bd20a86b49e41232c84c863c598d4
Author: Eike Rathke <erack at redhat.com>
Date: Mon Nov 18 21:44:54 2013 +0100
nitpick
Change-Id: I69d1498e527c3e9de200e46b6cc6b0b137ea5f9c
diff --git a/i18nlangtag/README b/i18nlangtag/README
index e56e6e1..e075c3b 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -48,7 +48,7 @@ When changing a (translation's) language tag (for example, 'ca-XV' to 'ca-valenc
** replace the tag and sort alphabetically
* setup_native/source/packinfo/spellchecker_selection.txt
-** replace the tag
+** replace the tag and sort alphabetically
If locale data exists:
More information about the Libreoffice-commits
mailing list