ICU-5566 Fix generated CLDR data

X-SVN-Rev: 21188

.gitattributes

@@ -48,7 +48,7 @@ README text !eol
 *.spp -text
 *.tri2 -text
 
-icu4c/source/data/coll/zh_Hans.txt -text
+icu4c/source/data/coll/sr_ME.txt -text
 icu4c/source/data/coll/zh_Hans_CN.txt -text
 icu4c/source/data/coll/zh_Hans_SG.txt -text
 icu4c/source/data/coll/zh_Hant_HK.txt -text

icu4c/source/data/coll/colfiles.mk

@@ -27,8 +27,9 @@
 # Aliases which do not have a corresponding xx.xml file (see icu-config.xml & build.xml)
 COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt es__TRADITIONAL.txt\
  hi_.txt hi__DIRECT.txt in.txt in_ID.txt iw.txt\
- iw_IL.txt zh_.txt zh_CN.txt zh_HK.txt zh_MO.txt\
- zh_SG.txt zh_TW.txt zh_TW_STROKE.txt zh__PINYIN.txt
+ iw_IL.txt sr_BA.txt sr_ME.txt sr_RS.txt zh_.txt\
+ zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt zh_TW.txt\
+ zh_TW_STROKE.txt zh__PINYIN.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -63,8 +64,7 @@ COLLATION_EMPTY_SOURCE = ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\
  sq_AL.txt sr_BA.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt\
  sr_Cyrl_RS.txt sr_RS.txt sv_FI.txt sv_SE.txt ta_IN.txt\
  te_IN.txt th_TH.txt tr_TR.txt uk_UA.txt vi_VN.txt\
- zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt\
- zh_Hant_TW.txt
+ zh_Hans_CN.txt zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt
 
 
 # Ordinary resources

icu4c/source/data/coll/sr_BA.txt

@@ -6,12 +6,6 @@
 // * Source File:<path>/icu-config.xml & build.xml
 // *
 // ***************************************************************************
-/**
- * validSubLocale of "sr"
- */
 sr_BA{
-    /**
-     * so genrb doesn't issue warnings
-     */
-    ___{""}
+    "%%ALIAS"{"sr_Cyrl_BA"}
 }

icu4c/source/data/coll/sr_ME.txt

@@ -6,12 +6,6 @@
 // * Source File:<path>/icu-config.xml & build.xml
 // *
 // ***************************************************************************
-/**
- * validSubLocale of "zh"
- */
-zh_Hans{
-    /**
-     * so genrb doesn't issue warnings
-     */
-    ___{""}
+sr_ME{
+    "%%ALIAS"{"sr_Cyrl_ME"}
 }

icu4c/source/data/coll/sr_RS.txt

@@ -6,12 +6,6 @@
 // * Source File:<path>/icu-config.xml & build.xml
 // *
 // ***************************************************************************
-/**
- * validSubLocale of "sr"
- */
 sr_RS{
-    /**
-     * so genrb doesn't issue warnings
-     */
-    ___{""}
+    "%%ALIAS"{"sr_Cyrl_RS"}
 }

icu4c/source/data/coll/zh.txt

@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/zh.xml
  */
 zh{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         big5han{
             Sequence{

icu4c/source/data/locales/as.txt

@@ -180,6 +180,6 @@ as{
         }
         gmtFormat{"GMT{0}"}
         hourFormat{"+HH:mm;-HH:mm"}
-        regionFormat{"{0} Time"}
+        regionFormat{"{0}"}
     }
 }

icu4c/source/data/locales/az.txt

@@ -197,6 +197,6 @@ az{
     zoneStrings{
         gmtFormat{"GMT{0}"}
         hourFormat{"+HH:mm;-HH:mm"}
-        regionFormat{"{0} Time"}
+        regionFormat{"{0}"}
     }
 }

icu4c/source/data/locales/ml.txt

@@ -526,6 +526,6 @@ ml{
     zoneStrings{
         gmtFormat{"GMT{0}"}
         hourFormat{"+HH:mm;-HH:mm"}
-        regionFormat{"{0} Time"}
+        regionFormat{"{0}"}
     }
 }

icu4c/source/data/locales/or.txt

@@ -178,6 +178,6 @@ or{
     zoneStrings{
         gmtFormat{"GMT{0}"}
         hourFormat{"+HH:mm;-HH:mm"}
-        regionFormat{"{0} Time"}
+        regionFormat{"{0}"}
     }
 }

icu4c/source/data/locales/uz.txt

@@ -238,6 +238,6 @@ uz{
         }
         gmtFormat{"GMT{0}"}
         hourFormat{"+HH:mm;-HH:mm"}
-        regionFormat{"{0} Time"}
+        regionFormat{"{0}"}
     }
 }

icu4c/source/data/locales/zh.txt

@@ -1979,13 +1979,24 @@ zh{
         REVISED{"已修订的拼字学"}
         SAAHO{"萨霍"}
     }
-    Version{"1.87"}
+    Version{"1.88"}
     calendar{
         gregorian{
             AmPmMarkers{
                 "上午",
                 "下午",
             }
+            DateTimePatterns{
+                "ahh时mm分ss秒 v",
+                "ahh'时'mm'分'ss'秒'",
+                "ahh:mm:ss",
+                "ah:mm",
+                "yyyy'年'M'月'd'日'EEEE",
+                "yyyy'年'M'月'd'日'",
+                "yyyy-M-d",
+                "yy-M-d",
+                "{1} {0}",
+            }
             availableFormats{
                 Md{"M-d"}
                 yyQ{"Q yy"}