[Libreoffice-commits] core.git: 3 commits - i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/source

Eike Rathke erack at redhat.com
Thu Sep 19 16:45:21 PDT 2013


 i18npool/Library_localedata_euro.mk            |    4 
 i18npool/Library_localedata_others.mk          |    2 
 i18npool/source/localedata/data/mn_Cyrl_MN.xml |  351 +++++++++++++++++++++++++
 i18npool/source/localedata/data/mn_MN.xml      |  350 ------------------------
 i18npool/source/localedata/data/sr_CS.xml      |   58 ++++
 i18npool/source/localedata/data/sr_Latn_CS.xml |   59 ++++
 i18npool/source/localedata/data/sr_Latn_YU.xml |   59 ----
 i18npool/source/localedata/data/sr_YU.xml      |   58 ----
 i18npool/source/localedata/localedata.cxx      |    6 
 9 files changed, 474 insertions(+), 473 deletions(-)

New commits:
commit f1ccfc64fca471f140a4b1830e370d8e4fe8ad4f
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 20 01:43:42 2013 +0200

    missing .mk for renamed 'mn-MN' to 'mn-Cyrl-MN'
    
    Change-Id: I77e457b27b083c7149e3696f978b1e85a6fe1e21

diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index 5f046f5..444b7d2 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
 	CustomTarget/i18npool/localedata/localedata_mdw_CG \
 	CustomTarget/i18npool/localedata/localedata_mkw_CG \
 	CustomTarget/i18npool/localedata/localedata_ml_IN \
-	CustomTarget/i18npool/localedata/localedata_mn_MN \
+	CustomTarget/i18npool/localedata/localedata_mn_Cyrl_MN \
 	CustomTarget/i18npool/localedata/localedata_mr_IN \
 	CustomTarget/i18npool/localedata/localedata_ms_MY \
 	CustomTarget/i18npool/localedata/localedata_my_MM \
commit 401edafdbec3941ad78b904a00d13cdd8655f10d
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 20 01:41:45 2013 +0200

    rename 'sr*YU' to 'sr*CS'
    
    Change-Id: Ibbe7b29e5eea22d0e2169f641d677fc4726fe6a7

diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index 8b533ed..2ae8162 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -80,10 +80,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
 	CustomTarget/i18npool/localedata/localedata_sl_SI \
 	CustomTarget/i18npool/localedata/localedata_sr_Latn_ME \
 	CustomTarget/i18npool/localedata/localedata_sr_Latn_RS \
-	CustomTarget/i18npool/localedata/localedata_sr_Latn_YU \
+	CustomTarget/i18npool/localedata/localedata_sr_Latn_CS \
 	CustomTarget/i18npool/localedata/localedata_sr_ME \
 	CustomTarget/i18npool/localedata/localedata_sr_RS \
-	CustomTarget/i18npool/localedata/localedata_sr_YU \
+	CustomTarget/i18npool/localedata/localedata_sr_CS \
 	CustomTarget/i18npool/localedata/localedata_sv_FI \
 	CustomTarget/i18npool/localedata/localedata_sv_SE \
 	CustomTarget/i18npool/localedata/localedata_tr_TR \
diff --git a/i18npool/source/localedata/data/sr_YU.xml b/i18npool/source/localedata/data/sr_CS.xml
similarity index 98%
rename from i18npool/source/localedata/data/sr_YU.xml
rename to i18npool/source/localedata/data/sr_CS.xml
index 53a6f1f..063a26c 100644
--- a/i18npool/source/localedata/data/sr_YU.xml
+++ b/i18npool/source/localedata/data/sr_CS.xml
@@ -24,7 +24,7 @@
       <DefaultName>Serbian Cyrillic</DefaultName>
     </Language>
     <Country>
-      <CountryID>YU</CountryID>
+      <CountryID>CS</CountryID>
       <DefaultName>Serbia and Montenegro</DefaultName>
     </Country>
   </LC_INFO>
diff --git a/i18npool/source/localedata/data/sr_Latn_YU.xml b/i18npool/source/localedata/data/sr_Latn_CS.xml
similarity index 97%
rename from i18npool/source/localedata/data/sr_Latn_YU.xml
rename to i18npool/source/localedata/data/sr_Latn_CS.xml
index 7197448..cca9831 100644
--- a/i18npool/source/localedata/data/sr_Latn_YU.xml
+++ b/i18npool/source/localedata/data/sr_Latn_CS.xml
@@ -24,10 +24,10 @@
       <DefaultName>Serbian Latin</DefaultName>
     </Language>
     <Country>
-      <CountryID>YU</CountryID>
+      <CountryID>CS</CountryID>
       <DefaultName>Serbia and Montenegro</DefaultName>
     </Country>
-    <Variant>sr-Latn-YU</Variant>
+    <Variant>sr-Latn-CS</Variant>
   </LC_INFO>
   <LC_CTYPE ref="sr_Latn_RS"/>
   <LC_FORMAT ref="sr_Latn_RS" replaceTo="[$Din-81A]"/>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 5da9313..c4427cb 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -135,10 +135,10 @@ static const struct {
     { "bg_BG",  lcl_DATA_EURO },
     { "sr_Latn_ME",  lcl_DATA_EURO },
     { "sr_Latn_RS",  lcl_DATA_EURO },
-    { "sr_Latn_YU",  lcl_DATA_EURO },
+    { "sr_Latn_CS",  lcl_DATA_EURO },
     { "sr_ME",  lcl_DATA_EURO },
     { "sr_RS",  lcl_DATA_EURO },
-    { "sr_YU",  lcl_DATA_EURO },
+    { "sr_CS",  lcl_DATA_EURO },
     { "hr_HR",  lcl_DATA_EURO },
     { "bs_BA",  lcl_DATA_EURO },
     { "eu",     lcl_DATA_EURO },
commit 09197c2df60bb4c7880fd4de2d18b150b9045637
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 20 01:34:16 2013 +0200

    renamed 'mn-MN' to 'mn-Cyrl-MN'
    
    Change-Id: Ice5fa332ff5308aa801099a9aff52ffea60ac622

diff --git a/i18npool/source/localedata/data/mn_MN.xml b/i18npool/source/localedata/data/mn_Cyrl_MN.xml
similarity index 99%
rename from i18npool/source/localedata/data/mn_MN.xml
rename to i18npool/source/localedata/data/mn_Cyrl_MN.xml
index 150b37d..89f7384 100644
--- a/i18npool/source/localedata/data/mn_MN.xml
+++ b/i18npool/source/localedata/data/mn_Cyrl_MN.xml
@@ -20,13 +20,14 @@
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
     <Language>
-      <LangID>mn</LangID>
-      <DefaultName>Mongolian</DefaultName>
+      <LangID>qlt</LangID>
+      <DefaultName>Mongolian Cyrillic</DefaultName>
     </Language>
     <Country>
       <CountryID>MN</CountryID>
       <DefaultName>Mongolia</DefaultName>
     </Country>
+    <Variant>mn-Cyrl-MN</Variant>
   </LC_INFO>
   <LC_CTYPE unoid="generic">
     <Separators>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f99e355..5da9313 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -200,7 +200,7 @@ static const struct {
     { "id_ID",  lcl_DATA_OTHERS },
     { "ms_MY",  lcl_DATA_OTHERS },
     { "ia",     lcl_DATA_OTHERS },
-    { "mn_MN",  lcl_DATA_OTHERS },
+    { "mn_Cyrl_MN",  lcl_DATA_OTHERS },
     { "az_AZ",  lcl_DATA_OTHERS },
     { "sw_TZ",  lcl_DATA_OTHERS },
     { "km_KH",  lcl_DATA_OTHERS },


More information about the Libreoffice-commits mailing list