From: Peter Edberg Date: Fri, 6 Oct 2017 00:46:48 +0000 (+0000) Subject: ICU-13359 Integrate updated CLDR 32 @13761 for 60rc. The previous issues #13366,... X-Git-Tag: release-60-rc~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbc623d0d8fb3449f61bf824a9b69e8f306dabcf;p=icu ICU-13359 Integrate updated CLDR 32 @13761 for 60rc. The previous issues #13366,#13368,#13374,#13390,#13391 are fixed. X-SVN-Rev: 40582 --- diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index 26a0d5e39dc..13dfa233222 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -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"} diff --git a/icu4c/source/data/curr/bg.txt b/icu4c/source/data/curr/bg.txt index 5b277e209f5..e6b9f52d115 100644 --- a/icu4c/source/data/curr/bg.txt +++ b/icu4c/source/data/curr/bg.txt @@ -2104,5 +2104,5 @@ bg{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.37.5"} + Version{"2.1.37.59"} } diff --git a/icu4c/source/data/curr/or.txt b/icu4c/source/data/curr/or.txt index 2994383e8f6..d2ddbaf39d7 100644 --- a/icu4c/source/data/curr/or.txt +++ b/icu4c/source/data/curr/or.txt @@ -1356,5 +1356,5 @@ or{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.36.86"} + Version{"2.1.37.57"} } diff --git a/icu4c/source/data/curr/ru.txt b/icu4c/source/data/curr/ru.txt index 329279c3b2d..468be7f2198 100644 --- a/icu4c/source/data/curr/ru.txt +++ b/icu4c/source/data/curr/ru.txt @@ -2206,5 +2206,5 @@ ru{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.37.12"} + Version{"2.1.37.58"} } diff --git a/icu4c/source/data/curr/th.txt b/icu4c/source/data/curr/th.txt index 8deba700fba..2d51ce0690d 100644 --- a/icu4c/source/data/curr/th.txt +++ b/icu4c/source/data/curr/th.txt @@ -1771,5 +1771,5 @@ th{ CurrencyUnitPatterns{ other{"{0} {1}"} } - Version{"2.1.37.5"} + Version{"2.1.37.56"} } diff --git a/icu4c/source/data/lang/bg.txt b/icu4c/source/data/lang/bg.txt index 44e9ace35a3..031abac2a61 100644 --- a/icu4c/source/data/lang/bg.txt +++ b/icu4c/source/data/lang/bg.txt @@ -828,7 +828,7 @@ bg{ VALENCIA{"Валенсиански"} WADEGILE{"Уейд-Джайлс романизация"} } - Version{"2.1.37.5"} + Version{"2.1.37.59"} characterLabelPattern{ all{"{0} – всички"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/or.txt b/icu4c/source/data/lang/or.txt index 8b70311d0b9..cb2f03f8cb5 100644 --- a/icu4c/source/data/lang/or.txt +++ b/icu4c/source/data/lang/or.txt @@ -738,7 +738,7 @@ or{ tibt{"ତିବେତାନ୍ ଅଙ୍କଗୁଡିକ"} } } - Version{"2.1.36.86"} + Version{"2.1.37.57"} characterLabelPattern{ all{"{0} — ସମସ୍ତ"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/ru.txt b/icu4c/source/data/lang/ru.txt index 645cc9ff4dc..390db969c76 100644 --- a/icu4c/source/data/lang/ru.txt +++ b/icu4c/source/data/lang/ru.txt @@ -916,7 +916,7 @@ ru{ VALENCIA{"Валенсийский"} WADEGILE{"Система Уэйда – Джайлза"} } - Version{"2.1.37.12"} + Version{"2.1.37.58"} characterLabelPattern{ all{"{0} – все"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/th.txt b/icu4c/source/data/lang/th.txt index ac6f0a317e8..088c865fc97 100644 --- a/icu4c/source/data/lang/th.txt +++ b/icu4c/source/data/lang/th.txt @@ -620,7 +620,7 @@ th{ yap{"ยัป"} yav{"แยงเบน"} ybb{"เยมบา"} - yi{"ยิว"} + yi{"ยิดดิช"} 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}"} diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index f6f1fcc6311..38246045be9 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -210,7 +210,7 @@ bg{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"2.1.37.5"} + Version{"2.1.37.59"} calendar{ generic{ DateTimePatterns{ diff --git a/icu4c/source/data/locales/or.txt b/icu4c/source/data/locales/or.txt index 8f3f3fa1301..f83964916d7 100644 --- a/icu4c/source/data/locales/or.txt +++ b/icu4c/source/data/locales/or.txt @@ -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{ diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 28be3d9eef7..3fdd3565cdd 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -290,7 +290,7 @@ ru{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"2.1.37.12"} + Version{"2.1.37.58"} calendar{ buddhist{ eras{ diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 5aecf15f210..4794938a718 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -181,7 +181,7 @@ th{ minimumGroupingDigits{"1"} native{"thai"} } - Version{"2.1.37.5"} + Version{"2.1.37.56"} calendar{ buddhist{ DateTimePatterns{ diff --git a/icu4c/source/data/region/bg.txt b/icu4c/source/data/region/bg.txt index db878774668..0c4346fd548 100644 --- a/icu4c/source/data/region/bg.txt +++ b/icu4c/source/data/region/bg.txt @@ -309,5 +309,5 @@ bg{ FK{"Фолклендски острови (Малвински острови)"} MK{"Бивша югославска република Македония"} } - Version{"2.1.37.5"} + Version{"2.1.37.59"} } diff --git a/icu4c/source/data/region/or.txt b/icu4c/source/data/region/or.txt index f5e40b1efd6..a79d9bbb2e6 100644 --- a/icu4c/source/data/region/or.txt +++ b/icu4c/source/data/region/or.txt @@ -310,5 +310,5 @@ or{ MK{"ମାସେଡୋନିଆ (ଫାଇରମ୍‌)"} TL{"ପୂର୍ବ ତିମୋର୍‌"} } - Version{"2.1.36.86"} + Version{"2.1.37.57"} } diff --git a/icu4c/source/data/region/ru.txt b/icu4c/source/data/region/ru.txt index bd73212c2e1..49870a761c4 100644 --- a/icu4c/source/data/region/ru.txt +++ b/icu4c/source/data/region/ru.txt @@ -309,5 +309,5 @@ ru{ MK{"Македония (БЮРМ)"} TL{"Тимор-Лесте"} } - Version{"2.1.37.12"} + Version{"2.1.37.58"} } diff --git a/icu4c/source/data/region/th.txt b/icu4c/source/data/region/th.txt index 127cc90189b..0b0a5850f43 100644 --- a/icu4c/source/data/region/th.txt +++ b/icu4c/source/data/region/th.txt @@ -311,5 +311,5 @@ th{ MK{"มาซิโดเนีย (FYROM)"} TL{"ติมอร์ตะวันออก"} } - Version{"2.1.37.5"} + Version{"2.1.37.56"} } diff --git a/icu4c/source/data/unit/bg.txt b/icu4c/source/data/unit/bg.txt index 72125d2d624..94c4b6ee9d9 100644 --- a/icu4c/source/data/unit/bg.txt +++ b/icu4c/source/data/unit/bg.txt @@ -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{"седм."} diff --git a/icu4c/source/data/unit/or.txt b/icu4c/source/data/unit/or.txt index a6368617a94..08c8456206a 100644 --- a/icu4c/source/data/unit/or.txt +++ b/icu4c/source/data/unit/or.txt @@ -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"} diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index cc83651ce97..58684ddfc0f 100644 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.txt @@ -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} фута"} - many{"{0} футов"} - one{"{0} фут"} - other{"{0} фута"} + few{"{0} фт"} + many{"{0} фт"} + one{"{0} фт"} + other{"{0} фт"} per{"{0}/фт"} } furlong{ @@ -2046,10 +2046,10 @@ ru{ } foot{ dnam{"фт"} - few{"{0} фт"} - many{"{0} фт"} - one{"{0} фт"} - other{"{0} фт"} + few{"{0} фута"} + many{"{0} футов"} + one{"{0} фут"} + other{"{0} фута"} per{"{0}/фт"} } furlong{ diff --git a/icu4c/source/data/unit/th.txt b/icu4c/source/data/unit/th.txt index 797f0995861..e6bd9e96cf5 100644 --- a/icu4c/source/data/unit/th.txt +++ b/icu4c/source/data/unit/th.txt @@ -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"} diff --git a/icu4c/source/data/zone/bg.txt b/icu4c/source/data/zone/bg.txt index 2ccc5878b00..4410d123924 100644 --- a/icu4c/source/data/zone/bg.txt +++ b/icu4c/source/data/zone/bg.txt @@ -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{"Абиджан"} diff --git a/icu4c/source/data/zone/or.txt b/icu4c/source/data/zone/or.txt index cd44a21730b..961a4ea3024 100644 --- a/icu4c/source/data/zone/or.txt +++ b/icu4c/source/data/zone/or.txt @@ -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{"ଆବିଦଜାନ"} diff --git a/icu4c/source/data/zone/ru.txt b/icu4c/source/data/zone/ru.txt index 026aec12ae6..7629c03e12e 100644 --- a/icu4c/source/data/zone/ru.txt +++ b/icu4c/source/data/zone/ru.txt @@ -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{"Абиджан"} diff --git a/icu4c/source/data/zone/th.txt b/icu4c/source/data/zone/th.txt index 594a77735c8..b584cde9215 100644 --- a/icu4c/source/data/zone/th.txt +++ b/icu4c/source/data/zone/th.txt @@ -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{"อาบีจาน"} diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 22f0c19e110..d997a26cde0 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -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( diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 871a6e7b744..1a2646f9011 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17e174083af458b0207c36037990d413b5e5bd25476bbf6ce6e315fa1d04ba3a -size 12523914 +oid sha256:31ae71be682038ec2d82a962cf84d8ad948b93405bb3f586ee8d67bb9478239c +size 12523944 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java index 706151707c6..c2143e732d7 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java @@ -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(