changed all 'sh' language to 'sr-Latn'

Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37

5 files changed, 32 insertions, 29 deletions

diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index c6d33dd591f9..8b533ed0a441 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -76,11 +76,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
 	CustomTarget/i18npool/localedata/localedata_rue_SK \
 	CustomTarget/i18npool/localedata/localedata_ru_RU \
 	CustomTarget/i18npool/localedata/localedata_sc_IT \
-	CustomTarget/i18npool/localedata/localedata_sh_ME \
-	CustomTarget/i18npool/localedata/localedata_sh_RS \
-	CustomTarget/i18npool/localedata/localedata_sh_YU \
 	CustomTarget/i18npool/localedata/localedata_sk_SK \
 	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_ME \
 	CustomTarget/i18npool/localedata/localedata_sr_RS \
 	CustomTarget/i18npool/localedata/localedata_sr_YU \
diff --git a/i18npool/source/localedata/data/sh_ME.xml b/i18npool/source/localedata/data/sr_Latn_ME.xml
index b039f01fc9d2..86aee0b27ac6 100644
--- a/i18npool/source/localedata/data/sh_ME.xml
+++ b/i18npool/source/localedata/data/sr_Latn_ME.xml
@@ -20,20 +20,21 @@
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
     <Language>
-      <LangID>sh</LangID>
+      <LangID>qlt</LangID>
       <DefaultName>Serbian Latin</DefaultName>
     </Language>
     <Country>
       <CountryID>ME</CountryID>
       <DefaultName>Serbia</DefaultName>
     </Country>
+    <Variant>sr-Latn-ME</Variant>
   </LC_INFO>
-  <LC_CTYPE ref="sh_RS"/>
-  <LC_FORMAT ref="sh_RS" replaceTo="[$€-C81A]"/>
-  <LC_COLLATION ref="sh_RS"/>
-  <LC_SEARCH ref="sh_RS"/>
-  <LC_INDEX ref="sh_RS"/>
-  <LC_CALENDAR ref="sh_RS"/>
+  <LC_CTYPE ref="sr_Latn_RS"/>
+  <LC_FORMAT ref="sr_Latn_RS" replaceTo="[$€-C81A]"/>
+  <LC_COLLATION ref="sr_Latn_RS"/>
+  <LC_SEARCH ref="sr_Latn_RS"/>
+  <LC_INDEX ref="sr_Latn_RS"/>
+  <LC_CALENDAR ref="sr_Latn_RS"/>
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>EUR</CurrencyID>
@@ -50,9 +51,9 @@
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
   </LC_CURRENCY>
-  <LC_TRANSLITERATION ref="sh_RS"/>
-  <LC_MISC ref="sh_RS"/>
-  <LC_NumberingLevel ref="sh_RS"/>
-  <LC_OutLineNumberingLevel ref="sh_RS"/>
+  <LC_TRANSLITERATION ref="sr_Latn_RS"/>
+  <LC_MISC ref="sr_Latn_RS"/>
+  <LC_NumberingLevel ref="sr_Latn_RS"/>
+  <LC_OutLineNumberingLevel ref="sr_Latn_RS"/>
 </Locale>
 
diff --git a/i18npool/source/localedata/data/sh_RS.xml b/i18npool/source/localedata/data/sr_Latn_RS.xml
index 7c4e622c4a6e..c1373b760491 100644
--- a/i18npool/source/localedata/data/sh_RS.xml
+++ b/i18npool/source/localedata/data/sr_Latn_RS.xml
@@ -20,13 +20,14 @@
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
   <LC_INFO>
     <Language>
-      <LangID>sh</LangID>
+      <LangID>qlt</LangID>
       <DefaultName>Serbian Latin</DefaultName>
     </Language>
     <Country>
       <CountryID>RS</CountryID>
       <DefaultName>Serbia</DefaultName>
     </Country>
+    <Variant>sr-Latn-RS</Variant>
   </LC_INFO>
   <LC_CTYPE>
     <Separators>
diff --git a/i18npool/source/localedata/data/sh_YU.xml b/i18npool/source/localedata/data/sr_Latn_YU.xml
index f46c96d8efec..7197448668ad 100644
--- a/i18npool/source/localedata/data/sh_YU.xml
+++ b/i18npool/source/localedata/data/sr_Latn_YU.xml
@@ -20,20 +20,21 @@
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="yes" version="1.2">
   <LC_INFO>
     <Language>
-      <LangID>sh</LangID>
+      <LangID>qlt</LangID>
       <DefaultName>Serbian Latin</DefaultName>
     </Language>
     <Country>
       <CountryID>YU</CountryID>
       <DefaultName>Serbia and Montenegro</DefaultName>
     </Country>
+    <Variant>sr-Latn-YU</Variant>
   </LC_INFO>
-  <LC_CTYPE ref="sh_RS"/>
-  <LC_FORMAT ref="sh_RS" replaceTo="[$Din-81A]"/>
-  <LC_COLLATION ref="sh_RS"/>
-  <LC_SEARCH ref="sh_RS"/>
-  <LC_INDEX ref="sh_RS"/>
-  <LC_CALENDAR ref="sh_RS"/>
+  <LC_CTYPE ref="sr_Latn_RS"/>
+  <LC_FORMAT ref="sr_Latn_RS" replaceTo="[$Din-81A]"/>
+  <LC_COLLATION ref="sr_Latn_RS"/>
+  <LC_SEARCH ref="sr_Latn_RS"/>
+  <LC_INDEX ref="sr_Latn_RS"/>
+  <LC_CALENDAR ref="sr_Latn_RS"/>
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>CSD</CurrencyID>
@@ -50,9 +51,9 @@
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
   </LC_CURRENCY>
-  <LC_TRANSLITERATION ref="sh_RS"/>
-  <LC_MISC ref="sh_RS"/>
-  <LC_NumberingLevel ref="sh_RS"/>
-  <LC_OutLineNumberingLevel ref="sh_RS"/>
+  <LC_TRANSLITERATION ref="sr_Latn_RS"/>
+  <LC_MISC ref="sr_Latn_RS"/>
+  <LC_NumberingLevel ref="sr_Latn_RS"/>
+  <LC_OutLineNumberingLevel ref="sr_Latn_RS"/>
 </Locale>
 
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 9c9d991e0358..f99e35512bbc 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -133,9 +133,9 @@ static const struct {
     { "ro_RO",  lcl_DATA_EURO },
     { "cy_GB",  lcl_DATA_EURO },
     { "bg_BG",  lcl_DATA_EURO },
-    { "sh_ME",  lcl_DATA_EURO },
-    { "sh_RS",  lcl_DATA_EURO },
-    { "sh_YU",  lcl_DATA_EURO },
+    { "sr_Latn_ME",  lcl_DATA_EURO },
+    { "sr_Latn_RS",  lcl_DATA_EURO },
+    { "sr_Latn_YU",  lcl_DATA_EURO },
     { "sr_ME",  lcl_DATA_EURO },
     { "sr_RS",  lcl_DATA_EURO },
     { "sr_YU",  lcl_DATA_EURO },