From: Peter Edberg Date: Fri, 29 Sep 2017 20:05:13 +0000 (+0000) Subject: ICU-13359 Integrate updated CLDR 32 tags/release-32-beta; still have known issues... X-Git-Tag: release-60-rc~82 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b06ac0cc8f75075e5985ee10dc0577cfd629042d;p=icu ICU-13359 Integrate updated CLDR 32 tags/release-32-beta; still have known issues #13366,#13368 X-SVN-Rev: 40515 --- diff --git a/icu4c/source/data/curr/ccp.txt b/icu4c/source/data/curr/ccp.txt index 39fca596833..1048ecf4388 100644 --- a/icu4c/source/data/curr/ccp.txt +++ b/icu4c/source/data/curr/ccp.txt @@ -1808,5 +1808,5 @@ ccp{ other{"𑄎𑄟𑄴𑄝𑄨𑄠𑄚𑄴 𑄇𑄧𑄤𑄌"} } } - Version{"2.1.37.43"} + Version{"2.1.37.51"} } diff --git a/icu4c/source/data/curr/en.txt b/icu4c/source/data/curr/en.txt index 97ea01d1b7f..09469b5c739 100644 --- a/icu4c/source/data/curr/en.txt +++ b/icu4c/source/data/curr/en.txt @@ -796,7 +796,7 @@ en{ } PHP{ "PHP", - "Philippine Peso", + "Philippine Piso", } PKR{ "PKR", @@ -918,6 +918,10 @@ en{ "STD", "São Tomé & Príncipe Dobra", } + STN{ + "STN", + "São Tomé & Príncipe Dobra (2018)", + } SUR{ "SUR", "Soviet Rouble", @@ -1993,8 +1997,8 @@ en{ other{"Papua New Guinean kina"} } PHP{ - one{"Philippine peso"} - other{"Philippine pesos"} + one{"Philippine piso"} + other{"Philippine pisos"} } PKR{ one{"Pakistani rupee"} @@ -2116,6 +2120,10 @@ en{ one{"São Tomé & Príncipe dobra"} other{"São Tomé & Príncipe dobras"} } + STN{ + one{"São Tomé & Príncipe dobra (2018)"} + other{"São Tomé & Príncipe dobras (2018)"} + } SUR{ one{"Soviet rouble"} other{"Soviet roubles"} @@ -2401,5 +2409,5 @@ en{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.37.1"} + Version{"2.1.37.44"} } diff --git a/icu4c/source/data/curr/en_PH.txt b/icu4c/source/data/curr/en_PH.txt index b5bc8f02ae2..abfd2f4ab10 100644 --- a/icu4c/source/data/curr/en_PH.txt +++ b/icu4c/source/data/curr/en_PH.txt @@ -5,7 +5,7 @@ en_PH{ Currencies{ PHP{ "₱", - "Philippine Peso", + "Philippine Piso", } } Version{"2.1.31.33"} diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt index d35991a1b86..d8c54761c65 100644 --- a/icu4c/source/data/curr/supplementalData.txt +++ b/icu4c/source/data/curr/supplementalData.txt @@ -3827,12 +3827,23 @@ supplementalData:table(nofallback){ } } ST{ + { + from:intvector{ + 352, + -1358655488, + } + id{"STN"} + } { from:intvector{ 56, 2006631424, } id{"STD"} + to:intvector{ + 352, + -1358655489, + } } } SU{ diff --git a/icu4c/source/data/lang/ccp.txt b/icu4c/source/data/lang/ccp.txt index a279e35dac1..b5c8df7e339 100644 --- a/icu4c/source/data/lang/ccp.txt +++ b/icu4c/source/data/lang/ccp.txt @@ -833,7 +833,7 @@ ccp{ vaii{"𑄞𑄭 𑄚𑄘"} } } - Version{"2.1.37.43"} + Version{"2.1.37.51"} characterLabelPattern{ all{"{0} — 𑄗𑄪𑄟𑄴"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index b03f6800a2e..fd54a51d67d 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -1226,7 +1226,7 @@ en{ VALENCIA{"Valencian"} WADEGILE{"Wade-Giles Romanization"} } - Version{"2.1.37.1"} + Version{"2.1.37.44"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/locales/ccp.txt b/icu4c/source/data/locales/ccp.txt index 164928f6239..cdca6c97f41 100644 --- a/icu4c/source/data/locales/ccp.txt +++ b/icu4c/source/data/locales/ccp.txt @@ -71,7 +71,7 @@ ccp{ minimumGroupingDigits{"1"} native{"cakm"} } - Version{"2.1.37.43"} + Version{"2.1.37.51"} calendar{ generic{ DateTimePatterns{ @@ -572,7 +572,7 @@ ccp{ "𑄎𑄚𑄪𑄠𑄢𑄨", "𑄜𑄬𑄛𑄴𑄝𑄳𑄢𑄪𑄠𑄢𑄨", "𑄟𑄢𑄴𑄌𑄧", - "𑄃𑄬𑄛𑄳𑄢𑄨𑄣", + "𑄃𑄬𑄛𑄳𑄢𑄨𑄣𑄴", "𑄟𑄬", "𑄎𑄪𑄚𑄴", "𑄎𑄪𑄣𑄭", diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 0936f5c2150..8425005fb5d 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -205,7 +205,7 @@ en{ } } } - Version{"2.1.37.1"} + Version{"2.1.37.44"} calendar{ buddhist{ eras{ diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt index 0ff8bc785b0..b5a3dcbdfff 100644 --- a/icu4c/source/data/misc/keyTypeData.txt +++ b/icu4c/source/data/misc/keyTypeData.txt @@ -393,6 +393,7 @@ keyTypeData:table(nofallback){ srg{""} ssp{""} std{""} + stn{""} sur{""} svc{""} syp{""} diff --git a/icu4c/source/data/region/ccp.txt b/icu4c/source/data/region/ccp.txt index d32725e5a41..b1031bbe80c 100644 --- a/icu4c/source/data/region/ccp.txt +++ b/icu4c/source/data/region/ccp.txt @@ -322,5 +322,5 @@ ccp{ MK{"𑄟𑄬𑄥𑄨𑄓𑄮𑄚𑄠(FYROM)"} TL{"𑄛𑄪𑄉𑄮 𑄖𑄨𑄟𑄪𑄢𑄴"} } - Version{"2.1.37.43"} + Version{"2.1.37.51"} } diff --git a/icu4c/source/data/region/en.txt b/icu4c/source/data/region/en.txt index 42eb2bd307d..001b5c8f0e8 100644 --- a/icu4c/source/data/region/en.txt +++ b/icu4c/source/data/region/en.txt @@ -314,5 +314,5 @@ en{ MK{"Macedonia (FYROM)"} TL{"East Timor"} } - Version{"2.1.37.1"} + Version{"2.1.37.44"} } diff --git a/icu4c/source/data/unit/ccp.txt b/icu4c/source/data/unit/ccp.txt index 9123b154d09..0dbe98c9d34 100644 --- a/icu4c/source/data/unit/ccp.txt +++ b/icu4c/source/data/unit/ccp.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ccp{ - Version{"2.1.37.43"} + Version{"2.1.37.51"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index f39fa08560e..d2078a4de8c 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License en{ - Version{"2.1.37.1"} + Version{"2.1.37.44"} units{ acceleration{ g-force{ diff --git a/icu4c/source/data/zone/ccp.txt b/icu4c/source/data/zone/ccp.txt index 8f2f5f3713e..b45e1f86b7d 100644 --- a/icu4c/source/data/zone/ccp.txt +++ b/icu4c/source/data/zone/ccp.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ccp{ - Version{"2.1.37.43"} + Version{"2.1.37.51"} zoneStrings{ "Africa:Abidjan"{ ec{"𑄃𑄝𑄨𑄘𑄴𑄎𑄚𑄴"} diff --git a/icu4c/source/data/zone/en.txt b/icu4c/source/data/zone/en.txt index 423da51efe2..8546d1e53da 100644 --- a/icu4c/source/data/zone/en.txt +++ b/icu4c/source/data/zone/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License en{ - Version{"2.1.37.1"} + Version{"2.1.37.44"} zoneStrings{ "Africa:Sao_Tome"{ ec{"São Tomé"} diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index f6351232acb..09e3da1b8f4 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -4950,9 +4950,9 @@ NumberFormatTest::TestParseCurrencyInUCurr() { "Peruvian soles1.00", "Peruvian sol (1863\\u20131965)1.00", "Peruvian soles (1863\\u20131965)1.00", - "Philippine Peso1.00", - "Philippine peso1.00", - "Philippine pesos1.00", + "Philippine Piso1.00", + "Philippine piso1.00", + "Philippine pisos1.00", "Platinum1.00", "Platinum1.00", "Polish Zloty (1950\\u20131995)1.00", @@ -5887,9 +5887,9 @@ NumberFormatTest::TestParseCurrencyInUCurr() { "1.00 Peruvian soles random", "1.00 Peruvian sol (1863\\u20131965) random", "1.00 Peruvian soles (1863\\u20131965) random", - "1.00 Philippine Peso random", - "1.00 Philippine peso random", - "1.00 Philippine pesos random", + "1.00 Philippine Piso random", + "1.00 Philippine piso random", + "1.00 Philippine pisos random", "1.00 Platinum random", "1.00 Platinum random", "1.00 Polish Zloty (1950\\u20131995) random", diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 2c1df9659cb..871a6e7b744 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:2073f814c80da31ed9d0acc5c35dcee12db9da194dce558a8aa1c61907c51e27 -size 12523764 +oid sha256:17e174083af458b0207c36037990d413b5e5bd25476bbf6ce6e315fa1d04ba3a +size 12523914