]> granicus.if.org Git - icu/commitdiff
ICU-13359 Integrate updated CLDR 32 @13761 for 60rc. The previous issues #13366,...
authorPeter Edberg <pedberg@unicode.org>
Fri, 6 Oct 2017 00:46:48 +0000 (00:46 +0000)
committerPeter Edberg <pedberg@unicode.org>
Fri, 6 Oct 2017 00:46:48 +0000 (00:46 +0000)
X-SVN-Rev: 40582

28 files changed:
icu4c/source/data/brkitr/root.txt
icu4c/source/data/curr/bg.txt
icu4c/source/data/curr/or.txt
icu4c/source/data/curr/ru.txt
icu4c/source/data/curr/th.txt
icu4c/source/data/lang/bg.txt
icu4c/source/data/lang/or.txt
icu4c/source/data/lang/ru.txt
icu4c/source/data/lang/th.txt
icu4c/source/data/locales/bg.txt
icu4c/source/data/locales/or.txt
icu4c/source/data/locales/ru.txt
icu4c/source/data/locales/th.txt
icu4c/source/data/region/bg.txt
icu4c/source/data/region/or.txt
icu4c/source/data/region/ru.txt
icu4c/source/data/region/th.txt
icu4c/source/data/unit/bg.txt
icu4c/source/data/unit/or.txt
icu4c/source/data/unit/ru.txt
icu4c/source/data/unit/th.txt
icu4c/source/data/zone/bg.txt
icu4c/source/data/zone/or.txt
icu4c/source/data/zone/ru.txt
icu4c/source/data/zone/th.txt
icu4c/source/test/intltest/measfmttest.cpp
icu4j/main/shared/data/icudata.jar
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java

index 26a0d5e39dc24d9fd3d5c3d5d096f006f1b918b5..13dfa23322255fb481f5064f286bd37ed5f5ef95 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 root{
-    Version{"2.1.36.90"}
+    Version{"2.1.37.61"}
     boundaries{
         grapheme:process(dependency){"char.brk"}
         line:process(dependency){"line.brk"}
index 5b277e209f51cf1695e23b2cc1aa2b24c6b2f39f..e6b9f52d11540107f76ba2a51504c21fcfc51ada 100644 (file)
@@ -2104,5 +2104,5 @@ bg{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
 }
index 2994383e8f603ef723f48092acccf56d18f8a067..d2ddbaf39d713d76717a70fe605255e879765814 100644 (file)
@@ -1356,5 +1356,5 @@ or{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
 }
index 329279c3b2d3daa154ecb82d70dcfbad301fa85e..468be7f2198c02b684c9fbdec3313e74f76dd3ee 100644 (file)
@@ -2206,5 +2206,5 @@ ru{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
 }
index 8deba700fba2aff61c8aa5a890d030cab1d5f72a..2d51ce0690dc8589975feef53fdc8d71ac6317ec 100644 (file)
@@ -1771,5 +1771,5 @@ th{
     CurrencyUnitPatterns{
         other{"{0} {1}"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
 }
index 44e9ace35a35132275838d6fa98474b4475c8e23..031abac2a6183f14524d4f249a8d4a9d672f9721 100644 (file)
@@ -828,7 +828,7 @@ bg{
         VALENCIA{"Валенсиански"}
         WADEGILE{"Уейд-Джайлс романизация"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
     characterLabelPattern{
         all{"{0} – всички"}
         category-list{"{0}: {1}"}
index 8b70311d0b9eb2926c638f7fcf1991b6a20b0fa7..cb2f03f8cb5760e4d304950313c27732e0f29a77 100644 (file)
@@ -738,7 +738,7 @@ or{
             tibt{"ତିବେତାନ୍ ଅଙ୍କଗୁଡିକ"}
         }
     }
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
     characterLabelPattern{
         all{"{0} — ସମସ୍ତ"}
         category-list{"{0}: {1}"}
index 645cc9ff4dc7b59f8ce255d5176de93172983904..390db969c76cc8f9a996e4a30a73dbcc75a4e4ca 100644 (file)
@@ -916,7 +916,7 @@ ru{
         VALENCIA{"Валенсийский"}
         WADEGILE{"Система Уэйда – Джайлза"}
     }
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
     characterLabelPattern{
         all{"{0} – все"}
         category-list{"{0}: {1}"}
index ac6f0a317e892228a2819c8a3198b796725b96d1..088c865fc97a9d053b3644c5f081dcba42d4103a 100644 (file)
@@ -620,7 +620,7 @@ th{
         yap{"ยัป"}
         yav{"แยงเบน"}
         ybb{"เยมบา"}
-        yi{"ยิว"}
+        yi{"ยิà¸\94à¸\94ิà¸\8a"}
         yo{"โยรูบา"}
         yrl{"เหงงกาตุ"}
         yue{"กวางตุ้ง"}
@@ -1054,7 +1054,7 @@ th{
         VALLADER{"วัลลาเดอร์"}
         WADEGILE{"การถอดอักษรแบบเวด-ไจลส์"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
     characterLabelPattern{
         all{"{0} — ทั้งหมด"}
         category-list{"{0}: {1}"}
index f6f1fcc631169e457ddd34875846f687f4ca1f6a..38246045be991be2ce559715fb6b92fb5c1772db 100644 (file)
@@ -210,7 +210,7 @@ bg{
         minimumGroupingDigits{"2"}
         native{"latn"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
     calendar{
         generic{
             DateTimePatterns{
index 8f3f3fa1301159dc58906ce4e92e4664fac6c00e..f83964916d7fcb2e0d30029d51d80ab141972e64 100644 (file)
@@ -29,10 +29,10 @@ or{
                 range{"{0}–{1}"}
             }
             patterns{
-                accountingFormat{"¤#,##0.00;(¤#,##0.00)"}
-                currencyFormat{"¤ #,##0.00"}
-                decimalFormat{"#,##0.###"}
-                percentFormat{"#,##0%"}
+                accountingFormat{"¤#,##,##0.00;(¤#,##,##0.00)"}
+                currencyFormat{"¤ #,##,##0.00"}
+                decimalFormat{"#,##,##0.###"}
+                percentFormat{"#,##,##0%"}
                 scientificFormat{"#E0"}
             }
             patternsLong{
@@ -206,9 +206,9 @@ or{
         native{"orya"}
         orya{
             patterns{
-                currencyFormat{"¤#,##0.00"}
-                decimalFormat{"#,##0.###"}
-                percentFormat{"#,##0%"}
+                currencyFormat{"¤#,##,##0.00"}
+                decimalFormat{"#,##,##0.###"}
+                percentFormat{"#,##,##0%"}
                 scientificFormat{"#E0"}
             }
             symbols{
@@ -225,7 +225,7 @@ or{
             }
         }
     }
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
     calendar{
         generic{
             DateTimePatterns{
index 28be3d9eef7bc36fb08582127dd51a5dee599595..3fdd3565cdde2bfd777f683384f71ed59d28989a 100644 (file)
@@ -290,7 +290,7 @@ ru{
         minimumGroupingDigits{"1"}
         native{"latn"}
     }
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
     calendar{
         buddhist{
             eras{
index 5aecf15f210c42e079859794bc9587db42efc4ea..4794938a71800be9da937d786be0950c8a4a94b8 100644 (file)
@@ -181,7 +181,7 @@ th{
         minimumGroupingDigits{"1"}
         native{"thai"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
     calendar{
         buddhist{
             DateTimePatterns{
index db878774668000c56a912db58b04c2ba2bf0e351..0c4346fd5488afcb226a88fa75bf369f37963fdd 100644 (file)
@@ -309,5 +309,5 @@ bg{
         FK{"Фолклендски острови (Малвински острови)"}
         MK{"Бивша югославска република Македония"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
 }
index f5e40b1efd6ac9f194f8bb77bdf5e40331310998..a79d9bbb2e6f6806ffce3c5eb1067d7cce2d818c 100644 (file)
@@ -310,5 +310,5 @@ or{
         MK{"ମାସେଡୋନିଆ (ଫାଇରମ୍‌)"}
         TL{"ପୂର୍ବ ତିମୋର୍‌"}
     }
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
 }
index bd73212c2e15adb757796e50f9ac8d3bfb6b0741..49870a761c4f2bebce0370b17bf1eb04b0557734 100644 (file)
@@ -309,5 +309,5 @@ ru{
         MK{"Македония (БЮРМ)"}
         TL{"Тимор-Лесте"}
     }
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
 }
index 127cc90189b95b759bd9faa804cf370584e7562b..0b0a5850f432a5c3ed3c25d0b4a42b1a280db952 100644 (file)
@@ -311,5 +311,5 @@ th{
         MK{"มาซิโดเนีย (FYROM)"}
         TL{"ติมอร์ตะวันออก"}
     }
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
 }
index 72125d2d624a20f72a854ffa75228b9919cf7e78..94c4b6ee9d9de466a50a970e3ffe56fcb05eaa88 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 bg{
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -805,9 +805,9 @@ bg{
                 other{"{0} д"}
             }
             hour{
-                dnam{"h"}
-                one{"{0} h"}
-                other{"{0} h"}
+                dnam{"ч"}
+                one{"{0} ч"}
+                other{"{0} ч"}
             }
             millisecond{
                 dnam{"ms"}
@@ -815,9 +815,9 @@ bg{
                 other{"{0} ms"}
             }
             minute{
-                dnam{"min"}
-                one{"{0} min"}
-                other{"{0} min"}
+                dnam{"мин"}
+                one{"{0} мин"}
+                other{"{0} мин"}
             }
             month{
                 dnam{"м"}
@@ -825,9 +825,9 @@ bg{
                 other{"{0} м"}
             }
             second{
-                dnam{"s"}
-                one{"{0} s"}
-                other{"{0} s"}
+                dnam{"с"}
+                one{"{0} с"}
+                other{"{0} с"}
             }
             week{
                 dnam{"седм."}
index a6368617a9491f42bcc092124810062df10f6223..08c8456206a2d6e2e835c2fc1a657eec504e35c8 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 or{
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index cc83651ce978e40e304e9a8da455126ccf76a1ff..58684ddfc0f3558762aaaceb8d6316ff36ef23b7 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 ru{
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -1229,10 +1229,10 @@ ru{
             }
             foot{
                 dnam{"фт"}
-                few{"{0} Ñ\84Ñ\83Ñ\82а"}
-                many{"{0} Ñ\84Ñ\83Ñ\82ов"}
-                one{"{0} Ñ\84Ñ\83Ñ\82"}
-                other{"{0} Ñ\84Ñ\83Ñ\82а"}
+                few{"{0} Ñ\84Ñ\82"}
+                many{"{0} Ñ\84Ñ\82"}
+                one{"{0} фт"}
+                other{"{0} Ñ\84Ñ\82"}
                 per{"{0}/фт"}
             }
             furlong{
@@ -2046,10 +2046,10 @@ ru{
             }
             foot{
                 dnam{"фт"}
-                few{"{0} Ñ\84Ñ\82"}
-                many{"{0} Ñ\84Ñ\82"}
-                one{"{0} фт"}
-                other{"{0} Ñ\84Ñ\82"}
+                few{"{0} Ñ\84Ñ\83Ñ\82а"}
+                many{"{0} Ñ\84Ñ\83Ñ\82ов"}
+                one{"{0} Ñ\84Ñ\83Ñ\82"}
+                other{"{0} Ñ\84Ñ\83Ñ\82а"}
                 per{"{0}/фт"}
             }
             furlong{
index 797f09958617cb2824a7c0534a33c449abd9ded1..e6bd9e96cf52674e966fe4e42494961c149107cd 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 th{
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index 2ccc5878b002d658d68ea96a174f09d2708bdf9b..4410d123924ae64069dc0c797eff271a37f41278 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 bg{
-    Version{"2.1.37.5"}
+    Version{"2.1.37.59"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Абиджан"}
index cd44a21730bc4d95db6d26cb418a22fcdf1c2f51..961a4ea3024803e0064ad26d370bc1f90f9743d3 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 or{
-    Version{"2.1.36.86"}
+    Version{"2.1.37.57"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"ଆବିଦଜାନ"}
index 026aec12ae6833f8efaae06fba8cab2ed60df314..7629c03e12e714b77269ad25d681e9ae63c61543 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 ru{
-    Version{"2.1.37.12"}
+    Version{"2.1.37.58"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Абиджан"}
index 594a77735c8e5a7e201c75958723aeacecb9ecad..b584cde92157b2a7c23b08fb24fdec25246758a5 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 th{
-    Version{"2.1.37.5"}
+    Version{"2.1.37.56"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"อาบีจาน"}
index 22f0c19e110a437c97be7b72e4cddb41e978e355..d997a26cde0e4beded9e4bf58eb31a67270852a1 100644 (file)
@@ -1743,12 +1743,12 @@ void MeasureFormatTest::helperTestSimplePer(
 void MeasureFormatTest::TestMultiples() {
     Locale ru("ru");
     Locale en("en");
-    helperTestMultiples(en, UMEASFMT_WIDTH_WIDE, "2 miles, 1 foot, 2.3 inches");
-    helperTestMultiples(en, UMEASFMT_WIDTH_SHORT, "2 mi, 1 ft, 2.3 in");
+    helperTestMultiples(en, UMEASFMT_WIDTH_WIDE,   "2 miles, 1 foot, 2.3 inches");
+    helperTestMultiples(en, UMEASFMT_WIDTH_SHORT,  "2 mi, 1 ft, 2.3 in");
     helperTestMultiples(en, UMEASFMT_WIDTH_NARROW, "2mi 1\\u2032 2.3\\u2033");
-    helperTestMultiples(ru, UMEASFMT_WIDTH_WIDE, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
-    helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C.");
-    helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u044C 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
+    helperTestMultiples(ru, UMEASFMT_WIDTH_WIDE,   "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
+    helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT,  "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C.");
+    helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u044C 1 \\u0444\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
 }
 
 void MeasureFormatTest::helperTestMultiples(
index 871a6e7b74460bf98e240509c0fd228098cca4af..1a2646f90110246f9a7a4e0705a2d5d4ac1d1b6c 100755 (executable)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17e174083af458b0207c36037990d413b5e5bd25476bbf6ce6e315fa1d04ba3a
-size 12523914
+oid sha256:31ae71be682038ec2d82a962cf84d8ad948b93405bb3f586ee8d67bb9478239c
+size 12523944
index 706151707c6ba9d03abfaa30f4bcd889d4c94b49..c2143e732d7a00f0dce9d5fcdbe734ebe97c15cf 100644 (file)
@@ -1488,8 +1488,8 @@ public class MeasureUnitTest extends TestFmwk {
                 {ULocale.ENGLISH, FormatWidth.SHORT, "2 mi, 1 ft, 2.3 in"},
                 {ULocale.ENGLISH, FormatWidth.NARROW, "2mi 1\u2032 2.3\u2033"},
                 {russia, FormatWidth.WIDE,   "2 \u043C\u0438\u043B\u0438 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
-                {russia, FormatWidth.SHORT,  "2 \u043C\u0438\u043B\u0438 1 \u0444\u0442 2,3 \u0434\u044E\u0439\u043C."},
-                {russia, FormatWidth.NARROW, "2 \u043C\u0438\u043B\u044C 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
+                {russia, FormatWidth.SHORT,  "2 \u043C\u0438\u043B\u0438 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C."},
+                {russia, FormatWidth.NARROW, "2 \u043C\u0438\u043B\u044C 1 \u0444\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
    };
         for (Object[] row : data) {
             MeasureFormat mf = MeasureFormat.getInstance(