From ca9bdb97801cb1d0383c36b66b43bf0587b7697a Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 22 Aug 2022 07:35:34 -0700 Subject: [PATCH] ICU-21957 integrate CLDR release-42-alpha2 to ICU main for 72 --- icu4c/source/data/curr/gsw.txt | 6 +- icu4c/source/data/curr/zh.txt | 2 +- .../source/data/dtd/cldr/common/dtd/ldml.dtd | 8 + icu4c/source/data/lang/en.txt | 10 +- icu4c/source/data/lang/en_001.txt | 2 +- icu4c/source/data/lang/en_CA.txt | 1 - icu4c/source/data/lang/en_GB.txt | 2 +- icu4c/source/data/lang/hi_Latn.txt | 2 +- icu4c/source/data/lang/sw_KE.txt | 2 - icu4c/source/data/locales/af.txt | 2 + icu4c/source/data/locales/am.txt | 3 +- icu4c/source/data/locales/ar.txt | 14 +- icu4c/source/data/locales/as.txt | 6 +- icu4c/source/data/locales/ast.txt | 14 + icu4c/source/data/locales/az.txt | 3 +- icu4c/source/data/locales/be.txt | 3 +- icu4c/source/data/locales/bg.txt | 9 +- icu4c/source/data/locales/bn.txt | 6 + icu4c/source/data/locales/br.txt | 14 + icu4c/source/data/locales/brx.txt | 18 + icu4c/source/data/locales/bs.txt | 3 +- icu4c/source/data/locales/ca.txt | 6 + icu4c/source/data/locales/ceb.txt | 14 + icu4c/source/data/locales/chr.txt | 7 +- icu4c/source/data/locales/cs.txt | 14 +- icu4c/source/data/locales/cy.txt | 3 +- icu4c/source/data/locales/da.txt | 1 - icu4c/source/data/locales/doi.txt | 17 + icu4c/source/data/locales/el.txt | 5 +- icu4c/source/data/locales/en.txt | 2 + icu4c/source/data/locales/en_001.txt | 12 + icu4c/source/data/locales/en_AU.txt | 12 - icu4c/source/data/locales/en_CH.txt | 391 ++++++ icu4c/source/data/locales/en_GB.txt | 51 - icu4c/source/data/locales/es_419.txt | 10 - icu4c/source/data/locales/es_US.txt | 7 - icu4c/source/data/locales/et.txt | 6 + icu4c/source/data/locales/eu.txt | 5 +- icu4c/source/data/locales/fa.txt | 6 + icu4c/source/data/locales/ff.txt | 14 + icu4c/source/data/locales/ff_Adlm.txt | 14 + icu4c/source/data/locales/fi.txt | 6 + icu4c/source/data/locales/fil.txt | 5 +- icu4c/source/data/locales/fo.txt | 14 + icu4c/source/data/locales/fr.txt | 7 +- icu4c/source/data/locales/ga.txt | 3 +- icu4c/source/data/locales/gd.txt | 16 +- icu4c/source/data/locales/gu.txt | 9 + icu4c/source/data/locales/ha.txt | 7 +- icu4c/source/data/locales/ha_NE.txt | 9 + icu4c/source/data/locales/he.txt | 8 +- icu4c/source/data/locales/hi.txt | 6 +- icu4c/source/data/locales/hi_Latn.txt | 9 + icu4c/source/data/locales/hr.txt | 6 + icu4c/source/data/locales/hu.txt | 10 + icu4c/source/data/locales/hy.txt | 7 +- icu4c/source/data/locales/id.txt | 3 +- icu4c/source/data/locales/ig.txt | 7 +- icu4c/source/data/locales/ja.txt | 1 + icu4c/source/data/locales/jv.txt | 6 + icu4c/source/data/locales/ka.txt | 6 + icu4c/source/data/locales/kgp.txt | 14 + icu4c/source/data/locales/kk.txt | 6 + icu4c/source/data/locales/km.txt | 8 +- icu4c/source/data/locales/kn.txt | 6 +- icu4c/source/data/locales/ko.txt | 1 + icu4c/source/data/locales/kok.txt | 9 + icu4c/source/data/locales/ks.txt | 17 + icu4c/source/data/locales/ks_Deva.txt | 17 + icu4c/source/data/locales/ky.txt | 11 +- icu4c/source/data/locales/lo.txt | 4 +- icu4c/source/data/locales/lt.txt | 2 - icu4c/source/data/locales/lv.txt | 6 + icu4c/source/data/locales/mai.txt | 17 + icu4c/source/data/locales/mi.txt | 7 + icu4c/source/data/locales/mk.txt | 7 +- icu4c/source/data/locales/ml.txt | 6 +- icu4c/source/data/locales/mn.txt | 10 +- icu4c/source/data/locales/mni.txt | 17 + icu4c/source/data/locales/mr.txt | 12 +- icu4c/source/data/locales/ms.txt | 6 + icu4c/source/data/locales/my.txt | 6 +- icu4c/source/data/locales/ne.txt | 14 +- icu4c/source/data/locales/nl.txt | 3 +- icu4c/source/data/locales/no.txt | 6 + icu4c/source/data/locales/or.txt | 6 +- icu4c/source/data/locales/pa.txt | 10 +- icu4c/source/data/locales/pcm.txt | 6 +- icu4c/source/data/locales/pl.txt | 3 +- icu4c/source/data/locales/ps.txt | 3 +- icu4c/source/data/locales/pt.txt | 3 +- icu4c/source/data/locales/qu.txt | 8 +- icu4c/source/data/locales/ro.txt | 1 - icu4c/source/data/locales/root.txt | 1 - icu4c/source/data/locales/sa.txt | 17 + icu4c/source/data/locales/sat.txt | 14 + icu4c/source/data/locales/sc.txt | 6 + icu4c/source/data/locales/sd.txt | 6 +- icu4c/source/data/locales/sd_Deva.txt | 17 + icu4c/source/data/locales/si.txt | 60 +- icu4c/source/data/locales/sl.txt | 6 + icu4c/source/data/locales/so.txt | 7 +- icu4c/source/data/locales/sq.txt | 2 - icu4c/source/data/locales/sr.txt | 7 +- icu4c/source/data/locales/sr_Latn.txt | 7 +- icu4c/source/data/locales/su.txt | 14 + icu4c/source/data/locales/sv.txt | 6 + icu4c/source/data/locales/sw.txt | 3 +- icu4c/source/data/locales/ta.txt | 83 +- icu4c/source/data/locales/te.txt | 11 +- icu4c/source/data/locales/tg.txt | 14 + icu4c/source/data/locales/th.txt | 6 + icu4c/source/data/locales/ti.txt | 17 + icu4c/source/data/locales/tk.txt | 1 - icu4c/source/data/locales/to.txt | 8 +- icu4c/source/data/locales/tr.txt | 4 +- icu4c/source/data/locales/tt.txt | 15 + icu4c/source/data/locales/uk.txt | 12 + icu4c/source/data/locales/ur.txt | 5 + icu4c/source/data/locales/uz.txt | 3 +- icu4c/source/data/locales/wo.txt | 14 + icu4c/source/data/locales/xh.txt | 14 + icu4c/source/data/locales/yo.txt | 7 +- icu4c/source/data/locales/yrl.txt | 14 + icu4c/source/data/locales/yue.txt | 46 +- icu4c/source/data/locales/zh.txt | 3 + icu4c/source/data/locales/zh_Hant.txt | 40 +- icu4c/source/data/locales/zh_Hant_HK.txt | 10 +- icu4c/source/data/locales/zu.txt | 7 +- icu4c/source/data/misc/dayPeriods.txt | 12 +- icu4c/source/data/misc/keyTypeData.txt | 6 + icu4c/source/data/misc/langInfo.txt | 1247 +++++++++-------- icu4c/source/data/misc/likelySubtags.txt | 3 + icu4c/source/data/misc/metadata.txt | 6 +- icu4c/source/data/misc/pluralRanges.txt | 219 ++- icu4c/source/data/misc/plurals.txt | 138 +- icu4c/source/data/misc/supplementalData.txt | 128 +- icu4c/source/data/misc/units.txt | 19 +- icu4c/source/data/rbnf/bg.txt | 485 ++++++- icu4c/source/data/region/bgc.txt | 1 + icu4c/source/data/region/bho.txt | 1 + icu4c/source/data/region/bn.txt | 5 +- icu4c/source/data/region/en_001.txt | 7 + icu4c/source/data/region/en_AU.txt | 5 + icu4c/source/data/region/en_GB.txt | 9 - icu4c/source/data/region/hi_Latn.txt | 6 + icu4c/source/data/region/raj.txt | 1 + icu4c/source/data/region/sw_KE.txt | 2 - icu4c/source/data/translit/Hans_Hant.txt | 24 +- icu4c/source/data/unit/af.txt | 28 +- icu4c/source/data/unit/am.txt | 42 +- icu4c/source/data/unit/ar.txt | 38 +- icu4c/source/data/unit/ar_SA.txt | 16 +- icu4c/source/data/unit/as.txt | 20 +- icu4c/source/data/unit/ast.txt | 30 +- icu4c/source/data/unit/az.txt | 20 +- icu4c/source/data/unit/be.txt | 28 +- icu4c/source/data/unit/bg.txt | 18 +- icu4c/source/data/unit/bn.txt | 30 +- icu4c/source/data/unit/br.txt | 48 +- icu4c/source/data/unit/bs.txt | 24 +- icu4c/source/data/unit/ca.txt | 32 +- icu4c/source/data/unit/ccp.txt | 20 +- icu4c/source/data/unit/ceb.txt | 10 +- icu4c/source/data/unit/chr.txt | 30 +- icu4c/source/data/unit/cs.txt | 108 +- icu4c/source/data/unit/cy.txt | 54 +- icu4c/source/data/unit/da.txt | 34 +- icu4c/source/data/unit/de.txt | 50 +- icu4c/source/data/unit/dsb.txt | 28 +- icu4c/source/data/unit/el.txt | 42 +- icu4c/source/data/unit/en.txt | 30 +- icu4c/source/data/unit/en_001.txt | 28 +- icu4c/source/data/unit/en_AU.txt | 21 +- icu4c/source/data/unit/en_CA.txt | 10 +- icu4c/source/data/unit/en_GB.txt | 27 - icu4c/source/data/unit/es.txt | 28 +- icu4c/source/data/unit/es_419.txt | 26 +- icu4c/source/data/unit/et.txt | 20 +- icu4c/source/data/unit/eu.txt | 20 +- icu4c/source/data/unit/fa.txt | 28 +- icu4c/source/data/unit/ff_Adlm.txt | 30 +- icu4c/source/data/unit/fi.txt | 66 +- icu4c/source/data/unit/fil.txt | 30 +- icu4c/source/data/unit/fo.txt | 20 +- icu4c/source/data/unit/fr.txt | 32 +- icu4c/source/data/unit/fr_CA.txt | 16 +- icu4c/source/data/unit/ga.txt | 48 +- icu4c/source/data/unit/gd.txt | 42 +- icu4c/source/data/unit/gl.txt | 20 +- icu4c/source/data/unit/gu.txt | 22 +- icu4c/source/data/unit/ha.txt | 26 +- icu4c/source/data/unit/he.txt | 50 +- icu4c/source/data/unit/hi.txt | 42 +- icu4c/source/data/unit/hi_Latn.txt | 15 +- icu4c/source/data/unit/hr.txt | 70 +- icu4c/source/data/unit/hsb.txt | 28 +- icu4c/source/data/unit/hu.txt | 56 +- icu4c/source/data/unit/hy.txt | 56 +- icu4c/source/data/unit/ia.txt | 16 +- icu4c/source/data/unit/id.txt | 16 +- icu4c/source/data/unit/is.txt | 60 +- icu4c/source/data/unit/it.txt | 30 +- icu4c/source/data/unit/ja.txt | 24 +- icu4c/source/data/unit/jv.txt | 18 +- icu4c/source/data/unit/ka.txt | 20 +- icu4c/source/data/unit/kea.txt | 8 +- icu4c/source/data/unit/kgp.txt | 20 +- icu4c/source/data/unit/kk.txt | 20 +- icu4c/source/data/unit/km.txt | 16 +- icu4c/source/data/unit/kn.txt | 66 +- icu4c/source/data/unit/ko.txt | 24 +- icu4c/source/data/unit/kok.txt | 24 +- icu4c/source/data/unit/ky.txt | 20 +- icu4c/source/data/unit/lb.txt | 28 +- icu4c/source/data/unit/lo.txt | 16 +- icu4c/source/data/unit/lt.txt | 94 +- icu4c/source/data/unit/lv.txt | 70 +- icu4c/source/data/unit/mk.txt | 20 +- icu4c/source/data/unit/ml.txt | 84 +- icu4c/source/data/unit/mn.txt | 20 +- icu4c/source/data/unit/mr.txt | 74 +- icu4c/source/data/unit/ms.txt | 24 +- icu4c/source/data/unit/my.txt | 16 +- icu4c/source/data/unit/mzn.txt | 16 +- icu4c/source/data/unit/ne.txt | 20 +- icu4c/source/data/unit/nl.txt | 32 +- icu4c/source/data/unit/no.txt | 44 +- icu4c/source/data/unit/or.txt | 30 +- icu4c/source/data/unit/pa.txt | 34 +- icu4c/source/data/unit/pcm.txt | 20 +- icu4c/source/data/unit/pl.txt | 44 +- icu4c/source/data/unit/ps.txt | 20 +- icu4c/source/data/unit/pt.txt | 22 +- icu4c/source/data/unit/ro.txt | 52 +- icu4c/source/data/unit/root.txt | 8 +- icu4c/source/data/unit/ru.txt | 108 +- icu4c/source/data/unit/sah.txt | 8 +- icu4c/source/data/unit/sc.txt | 18 +- icu4c/source/data/unit/sd.txt | 28 +- icu4c/source/data/unit/si.txt | 20 +- icu4c/source/data/unit/sk.txt | 108 +- icu4c/source/data/unit/sl.txt | 94 +- icu4c/source/data/unit/so.txt | 10 +- icu4c/source/data/unit/sq.txt | 30 +- icu4c/source/data/unit/sr.txt | 60 +- icu4c/source/data/unit/sr_Latn.txt | 60 +- icu4c/source/data/unit/sv.txt | 44 +- icu4c/source/data/unit/sw.txt | 20 +- icu4c/source/data/unit/ta.txt | 56 +- icu4c/source/data/unit/te.txt | 20 +- icu4c/source/data/unit/th.txt | 22 +- icu4c/source/data/unit/tk.txt | 20 +- icu4c/source/data/unit/to.txt | 24 +- icu4c/source/data/unit/tr.txt | 30 +- icu4c/source/data/unit/uk.txt | 108 +- icu4c/source/data/unit/ur.txt | 22 +- icu4c/source/data/unit/uz.txt | 20 +- icu4c/source/data/unit/vi.txt | 14 +- icu4c/source/data/unit/yrl.txt | 20 +- icu4c/source/data/unit/yue.txt | 16 +- icu4c/source/data/unit/yue_Hans.txt | 16 +- icu4c/source/data/unit/zh.txt | 14 +- icu4c/source/data/unit/zh_Hant.txt | 24 +- icu4c/source/data/unit/zu.txt | 20 +- icu4c/source/data/zone/en_001.txt | 6 + icu4c/source/data/zone/en_AU.txt | 6 - icu4c/source/data/zone/en_GB.txt | 9 - icu4c/source/data/zone/hi_Latn.txt | 6 - icu4c/source/data/zone/ti.txt | 3 + icu4c/source/i18n/measunit.cpp | 138 +- icu4c/source/i18n/unicode/measunit.h | 22 +- icu4c/source/i18n/units_converter.cpp | 6 + icu4c/source/i18n/units_converter.h | 6 + icu4c/source/test/cintltst/cpluralrulestest.c | 2 +- icu4c/source/test/intltest/measfmttest.cpp | 4 +- icu4c/source/test/intltest/numbertest_api.cpp | 102 +- icu4c/source/test/intltest/plurfmts.cpp | 2 +- .../cldr/units/unitPreferencesTest.txt | 4 +- .../test/testdata/cldr/units/unitsTest.txt | 2 +- icu4c/source/test/testdata/structLocale.txt | 3 + .../ibm/icu/impl/units/UnitsConverter.java | 32 +- .../src/com/ibm/icu/util/MeasureUnit.java | 10 +- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 4 +- .../data/cldr/units/unitPreferencesTest.txt | 4 +- .../ibm/icu/dev/data/cldr/units/unitsTest.txt | 2 +- .../icu/dev/test/format/MeasureUnitTest.java | 5 +- .../icu/dev/test/format/NumberFormatTest.java | 16 +- .../icu/dev/test/format/PluralFormatTest.java | 2 +- .../icu/dev/test/format/PluralRulesTest.java | 16 +- .../com/ibm/icu/dev/test/impl/UnitsTest.java | 14 +- .../test/number/NumberFormatterApiTest.java | 102 +- .../icu/dev/test/util/TestLocaleValidity.java | 1 + tools/cldr/cldr-to-icu/pom.xml | 2 +- 296 files changed, 4953 insertions(+), 3420 deletions(-) diff --git a/icu4c/source/data/curr/gsw.txt b/icu4c/source/data/curr/gsw.txt index 4ad91c43521..20796431ce8 100644 --- a/icu4c/source/data/curr/gsw.txt +++ b/icu4c/source/data/curr/gsw.txt @@ -629,7 +629,7 @@ gsw{ } MVR{ "MVR", - "Rufiyaa", + "Malediven-Rufiyaa", } MWK{ "MWK", @@ -1694,8 +1694,8 @@ gsw{ other{"Maurizius-Rupie"} } MVR{ - one{"Rufiyaa"} - other{"Rufiyaa"} + one{"Malediven-Rufiyaa"} + other{"Malediven-Rupien"} } MWK{ one{"Malawi-Kwacha"} diff --git a/icu4c/source/data/curr/zh.txt b/icu4c/source/data/curr/zh.txt index 60795197cdc..b768f487eab 100644 --- a/icu4c/source/data/curr/zh.txt +++ b/icu4c/source/data/curr/zh.txt @@ -1420,7 +1420,7 @@ zh{ other{"保加利亚社会党列弗"} } BGN{ - other{"保加利亚新列弗"} + other{"保加利亚列弗"} } BGO{ other{"保加利亚列弗 (1879–1952)"} diff --git a/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd b/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd index 0d472a6bb48..e62746edbde 100644 --- a/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd +++ b/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd @@ -3159,8 +3159,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + @@ -3170,6 +3172,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -3180,6 +3183,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -3189,6 +3193,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -3199,6 +3204,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -3206,10 +3212,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index ffef5406840..ba2b470f291 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -28,6 +28,7 @@ en{ lw{"Line Breaks In Words Setting"} m0{"Transform Rules"} ms{"Measurement System"} + mu{"Measurement Unit"} numbers{"Numbers"} rg{"Region For Supplemental Data"} s0{"Transform Source"} @@ -218,7 +219,7 @@ en{ fa_AF{"Dari"} fan{"Fang"} fat{"Fanti"} - ff{"Fulah"} + ff{"Fula"} fi{"Finnish"} fil{"Filipino"} fit{"Tornedalen Finnish"} @@ -539,7 +540,7 @@ en{ rwk{"Rwa"} sa{"Sanskrit"} sad{"Sandawe"} - sah{"Sakha"} + sah{"Yakut"} sam{"Samaritan Aramaic"} saq{"Samburu"} sas{"Sasak"} @@ -1174,6 +1175,11 @@ en{ uksystem{"Imperial Measurement System"} ussystem{"US Measurement System"} } + mu{ + celsius{"Celsius"} + fahrenhe{"Fahrenheit"} + kelvin{"Kelvin"} + } numbers{ adlm{"Adlam Digits"} ahom{"Ahom Digits"} diff --git a/icu4c/source/data/lang/en_001.txt b/icu4c/source/data/lang/en_001.txt index 592d261db8d..3afb8f2d8d5 100644 --- a/icu4c/source/data/lang/en_001.txt +++ b/icu4c/source/data/lang/en_001.txt @@ -7,9 +7,9 @@ en_001{ colNormalization{"Normalised Sorting"} } Languages{ + bla{"Siksika"} mus{"Creek"} nds_NL{"West Low German"} - sah{"Yakut"} } Types{ colNormalization{ diff --git a/icu4c/source/data/lang/en_CA.txt b/icu4c/source/data/lang/en_CA.txt index a809784fe67..7e3e5523d10 100644 --- a/icu4c/source/data/lang/en_CA.txt +++ b/icu4c/source/data/lang/en_CA.txt @@ -47,7 +47,6 @@ en_CA{ mul{"multiple languages"} nds_NL{"West Low German"} ro_MD{"Moldovan"} - sah{"Yakut"} und{"unknown language"} zh_Hans{"simplified Chinese"} zh_Hant{"traditional Chinese"} diff --git a/icu4c/source/data/lang/en_GB.txt b/icu4c/source/data/lang/en_GB.txt index 4f3f30861fb..bc17fdd71f9 100644 --- a/icu4c/source/data/lang/en_GB.txt +++ b/icu4c/source/data/lang/en_GB.txt @@ -4,6 +4,6 @@ en_GB{ %%Parent{"en_001"} Languages{ - bla{"Siksika"} + ff{"Fulah"} } } diff --git a/icu4c/source/data/lang/hi_Latn.txt b/icu4c/source/data/lang/hi_Latn.txt index 46913720878..d6532fae83a 100644 --- a/icu4c/source/data/lang/hi_Latn.txt +++ b/icu4c/source/data/lang/hi_Latn.txt @@ -18,12 +18,12 @@ hi_Latn{ } Languages{ af{"Afreeki"} - bla{"Siksika"} bn{"Bangla"} bo{"Tibbati"} ckb{"Kurdish, Sorani"} crh{"Crimean Turkish"} fa{"Faarsi"} + ff{"Fulah"} lah{"Lahnda"} mus{"Muscogee"} nan{"Min Nan"} diff --git a/icu4c/source/data/lang/sw_KE.txt b/icu4c/source/data/lang/sw_KE.txt index 288b3ead3ef..bb885385a02 100644 --- a/icu4c/source/data/lang/sw_KE.txt +++ b/icu4c/source/data/lang/sw_KE.txt @@ -180,7 +180,6 @@ sw_KE{ Ethi{"Kihabeshi"} Hanb{"Kihan chenye Kibopomofo"} Hans{"Kilichorahisishwa"} - Hant{"Kawaida"} Hira{"Kihiragana"} Hrkt{"Silabi za Kijapani"} Jamo{"Kijamo"} @@ -198,7 +197,6 @@ sw_KE{ } Scripts%stand-alone{ Hans{"Kihan Kilichorahisishwa"} - Hant{"Kihan cha Kawaida"} } Types{ calendar{ diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index fea3239ac8c..df2ddc19bdc 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -1918,6 +1918,8 @@ af{ surnameFirst{ "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/am.txt b/icu4c/source/data/locales/am.txt index baeaedd297c..d8926867bb7 100644 --- a/icu4c/source/data/locales/am.txt +++ b/icu4c/source/data/locales/am.txt @@ -2469,8 +2469,9 @@ am{ "am", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 3fc8f016820..c10fe5bf659 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -22,7 +22,7 @@ ar{ NumberElements{ arab{ patterns{ - currencyFormat{"#,##0.00 ¤"} + currencyFormat{"‏#,##0.00 ¤"} currencyFormat%noCurrency{"#,##0.00"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} @@ -53,10 +53,10 @@ ar{ range{"{0}–{1}"} } patterns{ - accountingFormat{"¤#,##0.00;(¤#,##0.00)"} - accountingFormat%alphaNextToNumber{"#,##0.00 ¤;(#,##0.00 ¤)"} + accountingFormat{"؜¤#,##0.00;(؜¤#,##0.00)"} + accountingFormat%alphaNextToNumber{"؜#,##0.00 ¤;(؜#,##0.00 ¤)"} accountingFormat%noCurrency{"#,##0.00;(#,##0.00)"} - currencyFormat{"¤ #,##0.00"} + currencyFormat{"‏¤ #,##0.00;‏-‏¤ #,##0.00"} currencyPatternAppendISO{"{0} ¤¤"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} @@ -3161,6 +3161,12 @@ ar{ "und", "ar", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/as.txt b/icu4c/source/data/locales/as.txt index 9aeac3b1991..61256f1c71f 100644 --- a/icu4c/source/data/locales/as.txt +++ b/icu4c/source/data/locales/as.txt @@ -1912,8 +1912,12 @@ as{ "as", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ast.txt b/icu4c/source/data/locales/ast.txt index 23f142734d8..cf7b5d7bba7 100644 --- a/icu4c/source/data/locales/ast.txt +++ b/icu4c/source/data/locales/ast.txt @@ -4071,4 +4071,18 @@ ast{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ast", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/az.txt b/icu4c/source/data/locales/az.txt index 4c28795d6b2..7346c205196 100644 --- a/icu4c/source/data/locales/az.txt +++ b/icu4c/source/data/locales/az.txt @@ -1742,8 +1742,9 @@ az{ "az", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt index 64a75b664a4..b37b08cd839 100644 --- a/icu4c/source/data/locales/be.txt +++ b/icu4c/source/data/locales/be.txt @@ -2230,8 +2230,9 @@ be{ "be", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index 7038fad6fd8..ff6f325d880 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -26,9 +26,9 @@ bg{ range{"{0} – {1}"} } patterns{ - accountingFormat{"0.00 ¤;(0.00 ¤)"} - accountingFormat%noCurrency{"0.00;(0.00)"} - currencyFormat{"0.00 ¤"} + accountingFormat{"#,##0.00 ¤;(#,##0.00 ¤)"} + accountingFormat%noCurrency{"#,##0.00;(#,##0.00)"} + currencyFormat{"#,##0.00 ¤"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} scientificFormat{"#E0"} @@ -2060,8 +2060,9 @@ bg{ "bg", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt index 1c233a3f933..05bc91f86e1 100644 --- a/icu4c/source/data/locales/bn.txt +++ b/icu4c/source/data/locales/bn.txt @@ -2879,6 +2879,12 @@ bn{ "und", "bn", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {given} {given2} {surname} {surname2} {suffix}"} diff --git a/icu4c/source/data/locales/br.txt b/icu4c/source/data/locales/br.txt index 76e004b7968..d6205c946ac 100644 --- a/icu4c/source/data/locales/br.txt +++ b/icu4c/source/data/locales/br.txt @@ -6441,4 +6441,18 @@ br{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "br", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/brx.txt b/icu4c/source/data/locales/brx.txt index 66fdc2915be..ade09c26e2c 100644 --- a/icu4c/source/data/locales/brx.txt +++ b/icu4c/source/data/locales/brx.txt @@ -1816,4 +1816,22 @@ brx{ US{"इउ.एस"} metric{"मेट्रिक जखा"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "brx", + } + surnameFirst{ + "ja", + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/bs.txt b/icu4c/source/data/locales/bs.txt index 842674e4386..b9a7fa21451 100644 --- a/icu4c/source/data/locales/bs.txt +++ b/icu4c/source/data/locales/bs.txt @@ -2329,8 +2329,9 @@ bs{ "bs", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index 4285cf0927c..87f94b10366 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -2209,6 +2209,12 @@ ca{ "und", "ca", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname} {surname2}"} diff --git a/icu4c/source/data/locales/ceb.txt b/icu4c/source/data/locales/ceb.txt index 105703f5d7f..a1fc1a9e464 100644 --- a/icu4c/source/data/locales/ceb.txt +++ b/icu4c/source/data/locales/ceb.txt @@ -822,4 +822,18 @@ ceb{ US{"US"} metric{"Metric"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ceb", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/chr.txt b/icu4c/source/data/locales/chr.txt index fe85268345b..5d78681ba34 100644 --- a/icu4c/source/data/locales/chr.txt +++ b/icu4c/source/data/locales/chr.txt @@ -1952,7 +1952,12 @@ chr{ givenFirst{ "und", "chr", - "en", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", } } } diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index e4ade8dc007..02de10f9863 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -6792,8 +6792,8 @@ cs{ start{"{0}, {1}"} } standard{ - 2{"{0} a {1}"} - end{"{0} a {1}"} + 2{"{0} a {1}"} + end{"{0} a {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } @@ -6804,14 +6804,14 @@ cs{ start{"{0}, {1}"} } standard-short{ - 2{"{0} a {1}"} - end{"{0} a {1}"} + 2{"{0} a {1}"} + end{"{0} a {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } unit{ - 2{"{0} a {1}"} - end{"{0} a {1}"} + 2{"{0} a {1}"} + end{"{0} a {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } @@ -6823,7 +6823,7 @@ cs{ } unit-short{ 2{"{0}, {1}"} - end{"{0} a {1}"} + end{"{0} a {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } diff --git a/icu4c/source/data/locales/cy.txt b/icu4c/source/data/locales/cy.txt index 724745696d3..c51d015f464 100644 --- a/icu4c/source/data/locales/cy.txt +++ b/icu4c/source/data/locales/cy.txt @@ -2463,8 +2463,9 @@ cy{ "cy", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 42fc84b0395..f55c0b6c011 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -2265,7 +2265,6 @@ da{ "da", } surnameFirst{ - "ja", "ko", "vi", "yue", diff --git a/icu4c/source/data/locales/doi.txt b/icu4c/source/data/locales/doi.txt index 9a0de7e6477..ad090c26b7b 100644 --- a/icu4c/source/data/locales/doi.txt +++ b/icu4c/source/data/locales/doi.txt @@ -676,4 +676,21 @@ doi{ US{"यूएस"} metric{"मीट्रिक"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "doi", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index 532f567a7e8..bec2632b553 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -2912,16 +2912,13 @@ el{ nameOrderLocales{ givenFirst{ "und", - "en", + "el", } surnameFirst{ - "hu", - "ja", "ko", "vi", "yue", "zh", - "el", } } namePattern{ diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 8f859009319..cdb9b7e3e62 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -2299,6 +2299,8 @@ en{ surnameFirst{ "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/en_001.txt b/icu4c/source/data/locales/en_001.txt index 09bc748561a..ba6bbb810fa 100644 --- a/icu4c/source/data/locales/en_001.txt +++ b/icu4c/source/data/locales/en_001.txt @@ -423,6 +423,18 @@ en_001{ math_symbols{"maths symbol"} } fields{ + day-narrow{ + relativeTime{ + future{ + one{"in {0} day"} + other{"in {0} days"} + } + past{ + one{"{0} day ago"} + other{"{0} days ago"} + } + } + } dayOfYear-narrow{ dn{"day of yr"} } diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt index 8761d96a6a1..08d549b120e 100644 --- a/icu4c/source/data/locales/en_AU.txt +++ b/icu4c/source/data/locales/en_AU.txt @@ -607,18 +607,6 @@ en_AU{ upwards_arrows{"upward arrows"} } fields{ - day-narrow{ - relativeTime{ - future{ - one{"in {0}d"} - other{"in {0} days"} - } - past{ - one{"{0} day ago"} - other{"{0} days ago"} - } - } - } fri-short{ relativeTime{ future{ diff --git a/icu4c/source/data/locales/en_CH.txt b/icu4c/source/data/locales/en_CH.txt index cbc74e6208d..4466df65d04 100644 --- a/icu4c/source/data/locales/en_CH.txt +++ b/icu4c/source/data/locales/en_CH.txt @@ -15,4 +15,395 @@ en_CH{ } } } + calendar{ + buddhist{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + chinese{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM r(U)", + "d MMMM r(U)", + "d MMM r", + "dd.MM.r", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + MEd{"E, dd.MM"} + UM{"M.U"} + UMd{"dd.MM.U"} + yyyyM{"MM.r"} + yyyyMEd{"E, dd.MM.r"} + yyyyMd{"dd.MM.r"} + } + } + coptic{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + dangi{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM r(U)", + "d MMMM r(U)", + "d MMM r", + "dd.MM.r", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + MEd{"E, dd.MM"} + Md{"dd.MM"} + UM{"M.U"} + UMd{"dd.MM.U"} + yyyyM{"MM.r"} + yyyyMEd{"E, dd.MM.r"} + yyyyMd{"dd.MM.r"} + } + } + ethiopic{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + ethiopic-amete-alem{ + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + generic{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + gregorian{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y", + "d MMMM y", + "d MMM y", + "dd.MM.y", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"d.M.y G"} + MEd{"E, dd.MM"} + MMdd{"dd.MM"} + Md{"dd.MM"} + yM{"MM.y"} + yMEd{"E, dd.MM.y"} + yMd{"dd.MM.y"} + } + } + hebrew{ + availableFormats{ + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + indian{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + islamic{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + islamic-civil{ + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + islamic-rgsa{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + islamic-tbla{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + islamic-umalqura{ + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + japanese{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, MMMM d, y G", + "MMMM d, y G", + "MMM d, y G", + "M.d.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + persian{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + roc{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd.MM.y GGGGG", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + MEd{"E, dd.MM"} + Md{"dd.MM"} + yyyyM{"MM.y GGGGG"} + yyyyMEd{"E, dd.MM.y GGGGG"} + yyyyMd{"dd.MM.y GGGGG"} + } + } + } } diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt index 1714a65eb8c..51f973c5d5a 100644 --- a/icu4c/source/data/locales/en_GB.txt +++ b/icu4c/source/data/locales/en_GB.txt @@ -12,20 +12,6 @@ en_GB{ minimumGroupingDigits{"1"} } calendar{ - generic{ - intervalFormats{ - MMMEd{ - d{"E d MMM – E d MMM"} - } - Md{ - M{"dd/MM–dd/MM"} - d{"dd/MM–dd/MM"} - } - yMMMEd{ - d{"E, d MMM – E, d MMM y G"} - } - } - } gregorian{ DateTimePatterns{ "HH:mm:ss zzzz", @@ -52,9 +38,6 @@ en_GB{ "yMMMd", "yMMdd", } - availableFormats{ - GyMd{"d/M/y GGGGG"} - } dayNames{ format{ narrow{ @@ -105,26 +88,6 @@ en_GB{ } } } - intervalFormats{ - GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} - } - GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} - } - MMMEd{ - d{"E d MMM – E d MMM"} - } - yMMMEd{ - d{"E, d MMM – E, d MMM y"} - } - } monthNames{ format{ narrow{ @@ -199,18 +162,4 @@ en_GB{ } } } - fields{ - day-narrow{ - relativeTime{ - future{ - one{"in {0} day"} - other{"in {0} days"} - } - past{ - one{"{0} day ago"} - other{"{0} days ago"} - } - } - } - } } diff --git a/icu4c/source/data/locales/es_419.txt b/icu4c/source/data/locales/es_419.txt index 9ce2e4e1cab..3d0bc542133 100644 --- a/icu4c/source/data/locales/es_419.txt +++ b/icu4c/source/data/locales/es_419.txt @@ -892,16 +892,6 @@ es_419{ initial{"{0}."} initialSequence{"{0} {1}"} } - nameOrderLocales{ - surnameFirst{ - "hu", - "ja", - "ko", - "vi", - "yue", - "zh", - } - } namePattern{ givenFirst-medium-referring-formal{"{given} {given2-initial} {surname} {suffix}"} surnameFirst-long-addressing-formal{"{prefix} {surname} {surname2}"} diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt index 317a50e9de1..ce1d21d0e73 100644 --- a/icu4c/source/data/locales/es_US.txt +++ b/icu4c/source/data/locales/es_US.txt @@ -351,13 +351,6 @@ es_US{ UK{"imperial"} } personNames{ - nameOrderLocales{ - surnameFirst{ - "ja", - "ko", - "zh", - } - } namePattern{ sorting-long-referring-formal{ "{surname}, {prefix} {given} {given2}", diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 0926f02cc0c..f70b6601929 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -2014,6 +2014,12 @@ et{ "und", "et", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index 7fba7dad27a..8ecfadf89ec 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -1918,9 +1918,10 @@ eu{ "eu", } surnameFirst{ - "zh", - "ja", "ko", + "vi", + "yue", + "zh", } } namePattern{ diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index 7f287192e78..ba1eb5a94dd 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -3609,6 +3609,12 @@ fa{ "und", "fa", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/ff.txt b/icu4c/source/data/locales/ff.txt index e44e449bb63..7b84a61f7cf 100644 --- a/icu4c/source/data/locales/ff.txt +++ b/icu4c/source/data/locales/ff.txt @@ -291,4 +291,18 @@ ff{ dn{"Diiwaan waktu"} } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ff", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/ff_Adlm.txt b/icu4c/source/data/locales/ff_Adlm.txt index 76a740149d3..fad9a8167f8 100644 --- a/icu4c/source/data/locales/ff_Adlm.txt +++ b/icu4c/source/data/locales/ff_Adlm.txt @@ -4596,4 +4596,18 @@ ff_Adlm{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ff", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index e51a8352446..87fcdfe4317 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -2641,6 +2641,12 @@ fi{ "und", "fi", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname} {surname2}"} diff --git a/icu4c/source/data/locales/fil.txt b/icu4c/source/data/locales/fil.txt index 756fdc13180..3ca6489fbaa 100644 --- a/icu4c/source/data/locales/fil.txt +++ b/icu4c/source/data/locales/fil.txt @@ -28,6 +28,8 @@ fil{ accountingFormat%alphaNextToNumber{"¤ #,##0.00;(¤ #,##0.00)"} accountingFormat%noCurrency{"#,##0.00;(#,##0.00)"} currencyFormat{"¤#,##0.00"} + currencyFormat%alphaNextToNumber{"¤ #,##0.00"} + currencyFormat%noCurrency{"#,##0.00"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} scientificFormat{"#E0"} @@ -3944,8 +3946,9 @@ fil{ "fil", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt index 7aba9530e21..6abe7cb6646 100644 --- a/icu4c/source/data/locales/fo.txt +++ b/icu4c/source/data/locales/fo.txt @@ -1898,4 +1898,18 @@ fo{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "fo", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 53b7e1e7a38..705f5fecdf3 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -3056,7 +3056,12 @@ fr{ "und", "fr", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/ga.txt b/icu4c/source/data/locales/ga.txt index 526a5807e63..2c4806bbe76 100644 --- a/icu4c/source/data/locales/ga.txt +++ b/icu4c/source/data/locales/ga.txt @@ -2486,8 +2486,9 @@ ga{ "ga", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/gd.txt b/icu4c/source/data/locales/gd.txt index dfc49d190c7..dc76acc06fa 100644 --- a/icu4c/source/data/locales/gd.txt +++ b/icu4c/source/data/locales/gd.txt @@ -951,6 +951,12 @@ gd{ } } minimalPairs{ + ordinal{ + few{"Tionndaidh ris an làimh dheas aig an {0}s gobhal."} + one{"Tionndaidh ris an làimh dheas aig a’ {0}d ghobhal."} + other{"Tionndaidh ris an làimh dheas aig a’ {0}mh gobhal."} + two{"Tionndaidh ris an làimh dheas aig an {0}na gobhal."} + } plural{ few{"{0} brògan"} one{"{0} bhròg"} @@ -4435,6 +4441,12 @@ gd{ "und", "gd", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} @@ -4479,7 +4491,7 @@ gd{ } sorting-medium-referring-formal{ "{surname} {surname2-initial}, {prefix} {given} {given2-initial}", - "{surname} {surname2-initial}, {prefix} {given} {given2-initial}", + "{surname}, {prefix} {given} {given2-initial}", } sorting-medium-referring-informal{ "{given-informal} {given2} {suffix}", @@ -4487,7 +4499,7 @@ gd{ } sorting-short-referring-formal{ "{surname} {surname2-initial}, {given-initial} {given2-initial}", - "{surname} {surname2-initial}, {given-initial} {given2-initial}", + "{surname}, {given-initial} {given2-initial}", } sorting-short-referring-informal{ "{given-informal} {given2-initial}", diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index 21eedefb9c3..4224b98b4a1 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -2708,6 +2708,15 @@ gu{ "und", "gu", } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/ha.txt b/icu4c/source/data/locales/ha.txt index 71dd318f080..136f9cfd0d5 100644 --- a/icu4c/source/data/locales/ha.txt +++ b/icu4c/source/data/locales/ha.txt @@ -1525,9 +1525,14 @@ ha{ nameOrderLocales{ givenFirst{ "und", - "en", "ha", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/ha_NE.txt b/icu4c/source/data/locales/ha_NE.txt index 3010a5cd745..a7a68b8dec5 100644 --- a/icu4c/source/data/locales/ha_NE.txt +++ b/icu4c/source/data/locales/ha_NE.txt @@ -4,4 +4,13 @@ ha_NE{ AuxExemplarCharacters{"[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x {ʼy}]"} ExemplarCharactersIndex{"[A B Ɓ C D Ɗ E F G H I J K Ƙ L M N O P Q R S T U V W X Y Ƴ Z]"} + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "en", + "ha", + } + } + } } diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 234ca6e223d..bfd988e5436 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -3472,8 +3472,14 @@ he{ personNames{ nameOrderLocales{ givenFirst{ - "he", "und", + "he", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", } } namePattern{ diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 67fcbc09c04..86bc03741d4 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -2474,8 +2474,12 @@ hi{ "hi", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/hi_Latn.txt b/icu4c/source/data/locales/hi_Latn.txt index d68ac9dd3d5..51c0f2403b4 100644 --- a/icu4c/source/data/locales/hi_Latn.txt +++ b/icu4c/source/data/locales/hi_Latn.txt @@ -1372,6 +1372,15 @@ hi_Latn{ "und", "hi", } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index a427e2c1fd1..8206cfede44 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -2926,6 +2926,12 @@ hr{ "und", "hr", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index c56926abfb8..a4de2e02080 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -2532,6 +2532,16 @@ hu{ } } personNames{ + nameOrderLocales{ + surnameFirst{ + "hu", + "ja", + "ko", + "vi", + "yue", + "zh", + } + } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} givenFirst-long-addressing-informal{"{given-informal}"} diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt index e4e5e01d1cb..8d71ac208f4 100644 --- a/icu4c/source/data/locales/hy.txt +++ b/icu4c/source/data/locales/hy.txt @@ -1880,7 +1880,12 @@ hy{ "und", "hy", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index db18a8e6ef5..354d81f5a81 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -2816,8 +2816,9 @@ id{ "id", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ig.txt b/icu4c/source/data/locales/ig.txt index a55d17e0046..ccb5aa9a78d 100644 --- a/icu4c/source/data/locales/ig.txt +++ b/icu4c/source/data/locales/ig.txt @@ -1032,7 +1032,12 @@ ig{ "und", "ig", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index c32f7da0143..d4814dddea7 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -4044,6 +4044,7 @@ ja{ foreignSpaceReplacement{"・"} nameOrderLocales{ surnameFirst{ + "hu", "ja", "ko", "vi", diff --git a/icu4c/source/data/locales/jv.txt b/icu4c/source/data/locales/jv.txt index bf3dea9a598..67d13691a30 100644 --- a/icu4c/source/data/locales/jv.txt +++ b/icu4c/source/data/locales/jv.txt @@ -1631,6 +1631,12 @@ jv{ "und", "jv", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/ka.txt b/icu4c/source/data/locales/ka.txt index 36ebda601b1..11d6c0dde4b 100644 --- a/icu4c/source/data/locales/ka.txt +++ b/icu4c/source/data/locales/ka.txt @@ -1869,6 +1869,12 @@ ka{ "und", "ka", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/kgp.txt b/icu4c/source/data/locales/kgp.txt index 1c8a8085a8c..935b1bd972d 100644 --- a/icu4c/source/data/locales/kgp.txt +++ b/icu4c/source/data/locales/kgp.txt @@ -2081,4 +2081,18 @@ kgp{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "kgp", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index d52dbcdd423..e8a28ea33a7 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -1992,6 +1992,12 @@ kk{ "und", "kk", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{surname}"} diff --git a/icu4c/source/data/locales/km.txt b/icu4c/source/data/locales/km.txt index b6c1bba40db..5beb59084fa 100644 --- a/icu4c/source/data/locales/km.txt +++ b/icu4c/source/data/locales/km.txt @@ -1847,7 +1847,13 @@ km{ personNames{ nameOrderLocales{ givenFirst{"und"} - surnameFirst{"km"} + surnameFirst{ + "km", + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt index babad578faa..b89879bd82c 100644 --- a/icu4c/source/data/locales/kn.txt +++ b/icu4c/source/data/locales/kn.txt @@ -2656,8 +2656,12 @@ kn{ "kn", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index e3d915e3a8c..83f4e53c259 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -3130,6 +3130,7 @@ ko{ personNames{ nameOrderLocales{ surnameFirst{ + "hu", "ja", "ko", "vi", diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt index 0da8bda8487..924090a5ae2 100644 --- a/icu4c/source/data/locales/kok.txt +++ b/icu4c/source/data/locales/kok.txt @@ -1832,6 +1832,15 @@ kok{ "und", "kok", } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/ks.txt b/icu4c/source/data/locales/ks.txt index 22592664dba..30975b61436 100644 --- a/icu4c/source/data/locales/ks.txt +++ b/icu4c/source/data/locales/ks.txt @@ -705,4 +705,21 @@ ks{ US{"یو ایس"} metric{"میٖٹرِک"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ks", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/ks_Deva.txt b/icu4c/source/data/locales/ks_Deva.txt index 9dd5db67460..f7e1d955465 100644 --- a/icu4c/source/data/locales/ks_Deva.txt +++ b/icu4c/source/data/locales/ks_Deva.txt @@ -395,4 +395,21 @@ ks_Deva{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ks", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/ky.txt b/icu4c/source/data/locales/ky.txt index a074fee1829..1b7204290fc 100644 --- a/icu4c/source/data/locales/ky.txt +++ b/icu4c/source/data/locales/ky.txt @@ -1865,11 +1865,17 @@ ky{ } personNames{ nameOrderLocales{ - givenFirst{"zxx"} - surnameFirst{ + givenFirst{ "und", "ky", } + surnameFirst{ + "ja", + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} @@ -1878,6 +1884,7 @@ ky{ givenFirst-medium-addressing-informal{"{given-informal}"} givenFirst-short-addressing-formal{"{prefix} {surname}"} givenFirst-short-addressing-informal{"{given-informal}"} + givenFirst-short-referring-formal{"{given-initial} {given2-initial} {surname}"} givenFirst-short-referring-informal{"{given-informal} {surname-initial}"} sorting-short-referring-informal{"{surname}, {given-informal}"} surnameFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/lo.txt b/icu4c/source/data/locales/lo.txt index 376a2c9ec0b..850c2e10715 100644 --- a/icu4c/source/data/locales/lo.txt +++ b/icu4c/source/data/locales/lo.txt @@ -2905,12 +2905,12 @@ lo{ nameOrderLocales{ givenFirst{ "und", - "en", "lo", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index 5b4362995fc..90d29e3f148 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -3878,8 +3878,6 @@ lt{ "lt", } surnameFirst{ - "hu", - "ja", "ko", "vi", "yue", diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index 2fc2681935d..cf23dcd75ff 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -2463,6 +2463,12 @@ lv{ "und", "lv", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/mai.txt b/icu4c/source/data/locales/mai.txt index 516e7207d9e..df83be4894c 100644 --- a/icu4c/source/data/locales/mai.txt +++ b/icu4c/source/data/locales/mai.txt @@ -746,4 +746,21 @@ mai{ US{"यूएस"} metric{"मीट्रिक"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "mai", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/mi.txt b/icu4c/source/data/locales/mi.txt index 0e03a5eb9e4..dc1227680dd 100644 --- a/icu4c/source/data/locales/mi.txt +++ b/icu4c/source/data/locales/mi.txt @@ -1305,6 +1305,13 @@ mi{ "und", "mi", } + surnameFirst{ + "ja", + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt index 11f42c4a23e..29985310383 100644 --- a/icu4c/source/data/locales/mk.txt +++ b/icu4c/source/data/locales/mk.txt @@ -2813,7 +2813,12 @@ mk{ "und", "mk", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/ml.txt b/icu4c/source/data/locales/ml.txt index a0cd9d25cc2..de88ee21e4f 100644 --- a/icu4c/source/data/locales/ml.txt +++ b/icu4c/source/data/locales/ml.txt @@ -2694,8 +2694,12 @@ ml{ "ml", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/mn.txt b/icu4c/source/data/locales/mn.txt index 87d876228fb..4d834a13a7a 100644 --- a/icu4c/source/data/locales/mn.txt +++ b/icu4c/source/data/locales/mn.txt @@ -1824,16 +1824,17 @@ mn{ "hu", "ja", "ko", + "mn", "vi", "yue", "zh", - "mn", } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} givenFirst-long-addressing-informal{"{given-informal}"} givenFirst-long-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} + givenFirst-long-referring-formal{"{given} {given2} {surname} {suffix}"} givenFirst-long-referring-informal{"{given-informal} {surname}"} givenFirst-medium-addressing-formal{"{prefix} {given}"} givenFirst-medium-addressing-informal{"{given-informal}"} @@ -1846,8 +1847,12 @@ mn{ givenFirst-short-monogram-formal{"{surname-monogram-allCaps}"} givenFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} givenFirst-short-referring-formal{"{given-initial} {given2-initial} {surname}"} + givenFirst-short-referring-informal{"{given-informal} {surname-initial}"} + sorting-long-referring-formal{"{surname-core}, {given} {given2} {surname-prefix}"} sorting-long-referring-informal{"{surname} {given-informal}"} + sorting-medium-referring-formal{"{surname-core}, {given} {given2-initial} {surname-prefix}"} sorting-medium-referring-informal{"{surname} {given-informal}"} + sorting-short-referring-formal{"{surname-core}, {given-initial} {given2-initial} {surname-prefix}"} sorting-short-referring-informal{"{surname} {given-informal}"} surnameFirst-long-addressing-formal{"{prefix} {surname}"} surnameFirst-long-addressing-informal{"{given-informal}"} @@ -1856,16 +1861,19 @@ mn{ "llCaps}" } surnameFirst-long-monogram-informal{"{surname-monogram-allCaps}{given-informal-monogram-allCaps}"} + surnameFirst-long-referring-formal{"{suffix} {surname} {given} {given2}"} surnameFirst-long-referring-informal{"{surname} {given-informal}"} surnameFirst-medium-addressing-formal{"{prefix} {surname}"} surnameFirst-medium-addressing-informal{"{given-informal}"} surnameFirst-medium-monogram-formal{"{surname-monogram-allCaps}"} surnameFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} + surnameFirst-medium-referring-formal{"{suffix} {surname} {given} {given2-initial}"} surnameFirst-medium-referring-informal{"{surname} {given-informal}"} surnameFirst-short-addressing-formal{"{prefix} {surname}"} surnameFirst-short-addressing-informal{"{given-informal}"} surnameFirst-short-monogram-formal{"{surname-monogram-allCaps}"} surnameFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} + surnameFirst-short-referring-formal{"{surname-initial} {given}"} surnameFirst-short-referring-informal{"{surname-initial} {given}"} } } diff --git a/icu4c/source/data/locales/mni.txt b/icu4c/source/data/locales/mni.txt index ef8703c5a38..38401cd609d 100644 --- a/icu4c/source/data/locales/mni.txt +++ b/icu4c/source/data/locales/mni.txt @@ -387,4 +387,21 @@ mni{ US{"য়ু এস"} metric{"মেত্রিক"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "mni", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 88147a236d6..2c1cd0f8fde 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -907,7 +907,6 @@ mr{ abbreviated{ afternoon1{"दुपार"} evening1{"संध्याकाळ"} - evening2{"सायंकाळ"} midnight{"मध्यरात्र"} morning1{"पहाट"} morning2{"सकाळ"} @@ -917,7 +916,6 @@ mr{ narrow{ afternoon1{"दु"} evening1{"सं"} - evening2{"सा"} midnight{"म.रा."} morning1{"प"} morning2{"स"} @@ -927,7 +925,6 @@ mr{ wide{ afternoon1{"दुपार"} evening1{"संध्याकाळ"} - evening2{"सायंकाळ"} midnight{"मध्यरात्र"} morning1{"पहाट"} morning2{"सकाळ"} @@ -940,7 +937,6 @@ mr{ afternoon1{"दुपार"} am{"AM"} evening1{"संध्याकाळ"} - evening2{"सायंकाळ"} midnight{"मध्यरात्र"} morning1{"पहाट"} morning2{"सकाळ"} @@ -952,7 +948,6 @@ mr{ afternoon1{"दु"} am{"AM"} evening1{"सं"} - evening2{"सा"} midnight{"म.रा."} morning1{"प"} morning2{"स"} @@ -964,7 +959,6 @@ mr{ afternoon1{"दुपार"} am{"AM"} evening1{"संध्याकाळ"} - evening2{"सायंकाळ"} midnight{"मध्यरात्र"} morning1{"पहाट"} morning2{"सकाळ"} @@ -2660,8 +2654,12 @@ mr{ "mr", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index 1c2c2cb6adf..5458744fb09 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -2873,6 +2873,12 @@ ms{ "und", "ms", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} diff --git a/icu4c/source/data/locales/my.txt b/icu4c/source/data/locales/my.txt index bb9967b5db8..710dd08b0bd 100644 --- a/icu4c/source/data/locales/my.txt +++ b/icu4c/source/data/locales/my.txt @@ -1798,8 +1798,12 @@ my{ "my", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ne.txt b/icu4c/source/data/locales/ne.txt index 72e98900e31..607e1bdc9cf 100644 --- a/icu4c/source/data/locales/ne.txt +++ b/icu4c/source/data/locales/ne.txt @@ -1957,11 +1957,19 @@ ne{ initialSequence{"{0} {1}"} } nameOrderLocales{ - surnameFirst{ - "ja", - "ko", + givenFirst{ + "und", "ne", } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 787ac2613a3..5180772ec6e 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -8126,8 +8126,9 @@ nl{ "nl", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/no.txt b/icu4c/source/data/locales/no.txt index 823643648f0..b40b1fbe675 100644 --- a/icu4c/source/data/locales/no.txt +++ b/icu4c/source/data/locales/no.txt @@ -7657,6 +7657,12 @@ no{ "und", "no", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/or.txt b/icu4c/source/data/locales/or.txt index 6e6fc44e8bc..15c71f2f040 100644 --- a/icu4c/source/data/locales/or.txt +++ b/icu4c/source/data/locales/or.txt @@ -1920,8 +1920,12 @@ or{ "or", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt index bfd2b81d821..88028dff447 100644 --- a/icu4c/source/data/locales/pa.txt +++ b/icu4c/source/data/locales/pa.txt @@ -2671,9 +2671,13 @@ pa{ "pa", } surnameFirst{ - "hi", - "gu", - "mr", + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", } } namePattern{ diff --git a/icu4c/source/data/locales/pcm.txt b/icu4c/source/data/locales/pcm.txt index e5d1381314c..1ec27ad74dd 100644 --- a/icu4c/source/data/locales/pcm.txt +++ b/icu4c/source/data/locales/pcm.txt @@ -1944,8 +1944,12 @@ pcm{ "pcm", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index 4c774548bf9..1c7d9381843 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -2735,8 +2735,9 @@ pl{ "pl", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt index 16b414d785c..c4271e9fbc9 100644 --- a/icu4c/source/data/locales/ps.txt +++ b/icu4c/source/data/locales/ps.txt @@ -2167,8 +2167,9 @@ ps{ "ps", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index d837deadfb4..fb881f53122 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -2125,8 +2125,9 @@ pt{ "pt", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/qu.txt b/icu4c/source/data/locales/qu.txt index cb4b5bb2ea2..db6affc58d7 100644 --- a/icu4c/source/data/locales/qu.txt +++ b/icu4c/source/data/locales/qu.txt @@ -1514,8 +1514,14 @@ qu{ personNames{ nameOrderLocales{ givenFirst{ - "qu", "und", + "qu", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", } } namePattern{ diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index e1fb3c2f75c..750f61489b0 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -3024,7 +3024,6 @@ ro{ "ro", } surnameFirst{ - "ja", "ko", "vi", "yue", diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index c638d323c3f..6f126fbb971 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -3302,7 +3302,6 @@ root{ nameOrderLocales{ givenFirst{"und"} surnameFirst{ - "hu", "ja", "ko", "vi", diff --git a/icu4c/source/data/locales/sa.txt b/icu4c/source/data/locales/sa.txt index 08d74101ae2..18b746717f6 100644 --- a/icu4c/source/data/locales/sa.txt +++ b/icu4c/source/data/locales/sa.txt @@ -631,4 +631,21 @@ sa{ US{"सं.रा."} metric{"छन्दोमान"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "sa", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/sat.txt b/icu4c/source/data/locales/sat.txt index 1b565625b23..c6428133d72 100644 --- a/icu4c/source/data/locales/sat.txt +++ b/icu4c/source/data/locales/sat.txt @@ -385,4 +385,18 @@ sat{ US{"ᱭᱩᱮᱥ"} metric{"ᱢᱮᱴᱨᱤᱠ"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "sat", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/sc.txt b/icu4c/source/data/locales/sc.txt index 02b6475eea1..395b035b302 100644 --- a/icu4c/source/data/locales/sc.txt +++ b/icu4c/source/data/locales/sc.txt @@ -2460,6 +2460,12 @@ sc{ "und", "sc", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/sd.txt b/icu4c/source/data/locales/sd.txt index bfcf7187154..b30def95f31 100644 --- a/icu4c/source/data/locales/sd.txt +++ b/icu4c/source/data/locales/sd.txt @@ -1970,8 +1970,12 @@ sd{ "sd", } surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/sd_Deva.txt b/icu4c/source/data/locales/sd_Deva.txt index 2832cdf3f2c..0017e8617e9 100644 --- a/icu4c/source/data/locales/sd_Deva.txt +++ b/icu4c/source/data/locales/sd_Deva.txt @@ -413,4 +413,21 @@ sd_Deva{ US{"यूएस"} metric{"मैट्रिक"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "sd", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/si.txt b/icu4c/source/data/locales/si.txt index e9e36c80f70..f81ed66b226 100644 --- a/icu4c/source/data/locales/si.txt +++ b/icu4c/source/data/locales/si.txt @@ -2036,30 +2036,34 @@ si{ initialSequence{"{0} {1}"} } nameOrderLocales{ - givenFirst{ - "und", - "si", - } + givenFirst{"und"} surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } namePattern{ - givenFirst-long-addressing-formal{"{prefix} {surname}"} + givenFirst-long-addressing-formal{"{prefix} {given} {surname}"} givenFirst-long-addressing-informal{"{given-informal}"} givenFirst-long-monogram-formal{ "{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-a" "llCaps}" } - givenFirst-long-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} - givenFirst-long-referring-formal{"{given} {given2} {surname} {suffix}"} + givenFirst-long-monogram-informal{ + "{given-informal-monogram-allCaps}{given2-monogram-allCaps}{surname-m" + "onogram-allCaps}" + } + givenFirst-long-referring-formal{"{given} {given2} {surname} {surname2} {suffix}"} givenFirst-long-referring-informal{"{given-informal} {surname}"} - givenFirst-medium-addressing-formal{"{prefix} {surname}"} + givenFirst-medium-addressing-formal{"{prefix} {given-initial} {surname}"} givenFirst-medium-addressing-informal{"{given-informal}"} - givenFirst-medium-monogram-formal{"{surname-monogram-allCaps}"} - givenFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} + givenFirst-medium-monogram-formal{"{given-monogram-allCaps}{surname-monogram-allCaps}"} + givenFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} givenFirst-medium-referring-formal{"{given} {given2-initial} {surname} {suffix}"} givenFirst-medium-referring-informal{"{given-informal} {surname}"} givenFirst-short-addressing-formal{"{prefix} {surname}"} @@ -2067,34 +2071,34 @@ si{ givenFirst-short-monogram-formal{"{surname-monogram-allCaps}"} givenFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} givenFirst-short-referring-formal{"{given-initial} {given2-initial} {surname}"} - givenFirst-short-referring-informal{"{given-informal} {surname-initial}"} - sorting-long-referring-formal{"{surname-core}, {given} {given2} {surname-prefix}"} - sorting-long-referring-informal{"{surname}, {given-informal}"} - sorting-medium-referring-formal{"{surname-core}, {given} {given2-initial} {surname-prefix}"} - sorting-medium-referring-informal{"{surname}, {given-informal}"} - sorting-short-referring-formal{"{surname-core}, {given-initial} {given2-initial} {surname-prefix}"} - sorting-short-referring-informal{"{surname}, {given-informal}"} - surnameFirst-long-addressing-formal{"{prefix} {surname}"} + givenFirst-short-referring-informal{"{given-informal}"} + sorting-long-referring-formal{"{given} {given2}, {surname}"} + sorting-long-referring-informal{"{given-informal} {given2}, {surname}"} + sorting-medium-referring-formal{"{given} {given2}, {surname-initial}"} + sorting-medium-referring-informal{"{given-informal} {given2}, {surname-initial}"} + sorting-short-referring-formal{"{given} {given2-initial}, {surname-initial}"} + sorting-short-referring-informal{"{given-informal} {given2-initial}, {surname-initial}"} + surnameFirst-long-addressing-formal{"{prefix} {surname-initial} {given}"} surnameFirst-long-addressing-informal{"{given-informal}"} surnameFirst-long-monogram-formal{ "{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-a" "llCaps}" } surnameFirst-long-monogram-informal{"{surname-monogram-allCaps}{given-informal-monogram-allCaps}"} - surnameFirst-long-referring-formal{"{surname} {given} {given2} {suffix}"} + surnameFirst-long-referring-formal{"{prefix} {surname} {given} {given2} {suffix}"} surnameFirst-long-referring-informal{"{surname} {given-informal}"} - surnameFirst-medium-addressing-formal{"{prefix} {surname}"} + surnameFirst-medium-addressing-formal{"{prefix} {surname-initial} {given}"} surnameFirst-medium-addressing-informal{"{given-informal}"} - surnameFirst-medium-monogram-formal{"{surname-monogram-allCaps}"} + surnameFirst-medium-monogram-formal{"{surname-monogram-allCaps}{given-monogram-allCaps}"} surnameFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} - surnameFirst-medium-referring-formal{"{surname} {given} {given2-initial} {suffix}"} - surnameFirst-medium-referring-informal{"{surname} {given-informal}"} - surnameFirst-short-addressing-formal{"{prefix} {surname}"} + surnameFirst-medium-referring-formal{"{surname-initial} {given} {given2} {suffix}"} + surnameFirst-medium-referring-informal{"{surname-initial} {given-informal}"} + surnameFirst-short-addressing-formal{"{prefix} {given}"} surnameFirst-short-addressing-informal{"{given-informal}"} - surnameFirst-short-monogram-formal{"{surname-monogram-allCaps}"} + surnameFirst-short-monogram-formal{"{given-monogram-allCaps}"} surnameFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} - surnameFirst-short-referring-formal{"{surname} {given-initial} {given2-initial}"} - surnameFirst-short-referring-informal{"{surname} {given-initial}"} + surnameFirst-short-referring-formal{"{surname-initial} {given}"} + surnameFirst-short-referring-informal{"{given-informal}"} } } } diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index 5853073ae3b..0fb8233cde7 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -2276,6 +2276,12 @@ sl{ "und", "sl", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt index 75bc471903e..94effc27e0d 100644 --- a/icu4c/source/data/locales/so.txt +++ b/icu4c/source/data/locales/so.txt @@ -2143,7 +2143,12 @@ so{ "und", "so", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index c8664c9ebf1..d05555e1f0a 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -2099,8 +2099,6 @@ sq{ "sq", } surnameFirst{ - "hu", - "ja", "ko", "vi", "yue", diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index df09d6b5820..63ae08d17fe 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -2446,7 +2446,12 @@ sr{ "und", "sr", } - surnameFirst{"ko"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt index baabfd811e4..8014953cb1d 100644 --- a/icu4c/source/data/locales/sr_Latn.txt +++ b/icu4c/source/data/locales/sr_Latn.txt @@ -2447,7 +2447,12 @@ sr_Latn{ "und", "sr", } - surnameFirst{"ko"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/su.txt b/icu4c/source/data/locales/su.txt index ec3a5d6591d..f7b5ba67950 100644 --- a/icu4c/source/data/locales/su.txt +++ b/icu4c/source/data/locales/su.txt @@ -437,4 +437,18 @@ su{ US{"A.S."} metric{"Métrik"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "su", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 2ea2de200bb..459706edb98 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -3033,6 +3033,12 @@ sv{ "und", "sv", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 97adab5255c..3863155436c 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -1936,8 +1936,9 @@ sw{ "sw", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt index 52d8292ee77..b17b9025813 100644 --- a/icu4c/source/data/locales/ta.txt +++ b/icu4c/source/data/locales/ta.txt @@ -2566,78 +2566,69 @@ ta{ personNames{ foreignSpaceReplacement{" "} nameOrderLocales{ - givenFirst{ - "und", - "ta", - } + givenFirst{"und"} surnameFirst{ - "ja", "ko", - "zh", + "si", + "ta", + "te", "vi", + "yue", + "zh", } } namePattern{ - givenFirst-long-addressing-formal{"{prefix} {given-informal}"} + givenFirst-long-addressing-formal{"{prefix} {given} {surname}"} givenFirst-long-addressing-informal{"{given-informal}"} givenFirst-long-monogram-formal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." + "{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-a" + "llCaps}" } givenFirst-long-monogram-informal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." + "{given-informal-monogram-allCaps}{given2-monogram-allCaps}{surname-m" + "onogram-allCaps}" } - givenFirst-long-referring-informal{"{given} {given2} {surname}"} - givenFirst-medium-addressing-formal{"{prefix} {surname}"} + givenFirst-long-referring-formal{"{given} {given2} {surname} {surname2} {suffix}"} + givenFirst-long-referring-informal{"{given-informal} {surname}"} + givenFirst-medium-addressing-formal{"{prefix} {given-initial} {surname}"} givenFirst-medium-addressing-informal{"{given-informal}"} - givenFirst-medium-monogram-formal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." - } - givenFirst-medium-monogram-informal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." - } - givenFirst-medium-referring-informal{"{given} {given2} {surname}"} + givenFirst-medium-monogram-formal{"{given-monogram-allCaps}{surname-monogram-allCaps}"} + givenFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} + givenFirst-medium-referring-formal{"{given} {given2-initial} {surname} {suffix}"} + givenFirst-medium-referring-informal{"{given-informal} {surname}"} givenFirst-short-addressing-formal{"{prefix} {surname}"} givenFirst-short-addressing-informal{"{given-informal}"} - givenFirst-short-monogram-formal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." - } - givenFirst-short-monogram-informal{ - "{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram" - "-allCaps}." - } + givenFirst-short-monogram-formal{"{surname-monogram-allCaps}"} + givenFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} givenFirst-short-referring-formal{"{given-initial} {given2-initial} {surname}"} - givenFirst-short-referring-informal{"{given-initial} {given2-initial} {surname-initial}"} - sorting-long-referring-formal{"{surname-core}, {given} {given2} {surname-prefix}"} - sorting-long-referring-informal{"{surname}, {given-informal}"} - sorting-medium-referring-informal{"{surname}, {given-informal}"} - sorting-short-referring-formal{"{surname-core}, {given-initial} {given2-initial}"} - sorting-short-referring-informal{"{surname}, {given-informal}"} - surnameFirst-long-addressing-formal{"{prefix} {surname}"} + givenFirst-short-referring-informal{"{given-informal}"} + sorting-long-referring-formal{"{given} {given2}, {surname}"} + sorting-long-referring-informal{"{given-informal} {given2}, {surname}"} + sorting-medium-referring-formal{"{given} {given2}, {surname-initial}"} + sorting-medium-referring-informal{"{given-informal} {given2}, {surname-initial}"} + sorting-short-referring-formal{"{given} {given2-initial}, {surname-initial}"} + sorting-short-referring-informal{"{given-informal} {given2-initial}, {surname-initial}"} + surnameFirst-long-addressing-formal{"{prefix} {surname-initial} {given}"} surnameFirst-long-addressing-informal{"{given-informal}"} surnameFirst-long-monogram-formal{ "{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-a" "llCaps}" } surnameFirst-long-monogram-informal{"{surname-monogram-allCaps}{given-informal-monogram-allCaps}"} - surnameFirst-long-referring-formal{"{surname} {given} {given2} {suffix}"} + surnameFirst-long-referring-formal{"{prefix} {surname} {given} {given2} {suffix}"} surnameFirst-long-referring-informal{"{surname} {given-informal}"} - surnameFirst-medium-addressing-formal{"{prefix} {surname}"} + surnameFirst-medium-addressing-formal{"{prefix} {surname-initial} {given}"} surnameFirst-medium-addressing-informal{"{given-informal}"} - surnameFirst-medium-monogram-formal{"{surname-monogram-allCaps}"} + surnameFirst-medium-monogram-formal{"{surname-monogram-allCaps}{given-monogram-allCaps}"} surnameFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} - surnameFirst-medium-referring-formal{"{surname} {given} {given2-initial} {suffix}"} - surnameFirst-medium-referring-informal{"{surname} {given-informal}"} - surnameFirst-short-addressing-formal{"{prefix} {surname}"} + surnameFirst-medium-referring-formal{"{surname-initial} {given} {given2} {suffix}"} + surnameFirst-medium-referring-informal{"{surname-initial} {given-informal}"} + surnameFirst-short-addressing-formal{"{prefix} {given}"} surnameFirst-short-addressing-informal{"{given-informal}"} - surnameFirst-short-monogram-formal{"{surname-monogram-allCaps}"} + surnameFirst-short-monogram-formal{"{given-monogram-allCaps}"} surnameFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} - surnameFirst-short-referring-formal{"{surname} {given2-initial}"} - surnameFirst-short-referring-informal{"{surname}"} + surnameFirst-short-referring-formal{"{surname-initial} {given}"} + surnameFirst-short-referring-informal{"{given-informal}"} } } } diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index 757fad23b56..92042cf76d4 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -2673,13 +2673,14 @@ te{ initialSequence{"{0} {1}"} } nameOrderLocales{ - givenFirst{ - "und", - "te", - } + givenFirst{"und"} surnameFirst{ - "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/tg.txt b/icu4c/source/data/locales/tg.txt index b64ab0302a8..1f2ad18aaf5 100644 --- a/icu4c/source/data/locales/tg.txt +++ b/icu4c/source/data/locales/tg.txt @@ -1676,4 +1676,18 @@ tg{ US{"ИМА"} metric{"Метрӣ"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "tg", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 19687abcab4..7a6d6f76681 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -3631,6 +3631,12 @@ th{ "und", "th", } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-informal{"{given-informal}"} diff --git a/icu4c/source/data/locales/ti.txt b/icu4c/source/data/locales/ti.txt index be2da9cd21c..30f6e80d00d 100644 --- a/icu4c/source/data/locales/ti.txt +++ b/icu4c/source/data/locales/ti.txt @@ -1688,4 +1688,21 @@ ti{ US{"ኣመሪካ"} metric{"ሜትሪክ"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "ti", + } + surnameFirst{ + "ko", + "si", + "ta", + "te", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/tk.txt b/icu4c/source/data/locales/tk.txt index c186c36d713..aee1d026ea5 100644 --- a/icu4c/source/data/locales/tk.txt +++ b/icu4c/source/data/locales/tk.txt @@ -1964,7 +1964,6 @@ tk{ "und", "tk", } - surnameFirst{"zxx"} } namePattern{ givenFirst-short-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/to.txt b/icu4c/source/data/locales/to.txt index d2e2dfc20a4..c13c7ee483b 100644 --- a/icu4c/source/data/locales/to.txt +++ b/icu4c/source/data/locales/to.txt @@ -1761,7 +1761,13 @@ to{ "und", "to", } - surnameFirst{"zxx"} + surnameFirst{ + "ja", + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index 0e5354b7be0..b9c9c204986 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -2457,8 +2457,10 @@ tr{ "tr", } surnameFirst{ - "zh", "ko", + "vi", + "yue", + "zh", } } namePattern{ diff --git a/icu4c/source/data/locales/tt.txt b/icu4c/source/data/locales/tt.txt index ec9ca12f9ad..af482f42833 100644 --- a/icu4c/source/data/locales/tt.txt +++ b/icu4c/source/data/locales/tt.txt @@ -1354,4 +1354,19 @@ tt{ US{"АКШ"} metric{"метрик"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "tt", + } + surnameFirst{ + "ja", + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index 95449aff3a9..6fe22f95798 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -3051,6 +3051,13 @@ uk{ "und", "uk", } + surnameFirst{ + "ja", + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-informal{"{given-informal} {surname} {surname2}"} @@ -3090,7 +3097,12 @@ uk{ sorting-medium-referring-informal{"{surname} {surname2}, {given-informal-initial}"} sorting-short-referring-formal{"{surname} {surname2}, {given-initial} {given2-initial}"} sorting-short-referring-informal{"{surname} {given-informal}"} + surnameFirst-long-addressing-formal{"{prefix} {surname}"} surnameFirst-long-addressing-informal{"{given-informal}"} + surnameFirst-long-monogram-formal{ + "{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-a" + "llCaps}" + } surnameFirst-long-monogram-informal{ "{surname-monogram-allCaps}{surname2-monogram-allCaps}{given-informal" "-monogram-allCaps}" diff --git a/icu4c/source/data/locales/ur.txt b/icu4c/source/data/locales/ur.txt index 0563657a542..d8a4924c08f 100644 --- a/icu4c/source/data/locales/ur.txt +++ b/icu4c/source/data/locales/ur.txt @@ -2558,6 +2558,11 @@ ur{ surnameFirst{ "ja", "ko", + "si", + "ta", + "te", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/uz.txt b/icu4c/source/data/locales/uz.txt index c973997591e..71f2299ce83 100644 --- a/icu4c/source/data/locales/uz.txt +++ b/icu4c/source/data/locales/uz.txt @@ -2062,8 +2062,9 @@ uz{ "uz", } surnameFirst{ - "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/wo.txt b/icu4c/source/data/locales/wo.txt index aa268c4da3e..302ca2374ce 100644 --- a/icu4c/source/data/locales/wo.txt +++ b/icu4c/source/data/locales/wo.txt @@ -1147,4 +1147,18 @@ wo{ US{"US"} metric{"Metrik"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "wo", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/xh.txt b/icu4c/source/data/locales/xh.txt index ad97e60a3bf..f5668841f4d 100644 --- a/icu4c/source/data/locales/xh.txt +++ b/icu4c/source/data/locales/xh.txt @@ -781,4 +781,18 @@ xh{ US{"US"} metric{"Metric"} } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "xh", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/yo.txt b/icu4c/source/data/locales/yo.txt index 9e12ba630bf..4f842c675b1 100644 --- a/icu4c/source/data/locales/yo.txt +++ b/icu4c/source/data/locales/yo.txt @@ -1128,7 +1128,12 @@ yo{ "und", "yo", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/yrl.txt b/icu4c/source/data/locales/yrl.txt index cf8bbbddef6..0d64dc075bf 100644 --- a/icu4c/source/data/locales/yrl.txt +++ b/icu4c/source/data/locales/yrl.txt @@ -2013,4 +2013,18 @@ yrl{ } } } + personNames{ + nameOrderLocales{ + givenFirst{ + "und", + "yrl", + } + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } + } + } } diff --git a/icu4c/source/data/locales/yue.txt b/icu4c/source/data/locales/yue.txt index d5bfc6d1569..fec4d0c7e0f 100644 --- a/icu4c/source/data/locales/yue.txt +++ b/icu4c/source/data/locales/yue.txt @@ -55,29 +55,29 @@ yue{ " 盜 盟 盡 監-盥 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睏 睛 睡 督 瞇 瞌 瞧 瞪 瞭 矛 矣 知 短 石 砂 砍 研 砲 破" " 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磚 磨 磯 礎 礙 礫 示 社 祈 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 禱 禿-私 秋 科" " 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稻 稿 穀 穆 穌 積 穩 究 穹 空 穿 突 窄 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 竿 笑" - " 笛 符 笨 第 筆 等 筋 答 策 筷 簡 箏 箔 算 管 箭 箱 節 範 篇 築 篷 簡 簫 簽 簿 籃 籌 籍 籠 籤 米 粉 粗 粵 精 糊 糕" - " 糖 糟 糥 系 糾 紀 約 紅 紉 納 紐 純 紙-紛 素 索 紫 紮-細 紳 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 綽 綿 緊" - " 緒 線 緣 編 緩 緬 緯 練 縛 縣 縫 縮 縱 總 績 繁 繃 繆 織 繞 繡 繩 繪 繳 繼 續 纖 缸 缺 罈 罐 罕 罩 罪 置 罰 署 罵" - " 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 聾 肉 肌 肚" - " 股 肥 肩 肯 育 肺 背 胎 胖 胞 胡 胸 能 脆 脈 脖 脫 腐 腓 腔 腦 腰 腳 腹 腿 膚 膠 膽 臂 臉 臘 臟 臣 臥 臨 自 臭 至" - " 致 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芙 芝 芬 芭 花 芳 芽 苣 若 苦 英 茄 茅 茫 茲 茵 茶 茸 草 荒 荷 荼" - " 莉 莊 莎 莓 莖 莫 菇 菌 菜 菩 華 菲 萄 萊 萎 萬 萵 落 葉 著 葛 葡 葵 蒂 蒙 蒜 蒲 蒸 蒼 蓄 蓉 蓋 蓮 蔔 蔕 蔡 蔣 蔥" - " 蔬 蕉 蕭 蕾 薄 薑 薦 薩 薪 薯 藉 藍 藏 藝 藤 藥 蘆 蘇 蘋 蘑 蘭 蘿 虎 處 虛 號 虧 蚊 蚓 蚯 蛇 蛋 蛙 蜂 蜜 蜥 蜴 蝙" - " 蝟 蝠 蝦 蝶 螂 螃 融 螞 螢 螺 蟀 蟄 蟋 蟑 蟲 蟳 蟹 蟻 蠅 蠍 蠕 蠣 蠻 血 行 術 街 衛 衝 衡 衣 表 衫 袋 袍 被 裁 裂" - " 裏 裕 補 裝 裡 裱 裹 製 複 褐 褲 襪 襯 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訝 訥 訪 設" - " 許 訴 診-証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 謎 講 謝 證 識" - " 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豎 豐 豔 象 豪 豬 豹 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜" - " 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 贛 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跆 跌 跎 跑 距 跟 跡 跪 路 跳 踏 踢 踩" - " 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 軸 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轎 轟 辛 辜 辣 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪" - " 迫 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷" - " 選 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄙 鄭 鄰 酉 配 酒 酪 酷 酸 醉 醒 醜 醫 醬 采 釋-量 金 針 釣" - " 鈴 鉅 鉢 鉤 銀 銅 銖 銘 銳 銷 鋁 鋒 鋼 錄 錢 錦 錨 錫 錯 錶 鍊 鍋 鍵 鍾 鎊 鎖 鎮 鏈 鏡 鏢 鐘 鐡 鐵 鑑 鑿 長 門 閃" - " 閉 開 閏 閒 間 閣 閩 閱 闆 闊 闍 闐 關 闡 阱 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險" - " 隱 隻 雄-集 雉 雌 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霜 霧 露 霸 霹 靂 靈 青 靖 静 靜 非 靠 面 革 靴 靼" - " 鞋 鞭 韃 韋 韓 音 韻 響 頁 頂 項 順 須 頌 預 頑 頓 頗 領 頞 頭 頸 頻 顆 題 額 顏 願 顛 類 顧 顯 風 颱 飄 飆 飛 食" - " 飪 飯 飲 飽 飾 餃 餅 養 餌 餐 餘 餚 館 餾 首 香 馬 駐 駕 駛 駝 駱 騎 騙 騷 驅 驕 驗 驚 骨 體 高 髮 鬆 鬍 鬥 鬧 鬱" - " 鬼 魁 魂 魅 魔 魚 魯 魷 鮑 鮮 鯊 鯨 鱷 鳥 鳩 鳳 鳴 鴨 鴻 鵝 鵡 鶴 鷹 鸚 鹽 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 黛 點 黨" - " 鼓 鼠 鼬 鼻 齊 齋 齒 齡 龍 龐 龜]" + " 笛 符 笨 第 筆 等 筋 答 策 筷 箏 箔 算 管 箭 箱 節 範 篇 築 篷 簡 簫 簽 簿 籃 籌 籍 籠 籤 米 粉 粗 粵 精 糊 糕 糖" + " 糟 糥 系 糾 紀 約 紅 紉 納 紐 純 紙-紛 素 索 紫 紮-細 紳 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 綽 綿 緊 緒" + " 線 緣 編 緩 緬 緯 練 縛 縣 縫 縮 縱 總 績 繁 繃 繆 織 繞 繡 繩 繪 繳 繼 續 纖 缸 缺 罈 罐 罕 罩 罪 置 罰 署 罵 罷" + " 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 聾 肉 肌 肚 股" + " 肥 肩 肯 育 肺 背 胎 胖 胞 胡 胸 能 脆 脈 脖 脫 腐 腓 腔 腦 腰 腳 腹 腿 膚 膠 膽 臂 臉 臘 臟 臣 臥 臨 自 臭 至 致" + " 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芙 芝 芬 芭 花 芳 芽 苣 若 苦 英 茄 茅 茫 茲 茵 茶 茸 草 荒 荷 荼 莉" + " 莊 莎 莓 莖 莫 菇 菌 菜 菩 華 菲 萄 萊 萎 萬 萵 落 葉 著 葛 葡 葵 蒂 蒙 蒜 蒲 蒸 蒼 蓄 蓉 蓋 蓮 蔔 蔕 蔡 蔣 蔥 蔬" + " 蕉 蕭 蕾 薄 薑 薦 薩 薪 薯 藉 藍 藏 藝 藤 藥 蘆 蘇 蘋 蘑 蘭 蘿 虎 處 虛 號 虧 蚊 蚓 蚯 蛇 蛋 蛙 蜂 蜜 蜥 蜴 蝙 蝟" + " 蝠 蝦 蝶 螂 螃 融 螞 螢 螺 蟀 蟄 蟋 蟑 蟲 蟳 蟹 蟻 蠅 蠍 蠕 蠣 蠻 血 行 術 街 衛 衝 衡 衣 表 衫 袋 袍 被 裁 裂 裏" + " 裕 補 裝 裡 裱 裹 製 複 褐 褲 襪 襯 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訝 訥 訪 設 許" + " 訴 診-証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 謎 講 謝 證 識 譜" + " 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豎 豐 豔 象 豪 豬 豹 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜 賞" + " 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 贛 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跆 跌 跎 跑 距 跟 跡 跪 路 跳 踏 踢 踩 蹟" + " 蹤 躍 身 躲 車 軌 軍 軒 軟 軸 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轎 轟 辛 辜 辣 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫" + " 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選" + " 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄙 鄭 鄰 酉 配 酒 酪 酷 酸 醉 醒 醜 醫 醬 采 釋-量 金 針 釣 鈴" + " 鉅 鉢 鉤 銀 銅 銖 銘 銳 銷 鋁 鋒 鋼 錄 錢 錦 錨 錫 錯 錶 鍊 鍋 鍵 鍾 鎊 鎖 鎮 鏈 鏡 鏢 鐘 鐡 鐵 鑑 鑿 長 門 閃 閉" + " 開 閏 閒 間 閣 閩 閱 闆 闊 闍 闐 關 闡 阱 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱" + " 隻 雄-集 雉 雌 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霜 霧 露 霸 霹 靂 靈 青 靖 静 靜 非 靠 面 革 靴 靼 鞋" + " 鞭 韃 韋 韓 音 韻 響 頁 頂 項 順 須 頌 預 頑 頓 頗 領 頞 頭 頸 頻 顆 題 額 顏 願 顛 類 顧 顯 風 颱 飄 飆 飛 食 飪" + " 飯 飲 飽 飾 餃 餅 養 餌 餐 餘 餚 館 餾 首 香 馬 駐 駕 駛 駝 駱 騎 騙 騷 驅 驕 驗 驚 骨 體 高 髮 鬆 鬍 鬥 鬧 鬱 鬼" + " 魁 魂 魅 魔 魚 魯 魷 鮑 鮮 鯊 鯨 鱷 鳥 鳩 鳳 鳴 鴨 鴻 鵝 鵡 鶴 鷹 鸚 鹽 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 黛 點 黨 鼓" + " 鼠 鼬 鼻 齊 齋 齒 齡 龍 龐 龜]" } ExemplarCharactersIndex{"[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]"} diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 51cef234b8c..7aad0af874a 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -5142,8 +5142,11 @@ zh{ } nameOrderLocales{ surnameFirst{ + "hu", "ja", "ko", + "vi", + "yue", "zh", } } diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index e14378923d2..5951ac26ee7 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -64,26 +64,25 @@ zh_Hant{ " 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟" " 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩" " 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種" - " 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 簡 算 管 箭 箱" - " 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組" - " 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕" - " 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職" - " 聽 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍" - " 舒 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉" - " 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融" - " 螢 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸" - " 言 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒" - " 論 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買" - " 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路" - " 跳 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫" - " 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選" - " 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅" - " 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防" - " 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷" - " 電 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻" - " 顆 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆" - " 鬥 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜" - "]" + " 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 算 管 箭 箱 節" + " 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組 結" + " 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕 罪" + " 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽" + " 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍 舒" + " 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉 著" + " 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融 螢" + " 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言" + " 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論" + " 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費" + " 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路 跳" + " 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫 述" + " 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選 遺" + " 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅 銖" + " 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防 阻" + " 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電" + " 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻 顆" + " 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆 鬥" + " 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜]" } ExemplarCharactersIndex{ "[一 丨 丶 丿 乙 亅 二 亠 人 儿 入 八 冂 冖 冫 几 凵 刀 力 勹 匕 匚 匸 十 卜 卩 厂 厶 又 口 囗 土 士 夂 夊 夕 大 女" @@ -7838,6 +7837,7 @@ zh_Hant{ personNames{ nameOrderLocales{ surnameFirst{ + "hu", "ja", "ko", "vi", diff --git a/icu4c/source/data/locales/zh_Hant_HK.txt b/icu4c/source/data/locales/zh_Hant_HK.txt index 9a68ab7f2c8..64745d920e4 100644 --- a/icu4c/source/data/locales/zh_Hant_HK.txt +++ b/icu4c/source/data/locales/zh_Hant_HK.txt @@ -1295,15 +1295,7 @@ zh_Hant_HK{ } personNames{ nameOrderLocales{ - givenFirst{ - "und", - "en", - } - surnameFirst{ - "ja", - "ko", - "zh", - } + givenFirst{"und"} } namePattern{ givenFirst-long-addressing-formal{"{prefix} {surname}"} diff --git a/icu4c/source/data/locales/zu.txt b/icu4c/source/data/locales/zu.txt index 81e2b5b55f6..ce7b9d25021 100644 --- a/icu4c/source/data/locales/zu.txt +++ b/icu4c/source/data/locales/zu.txt @@ -1608,7 +1608,12 @@ zu{ "und", "zu", } - surnameFirst{"zxx"} + surnameFirst{ + "ko", + "vi", + "yue", + "zh", + } } } } diff --git a/icu4c/source/data/misc/dayPeriods.txt b/icu4c/source/data/misc/dayPeriods.txt index eb4cf6b68d0..a29a65eeb68 100644 --- a/icu4c/source/data/misc/dayPeriods.txt +++ b/icu4c/source/data/misc/dayPeriods.txt @@ -745,12 +745,8 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"18:00"} - from{"16:00"} - } - evening2{ before{"21:00"} - from{"18:00"} + from{"16:00"} } morning1{ before{"06:00"} @@ -2267,12 +2263,8 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"18:00"} - from{"16:00"} - } - evening2{ before{"21:00"} - from{"18:00"} + from{"16:00"} } midnight{ at{"00:00"} diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt index a0333d63499..0fe141d529a 100644 --- a/icu4c/source/data/misc/keyTypeData.txt +++ b/icu4c/source/data/misc/keyTypeData.txt @@ -49,6 +49,7 @@ keyTypeData:table(nofallback){ lw{""} m0{""} measure{"ms"} + measurement-unit{"mu"} numbers{"nu"} rg{""} s0{""} @@ -617,6 +618,11 @@ keyTypeData:table(nofallback){ metric{""} ussystem{""} } + measurement-unit{ + celsius{""} + fahrenhe{""} + kelvin{""} + } numbers{ adlm{""} ahom{""} diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index bded5319c77..e10312fbd18 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -272,6 +272,7 @@ langInfo:table(nofallback){ "ahl","Latn","ZZ", "aho","Ahom","IN", "ajg","Latn","ZZ", + "ajt","Arab","TN", "ak","Latn","GH", "akk","Xsux","IQ", "ala","Latn","ZZ", @@ -1364,12 +1365,14 @@ langInfo:table(nofallback){ "sly","Latn","ID", "sm","Latn","WS", "sma","Latn","SE", + "smd","Latn","AO", "smj","Latn","SE", "smn","Latn","FI", "smp","Samr","IL", "smq","Latn","ZZ", "sms","Latn","FI", "sn","Latn","ZW", + "snb","Latn","MY", "snc","Latn","ZZ", "snk","Latn","ML", "snp","Latn","ZZ", @@ -1895,630 +1898,630 @@ langInfo:table(nofallback){ } trie:bin{ 001a6dcc4874c4fc77c26777a2b778a4 -5279a4c27a0f6d7d7a5c7a30e1adaae8 -2ef5af4e10e1a53b022a3c42cc654811 -616e01e2a3fff4a3fa0b4d25540e54cc -12552a5610cea3fd10d3a3fc4dd81ed4 -502a5310d2a3f802c1a3f7c6a3f5c8a3 -f647d521473248d81eb64910c4a3f301 -c2a3fbc6a3f16d326e36733a7910e2ad -aa10e9af4c10e5af4d10ed22012aa914 -4310c3a9156817683269366b3a6c10ed -af4b10f8adc810e1af4a10f4ada56132 -6436653a6710e8add610e7af4710eaaf -4810e1af4900126d46741b7434753877 -42e1adfbefaf1210edaf1701f5af18f6 -af1910e1af1a6d3c6e406f50725a7301 -e7ad96ebaf1610efaf0e02e3af0fe9af -10f5af1101e2af13f3af1410f3af1567 -266736683a693e6a4e6c10f3af0d10e9 -af0610e7af0702e2af08f5af09f6af0a -01e1af0be9af0c6138625463646501ec -a522f2af0504e5adfceaadfdecadfeee -adfff2af0002f0af01f1af02f2af0310 -e9af040c6e3d7221722e7332774ee8af -1e10e2af2404e1adcee9af25eca531ed -af26f2af2710e5af286e346f3e7001e5 -a791f2adcc01e1adc6f2af2101e7af22 -eeaf23651d653a6c3e6d02e6af20eead -bbf2adbe10f3af1d02e1af1fe3adb7e4 -adb8613462386301efad84f2ad8310f6 -af1b10e9af1c0d6d49733073307534e9 -a736efaf3b10f3af4004e1af41e532ea -af44f4af45f7af46012a2e4812616ef3 -af43012aaf424310ceaf436d3a6f3e72 -02e2af3de5af3eecaf3f10ecaf3a10ee -af3c6520653e67426b4c6c02e5af37e7 -af38ecaf3910f2af3301f2af34f7af35 -10efaf36612e62606410e4a73607f40c -f4af2cf6af2df9af2efaaf2feda7bbef -af29f0af2af3af2b02e1af30e2af31f9 -af3274a25275a4d9760a6f1fe509e5ad -eee9ad70efadf66f3472387501eeadf9 -f4adfa10f4adf710efadf8613c654c69 -566c606d01e6adf4f7adf502e7adece9 -addbeeaded01e3adeff0adf001e3adf1 -f6adf210f3adf30026757ce91ff20ef2 -abd3f3abd7f4abddf767f9abeee9abb7 -ebabbeecabc2eeabc8efabca7a247a36 -e1ab96e5aba8e72ee8abb310edabf101 -2a2e41127261e2abaf012aabae5010cb -abaf753c76527762786c7901e1abeff6 -abf003e8abe4ecabe5edabe6f1abe702 -e4a7beecabe8f5abe901e8abeaf1abeb -01e7abecefabed6b807049705e716e72 -7273827406f10cf1abc6f2abe1f3abe2 -f4abe3e4abdee5abdfeaabe002e9abcf -edabd0faabd110efabd202f5abd4f6ab -d5f7abd604e4abd8e6abd9e7abdaeaab -dbf7abdc6b486c586d686e726f03e6ab -cbe7abccebabcdf1abce02ecabbff2ab -c0f4abc102e6abc3f8abc4f9abc501e8 -abc6f9abc710e8abc96546655e667467 -7868886906eb0cebabbaedabbbefabbc -f6abbde2a3b3e6abb8e7abb903e4aba9 -edabaaefababf4abac10e9abad02e3ab -b0efabb1f5abb202ecabb4f1abb5f2ab -b66144625a63866403e4aba4e7aba5e8 -aba6f5aba703eaab97ecab98eeab99f1 -ab9a06e70ce7ab9eefab9ff7aba0faab -a1e3ab9be4ab9ce6ab9d01e9aba2f9ab -a30f7362e72ce742ebabf9f2ad58fa01 -2a8641127261e2adea012a2e43127972 -ecabf6022aabf54b2a4d10ceabf710da -abf673607464766e7a10ee012a2e4112 -7261e2adea022aad04412a4310ceadeb -10c6adea10e1ade601e8a54cf2ade701 -e8ade8ecade96d326d3e6e426f707202 -e9ade3f4ade4f7ade510e2abfb01f226 -f8ade1012a2e44126576e1ade0012aad -df4e10d0ade010ebade2623264366740 -6c10e9abfa10f5abf201e9abf3edabf4 -10e1abf870c3ac70a60671a6ee72a6fb -730028788cec39f229f509f5ab85f6ab -8bf7ab8cf22cf3ab7ef4ab8222032aab -394da4cc522a5410d2ab3d01cfab3cd5 -ab3aecab60edab65eeab6cefab72f16d -e431e438e5ab48e7ab4de9ab56ebab5c -032a3644444b4c5312696ee4ab45012a -ab424910ceab43126576e1ab4312686f -eaab447834793e7a48e1ab2de3ab3801 -eeab92f7ab9301ecab94f2a50f10ecab -956cb5724f725873747484758e7705e8 -09e8ab8cf0ab90f6ab91e2ab8de3ab8e -e7ab8f04e2ab7be3ab38eeab7cf2ab7d -f8a5f502e4ab7fe7ab80f9ab8101ebab -83f1ab8404e1ab86e5ab87ebab88f2ab -89f3ab8a6c4a6d666e926fa24b7003e4 -ab78ecab79f3ab7af9a77804e4ab61e9 -ab62ecab63efab5cf9ab6406ee0ceeab -68f0ab69f1ab6af3ab6be1ab66e4a77d -eaab6705f009f0ab6ff8ab70f9ab71e2 -a3a8e3ab6debab6e04e7ab73ebab74f1 -ab75f5ab76f9ab77673e67426858696e -6a846b02e3ab5df2ab5ef3ab5f03e1ab -4ef3ab4ff7ab50faab5103e9ab52ebab -53eeab54f5ab5503e4ab57e7ab58ecab -59edab5a10f2ab5b614a6276638664a2 -686503e6ab49e8ab4ae9ab4bf3ab4c06 -f30cf3ab31f4ab32f6ab33faab34e6ab -2ee8ab2ff1ab3002e1ab35e5ab36f0ab -3705ee09eeab40efab41f2a703e32ceb -ab3eecab3f22055211522e53325410d2 -ab3d10cfab3c10d5ab3a2aab39312a4d -10c5ab3b1137b2ab3a01e3ab46e8ab47 -00176f5a752bec09eca9f7f3a9e7f4ab -05754c7750e1012a2e41127261e2a9df -012aa9de5010cba9df10f5ab0710e1ab -087217722e733e7410f0ab0602e1ab01 -e4ab02e7ab0310f3ab046f2e70327110 -edab0010eea9fd01e1a9feefa9ff683c -6c1d6c406d4a6e03e2a7d1e7a9faeea9 -fbf4a9fc01e1a9f8f4a93410f3a9f968 -34693e6b01e1a9f5efa9f601eca9f0ee -a9f102eca9f2f0a9f3f3a9f46420642e -65386610eca9ef01e3a9eaf4a9eb04e4 -a9ecefa9edf2a573f3a573f8a9ee6134 -62646301e4a9e8eda9e904e7a9e0ec32 -eda9e3f0a9e4f5a9e5012aa9e1501268 -6cf0a9e201e9a9e6f5a9e7017526f5ab -0902e3ab0ae7ab0bfaab0900146f4579 -17ef09efa950f5ab26f7ab29792cedab -19eeab1e10f5ab2c6f3c724c74507554 -7701ebab2aefab2b02e2ab21e6ab22ef -ab2310efab2410edab2502e5ab27e7ab -28eda9506934693c6a566b5a6d5e6e01 -e1ab1fe7ab2001e1ab14e622012aab15 -4e10ccab1610f3ab1710f4ab1803e6ab -1aefab1bf4ab1cf5ab1d61366346654a -675a6810e7ab1302e9ab0ceaa965efab -0d10e6ab0e02eaab0fecab10f3ab1110 -eeab126da2746ea6516f0e742eea0cea -a9cceda5a4f2a9d5f3a9d8743e75487a -4ce322012aa9c94510d3a9ca01e1a9da -eba9db10e9a9dc10eda9dd6e236e3270 -4272467310e1a9d902e7a9d1eea9d2f3 -a9d310eda9d402efa9d6f5a9d7f9a9d5 -673a6a3e6b02e1a9cef2a9cff6a9d010 -e3a9cb01e7a9ccf3a9cd0022749fe926 -ef0fefa950f2a95bf3a488f4a95ff9a3 -d0e9a911eba90beca945ee012abad34d -126f6ee7a542783d7834793e7a64e7a9 -34e8a93a01e3a96eeda96f05f709f7a9 -73f8a974faa975eba970eda971f6a972 -05f009f0a979f7a97afaa97beba976ed -a977eea9787444755a76707703eba96b -f2a539f6a96cf7a96d03e3a960e6a961 -e9a962f2a96303e1a964f0a965f2a966 -f3a96702e1a968eea969f9a96a697b6e -446e426f5e707a71907202e4a95ceaa9 -5defa95e04e1a94ce6a94de9a94eebb6 -29f7a94f04e1a951e5a952e8a953f3a9 -54f8a95503f0a956f3a957f4a958f8a9 -5910eca95a693e6b546c6a6d02efa949 -f5a94af8a94b03e3a93de6a93eeea93f -f7a94003e9a941eca942f0a943f7a944 -02e5a946f0a947f3a9486549653e666a -67866802e9a93beca93cf2a50106ee0c -eea92bf2a92cf4a92df5a92ee4a928e5 -a929eba92a04e1a92fe5a930eea931ef -a932f1a93304e8a935eca936efa937f0 -a938f9a939615e62a25063a25d6406e8 -0ce8a924eaa925f2a926f8a927e1a921 -e5a922e6a9230bee1df712f7a913f926 -faa91622012aa9144310c3a915eeb44a -efa911f3a912e709e7a90ee9a90feba9 -10e3a90be4a90ce6a90d04e8a917efa9 -18f1a919f5a91af7a91b04e9a91cf0a9 -1df1a91ef2a91ff5a9200021745fe41d -ee0feea9a6efa9acf2a9b3f6a9c1f9a9 -c5e4a98be5a98ee7a993eca54e791579 -307a3ae1a97ce2a98401eda9c6eea9c7 -10e9a9c874387542775e7801f1a9c3f2 -a9c401eda9baf2a9bb04e9a9bcf0a9bd -f3a9bef6a9bff8a9c010e2a9c26a606f -356f4e706a716e72727304eba9b5eea9 -b6efa9b7f3a9b8f4a9b904e4a9ade5a9 -aeeea9aff0a9b0f5a9b110e9a98e10ef -a9b210e2a9b46a4a6b4e6d586e04e6a9 -a7e8a9a8eba9a9eda9aaf0a9ab10efa9 -a101e7a9a2efa9a301e7a9a4faa9a566 -37665a675e686e6906ee0ceea99df5a9 -9ef9a99ffaa9a0e6a99ae9a99beaa99c -10f2a99202e1a994e2a995eca99602e2 -a997e5a998f7a999613e636a64906502 -e2a98ff7a990f8a99106ee0ceea980f0 -a981f1a982f3a983e3a97de6a97eeba9 -7f05e809e8a988efa989f5a98ae1a985 -e5a986e6a98701e3a98cf3a98d66c769 +5279a4c27a0f6d7d7a5c7a30e1adade8 +2ef5af5110e1a53c022a3c42cc654811 +616e01e2a500f4a3fb0b4d25540e54cc +12552a5610cea3fe10d3a3fd4dd81ed5 +502a5310d2a3f902c1a3f8c6a3f6c8a3 +f747d521473248d81eb74910c4a3f401 +c2a3fcc6a3f26d326e36733a7910e2ad +ad10e9af4f10e5af5010ed22012aa915 +4310c3a9166817683269366b3a6c10ed +af4e10f8adcb10e1af4d10f4ada86132 +6436653a6710e8add910e7af4a10eaaf +4b10e1af4c00126d46741b7434753877 +42e1adfeefaf1510edaf1a01f5af1bf6 +af1c10e1af1d6d3c6e406f50725a7301 +e7ad99ebaf1910efaf1102e3af12e9af +13f5af1401e2af16f3af1710f3af1867 +266736683a693e6a4e6c10f3af1010e9 +af0910e7af0a02e2af0bf5af0cf6af0d +01e1af0ee9af0f6138625463646501ec +a523f2af0804e5adffeaaf00ecaf01ee +af02f2af0302f0af04f1af05f2af0610 +e9af070c6e3d7221722e7332774ee8af +2110e2af2704e1add1e9af28eca532ed +af29f2af2a10e5af2b6e346f3e7001e5 +a792f2adcf01e1adc9f2af2401e7af25 +eeaf26651d653a6c3e6d02e6af23eead +bef2adc110f3af2002e1af22e3adbae4 +adbb613462386301efad87f2ad8610f6 +af1e10e9af1f0d6d49733073307534e9 +a737efaf3e10f3af4304e1af44e532ea +af47f4af48f7af49012a2e4812616ef3 +af46012aaf454310ceaf466d3a6f3e72 +02e2af40e5af41ecaf4210ecaf3d10ee +af3f6520653e67426b4c6c02e5af3ae7 +af3becaf3c10f2af3601f2af37f7af38 +10efaf39612e62606410e4a73707f40c +f4af2ff6af30f9af31faaf32eda7bcef +af2cf0af2df3af2e02e1af33e2af34f9 +af3574a25275a4d9760a6f1fe509e5ad +f1e9ad73efadf96f3472387501eeadfc +f4adfd10f4adfa10efadfb613c654c69 +566c606d01e6adf7f7adf802e7adefe9 +addeeeadf001e3adf2f0adf301e3adf4 +f6adf510f3adf60026757ce91ff20ef2 +abd6f3abdaf4abe0f769f9abf1e9abba +ebabc1ecabc5eeabcbefabcd7a247a36 +e1ab99e5ababe72ee8abb610edabf401 +2a2e41127261e2abb2012aabb15010cb +abb2753c76527762786c7901e1abf2f6 +abf303e8abe7ecabe8edabe9f1abea02 +e4a7bfecabebf5abec01e8abedf1abee +01e7abefefabf06b807049705e716e72 +7273827406f10cf1abc9f2abe4f3abe5 +f4abe6e4abe1e5abe2eaabe302e9abd2 +edabd3faabd410efabd502f5abd7f6ab +d8f7abd904e4abdbe6abdce7abddeaab +def7abdf6b486c586d686e726f03e6ab +cee7abcfebabd0f1abd102ecabc2f2ab +c3f4abc402e6abc6f8abc7f9abc801e8 +abc9f9abca10e8abcc6546655e667467 +7868886906eb0cebabbdedabbeefabbf +f6abc0e2a3b4e6abbbe7abbc03e4abac +edabadefabaef4abaf10e9abb002e3ab +b3efabb4f5abb502ecabb7f1abb8f2ab +b96144625a63866403e4aba7e7aba8e8 +aba9f5abaa03eaab9aecab9beeab9cf1 +ab9d06e70ce7aba1efaba2f7aba3faab +a4e3ab9ee4ab9fe6aba001e9aba5f9ab +a60f7362e72ce742ebabfcf2ad5bfa01 +2a8641127261e2aded012a2e43127972 +ecabf9022aabf84b2a4d10ceabfa10da +abf973607464766e7a10ee012a2e4112 +7261e2aded022aad07412a4310ceadee +10c6aded10e1ade901e8a54df2adea01 +e8adebecadec6d326d3e6e426f707202 +e9ade6f4ade7f7ade810e2abfe01f226 +f8ade4012a2e44126576e1ade3012aad +e24e10d0ade310ebade5623264366740 +6c10e9abfd10f5abf501e9abf6edabf7 +10e1abfb70c3ac70a60671a6ee72a6fb +730028788cec39f229f509f5ab88f6ab +8ef7ab8ff22cf3ab81f4ab8522032aab +3a4da4cc522a5410d2ab3e01cfab3dd5 +ab3becab61edab66eeab6eefab75f16f +e431e438e5ab49e7ab4ee9ab57ebab5d +032a3644444b4c5312696ee4ab46012a +ab434910ceab44126576e1ab4412686f +eaab457834793e7a48e1ab2ee3ab3901 +eeab95f7ab9601ecab97f2a51010ecab +986cb5724f725873747484758e7705e8 +09e8ab8ff0ab93f6ab94e2ab90e3ab91 +e7ab9204e2ab7ee3ab39eeab7ff2ab80 +f8a5f602e4ab82e7ab83f9ab8401ebab +86f1ab8704e1ab89e5ab8aebab8bf2ab +8cf3ab8d6c4a6d666e926fa24b7003e4 +ab7becab7cf3ab7df9a77904e4ab62e9 +ab63ecab64efab5df9ab6506ee0ceeab +6af0ab6bf1ab6cf3ab6de1ab67e4ab68 +eaab6905f009f0ab72f8ab73f9ab74e2 +ab6fe3ab70ebab7104e7ab76ebab77f1 +ab78f5ab79f9ab7a673e67426858696e +6a846b02e3ab5ef2ab5ff3ab6003e1ab +4ff3ab50f7ab51faab5203e9ab53ebab +54eeab55f5ab5603e4ab58e7ab59ecab +5aedab5b10f2ab5c614a6276638664a2 +686503e6ab4ae8ab4be9ab4cf3ab4d06 +f30cf3ab32f4ab33f6ab34faab35e6ab +2fe8ab30f1ab3102e1ab36e5ab37f0ab +3805ee09eeab41efab42f2a704e32ceb +ab3fecab4022055211522e53325410d2 +ab3e10cfab3d10d5ab3b2aab3a312a4d +10c5ab3c1137b2ab3b01e3ab47e8ab48 +00176f5a752bec09eca9f8f3a9e8f4ab +06754c7750e1012a2e41127261e2a9e0 +012aa9df5010cba9e010f5ab0810e1ab +097217722e733e7410f0ab0702e1ab02 +e4ab03e7ab0410f3ab056f2e70327110 +edab0110eea9fe01e1a9ffefab00683c +6c1d6c406d4a6e03e2a7d2e7a9fbeea9 +fcf4a9fd01e1a9f9f4a93510f3a9fa68 +34693e6b01e1a9f6efa9f701eca9f1ee +a9f202eca9f3f0a9f4f3a9f56420642e +65386610eca9f001e3a9ebf4a9ec04e4 +a9edefa9eef2a574f3a574f8a9ef6134 +62646301e4a9e9eda9ea04e7a9e1ec32 +eda9e4f0a9e5f5a9e6012aa9e2501268 +6cf0a9e301e9a9e7f5a9e8017526f5ab +0a02e3ab0be7ab0cfaab0a00146f4579 +17ef09efa951f5ab27f7ab2a792cedab +1aeeab1f10f5ab2d6f3c724c74507554 +7701ebab2befab2c02e2ab22e6ab23ef +ab2410efab2510edab2602e5ab28e7ab +29eda9516934693c6a566b5a6d5e6e01 +e1ab20e7ab2101e1ab15e622012aab16 +4e10ccab1710f3ab1810f4ab1903e6ab +1befab1cf4ab1df5ab1e61366346654a +675a6810e7ab1402e9ab0deaa966efab +0e10e6ab0f02eaab10ecab11f3ab1210 +eeab136da2746ea6516f0e742eea0cea +a9cdeda5a5f2a9d6f3a9d9743e75487a +4ce322012aa9ca4510d3a9cb01e1a9db +eba9dc10e9a9dd10eda9de6e236e3270 +4272467310e1a9da02e7a9d2eea9d3f3 +a9d410eda9d502efa9d7f5a9d8f9a9d6 +673a6a3e6b02e1a9cff2a9d0f6a9d110 +e3a9cc01e7a9cdf3a9ce0022749fe926 +ef0fefa951f2a95cf3a488f4a960f9a3 +d1e9a912eba90ceca946ee012abad34d +126f6ee7a543783d7834793e7a64e7a9 +35e8a93b01e3a96feda97005f709f7a9 +74f8a975faa976eba971eda972f6a973 +05f009f0a97af7a97bfaa97ceba977ed +a978eea9797444755a76707703eba96c +f2a53af6a96df7a96e03e3a961e6a962 +e9a963f2a96403e1a965f0a966f2a967 +f3a96802e1a969eea96af9a96b697b6e +446e426f5e707a71907202e4a95deaa9 +5eefa95f04e1a94de6a94ee9a94febb6 +29f7a95004e1a952e5a953e8a954f3a9 +55f8a95603f0a957f3a958f4a959f8a9 +5a10eca95b693e6b546c6a6d02efa94a +f5a94bf8a94c03e3a93ee6a93feea940 +f7a94103e9a942eca943f0a944f7a945 +02e5a947f0a948f3a9496549653e666a +67866802e9a93ceca93df2a50206ee0c +eea92cf2a92df4a92ef5a92fe4a929e5 +a92aeba92b04e1a930e5a931eea932ef +a933f1a93404e8a936eca937efa938f0 +a939f9a93a615e62a25063a25d6406e8 +0ce8a925eaa926f2a927f8a928e1a922 +e5a923e6a9240bee1df712f7a914f926 +faa91722012aa9154310c3a916eeb44a +efa912f3a913e709e7a90fe9a910eba9 +11e3a90ce4a90de6a90e04e8a918efa9 +19f1a91af5a91bf7a91c04e9a91df0a9 +1ef1a91ff2a920f5a9210021745fe41d +ee0feea9a7efa9adf2a9b4f6a9c2f9a9 +c6e4a98ce5a98fe7a994eca54f791579 +307a3ae1a97de2a98501eda9c7eea9c8 +10e9a9c974387542775e7801f1a9c4f2 +a9c501eda9bbf2a9bc04e9a9bdf0a9be +f3a9bff6a9c0f8a9c110e2a9c36a606f +356f4e706a716e72727304eba9b6eea9 +b7efa9b8f3a9b9f4a9ba04e4a9aee5a9 +afeea9b0f0a9b1f5a9b210e9a98f10ef +a9b310e2a9b56a4a6b4e6d586e04e6a9 +a8e8a9a9eba9aaeda9abf0a9ac10efa9 +a201e7a9a3efa9a401e7a9a5faa9a666 +37665a675e686e6906ee0ceea99ef5a9 +9ff9a9a0faa9a1e6a99be9a99ceaa99d +10f2a99302e1a995e2a996eca99702e2 +a998e5a999f7a99a613e636a64906502 +e2a990f7a991f8a99206ee0ceea981f0 +a982f1a983f3a984e3a97ee6a97feba9 +8005e809e8a989efa98af5a98be1a986 +e5a987e6a98801e3a98df3a98e66c769 69c49f69a41b6aa4c66ba6136c001b74 -4ae717ef0cefa7f9f4a901f5a903f6a9 -07e7a7e2e9a7e4eea7f6771577307a34 -e1a7cde2a7d410eca90801e8a909faa9 -0a742e75327610f3a90710e7a90203e1 -a904efa905f9a3d7faa9066a4a6d316d -326e426f4c7210e3a90002eea7f3efa7 -f4f0a7f501f3a7f7f5a7f805f209f2a7 -fdf3a7fefaa7ffeaa7faeba7fbeca7fc -6a346b386c01e5a7f1eea7f210f0a7ee -01e9a7eff4a7f0644d6476657a67a242 -6907e80ce8a7eaeaa7ebeca7ecf3a7ed -e1a7e5e4a7e6e626e7a7e9012aa7e74c -12696de2a7e810e2a7da06f00cf0a7de -f1a7dff5a7e0faa7e1e4a7dbe5a7dced -a7dd10e7a7e36134625a6301eda7d8f0 -a7d905e809e8a7d1eaa7d2f3a7d3e2a7 -cee4a7cfe7a7d002e5a7d5f5a7d6f7a7 -d700197739eb17f30cf3a711f4a728f5 -a71df7a729eba56aeea723efa725e409 -e4a713e7a718e9a71b772a7a34e1a70b -01eda72af3a72b01e8a72ce9a72d6a33 -6d176d326e366f3a7210e9a72710efa7 -2210e8a72410f5a7266a2e6b326c10ef -a72110eaa71c03e5a71deba71ef7a71f -f8a720641a643466446701e2a719e5a7 -1a02e4a714e9a715f5a71610e5a71761 -3a62446302e1a710e5a711e8a71201ee -a70cf2a70d02e1a3a8e2a70ef9a70f0b -721ae909e9a736f6a73cf7a73d722a75 -2ee1a72e10e1a73a10f4a73b67176734 -693e6d01e3a738eca73901eba731efa7 -3510e2a737612e623e6510eea73402e2 -a72feda730f2a73101efa732f5a73300 -2875c0f0eb74f23ff628f6a795f7a7b7 -f9022a32414c4c126174eea7c6022aa7 -c4432a5410d2a7c610cea7c5127261e2 -a7c5f2a788f3a7a1f5022aa46741a46d -5912657ae9a783eb38eca777eda77cee -a787efa78c012a2e41127261e2a77204 -2aa77041324336493a4d10cea77410c6 -a77110cea77210d2a7737a1b7a38e1a5 -b3e7a75be9a767eaa76b03e8a7c9eaa7 -caf2a7cbf4a7cc753c766e777e789479 -01e5a7c7f8a7c807ed0ceda7b0eea7b1 -f0a7b2f3a7b3e2a7ace4a7ade5a7aeea -a7af02e7a7b4f2a7b5f8a7b603eaa7b8 -eba7b9efa7baf1a7bb07ed0ceda7c0f0 -a7c1f7a7c2faa7c3e1a7bce3a7bde5a7 -beeca7bf6bc0d57063704a7170728673 -a2457403e2a7a8eda7a9efa7aaf2a7ab -05f209f2a794f6a795f8a796e5a791e6 -a792efa79303e2a797e6a798f3a799f9 -a79a05ec09eca79ef3a79ff5a7a0e3a7 -9be9a79ceaa79d05e809e8a7a5eaa7a6 -f2a7a7e2a7a2e4a7a3e6a7a46b506c5a -6d706ea2576f04e9a78deba78aeca78e -f3a78ffaa79001e3a775eaa77603eea7 -78f1a779f4a77af8a77b06f226f232f3 -a784f5a785f7a786022a324140591265 -7ae9a783012aa7804c10c2a781127261 -e2a782e2a77de8a77eefa77f04e3a788 -e6a789e7a75beea78af0a78b66526648 -6758686869a06a03e4a76ce7a76df3a7 -6ef9a76f02efa758f2a759f9a75a02e5 -a75ce6a75df0a75e08f10ff1a762f3a7 -63f4a764f7a765faa766e1a75fe2a760 -ebac95eea76102eaa768f5a769f7a76a -6146627e63a24164a24b6502e1a755ee -a756faa75708e90fe9a742eaa743eda7 -44efa745f7a746e1a73ee2a73fe3a740 -e4a74105f109f1a74af8a74bf9a74ce4 -a747eda748f0a74903e7a74deba74eec -a74ff4a75003e5a751e8a752eca753f4 -a75466a2c267a4776800137546f20ff2 -a703f4a706f5a707f9a342faa70a7534 -e13ee5a5ece962efa5ff01e9a708f2a7 -0922032aa5e2372e43345310c4a5e311 -33b6a5e310cda5e4012aa5ee4c126174 -eea5ef6c386c3c6d466e506f6c7301e2 -a704eea70501e1a5f6f5a5f701e4a5f8 -f4a5f904e4a5fae5a5fbeaa5fceea5fd -efa5fe02e3a700eaa701f4a702615862 -746478687c6905e809e8a5f3eca5f4ed -a5f5e1a5f0e6a5f1e7a5f204e7a5e5eb -a5e6eda5e7f7a5e8faa5e910e2a5ea10 -f9a5eb10f9a5ed00117553e90fe9a57d -eaa581efa584f2a58af9a59975427694 -e1a573e6012aa5794112646ceda57a09 -e80fe8a593f1a594f2a595f6a596f9a5 -97e2a58fe332e4a590e5a591e6a59201 -2aa5794112646ceda57a10f2a5986d2f -6d4e6f52706271667204e3a58be5a58a -f0a58cf2a58df3a58e10f0a58302e4a5 -85eea586f2a58710e5a58810f3a58961 -32665669606c10f2a58205e908e9a577 -eea578f467e1a574e2a575e7a57601e9 -a57beda57c02e1a57eeca57ff4a58000 -1a6e9f791dec0ceca5bfeea5c3f5a5d3 -f6a5db792ce1a59ae4a5ac01e1a5a5e9 -a5e1733a733e754276747702e3a5dee9 -a5dff4a5e010f7a5d207f20cf2a5d7f7 -a5d8f8a5d9faa5dae2a5d4e3a5d5e4a5 -d6e7a5c302e6a5dcf2a5b6f3a5dd6e5a -6f6a7204e2a5a8e332e5a55df4a5d0f7 -a5d1012aa5ce4c12696ee2a5cf02e4a5 -c4e7a5c5efa5c607ee0ceea5c6f2a5cb -f3a5ccf4a5cde4a5c7e6a5c8e9a5c9ed -a5ca673c6a236a386b486c526d01eda5 -c1f6a5c202eba5baeea5bbf5a5bc01ee -a5bdf0a5be10eba5c06734683e6901ec -a5b8eda5b901eea5b6efa56910f3a5b7 -6428642e653e6610eba5b502e5a5adee -a5aef2a5af05ef09efa5b3f2a52ffaa5 -b4e2a5b0eaa5b1eca5b2612e626c6310 -f2a5ab09ed0feda5a0eea5a1f7a5a2f9 -a5a3faa5a4e1a59be6a59ce7a59de8a5 -9eeaa59f05ef09efa5a8f9a5a9faa5aa -e1a5a5e6a5a6eda5a763c2f463a2a364 -a4fa6500127733ee19ee38efa566f3a5 -68f4a55bf5a366012aa56253126861f7 -a563773478387a3ce5a556eca55d10ef -a57010f4a57110e1a5726d466d486e7a -728473887403f2a56cf4a56df5a56ef8 -a56f02e1a55ee9a55feb012a2e4e126b -6fefa561012aa5604710cea56101eea5 -64f1a56510e9a56702e7a569eba56af5 -a56b623e664267466b02e1a55aeba55b -f9a55c10f5a55510e9a55701eca558f9 -a559001b7257e821f316f3a51bf52cf6 -a521f9a522012aa51f47126c61e7a520 -e8a3edefa512f2a515771277307a34e1 -a3e3e5a3e910e4a51510e5a51b722e73 -4a7410e4a51e04e7a516e8a517eba518 -eca519f3a51a01e2a51cf7a51d69556c -336c326d426f727010f3a51402e1a50d -e3a50ee4a50f02e5a510e7a511ee022a -a26342a2ae4811616e01e2a3fff4a3fa -10f0a51369406a446b03e2a509eca50a -efa50bf9a50c10e3a50502e1a506eda5 -07f6a508658f65a28066a28167a28268 -05ef09efa502f0a503f2a504e92ceba5 -00eda501022a3c42a2594811616e01e2 -a3fff4a3fa0b4d2d5417542e55385610 -c4a3fd01c8a3f9d7a3fa01cba3fbd3a3 -fc4db4c0502a5310d2a3f802c6a3f5c8 -a3f6daa3f7470e473048b4a44910c4a3 -f310c6a3f12aa3ee412a4210cea3f010 -d5a3ef126f70efa3fe10e2a3ea10e1a3 -eb10e7a3ec6134623e6301e8a3e7f0a3 -e801e4a3e4eea3e510eaa3e60017726f -791ce508e5a52ff6a54ffa45792a7a34 -e1a52301efa552f5a55310e7a554751d -752e764a7710f7a55104e1a54ae3a54b -e4a54ce7a54df4a54e10e1a550724073 -747403eda546f0a547f3a548f9a54902 -e82ce9a543f3a544012a2e4d126f6ee7 -a542012aa5414310cea54210e2a54568 -2d6d176daacf6e3c6f03e2a53ee9a536 -f0a53ff7a54010eaa525682e69326a10 -e5a53c10e4a53901e1a53af1a53b6428 -6456655a6706ec0ceca535efa536f2a5 -37faa538e1a532e8a533e9a53410eea5 -2e01e4a530eea531612e625a6310e3a5 -2d06e80ce8a527eba528f2a529f6a52a -e4a524e6a525e7a52601e4a52bf1a52c -2aa60061bed462002373a5e51ded0fed -a3aaeea3afefa3b3f2a3bcf3a3c1e5a3 -7ce7a389e8a38de9a39377417732783c -794c7a72e1a36201e4a3d4f2a3d502e8 -a3d6eba3d7f2a3c905f309f3a3dbf6a3 -dcf8a3dde5a3d8eea3d9f2a3da04e1a3 -dee5a3dfe6a3e0e8a3e1f7a3e2733274 -4875587610e2a3d303eaa3c2f1a3c3f3 -a3c4f4a3c502efa3c6f4a3c7f6a3c809 -ed0feda3ceefa3cff2a3d0f3a3d1f5a3 -d2e1a3c9e3a3cae4a3cbe7a3cceba3cd +4ae717ef0cefa7faf4a902f5a904f6a9 +08e7a7e3e9a7e5eea7f7771577307a34 +e1a7cee2a7d510eca90901e8a90afaa9 +0b742e75327610f3a90810e7a90303e1 +a905efa906f9a3d8faa9076a4a6d316d +326e426f4c7210e3a90102eea7f4efa7 +f5f0a7f601f3a7f8f5a7f905f209f2a7 +fef3a7fffaa900eaa7fbeba7fceca7fd +6a346b386c01e5a7f2eea7f310f0a7ef +01e9a7f0f4a7f1644d6476657a67a242 +6907e80ce8a7ebeaa7ececa7edf3a7ee +e1a7e6e4a7e7e626e7a7ea012aa7e84c +12696de2a7e910e2a7db06f00cf0a7df +f1a7e0f5a7e1faa7e2e4a7dce5a7dded +a7de10e7a7e46134625a6301eda7d9f0 +a7da05e809e8a7d2eaa7d3f3a7d4e2a7 +cfe4a7d0e7a7d102e5a7d6f5a7d7f7a7 +d800197739eb17f30cf3a712f4a729f5 +a71ef7a72aeba56beea724efa726e409 +e4a714e7a719e9a71c772a7a34e1a70c +01eda72bf3a72c01e8a72de9a72e6a33 +6d176d326e366f3a7210e9a72810efa7 +2310e8a72510f5a7276a2e6b326c10ef +a72210eaa71d03e5a71eeba71ff7a720 +f8a721641a643466446701e2a71ae5a7 +1b02e4a715e9a716f5a71710e5a71861 +3a62446302e1a711e5a712e8a71301ee +a70df2a70e02e1a3a9e2a70ff9a7100b +721ae909e9a737f6a73df7a73e722a75 +2ee1a72f10e1a73b10f4a73c67176734 +693e6d01e3a739eca73a01eba732efa7 +3610e2a738612e623e6510eea73502e2 +a730eda731f2a73201efa733f5a73400 +2875c0f0eb74f23ff628f6a796f7a7b8 +f9022a32414c4c126174eea7c7022aa7 +c5432a5410d2a7c710cea7c6127261e2 +a7c6f2a789f3a7a2f5022aa46741a46d +5912657ae9a784eb38eca778eda77dee +a788efa78d012a2e41127261e2a77304 +2aa77141324336493a4d10cea77510c6 +a77210cea77310d2a7747a1b7a38e1a5 +b4e7a75ce9a768eaa76c03e8a7caeaa7 +cbf2a7ccf4a7cd753c766e777e789479 +01e5a7c8f8a7c907ed0ceda7b1eea7b2 +f0a7b3f3a7b4e2a7ade4a7aee5a7afea +a7b002e7a7b5f2a7b6f8a7b703eaa7b9 +eba7baefa7bbf1a7bc07ed0ceda7c1f0 +a7c2f7a7c3faa7c4e1a7bde3a7bee5a7 +bfeca7c06bc0d57063704a7170728673 +a2457403e2a7a9eda7aaefa7abf2a7ac +05f209f2a795f6a796f8a797e5a792e6 +a793efa79403e2a798e6a799f3a79af9 +a79b05ec09eca79ff3a7a0f5a7a1e3a7 +9ce9a79deaa79e05e809e8a7a6eaa7a7 +f2a7a8e2a7a3e4a7a4e6a7a56b506c5a +6d706ea2576f04e9a78eeba78beca78f +f3a790faa79101e3a776eaa77703eea7 +79f1a77af4a77bf8a77c06f226f232f3 +a785f5a786f7a787022a324140591265 +7ae9a784012aa7814c10c2a782127261 +e2a783e2a77ee8a77fefa78004e3a789 +e6a78ae7a75ceea78bf0a78c66526648 +6758686869a06a03e4a76de7a76ef3a7 +6ff9a77002efa759f2a75af9a75b02e5 +a75de6a75ef0a75f08f10ff1a763f3a7 +64f4a765f7a766faa767e1a760e2a761 +ebac95eea76202eaa769f5a76af7a76b +6146627e63a24164a24b6502e1a756ee +a757faa75808e90fe9a743eaa744eda7 +45efa746f7a747e1a73fe2a740e3a741 +e4a74205f109f1a74bf8a74cf9a74de4 +a748eda749f0a74a03e7a74eeba74fec +a750f4a75103e5a752e8a753eca754f4 +a75566a2c267a4776800137546f20ff2 +a704f4a707f5a708f9a343faa70b7534 +e13ee5a5ede962efa70001e9a709f2a7 +0a22032aa5e3372e43345310c4a5e411 +33b6a5e410cda5e5012aa5ef4c126174 +eea5f06c386c3c6d466e506f6c7301e2 +a705eea70601e1a5f7f5a5f801e4a5f9 +f4a5fa04e4a5fbe5a5fceaa5fdeea5fe +efa5ff02e3a701eaa702f4a703615862 +746478687c6905e809e8a5f4eca5f5ed +a5f6e1a5f1e6a5f2e7a5f304e7a5e6eb +a5e7eda5e8f7a5e9faa5ea10e2a5eb10 +f9a5ec10f9a5ee00117553e90fe9a57e +eaa582efa585f2a58bf9a59a75427694 +e1a574e6012aa57a4112646ceda57b09 +e80fe8a594f1a595f2a596f6a597f9a5 +98e2a590e332e4a591e5a592e6a59301 +2aa57a4112646ceda57b10f2a5996d2f +6d4e6f52706271667204e3a58ce5a58b +f0a58df2a58ef3a58f10f0a58402e4a5 +86eea587f2a58810e5a58910f3a58a61 +32665669606c10f2a58305e908e9a578 +eea579f469e1a575e2a576e7a57701e9 +a57ceda57d02e1a57feca580f4a58100 +1a6e9f791dec0ceca5c0eea5c4f5a5d4 +f6a5dc792ce1a59be4a5ad01e1a5a6e9 +a5e2733a733e754276747702e3a5dfe9 +a5e0f4a5e110f7a5d307f20cf2a5d8f7 +a5d9f8a5dafaa5dbe2a5d5e3a5d6e4a5 +d7e7a5c402e6a5ddf2a5b7f3a5de6e5a +6f6a7204e2a5a9e332e5a55ef4a5d1f7 +a5d2012aa5cf4c12696ee2a5d002e4a5 +c5e7a5c6efa5c707ee0ceea5c7f2a5cc +f3a5cdf4a5cee4a5c8e6a5c9e9a5caed +a5cb673c6a236a386b486c526d01eda5 +c2f6a5c302eba5bbeea5bcf5a5bd01ee +a5bef0a5bf10eba5c16734683e6901ec +a5b9eda5ba01eea5b7efa56a10f3a5b8 +6428642e653e6610eba5b602e5a5aeee +a5aff2a5b005ef09efa5b4f2a530faa5 +b5e2a5b1eaa5b2eca5b3612e626c6310 +f2a5ac09ed0feda5a1eea5a2f7a5a3f9 +a5a4faa5a5e1a59ce6a59de7a59ee8a5 +9feaa5a005ef09efa5a9f9a5aafaa5ab +e1a5a6e6a5a7eda5a863c2f463a2a364 +a4fa6500127733ee19ee38efa567f3a5 +69f4a55cf5a367012aa56353126861f7 +a564773478387a3ce5a557eca55e10ef +a57110f4a57210e1a5736d466d486e7a +728473887403f2a56df4a56ef5a56ff8 +a57002e1a55fe9a560eb012a2e4e126b +6fefa562012aa5614710cea56201eea5 +65f1a56610e9a56802e7a56aeba56bf5 +a56c623e664267466b02e1a55beba55c +f9a55d10f5a55610e9a55801eca559f9 +a55a001b7257e821f316f3a51cf52cf6 +a522f9a523012aa52047126c61e7a521 +e8a3eeefa513f2a516771277307a34e1 +a3e4e5a3ea10e4a51610e5a51c722e73 +4a7410e4a51f04e7a517e8a518eba519 +eca51af3a51b01e2a51df7a51e69556c +336c326d426f727010f3a51502e1a50e +e3a50fe4a51002e5a511e7a512ee022a +a26342a2ae4811616e01e2a500f4a3fb +10f0a51469406a446b03e2a50aeca50b +efa50cf9a50d10e3a50602e1a507eda5 +08f6a509658f65a28066a28167a28268 +05ef09efa503f0a504f2a505e92ceba5 +01eda502022a3c42a2594811616e01e2 +a500f4a3fb0b4d2d5417542e55385610 +c4a3fe01c8a3fad7a3fb01cba3fcd3a3 +fd4db4c1502a5310d2a3f902c6a3f6c8 +a3f7daa3f8470e473048b4a54910c4a3 +f410c6a3f22aa3ef412a4210cea3f110 +d5a3f0126f70efa3ff10e2a3eb10e1a3 +ec10e7a3ed6134623e6301e8a3e8f0a3 +e901e4a3e5eea3e610eaa3e70017726f +791ce508e5a530f6a550fa45792a7a34 +e1a52401efa553f5a55410e7a555751d +752e764a7710f7a55204e1a54be3a54c +e4a54de7a54ef4a54f10e1a551724073 +747403eda547f0a548f3a549f9a54a02 +e82ce9a544f3a545012a2e4d126f6ee7 +a543012aa5424310cea54310e2a54668 +2d6d176daad06e3c6f03e2a53fe9a537 +f0a540f7a54110eaa526682e69326a10 +e5a53d10e4a53a01e1a53bf1a53c6428 +6456655a6706ec0ceca536efa537f2a5 +38faa539e1a533e8a534e9a53510eea5 +2f01e4a531eea532612e625a6310e3a5 +2e06e80ce8a528eba529f2a52af6a52b +e4a525e6a526e7a52701e4a52cf1a52d +2aa60061bed562002373a5e51ded0fed +a3abeea3b0efa3b4f2a3bdf3a3c2e5a3 +7de7a38ae8a38ee9a39477417732783c +794c7a72e1a36301e4a3d5f2a3d602e8 +a3d7eba3d8f2a3ca05f309f3a3dcf6a3 +ddf8a3dee5a3d9eea3daf2a3db04e1a3 +dfe5a3e0e6a3e1e8a3e2f7a3e3733274 +4875587610e2a3d403eaa3c3f1a3c4f3 +a3c5f4a3c602efa3c7f4a3c8f6a3c909 +ed0feda3cfefa3d0f2a3d1f3a3d2f5a3 +d3e1a3cae3a3cbe4a3cce7a3cdeba3ce 6a866e3b6e486f587068716c7203e1a3 -bde8a3bef8a3bffaa3c002e7a3b0eda3 -b1f0a3b202eaa3b4eda3b5eea3b610f9 -a3b703e3a3b8e9a3b9f0a3baf6a3bb6a -446b766c926d03e8a3abeba3acf1a3ad -f5a3ae07ef0cefa39ef2a39ff4a3a0fa -a3a1e8a39ae9a39beaa39ceea39d04e3 -a3a2eda3a3f1a3a4f5a3a5f6a3a602e1 -a3a7e7a3a8f4a3a9656a6562669467a2 -4468a24b6906ed0ceda396eea397efa3 -98f1a399e2a394e7a395eba37507f40c -f4a381f7a382f8a383faa384e6a37de8 -a37eeaa37feda38003e4a385f1a386f4 -a387f9a38802e3a38aeea38bf8a38c05 -ec09eca391efa38df9a392e2a38ee7a3 -8fe9a3906132626463906410e4a37b07 -f20cf2a367f3a368f6a369f8a36aeca3 -63eea364f0a365f1a36606e40ce4a36e -eaa36ff0a370f2a371e1a36be2a36ce3 -a36d09ed0feda376eea377efa378f1a3 -79f5a37ae3a363e6a372e8a373e9a374 -eca37500184dc28954c0e15736573658 -4e59645a12616ee2adde01612c631168 -efa9ab1172e1addd01702a731175f869 -1165efa9ed01652c691169e9a71b117a -e9a783544455a29e5601612c691174e8 -addc1169e9addb07684e683669866ea2 -426f1174efabed106101e158e9042aab -b343324b364c3a5410c8abb310cea7d9 -10c8add810c1add9012aa54f4d10d6a5 -4f01622a7210e8adda10f4012aa3b342 -10d4451173e1a9b96134658066866711 -6ce7add7056d116d2e6e327610f4a3a9 -10ecab9610e7abec67346b386c01e5ab -a4f5a76010e2add410f2add5116cf5ab -a8116ee7add6126761f2abf850c0c350 -a27252a2a85306694369426f6a759079 -016c2a7210e3a50f10efadd301643e6e -01e4ab45e8012aab564c10cbab5610e4 -add002672e72387910efa51101e4ab73 -efadd110e1ab7b116ee4add2613e675e -6801612a7210e4adcf10f7a563026d2e -72327510f2ab3410f2ab6910e2adce11 -6ef7a34b046138654a68506c76721174 -e9adcc016c2a7510e3a51e10eda11172 -edadca02612e6c326e10f8a9f110e7ad -cb01e9a9e1f0a9e21172e4a5f8026a30 -6f3675116ef2a9af116ee7adcd1168e7 -ab134d8a4ea2ab4f0467386c3e724473 -58751167f2a9dc1161edab4e1163ebab -32016b2a7910e1a9d510e8a9db01672a -6d10e1adc910e5a9d907722e725a7460 -756679116df2032aa3d0492e4d325410 -c8adc310cea76410cda3d0116fefa95e -1165e9adc1116cf4adc2614265746c9a -6f01642a6e10e7a54210e9adc0036832 -6b366e3a7210e3adbc10eaadb910e1ad -ba01e4a975e9adbb0264346e387201e3 -adbeefadbf10e6a53d10e4adbd1179ed -a9450461386258655c6b62731168f5ad -c802672e6e327210e2adc610edadc410 -e4adc51161f49f1177e1adc7116fefa5 -6147c4114ac3354aa6c04ba6d94c0361 -4665a69c69a69e7901632a6410e9adb8 -10e9adb7026ea6796fa67a7410ee001a -4bc139545b571457ac7358ac7759305a -01c1ad00d7ab6c10d4ad745440558256 -03c1ad6fc5ad71cead70d5a3930bce14 -d609d6abe8d7abd5daab8cceadb5cfab -cad2abd3cbc5d7cbabbfccad6bcdabbe -04c1adb6c7ad6dd3a562d9ad6edaad04 -4e824e8a50a24a52a26d530cce17d40c -d4ad65d5a79ed6ad66d9adb4cead63cf -ab72d2ad64ca09caad61cbab5ccdad62 -c3ad60c5ab8bc9ab6006c70cc7abfcc9 -ad53cca54ecfa984c1ad50c3ad51c5ad -520acc14d409d4ad5cd7a9e5d9a5c3cc -a9f7cdad59d2ad5ac1ad55c5ad56c6ad -57c7abcfc8a57f03c5ad5fcfa950d5a7 -9ed7ab294b9e4ca2434d0010cd1dd40f -d4a95fd5a930d8abfed9a914daad4fcd -a740cfadb2d1ad4dd2adb3c60cc6ad4c -c7a934cbadb1cca3aac1adb0c3ad4ac4 -ad4bc5ab3b01c5ad3fcdadaf04c9ad45 -d3ad46d4a901d5ad47d6a90743c0c246 -644656476648a24d4905d209d2adaed3 -a711d4a728c3ad3cc4a713c5ad3002c9 -a57dcfa584d2a58a0cce17d30cd3ad37 -d4ad38d5ad03d7ad39cead34d0ad35d1 -ad36c608c6ad33c867cca777c1ad32c2 -ad06c5adad04cdad3acead3bd2a703d4 -a706d5a707435244a2424505d309d3a5 -68d4ada7daad31c1ad2cc3ad2dc5a55b -0fcf1ad60cd6ad27d7ad08d9adabdaa5 -1bcfad24d0ad25d2ad26d5ad01c9c68f -c9ad21ccad22cdad23ceadaa05cb09cb -a523cfad2adaadacc5a52fc7ad5ecaad -29345e34ae8a4178420bce14d209d2ab -05d5a740d6ad1dcead1acfad1bd1ad1c -c909c9ab1ecaad18ccad19c1a3c1c5ad -15c6ad160cd217d50cd5abfdd7ad13d8 -ad14daa35ed2ad10d3ad11d4ad12cd09 -cdada9cfad0ed1ad0fc4ad0bc6ada8cc -6d2aa562312c321133b0ada71137b2a7 -9e10e1a9ad10ef012aa7f94c10c1a7f9 -1170e3a7de026d2e6e327310f5a7ed10 -e2a7e801e1a7cee2a5cf01613a701161 -ee012aa72e4a10d0a72e016d2a7610e1 -ada310efada2056e1e6e306f36741168 -e9ada61164e1a7871172e5012aa78c4b -01d0ad41d2a78c61306850691174f3ad -a5026c2e6e327710e9a74610e9a55c10 -e1ada402612e6d326f10eaab4410f2ab -0110f2012aa77c4b10c8a77c473448a2 -5c49127461eca56d0465466c5a6f6072 -7a75016a2a7210f5a9de10f2a5d3116f -f2012aa5b34710c5a5b31161e7a52001 -6e2a7410e8a5cd01e7ad96eda5690161 -506510eb032aa55d432e47325410d2a3 -8c10d9ad2810d2a55d10eead97056c18 -6c306d3675116ee7ada11175f7a5f710 -6e01e7ada0f0a5fc6130659c691172e1 -ad9f106e05ef2aefad9af358f4042aa3 -fa433248364d3a5410d7a3fa10c1ad9b -10cba3f210cfa3f4012aa3ee4310cea3 -eee2a3ffe7ad98e9ad991162f2032aa5 -ec493453385501c1ad9dd3ad9e10cca5 -ec10c5ad9c43c114437044a2cd450267 -406c46741168e9012a754501d2ad2fd4 -751179f0a55901622a7910edad9510e1 -ad940461a26868a2776fa28670a28879 -1172ec0a4d335414542e55385810cbad -8d01caabaed2ad8c10c1abf94d2e523e -5310cbad8b02c4ad89cba90bcea54102 -cfad8ad3ab39d5ab262aab264138423c -474c4b01c7a7c4daad4310ccad8602c1 -ad87c7a389d9a37c01c52dd2ad88026b -2e6e327210e9ad8310eda3e810f3a71d -02612e65327210f3ad8410eda50710f2 -a5041170f4a513016d2a7210f4a5ce10 -ee012aad854310d9ad8503653469866f -8c751170ecad931176e106491749324d -364e3a5010cba3c810cea5ee10d5ad90 -10d0a98e2aa5ee422a4610caad8f10d4 -ad8e1161ebad911167f2ad922aa25441 -aa3142056f1f6f3e72447501672a6810 -e4ad8210e9ad811170efa3fe106101e8 -a9f5e9ad806130655c68116bf3ad7f03 -6c326d36733a7410ebad7e10e9ad7d10 -f5a36a10f3a3c3116ee7012aa3af4210 -c4a3af00214ac1c052c0cc5638563c57 -58586259665a01d2abffd7ab6c04c1ad -6fc4ad70c5ad71cead70d5a39301c6ad -72d3ab6510cbad7303c4ad0ac5ad0ad4 -ad74d5ab395246536c54a2575503c1ab -f9c7ad6dd9ad6edaad0405d309d3ab39 -d5ab26d7ab29c5ad5fc8ab6ccfa9500e -cd1ad40cd4ad65d5ab26d6ad66d9ad67 -cdad62cead63cfab72d2ad64c50cc5ab -8bc9ab60caad61cbab5cc1ad05c3ad60 -c4ad090ecd1ad20cd2abd3d6abe8d7a3 -fadaab8ccdabbecead6ccfabcad0ad6b -c80cc8abb3caabaecbabbfccad6bc4ad -68c6ad69c7ad6a4e644e404fa8965078 -5102c1ad5dcfad5ed5ad3009cc0fcca5 -4ecfa984d0a98ed1ad0fd4ad05c1ad50 -c3ad51c5ad52c8a393c9ad530dcd17d4 -0cd4ad5cd7a9e5d9a5c3daad55cdad59 -d2ad5ad3ad5bc70cc7abcfc8a57fcbad -58cca9f7c1ad55c5ad56c6ad574aa248 -4ba24c4ca2644d0012ce20d50fd5a930 -d6a54fd8abfed9a914daad4fcea541cf -a3f4d1ad4dd2ad4ed4a95fc60fc6ad4c -c7a934cba90bcca3aacda3d0c1ad49c3 -ad4ac4ad4bc5ab3b01cfad3ed0a72e07 -d00cd0ad41d2a78cd7ad42daad43c5ad -3fc7a7c4c8a77ccdad4008d30fd3ad46 -d4a901d5ad47d6a907d9ad48c1a7f9c2 -ad44c9ad45cbab5641c1604598456a46 -a24147a24e48a2754907d10cd1ad3dd2 -a573d3a711d4a728c3ad3cc4a713cca5 -eccea5ee09d20ed2ad2fd3a568d475d5 -ad30daad31c1ad2cc3ad2dc5a55bc79b -c8ad2e04c9a57dcfa584d1ad0fd2a58a -d8a58a0bd014d309d3ad37d4ad38d7ad -39d0ad35d1ad36d2a55dc808c867cca7 -77cead34c1ad32c5a5b3c6ad3306d20c -d2a703d4a706d5a707d6ad16cba3f2cd -ad3acead3b415e42a24c43a2834406cb -0ccba523cfad2ad9ad18daad2bc4a52f -c5a52fcaad290dd117d40cd4ad12d7ad -13d8ad14daa35ed1ad0fd2ad10d3ad11 -cc0bcc6dcda342cead08cfad0ec4ad0b -c5ad0cc6ad0d0010cc1cd20ed2ab05d4 -45d5a3d0d6ad1dd9a37cccad19cead1a -cfad1bd1ad1cc70cc7a389c8ad17c9ab -1ecaad18c1a3c1c4a3afc5ad15c6ad16 -0010cf1dd50fd5ad01d6ad27d7ad08d9 -ad28daa51bcfad24d0ad25d2ad26d3ab -39c90cc9ad21ccad22cdad23cea3eec4 -abffc6ad1ec7ad1fc8ad203422344235 -48374e3801382a3910b0ab3910b6ad0a -1131b9ad071133b2ad081133b6ad092a -a562305031a26b3202302e33383810b0 -a52f01b0a51bb2abfc10b07505332333 -34354a3601b1ab65b2a5ee03b0a3eeb4 -a5eeb5a713b9a72802b3abfdb4ad02b7 -ad033034314a3201b1a562b9ad0103b2 -abfcb3a562b5ab05b9abfd06b50bb59b -b7abffb8ad00b9a562b1abfcb3abfeb4 -ab8c02342e353e3710b2ab2602b2a3ee -b3ad04b5ad0503b0ab26b1ab26b4ad06 -b5a52f046436673c68427246761173f4 -4b116ceda57a1168e2abf3116fed6301 -613c6d01e99dee012aa3424110cda342 -10e200134c625131513c53405450556a -5901c5ad0ad4ab8d10c1ad5d02c1ad05 -c4ad09d9ad6704c791c8a92fcaad7bce -ad6cd2ad7c10cbad764c3c4d464e624f -665001cbad58d3ad5b01c2ad44d9ad48 -04c1ad49cdad75cea774d2ad4ed5ad79 -10c7ad7a10cdad54452e4542474a494e -4a644b02c8a506cdad40d7ad4201c79b -c8ad2e10c2ad7603c4ad77cead78d1ad -3dd2a57310cfad3e2a9b4132423c4346 -4410daad2b01c5ad0cc6ad0d01c8ad17 -d5ad7501c3a915ceabf500217588e62b -f221f29bf3a349f6a353f9a35cfa012a -2e41127261e2a360022aa35e498a5210 -d5a361e651eb67ed75ee7f7a2d7a2ce1 -25e22de54b10ea012a2e41127261e2a3 -60032aa35e312e49345310d5a3611137 -b2a36101d1a35fd2a3607538763c7752 -7901e2a35df2a35c10f9a35203eca354 -eea355f4a356f5a35703e1a358e2a359 -efa35af8a35b6b966f696f44704e7268 -73a2507402e1a34fe7a350eaa35102ea -89ed8bfa8d05f206f295f397fa99e38f -e491e59309ef0fefa344f1a345f3a346 -f9a347faa348e29be332e8a341eda342 -eea343022a9d4e2c5012616ceda11262 -61f49f04e1a34ae5a34be7a34cefa34d -f4a34e6b3c6c3e6d586e03e381eb83ee -85f98710eb6905ee06ee71f36df473e1 -6be26de96f03ed77ee79ef7bf07d6527 -6534673a68546a01e765f44d01e24df9 -4f05ed06ed59ef5bf15de353e455e757 -02e15fec61ef636148625263646405f0 -06f045f947fa49e13fe541ea4302e927 -eb29f52b04e92ff131f233f435f93702 -e439e53be83d +bee8a3bff8a3c0faa3c102e7a3b1eda3 +b2f0a3b302eaa3b5eda3b6eea3b710f9 +a3b803e3a3b9e9a3baf0a3bbf6a3bc6a +446b766c926d03e8a3aceba3adf1a3ae +f5a3af07ef0cefa39ff2a3a0f4a3a1fa +a3a2e8a39be9a39ceaa39deea39e04e3 +a3a3eda3a4f1a3a5f5a3a6f6a3a702e1 +a3a8e7a3a9f4a3aa656a6562669467a2 +4468a24b6906ed0ceda397eea398efa3 +99f1a39ae2a395e7a396eba37607f40c +f4a382f7a383f8a384faa385e6a37ee8 +a37feaa380eda38103e4a386f1a387f4 +a388f9a38902e3a38beea38cf8a38d05 +ec09eca392efa38ef9a393e2a38fe7a3 +90e9a3916132626463906410e4a37c07 +f20cf2a368f3a369f6a36af8a36beca3 +64eea365f0a366f1a36706e40ce4a36f +eaa370f0a371f2a372e1a36ce2a36de3 +a36e09ed0feda377eea378efa379f1a3 +7af5a37be3a364e6a373e8a374e9a375 +eca37600184dc28a54c0e15736573658 +4e59645a12616ee2ade101612c631168 +efa9ac1172e1ade001702a731175f86b +1165efa9ee01652c691169e9a71c117a +e9a784544455a29e5601612c691174e8 +addf1169e9adde07684e683669866ea2 +426f1174efabf0106101e158e9042aab +b643324b364c3a5410c8abb610cea7da +10c8addb10c1addc012aa5504d10d6a5 +5001622a7210e8addd10f4012aa3b442 +10d4451173e1a9ba6134658066866711 +6ce7adda056d116d2e6e327610f4a3aa +10ecab9910e7abef67346b386c01e5ab +a7f5a76110e2add710f2add8116cf5ab +ab116ee7add9126761f2abfb50c0c450 +a27252a2a95306694369426f6a759079 +016c2a7210e3a51010efadd601643e6e +01e4ab46e8012aab574c10cbab5710e4 +add302672e72387910efa51201e4ab76 +efadd410e1ab7e116ee4add5613e675e +6801612a7210e4add210f7a564026d2e +72327510f2ab3510f2ab6b10e2add111 +6ef7a34c046138654c68526c78721174 +e9adcf016c2a7510e3a51f10eda34111 +72edadcd02612e6c326e10f8a9f210e7 +adce01e9a9e2f0a9e31172e4a5f9026a +306f3675116ef2a9b0116ee7add01168 +e7ab144d8a4ea2ab4f0467386c3e7244 +7358751167f2a9dd1161edab4f1163eb +ab33016b2a7910e1a9d610e8a9dc0167 +2a6d10e1adcc10e5a9da07722e725a74 +60756679116df2032aa3d1492e4d3254 +10c8adc610cea76510cda3d1116fefa9 +5f1165e9adc4116cf4adc5614265746c +9a6f01642a6e10e7a54310e9adc30368 +326b366e3a7210e3adbf10eaadbc10e1 +adbd01e4a976e9adbe0264346e387201 +e3adc1efadc210e6a53e10e4adc01179 +eda9460461386258655c6b62731168f5 +adcb02672e6e327210e2adc910edadc7 +10e4adc81161f4a11177e1adca116fef +a56247c4114ac3354aa6c04ba6d94c03 +614665a69c69a69e7901632a6410e9ad +bb10e9adba026ea6796fa67a7410ee00 +1a4bc139545b571457ac7358ac775930 +5a01c1ad03d7ab6e10d4ad7754405582 +5603c1ad72c5ad74cead73d5a3940bce +14d609d6abebd7abd8daab8fceadb8cf +abcdd2abd6cbc5d7cbabc2ccad6ecdab +c104c1adb9c7ad70d3a563d9ad71daad +074e824e8a50a24a52a26d530cce17d4 +0cd4ad68d5a79fd6ad69d9adb7cead66 +cfab75d2ad67ca09caad64cbab5dcdad +65c3ad63c5ab8ec9ab6106c70cc7abff +c9ad56cca54fcfa985c1ad53c3ad54c5 +ad550acc14d409d4ad5fd7a9e6d9a5c4 +cca9f8cdad5cd2ad5dc1ad58c5ad59c6 +ad5ac7abd2c8a58003c5ad62cfa951d5 +a79fd7ab2a4b9e4ca2434d0010cd1dd4 +0fd4a960d5a931d8ad01d9a915daad52 +cda741cfadb5d1ad50d2adb6c60cc6ad +4fc7a935cbadb4cca3abc1adb3c3ad4d +c4ad4ec5ab3c01c5ad42cdadb204c9ad +48d3ad49d4a902d5ad4ad6a90843c0c2 +46644656476648a24d4905d209d2adb1 +d3a712d4a729c3ad3fc4a714c5ad3302 +c9a57ecfa585d2a58b0cce17d30cd3ad +3ad4ad3bd5ad06d7ad3ccead37d0ad38 +d1ad39c608c6ad36c869cca778c1ad35 +c2ad09c5adb004cdad3dcead3ed2a704 +d4a707d5a708435244a2424505d309d3 +a569d4adaadaad34c1ad2fc3ad30c5a5 +5c0fcf1ad60cd6ad2ad7ad0bd9adaeda +a51ccfad27d0ad28d2ad29d5ad04c9c6 +8fc9ad24ccad25cdad26ceadad05cb09 +cba524cfad2ddaadafc5a530c7ad61ca +ad2c345e34ae8a4178420bce14d209d2 +ab06d5a741d6ad20cead1dcfad1ed1ad +1fc909c9ab1fcaad1bccad1cc1a3c2c5 +ad18c6ad190cd217d50cd5ad00d7ad16 +d8ad17daa35fd2ad13d3ad14d4ad15cd +09cdadaccfad11d1ad12c4ad0ec6adab +cc6f2aa563312c321133b0adaa1137b2 +a79f10e1a9ae10ef012aa7fa4c10c1a7 +fa1170e3a7df026d2e6e327310f5a7ee +10e2a7e901e1a7cfe2a5d001613a7011 +61ee012aa72f4a10d0a72f016d2a7610 +e1ada610efada5056e1e6e306f367411 +68e9ada91164e1a7881172e5012aa78d +4b01d0ad44d2a78d61306850691174f3 +ada8026c2e6e327710e9a74710e9a55d +10e1ada702612e6d326f10eaab4510f2 +ab0210f2012aa77d4b10c8a77d473448 +a25c49127461eca56e0465466c5a6f60 +727a75016a2a7210f5a9df10f2a5d411 +6ff2012aa5b44710c5a5b41161e7a521 +016e2a7410e8a5ce01e7ad99eda56a01 +61506510eb032aa55e432e47325410d2 +a38d10d9ad2b10d2a55e10eead9a056c +186c306d3675116ee7ada41175f7a5f8 +106e01e7ada3f0a5fd6130659c691172 +e1ada2106e05ef2aefad9df358f4042a +a3fb433248364d3a5410d7a3fb10c1ad +9e10cba3f310cfa3f5012aa3ef4310ce +a3efe2a500e7ad9be9ad9c1162f2032a +a5ed493453385501c1ada0d3ada110cc +a5ed10c5ad9f43c114437044a2cd4502 +67406c46741168e9012a774501d2ad32 +d4771179f0a55a01622a7910edad9810 +e1ad970461a26868a2776fa28670a288 +791172ec0a4d335414542e55385810cb +ad9001caabb1d2ad8f10c1abfc4d2e52 +3e5310cbad8e02c4ad8ccba90ccea542 +02cfad8dd3ab3ad5ab272aab27413842 +3c474c4b01c7a7c5daad4610ccad8902 +c1ad8ac7a38ad9a37d01c52dd2ad8b02 +6b2e6e327210e9ad8610eda3e910f3a7 +1e02612e65327210f3ad8710eda50810 +f2a5051170f4a514016d2a7210f4a5cf +10ee012aad884310d9ad880365346986 +6f8c751170ecad961176e10649174932 +4d364e3a5010cba3c910cea5ef10d5ad +9310d0a98f2aa5ef422a4610caad9210 +d4ad911161ebad941167f2ad952aa254 +41aa3142056f1f6f3e72447501672a68 +10e4ad8510e9ad841170efa3ff106101 +e8a9f6e9ad836130655c68116bf3ad82 +036c326d36733a7410ebad8110e9ad80 +10f5a36b10f3a3c4116ee7012aa3b042 +10c4a3b000214ac1c052c0cc5638563c +5758586259665a01d2ad02d7ab6e04c1 +ad72c4ad73c5ad74cead73d5a39401c6 +ad75d3ab6610cbad7603c4ad0dc5ad0d +d4ad77d5ab3a5246536c54a2575503c1 +abfcc7ad70d9ad71daad0705d309d3ab +3ad5ab27d7ab2ac5ad62c8ab6ecfa951 +0ecd1ad40cd4ad68d5ab27d6ad69d9ad +6acdad65cead66cfab75d2ad67c50cc5 +ab8ec9ab61caad64cbab5dc1ad08c3ad +63c4ad0c0ecd1ad20cd2abd6d6abebd7 +a3fbdaab8fcdabc1cead6fcfabcdd0ad +6ec80cc8abb6caabb1cbabc2ccad6ec4 +ad6bc6ad6cc7ad6d4e644e404fa89650 +785102c1ad60cfad61d5ad3309cc0fcc +a54fcfa985d0a98fd1ad12d4ad08c1ad +53c3ad54c5ad55c8a394c9ad560dcd17 +d40cd4ad5fd7a9e6d9a5c4daad58cdad +5cd2ad5dd3ad5ec70cc7abd2c8a580cb +ad5bcca9f8c1ad58c5ad59c6ad5a4aa2 +484ba24c4ca2644d0012ce20d50fd5a9 +31d6a550d8ad01d9a915daad52cea542 +cfa3f5d1ad50d2ad51d4a960c60fc6ad +4fc7a935cba90ccca3abcda3d1c1ad4c +c3ad4dc4ad4ec5ab3c01cfad41d0a72f +07d00cd0ad44d2a78dd7ad45daad46c5 +ad42c7a7c5c8a77dcdad4308d30fd3ad +49d4a902d5ad4ad6a908d9ad4bc1a7fa +c2ad47c9ad48cbab5741c1604598456a +46a24147a24e48a2754907d10cd1ad40 +d2a574d3a712d4a729c3ad3fc4a714cc +a5edcea5ef09d20ed2ad32d3a569d477 +d5ad33daad34c1ad2fc3ad30c5a55cc7 +9dc8ad3104c9a57ecfa585d1ad12d2a5 +8bd8a58b0bd014d309d3ad3ad4ad3bd7 +ad3cd0ad38d1ad39d2a55ec808c869cc +a778cead37c1ad35c5a5b4c6ad3606d2 +0cd2a704d4a707d5a708d6ad19cba3f3 +cdad3dcead3e415e42a24c43a2834406 +cb0ccba524cfad2dd9ad1bdaad2ec4a5 +30c5a530caad2c0dd117d40cd4ad15d7 +ad16d8ad17daa35fd1ad12d2ad13d3ad +14cc0bcc6fcda343cead0bcfad11c4ad +0ec5ad0fc6ad100010cc1cd20ed2ab06 +d445d5a3d1d6ad20d9a37dccad1ccead +1dcfad1ed1ad1fc70cc7a38ac8ad1ac9 +ab1fcaad1bc1a3c2c4a3b0c5ad18c6ad +190010cf1dd50fd5ad04d6ad2ad7ad0b +d9ad2bdaa51ccfad27d0ad28d2ad29d3 +ab3ac90cc9ad24ccad25cdad26cea3ef +c4ad02c6ad21c7ad22c8ad2334223442 +3548374e3801382a3910b0ab3a10b6ad +0d1131b9ad0a1133b2ad0b1133b6ad0c +2aa563305031a26b3202302e33383810 +b0a53001b0a51cb2abff10b077053323 +3334354a3601b1ab66b2a5ef03b0a3ef +b4a5efb5a714b9a72902b3ad00b4ad05 +b7ad063034314a3201b1a563b9ad0403 +b2abffb3a563b5ab06b9ad0006b50bb5 +9db7ad02b8ad03b9a563b1abffb3ad01 +b4ab8f02342e353e3710b2ab2702b2a3 +efb3ad07b5ad0803b0ab27b1ab27b4ad +09b5a530046436673c68427246761173 +f44b116ceda57b1168e2abf6116fed63 +01613c6d01e99fee012aa3434110cda3 +4310e200134c625131513c5340545055 +6a5901c5ad0dd4ab9010c1ad6002c1ad +08c4ad0cd9ad6a04c793c8a930caad7e +cead6fd2ad7f10cbad794c3c4d464e62 +4f665001cbad5bd3ad5e01c2ad47d9ad +4b04c1ad4ccdad78cea775d2ad51d5ad +7c10c7ad7d10cdad57452e4542474a49 +4e4a644b02c8a507cdad43d7ad4501c7 +9dc8ad3110c2ad7903c4ad7acead7bd1 +ad40d2a57410cfad412a9d4132423c43 +464410daad2e01c5ad0fc6ad1001c8ad +1ad5ad7801c3a916ceabf800217588e6 +2bf221f29df3a34af6a354f9a35dfa01 +2a2e41127261e2a361022aa35f498a52 +10d5a362e651eb69ed77ee817a2d7a2c +e125e22de54b10ea012a2e41127261e2 +a361032aa35f312e49345310d5a36211 +37b2a36201d1a360d2a3617538763c77 +527901e2a35ef2a35d10f9a35303eca3 +55eea356f4a357f5a35803e1a359e2a3 +5aefa35bf8a35c6b976f6a6f44704e72 +6873a2517402e1a350e7a351eaa35202 +ea8bed8dfa8f05f206f297f399fa9be3 +91e493e59509ef0fefa345f1a346f3a3 +47f9a348faa349e29de332e8a342eda3 +43eea344022a9f4e2e5012616ceda341 +126261f4a104e1a34be5a34ce7a34def +a34ef4a34f6b3c6c3e6d586e03e383eb +85ee87f98910eb6b05ee06ee73f36ff4 +75e16de26fe97103ed79ee7bef7df07f +65276534673a68546a01e765f46701e2 +4df94f05ed06ed59ef5bf15de353e455 +e75702e15fec61ef6361486252636464 +05f006f045f947fa49e13fe541ea4302 +e927eb29f52b04e92ff131f233f435f9 +3702e439e53be83d } } match{ diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index a9e46d969c8..aae15f55c1c 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -35,6 +35,7 @@ likelySubtags:table(nofallback){ ahl{"ahl_Latn_ZZ"} aho{"aho_Ahom_IN"} ajg{"ajg_Latn_ZZ"} + ajt{"ajt_Arab_TN"} ak{"ak_Latn_GH"} akk{"akk_Xsux_IQ"} ala{"ala_Latn_ZZ"} @@ -1115,12 +1116,14 @@ likelySubtags:table(nofallback){ sly{"sly_Latn_ID"} sm{"sm_Latn_WS"} sma{"sma_Latn_SE"} + smd{"smd_Latn_AO"} smj{"smj_Latn_SE"} smn{"smn_Latn_FI"} smp{"smp_Samr_IL"} smq{"smq_Latn_ZZ"} sms{"sms_Latn_FI"} sn{"sn_Latn_ZW"} + snb{"snb_Latn_MY"} snc{"snc_Latn_ZZ"} snk{"snk_Latn_ML"} snp{"snp_Latn_ZZ"} diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 585bfb4642c..009122d1f71 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -5116,6 +5116,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"meter-per-square-second"} } + metric-ton{ + reason{"deprecated"} + replacement{"tonne"} + } milligram-per-deciliter{ reason{"deprecated"} replacement{"milligram-ofglucose-per-deciliter"} @@ -5350,7 +5354,6 @@ metadata:table(nofallback){ "mua_CM", "mus_US", "my_MM", - "shn_MM", "myv_RU", "mzn_IR", "naq_NA", @@ -5416,6 +5419,7 @@ metadata:table(nofallback){ "shi_Latn_MA", "shi_Tfng", "shi_Tfng_MA", + "shn_MM", "si_LK", "sid_ET", "sk_SK", diff --git a/icu4c/source/data/misc/pluralRanges.txt b/icu4c/source/data/misc/pluralRanges.txt index a718cded033..d61226c2449 100644 --- a/icu4c/source/data/misc/pluralRanges.txt +++ b/icu4c/source/data/misc/pluralRanges.txt @@ -13,35 +13,35 @@ pluralRanges:table(nofallback){ be{"set18"} bg{"set04"} bn{"set01"} - bs{"set11"} - ca{"set14"} + bs{"set12"} + ca{"set15"} cs{"set17"} cy{"set20"} da{"set05"} de{"set03"} el{"set03"} en{"set04"} - es{"set14"} + es{"set15"} et{"set04"} eu{"set04"} fa{"set07"} fi{"set04"} fil{"set05"} - fr{"set12"} + fr{"set13"} ga{"set19"} gl{"set03"} gsw{"set03"} gu{"set01"} - he{"set16"} + he{"set10"} hi{"set01"} - hr{"set11"} + hr{"set12"} hu{"set03"} hy{"set01"} ia{"set04"} id{"set00"} io{"set04"} is{"set05"} - it{"set13"} + it{"set14"} ja{"set00"} ka{"set02"} kk{"set03"} @@ -68,17 +68,17 @@ pluralRanges:table(nofallback){ pcm{"set04"} pl{"set17"} ps{"set01"} - pt{"set12"} - ro{"set10"} + pt{"set13"} + ro{"set11"} ru{"set18"} sc{"set03"} scn{"set03"} sd{"set07"} si{"set06"} sk{"set17"} - sl{"set15"} + sl{"set16"} sq{"set03"} - sr{"set11"} + sr{"set12"} sv{"set04"} sw{"set03"} ta{"set03"} @@ -309,8 +309,8 @@ pluralRanges:table(nofallback){ set10{ { "one", - "few", - "few", + "two", + "other", } { "one", @@ -318,24 +318,19 @@ pluralRanges:table(nofallback){ "other", } { - "few", + "two", + "other", + "other", + } + { + "other", "one", - "few", - } - { - "few", - "few", - "few", - } - { - "few", - "other", "other", } { "other", - "few", - "few", + "two", + "other", } { "other", @@ -344,11 +339,6 @@ pluralRanges:table(nofallback){ } } set11{ - { - "one", - "one", - "one", - } { "one", "few", @@ -362,7 +352,7 @@ pluralRanges:table(nofallback){ { "few", "one", - "one", + "few", } { "few", @@ -374,11 +364,6 @@ pluralRanges:table(nofallback){ "other", "other", } - { - "other", - "one", - "one", - } { "other", "few", @@ -396,11 +381,41 @@ pluralRanges:table(nofallback){ "one", "one", } + { + "one", + "few", + "few", + } { "one", "other", "other", } + { + "few", + "one", + "one", + } + { + "few", + "few", + "few", + } + { + "few", + "other", + "other", + } + { + "other", + "one", + "one", + } + { + "other", + "few", + "few", + } { "other", "other", @@ -410,13 +425,13 @@ pluralRanges:table(nofallback){ set13{ { "one", - "other", - "other", + "one", + "one", } { + "one", + "other", "other", - "one", - "one", } { "other", @@ -433,7 +448,7 @@ pluralRanges:table(nofallback){ { "other", "one", - "other", + "one", } { "other", @@ -444,78 +459,13 @@ pluralRanges:table(nofallback){ set15{ { "one", - "one", - "few", - } - { - "one", - "two", - "two", - } - { - "one", - "few", - "few", - } - { - "one", - "other", - "other", - } - { - "two", - "one", - "few", - } - { - "two", - "two", - "two", - } - { - "two", - "few", - "few", - } - { - "two", - "other", - "other", - } - { - "few", - "one", - "few", - } - { - "few", - "two", - "two", - } - { - "few", - "few", - "few", - } - { - "few", "other", "other", } { "other", "one", - "few", - } - { "other", - "two", - "two", - } - { - "other", - "few", - "few", } { "other", @@ -526,13 +476,18 @@ pluralRanges:table(nofallback){ set16{ { "one", - "two", - "other", + "one", + "few", } { "one", - "many", - "many", + "two", + "two", + } + { + "one", + "few", + "few", } { "one", @@ -541,8 +496,18 @@ pluralRanges:table(nofallback){ } { "two", - "many", - "other", + "one", + "few", + } + { + "two", + "two", + "two", + } + { + "two", + "few", + "few", } { "two", @@ -550,29 +515,39 @@ pluralRanges:table(nofallback){ "other", } { - "many", - "many", - "many", + "few", + "one", + "few", } { - "many", + "few", + "two", + "two", + } + { + "few", + "few", + "few", + } + { + "few", + "other", "other", - "many", } { "other", "one", - "other", + "few", } { "other", "two", - "other", + "two", } { "other", - "many", - "many", + "few", + "few", } { "other", diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt index 262479269a3..973bc397efb 100644 --- a/icu4c/source/data/misc/plurals.txt +++ b/icu4c/source/data/misc/plurals.txt @@ -24,8 +24,8 @@ plurals:table(nofallback){ bo{"set0"} br{"set32"} brx{"set7"} - bs{"set18"} - ca{"set21"} + bs{"set19"} + ca{"set22"} ce{"set7"} ceb{"set11"} cgg{"set7"} @@ -36,14 +36,14 @@ plurals:table(nofallback){ da{"set8"} de{"set3"} doi{"set1"} - dsb{"set25"} + dsb{"set26"} dv{"set7"} dz{"set0"} ee{"set7"} el{"set7"} en{"set3"} eo{"set7"} - es{"set22"} + es{"set23"} et{"set3"} eu{"set7"} fa{"set1"} @@ -51,11 +51,11 @@ plurals:table(nofallback){ fi{"set3"} fil{"set11"} fo{"set7"} - fr{"set19"} + fr{"set20"} fur{"set7"} fy{"set3"} ga{"set34"} - gd{"set23"} + gd{"set24"} gl{"set3"} gsw{"set7"} gu{"set1"} @@ -63,11 +63,11 @@ plurals:table(nofallback){ gv{"set35"} ha{"set7"} haw{"set7"} - he{"set26"} + he{"set15"} hi{"set1"} hnj{"set0"} - hr{"set18"} - hsb{"set25"} + hr{"set19"} + hsb{"set26"} hu{"set7"} hy{"set2"} ia{"set3"} @@ -77,9 +77,9 @@ plurals:table(nofallback){ in{"set0"} io{"set3"} is{"set9"} - it{"set21"} - iu{"set15"} - iw{"set26"} + it{"set22"} + iu{"set16"} + iw{"set15"} ja{"set0"} jbo{"set0"} jgo{"set7"} @@ -120,13 +120,13 @@ plurals:table(nofallback){ mk{"set10"} ml{"set7"} mn{"set7"} - mo{"set17"} + mo{"set18"} mr{"set7"} ms{"set0"} mt{"set33"} my{"set0"} nah{"set7"} - naq{"set15"} + naq{"set16"} nb{"set7"} nd{"set7"} ne{"set7"} @@ -149,39 +149,39 @@ plurals:table(nofallback){ pl{"set28"} prg{"set12"} ps{"set7"} - pt{"set20"} - pt_PT{"set21"} + pt{"set21"} + pt_PT{"set22"} rm{"set7"} - ro{"set17"} + ro{"set18"} rof{"set7"} root{"set0"} ru{"set31"} rwk{"set7"} sah{"set0"} saq{"set7"} - sat{"set15"} + sat{"set16"} sc{"set3"} scn{"set3"} sd{"set7"} sdh{"set7"} - se{"set15"} + se{"set16"} seh{"set7"} ses{"set0"} sg{"set0"} - sh{"set18"} - shi{"set16"} + sh{"set19"} + shi{"set17"} si{"set4"} sk{"set27"} - sl{"set24"} - sma{"set15"} - smi{"set15"} - smj{"set15"} - smn{"set15"} - sms{"set15"} + sl{"set25"} + sma{"set16"} + smi{"set16"} + smj{"set16"} + smn{"set16"} + sms{"set16"} sn{"set7"} so{"set7"} sq{"set7"} - sr{"set18"} + sr{"set19"} ss{"set7"} ssy{"set7"} st{"set7"} @@ -208,7 +208,7 @@ plurals:table(nofallback){ ur{"set3"} uz{"set7"} ve{"set7"} - vec{"set21"} + vec{"set22"} vi{"set0"} vo{"set7"} vun{"set7"} @@ -403,6 +403,17 @@ plurals:table(nofallback){ zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"} } set15{ + one{ + "i = 1 and v = 0 or i = 0 and v != 0 @integer 1 @decimal 0.0~0.9, 0.0" + "0~0.05" + } + other{ + " @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 1.0" + "~2.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + } + two{"i = 2 and v = 0 @integer 2"} + } + set16{ one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"} other{ " @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0" @@ -410,7 +421,7 @@ plurals:table(nofallback){ } two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"} } - set16{ + set17{ few{ "n = 2..10 @integer 2~10 @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, " "9.0, 10.0, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00" @@ -421,15 +432,16 @@ plurals:table(nofallback){ ".9, 2.1~2.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" } } - set17{ + set18{ few{ - "v != 0 or n = 0 or n % 100 = 2..19 @integer 0, 2~16, 102, 1002, … @d" - "ecimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + "v != 0 or n = 0 or n != 1 and n % 100 = 1..19 @integer 0, 2~16, 101," + " 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1" + "000000.0, …" } one{"i = 1 and v = 0 @integer 1"} other{" @integer 20~35, 100, 1000, 10000, 100000, 1000000, …"} } - set18{ + set19{ few{ "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 or f % 10 = 2..4 and f" " % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, " @@ -447,19 +459,6 @@ plurals:table(nofallback){ " 1000000.0, …" } } - set19{ - many{ - "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer" - " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c" - "6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …" - } - one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} - other{ - " @integer 2~17, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6" - "c3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000" - "000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …" - } - } set2{ one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} other{ @@ -473,7 +472,7 @@ plurals:table(nofallback){ " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c" "6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …" } - one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"} + one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} other{ " @integer 2~17, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6" "c3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000" @@ -481,6 +480,19 @@ plurals:table(nofallback){ } } set21{ + many{ + "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer" + " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c" + "6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …" + } + one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"} + other{ + " @integer 2~17, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6" + "c3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000" + "000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …" + } + } + set22{ many{ "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer" " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c" @@ -493,7 +505,7 @@ plurals:table(nofallback){ "000000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …" } } - set22{ + set23{ many{ "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer" " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c" @@ -507,7 +519,7 @@ plurals:table(nofallback){ ", …" } } - set23{ + set24{ few{ "n = 3..10,13..19 @integer 3~10, 13~19 @decimal 3.0, 4.0, 5.0, 6.0, 7" ".0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 3.00" @@ -525,7 +537,7 @@ plurals:table(nofallback){ "00, 2.0000" } } - set24{ + set25{ few{ "v = 0 and i % 100 = 3..4 or v != 0 @integer 3, 4, 103, 104, 203, 204" ", 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … @decimal" @@ -541,7 +553,7 @@ plurals:table(nofallback){ " 1002, …" } } - set25{ + set26{ few{ "v = 0 and i % 100 = 3..4 or f % 100 = 3..4 @integer 3, 4, 103, 104, " "203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … " @@ -564,18 +576,6 @@ plurals:table(nofallback){ "7.2, 10.2, 100.2, 1000.2, …" } } - set26{ - many{ - "v = 0 and n != 0..10 and n % 10 = 0 @integer 20, 30, 40, 50, 60, 70," - " 80, 90, 100, 1000, 10000, 100000, 1000000, …" - } - one{"i = 1 and v = 0 @integer 1"} - other{ - " @integer 0, 3~17, 101, 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000." - "0, 10000.0, 100000.0, 1000000.0, …" - } - two{"i = 2 and v = 0 @integer 2"} - } set27{ few{"i = 2..4 and v = 0 @integer 2~4"} many{ @@ -1023,14 +1023,14 @@ plurals:table(nofallback){ } set9{ one{ - "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31," - " 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 100" - "0.1, …" + "t = 0 and i % 10 = 1 and i % 100 != 11 or t % 10 = 1 and t % 100 != " + "11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1" + ", 1.0, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …" } other{ " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0" - ", 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 100.0, 1000.0, 10000.0, 1" - "00000.0, 1000000.0, …" + ", 0.2~0.9, 1.2~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000." + "0, …" } } } diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index c252384da56..c04bb397e4d 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -11632,6 +11632,7 @@ supplementalData:table(nofallback){ "proportion-karat", "torque-pound-foot", "concentr-milligram-per-deciliter", + "mass-metric-ton", } regular{ "acceleration-g-force", @@ -11753,7 +11754,7 @@ supplementalData:table(nofallback){ "mass-grain", "mass-gram", "mass-kilogram", - "mass-metric-ton", + "mass-tonne", "mass-microgram", "mass-milligram", "mass-ounce", @@ -12107,7 +12108,6 @@ supplementalData:table(nofallback){ ann{ primary{ scripts{"Latn"} - territories{"NG"} } } anp{ @@ -12847,6 +12847,8 @@ supplementalData:table(nofallback){ ckb{ primary{ scripts{"Arab"} + } + secondary{ territories{ "IQ", "IR", @@ -13653,6 +13655,8 @@ supplementalData:table(nofallback){ frr{ primary{ scripts{"Latn"} + } + secondary{ territories{"DE"} } } @@ -15974,6 +15978,8 @@ supplementalData:table(nofallback){ pis{ primary{ scripts{"Latn"} + } + secondary{ territories{"SB"} } } @@ -16624,6 +16630,8 @@ supplementalData:table(nofallback){ sms{ primary{ scripts{"Latn"} + } + secondary{ territories{"FI"} } } @@ -17097,7 +17105,7 @@ supplementalData:table(nofallback){ } } tok{ - primary{ + secondary{ scripts{"Latn"} } } @@ -17376,10 +17384,8 @@ supplementalData:table(nofallback){ } secondary{ territories{ - "IT", "BR", - "HR", - "SI", + "IT", "MX", } } @@ -27156,6 +27162,9 @@ supplementalData:table(nofallback){ officialStatus{"de_facto_official"} populationShareF:int{49960000} } + hnj{ + populationShareF:int{45860000} + } it{ populationShareF:int{48190000} } @@ -27554,6 +27563,10 @@ supplementalData:table(nofallback){ 49904000, 58211716, } + vec{ + officialStatus{"official_regional"} + populationShareF:int{47240000} + } xav{ populationShareF:int{45470000} } @@ -28098,6 +28111,9 @@ supplementalData:table(nofallback){ literacyShareF:int{49300000} populationShareF:int{47340000} } + ken{ + populationShareF:int{47250000} + } kkj{ populationShareF:int{47540000} } @@ -28149,6 +28165,9 @@ supplementalData:table(nofallback){ hak{ populationShareF:int{48230000} } + hnj{ + populationShareF:int{45400000} + } hsn{ populationShareF:int{48290000} } @@ -28395,6 +28414,7 @@ supplementalData:table(nofallback){ populationShareF:int{49180000} } frr{ + officialStatus{"official_regional"} populationShareF:int{46120000} } frs{ @@ -28714,7 +28734,8 @@ supplementalData:table(nofallback){ populationShareF:int{48700000} } oc{ - populationShareF:int{46100000} + officialStatus{"official_regional"} + populationShareF:int{45990000} } territoryF:intvector{ 62177800, @@ -28733,6 +28754,9 @@ supplementalData:table(nofallback){ en{ populationShareF:int{49430000} } + gez{ + populationShareF:int{0} + } om{ populationShareF:int{49320000} } @@ -28781,6 +28805,7 @@ supplementalData:table(nofallback){ populationShareF:int{46110000} } sms{ + officialStatus{"official_regional"} populationShareF:int{46110000} } sv{ @@ -28901,6 +28926,9 @@ supplementalData:table(nofallback){ populationShareF:int{47910000} writingShareF:int{48500000} } + hnj{ + populationShareF:int{47190000} + } ia{ populationShareF:int{44200000} } @@ -28958,6 +28986,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{49980000} } + en_Shaw{ + populationShareF:int{0} + } es{ populationShareF:int{48800000} } @@ -29069,6 +29100,9 @@ supplementalData:table(nofallback){ gcr{ populationShareF:int{49260000} } + hnj{ + populationShareF:int{48240000} + } territoryF:intvector{ 59155100, 49830000, @@ -29422,6 +29456,9 @@ supplementalData:table(nofallback){ 49989000, 56422775, } + vec{ + populationShareF:int{47700000} + } } HT{ fr{ @@ -30132,6 +30169,7 @@ supplementalData:table(nofallback){ 57624027, } vec{ + officialStatus{"official_regional"} populationShareF:int{48130000} } } @@ -30416,6 +30454,9 @@ supplementalData:table(nofallback){ } } LA{ + hnj{ + populationShareF:int{48300000} + } kdt{ populationShareF:int{47960000} } @@ -30847,6 +30888,9 @@ supplementalData:table(nofallback){ } } MM{ + hnj{ + populationShareF:int{46220000} + } kac{ populationShareF:int{48170000} } @@ -31089,6 +31133,10 @@ supplementalData:table(nofallback){ 49935000, 58128650, } + vec{ + officialStatus{"official_regional"} + populationShareF:int{45190000} + } yua{ populationShareF:int{47670000} } @@ -31272,7 +31320,7 @@ supplementalData:table(nofallback){ populationShareF:int{45870000} } ann{ - populationShareF:int{45150000} + populationShareF:int{0} } ar{ populationShareF:int{46710000} @@ -31732,14 +31780,14 @@ supplementalData:table(nofallback){ populationShareF:int{48260000} } bft{ - populationShareF:int{47204000} + populationShareF:int{47180000} } bgn{ - populationShareF:int{47505000} + populationShareF:int{47570000} writingShareF:int{48500000} } brh{ - populationShareF:int{48127000} + populationShareF:int{48130000} } btv{ populationShareF:int{46190000} @@ -31752,55 +31800,58 @@ supplementalData:table(nofallback){ populationShareF:int{47660000} } gjk{ - populationShareF:int{46630000} + populationShareF:int{47110000} } gju{ - populationShareF:int{47188000} + populationShareF:int{47200000} } hnd{ - populationShareF:int{47569000} + populationShareF:int{47410000} } hno{ - populationShareF:int{48171700} + populationShareF:int{48170000} } khw{ - populationShareF:int{47169000} + populationShareF:int{47150000} } ks{ - populationShareF:int{47174000} + populationShareF:int{46690000} } kvx{ - populationShareF:int{47172000} + populationShareF:int{47160000} } kxp{ - populationShareF:int{46860000} + populationShareF:int{47110000} } lah{ populationShareF:int{49400000} } mvy{ - populationShareF:int{46960000} + populationShareF:int{47140000} } pa_Arab{ populationShareF:int{49700000} } ps{ - populationShareF:int{49158000} + populationShareF:int{49160000} } sd{ - populationShareF:int{49149000} + populationShareF:int{49150000} } skr{ literacyShareF:int{48100000} - populationShareF:int{49124600} + populationShareF:int{49120000} } territoryF:intvector{ 62106100, 49549000, 58233501, } + tg_Arab{ + populationShareF:int{47330000} + } trw{ - populationShareF:int{46550000} + populationShareF:int{46530000} } ur{ officialStatus{"official"} @@ -31830,6 +31881,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{49960000} } + prg{ + populationShareF:int{44100000} + } ru{ populationShareF:int{49180000} } @@ -32245,7 +32299,7 @@ supplementalData:table(nofallback){ populationShareF:int{50100000} } pis{ - populationShareF:int{49823300} + populationShareF:int{49820000} } rug{ populationShareF:int{48140000} @@ -32412,6 +32466,9 @@ supplementalData:table(nofallback){ 49997000, 56210268, } + vec{ + populationShareF:int{48140000} + } } SJ{ nb{ @@ -32591,6 +32648,9 @@ supplementalData:table(nofallback){ } } SR{ + hnj{ + populationShareF:int{47380000} + } nl{ officialStatus{"official"} populationShareF:int{49900000} @@ -32783,6 +32843,9 @@ supplementalData:table(nofallback){ en{ populationShareF:int{49270000} } + hnj{ + populationShareF:int{46980000} + } kdt{ literacyShareF:int{49500000} populationShareF:int{47480000} @@ -33265,13 +33328,22 @@ supplementalData:table(nofallback){ officialStatus{"official_regional"} populationShareF:int{45890000} } + hnj{ + populationShareF:int{46350000} + } ik{ populationShareF:int{45240000} writingShareF:int{48500000} } + io{ + populationShareF:int{0} + } it{ populationShareF:int{47340000} } + jbo{ + populationShareF:int{0} + } ko{ populationShareF:int{47300000} } @@ -33405,10 +33477,16 @@ supplementalData:table(nofallback){ } } VN{ + blt{ + populationShareF:int{47690000} + } cjm{ literacyShareF:int{49600000} populationShareF:int{46890000} } + hnj{ + populationShareF:int{47170000} + } territoryF:intvector{ 61648700, 49934000, diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt index 236ea6a17c1..8e0addcbaca 100644 --- a/icu4c/source/data/misc/units.txt +++ b/icu4c/source/data/misc/units.txt @@ -25,7 +25,7 @@ units:table(nofallback){ target{"revolution"} } astronomical-unit{ - factor{"149597900000"} + factor{"meters_per_AU"} target{"meter"} } atmosphere{ @@ -243,7 +243,7 @@ units:table(nofallback){ target{"meter-per-second"} } light-year{ - factor{"9460730000000000"} + factor{"speed_of_light_meters_per_second*sec_per_julian_year"} target{"meter"} } liter{ @@ -262,10 +262,6 @@ units:table(nofallback){ factor{"1"} target{"meter"} } - metric-ton{ - factor{"1000"} - target{"kilogram"} - } mile{ factor{"ft_to_m*5280"} target{"meter"} @@ -319,7 +315,7 @@ units:table(nofallback){ target{"kilogram"} } parsec{ - factor{"30856780000000000"} + factor{"meters_per_AU*60*60*180/PI"} target{"meter"} } pascal{ @@ -430,6 +426,10 @@ units:table(nofallback){ factor{"lb_to_kg*2000"} target{"kilogram"} } + tonne{ + factor{"1000"} + target{"kilogram"} + } volt{ factor{"1"} target{"kilogram-square-meter-per-cubic-second-ampere"} @@ -472,6 +472,9 @@ units:table(nofallback){ in3_to_m3{"ft3_to_m3/12*12*12"} item_per_mole{"6.02214076E+23"} lb_to_kg{"0.45359237"} + meters_per_AU{"149597870700"} + sec_per_julian_year{"31557600"} + speed_of_light_meters_per_second{"299792458"} } unitPreferenceData{ "area"{ @@ -1409,7 +1412,7 @@ units:table(nofallback){ "default"{ 001{ { - unit{"metric-ton"} + unit{"tonne"} } { unit{"kilogram"} diff --git a/icu4c/source/data/rbnf/bg.txt b/icu4c/source/data/rbnf/bg.txt index 7a73e62f896..074b06cb00d 100644 --- a/icu4c/source/data/rbnf/bg.txt +++ b/icu4c/source/data/rbnf/bg.txt @@ -3,6 +3,58 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ RBNFRules{ + OrdinalRules{ + "%%digits-ordinal-masculine-larger-suffix:", + "0: \u0442\u0435\u043D;", + "1: >%%digits-ordinal-masculine-suffix>;", + "100: >>;", + "%%digits-ordinal-masculine-suffix:", + "0: \u0438;", + "1: \u0432\u0438;", + "2: \u0440\u0438;", + "3: \u0442\u0438;", + "5: \u0438;", + "20: >>;", + "100: >%%digits-ordinal-masculine-larger-suffix>;", + "1000: >>;", + "%digits-ordinal-masculine:", + "-x: \u2212>>;", + "0: =#,##0=-=%%digits-ordinal-masculine-suffix=;", + "%%digits-ordinal-feminine-larger-suffix:", + "0: \u0442\u043D\u0430;", + "1: >%%digits-ordinal-feminine-suffix>;", + "100: >>;", + "%%digits-ordinal-feminine-suffix:", + "0: \u0430;", + "1: \u0432\u0430;", + "2: \u0440\u0430;", + "3: \u0442\u0430;", + "5: \u0430;", + "20: >>;", + "100: >%%digits-ordinal-feminine-larger-suffix>;", + "1000: >>;", + "%digits-ordinal-feminine:", + "-x: \u2212>>;", + "0: =#,##0=-=%%digits-ordinal-feminine-suffix=;", + "%%digits-ordinal-neuter-larger-suffix:", + "0: \u0442\u043D\u043E;", + "1: >%%digits-ordinal-neuter-suffix>;", + "100: >>;", + "%%digits-ordinal-neuter-suffix:", + "0: o;", + "1: \u0432o;", + "2: \u0440o;", + "3: \u0442o;", + "5: o;", + "20: >>;", + "100: >%%digits-ordinal-neuter-larger-suffix>;", + "1000: >>;", + "%digits-ordinal-neuter:", + "-x: \u2212>>;", + "0: =#,##0=-=%%digits-ordinal-neuter-suffix=;", + "%digits-ordinal:", + "0: =%digits-ordinal-masculine=;", + } SpelloutRules{ "%%lenient-parse:", "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';", @@ -10,10 +62,154 @@ bg{ "x.x: =0.0=;", "0: =%spellout-numbering=;", "%spellout-numbering:", - "0: =%spellout-cardinal-feminine=;", + "0: =%spellout-cardinal-neuter=;", "%spellout-cardinal-masculine:", "-x: \u043C\u0438\u043D\u0443\u0441 >>;", - "x.x: << \u043A\u043E\u043C\u0430 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u0438\u043D;", + "2: \u0434\u0432\u0430;", + "3: \u0442\u0440\u0438;", + "4: \u0447\u0435\u0442\u0438\u0440\u0438;", + "5: \u043F\u0435\u0442;", + "6: \u0448\u0435\u0441\u0442;", + "7: \u0441\u0435\u0434\u0435\u043C;", + "8: \u043E\u0441\u0435\u043C;", + "9: \u0434\u0435\u0432\u0435\u0442;", + "10: \u0434\u0435\u0441\u0435\u0442;", + "11: \u0435\u0434\u0438\u043D\u0430\u0439\u0441\u0435\u0442;", + "12: \u0434\u0432\u0430\u043D\u0430\u0439\u0441\u0435\u0442;", + "13: >>\u043D\u0430\u0439\u0441\u0435\u0442;", + "20: <<\u0439\u0441\u0435\u0442[ \u0438 >>];", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442[ \u0438 >>];", + "50: <<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "60: \u0448\u0435\u0439\u0441\u0435\u0442[ \u0438 >>];", + "70: <<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-masculine-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-masculine-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-masculine-and>];", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-masculine-and>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-and>];", + "1000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-masculine-and>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-and>];", + "1000000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-masculine-and:", + "0: '\u0438 =%spellout-cardinal-masculine=;", + "10: =%spellout-cardinal-masculine=;", + "%spellout-cardinal-feminine:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u043D\u0430;", + "2: \u0434\u0432\u0435;", + "3: =%spellout-cardinal-masculine=;", + "20: <%spellout-cardinal-masculine<\u0439\u0441\u0435\u0442[ \u0438 >>];", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442[ \u0438 >>];", + "50: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "60: \u0448\u0435\u0439\u0441\u0435\u0442[ \u0438 >>];", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-feminine-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-feminine-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-feminine-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-feminine-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-feminine-and>];", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-feminine-and>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-and>];", + "1000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-feminine-and>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-and>];", + "1000000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-feminine-and:", + "0: '\u0438 =%spellout-cardinal-feminine=;", + "10: =%spellout-cardinal-feminine=;", + "%spellout-cardinal-neuter:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u043D\u043E;", + "2: \u0434\u0432\u0435;", + "3: =%spellout-cardinal-masculine=;", + "20: <%spellout-cardinal-masculine<\u0439\u0441\u0435\u0442[ \u0438 >>];", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442[ \u0438 >>];", + "50: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "60: \u0448\u0435\u0439\u0441\u0435\u0442[ \u0438 >>];", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-neuter-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-neuter-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-neuter-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-neuter-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-neuter-and>];", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-neuter-and>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-and>];", + "1000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-neuter-and>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-and>];", + "1000000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-neuter-and:", + "0: '\u0438 =%spellout-cardinal-neuter=;", + "10: =%spellout-cardinal-neuter=;", + "%spellout-cardinal-masculine-personal:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u0438\u043D;", + "2: \u0434\u0432\u0430\u043C\u0430;", + "3: \u0442\u0440\u0438\u043C\u0430;", + "4: \u0447\u0435\u0442\u0438\u0440\u0438\u043C\u0430;", + "5: \u043F\u0435\u0442\u0438\u043C\u0430;", + "6: \u0448\u0435\u0441\u0442\u0438\u043C\u0430;", + "7: =%spellout-cardinal-masculine=;", + "20: <%spellout-cardinal-masculine<\u0439\u0441\u0435\u0442[ \u0438 >>];", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442[ \u0438 >>];", + "50: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "60: \u0448\u0435\u0439\u0441\u0435\u0442[ \u0438 >>];", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-masculine-personal-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-personal-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-personal-and>];", + "400: <%spellout-cardinal-masculine<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-masculine-personal-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-masculine-personal-and>];", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-masculine-personal-and>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-and>];", + "1000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-masculine-personal-and>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-and>];", + "1000000000000000: <%spellout-cardinal-masculine< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-masculine-personal-and:", + "0: '\u0438 =%spellout-cardinal-masculine-personal=;", + "10: =%spellout-cardinal-masculine-personal=;", + "%spellout-cardinal-masculine-personal-financial:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u0438\u043D;", + "2: \u0434\u0432\u0430\u043C\u0430;", + "3: \u0442\u0440\u0438\u043C\u0430;", + "4: \u0447\u0435\u0442\u0438\u0440\u0438\u043C\u0430;", + "5: \u043F\u0435\u0442\u0438\u043C\u0430;", + "6: \u0448\u0435\u0441\u0442\u0438\u043C\u0430;", + "7: =%spellout-cardinal-masculine-financial=;", + "20: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "400: <%spellout-cardinal-masculine-financial<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "2000: <%spellout-cardinal-feminine-financial< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-personal-financial-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-masculine-personal-financial-and:", + "0: '\u0438 =%spellout-cardinal-masculine-personal-financial=;", + "10: =%spellout-cardinal-masculine-personal-financial=;", + "%spellout-cardinal-masculine-financial:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", "0: \u043D\u0443\u043B\u0430;", "1: \u0435\u0434\u0438\u043D;", "2: \u0434\u0432\u0430;", @@ -27,76 +223,237 @@ bg{ "10: \u0434\u0435\u0441\u0435\u0442;", "11: \u0435\u0434\u0438\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", "12: \u0434\u0432\u0430\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "13: \u0442\u0440\u0438\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "14: \u0447\u0435\u0442\u0438\u0440\u0438\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "15: \u043F\u0435\u0442\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "16: \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "17: \u0441\u0435\u0434\u0435\u043C\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "18: \u043E\u0441\u0435\u043C\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", - "19: \u0434\u0435\u0432\u0435\u0442\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", + "13: >>\u043D\u0430\u0434\u0435\u0441\u0435\u0442;", "20: \u0434\u0432\u0430\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "30: \u0442\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "50: \u043F\u0435\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "60: \u0448\u0435\u0441\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "70: \u0441\u0435\u0434\u0435\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "80: \u043E\u0441\u0435\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "90: \u0434\u0435\u0432\u0435\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "100: \u0441\u0442\u043E[ >>];", - "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >>];", - "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >>];", - "400: \u0447\u0435\u0442\u0438\u0440\u0438\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "500: \u043F\u0435\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "600: \u0448\u0435\u0441\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "700: \u0441\u0435\u0434\u0435\u043C\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "800: \u043E\u0441\u0435\u043C\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "900: \u0434\u0435\u0432\u0435\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >>];", - "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >>];", - "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", - "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434[ >>];", - "2000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430[ >>];", - "1000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", - "1000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", + "30: <<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-masculine-financial-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-financial-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-masculine-financial-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-masculine-financial-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-masculine-financial-and>];", + "2000: <%spellout-cardinal-feminine-financial< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-masculine-financial-and>];", + "1000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-financial-and>];", + "1000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-masculine-financial-and>];", + "1000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-financial-and>];", + "1000000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-masculine-financial-and>];", "1000000000000000000: =#,##0=;", - "%spellout-cardinal-feminine:", + "%%spellout-cardinal-masculine-financial-and:", + "0: '\u0438 =%spellout-cardinal-masculine-financial=;", + "10: =%spellout-cardinal-masculine-financial=;", + "%spellout-cardinal-feminine-financial:", "-x: \u043C\u0438\u043D\u0443\u0441 >>;", - "x.x: << \u043A\u043E\u043C\u0430 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u0435\u0434\u043D\u0430;", + "2: \u0434\u0432\u0435;", + "3: =%spellout-cardinal-masculine-financial=;", + "20: \u0434\u0432\u0430\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "30: <<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-feminine-financial-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-feminine-financial-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-feminine-financial-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-feminine-financial-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-feminine-financial-and>];", + "2000: <%spellout-cardinal-feminine-financial< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-feminine-financial-and>];", + "1000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-financial-and>];", + "1000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-feminine-financial-and>];", + "1000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-financial-and>];", + "1000000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-feminine-financial-and>];", + "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-feminine-financial-and:", + "0: '\u0438 =%spellout-cardinal-feminine-financial=;", + "10: =%spellout-cardinal-feminine-financial=;", + "%spellout-cardinal-neuter-financial:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: << \u0446\u044F\u043B\u043E \u0438 >>;", "0: \u043D\u0443\u043B\u0430;", "1: \u0435\u0434\u043D\u043E;", "2: \u0434\u0432\u0435;", - "3: =%spellout-cardinal-masculine=;", + "3: =%spellout-cardinal-masculine-financial=;", "20: \u0434\u0432\u0430\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "30: \u0442\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "50: \u043F\u0435\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "60: \u0448\u0435\u0441\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "70: \u0441\u0435\u0434\u0435\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "80: \u043E\u0441\u0435\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "90: \u0434\u0435\u0432\u0435\u0442\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", - "100: \u0441\u0442\u043E[ >>];", - "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >>];", - "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >>];", - "400: \u0447\u0435\u0442\u0438\u0440\u0438\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "500: \u043F\u0435\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "600: \u0448\u0435\u0441\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "700: \u0441\u0435\u0434\u0435\u043C\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "800: \u043E\u0441\u0435\u043C\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "900: \u0434\u0435\u0432\u0435\u0442\u0441\u0442\u043E\u0442\u0438\u043D[ >>];", - "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >>];", - "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434\u0438[ >>];", - "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", - "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434[ >>];", - "2000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430[ >>];", - "1000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", - "1000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D[ >>];", - "2000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430[ >>];", + "30: <<\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];", + "100: \u0441\u0442\u043E[ >%%spellout-cardinal-neuter-financial-and>];", + "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >%%spellout-cardinal-neuter-financial-and>];", + "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >%%spellout-cardinal-neuter-financial-and>];", + "400: <<\u0441\u0442\u043E\u0442\u0438\u043D[ >%%spellout-cardinal-neuter-financial-and>];", + "1000: \u0445\u0438\u043B\u044F\u0434\u0430[ >%%spellout-cardinal-neuter-financial-and>];", + "2000: <%spellout-cardinal-feminine-financial< \u0445\u0438\u043B\u044F\u0434\u0438[ >%%spellout-cardinal-neuter-financial-and>];", + "1000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u043E\u043D}other{\u043C\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-financial-and>];", + "1000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043C\u0438\u043B\u0438\u0430\u0440\u0434}other{\u043C\u0438\u043B\u0438\u0430\u0440\u0434\u0430})$[ >%%spellout-cardinal-neuter-financial-and>];", + "1000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u0442\u0440\u0438\u043B\u0438\u043E\u043D}other{\u0442\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-financial-and>];", + "1000000000000000: <%spellout-cardinal-masculine-financial< $(cardinal,one{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D}other{\u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D\u0430})$[ >%%spellout-cardinal-neuter-financial-and>];", "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-neuter-financial-and:", + "0: '\u0438 =%spellout-cardinal-neuter-financial=;", + "10: =%spellout-cardinal-neuter-financial=;", + "%spellout-ordinal-masculine:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: =#,##0.#=;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u043F\u044A\u0440\u0432\u0438;", + "2: \u0432\u0442\u043E\u0440\u0438;", + "3: \u0442\u0440\u0435\u0442\u0438;", + "4: \u0447\u0435\u0442\u0432\u044A\u0440\u0442\u0438;", + "5: \u043F\u0435\u0442\u0438;", + "6: \u0448\u0435\u0441\u0442\u0438;", + "7: \u0441\u0435\u0434\u043C\u0438;", + "8: \u043E\u0441\u043C\u0438;", + "9: \u0434\u0435\u0432\u0435\u0442\u0438;", + "10: \u0434\u0435\u0441\u0435\u0442\u0438;", + "11: \u0435\u0434\u0438\u043D\u0430\u0439\u0441\u0435\u0442\u0438;", + "12: >%spellout-cardinal-masculine>\u043D\u0430\u0439\u0441\u0435\u0442\u0438;", + "20: \u0434\u0432\u0430\u0439\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "30: \u0442\u0440\u0438\u0439\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "50: \u043F\u0435\u0442\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "60: \u0448\u0435\u0439\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-masculine-and-suffix>;", + "100: \u0441\u0442\u043E>%%spellout-ordinal-masculine-hundreds-and-suffix>;", + "200: \u0434\u0432\u0435\u0441\u0442\u0430>%%spellout-ordinal-masculine-hundreds-and-suffix>;", + "300: \u0442\u0440\u0438\u0441\u0442\u0430>%%spellout-ordinal-masculine-hundreds-and-suffix>;", + "400: <%spellout-cardinal-masculine<\u0441\u0442\u043E\u0442\u0438\u043D>%%spellout-ordinal-masculine-hundreds-and-suffix>;", + "1000: \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-masculine-thousand-and-suffix>;", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-masculine-thousands-and-suffix>;", + "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-million-and-suffix>;", + "2000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-thousand-and-suffix>;", + "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-masculine-million-and-suffix>;", + "2000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-masculine-thousand-and-suffix>;", + "1000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-million-and-suffix>;", + "2000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-thousand-and-suffix>;", + "1000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-million-and-suffix>;", + "2000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-masculine-thousand-and-suffix>;", + "1000000000000000000: =#,##0=-\u0438;", + "%%spellout-ordinal-masculine-and-suffix:", + "0: \u0438;", + "1: ' \u0438 =%spellout-ordinal-masculine=;", + "%%spellout-ordinal-masculine-hundreds-and-suffix:", + "0: \u0442\u0435\u043D;", + "1: ' \u0438 =%spellout-ordinal-masculine=;", + "10: ' =%spellout-ordinal-masculine=;", + "%%spellout-ordinal-masculine-thousand-and-suffix:", + "0: \u0435\u043D;", + "1: '\u0430 \u0438 =%spellout-ordinal-masculine=;", + "10: '\u0430 =%spellout-ordinal-masculine=;", + "%%spellout-ordinal-masculine-thousands-and-suffix:", + "0: \u0435\u043D;", + "1: '\u0438 \u0438 =%spellout-ordinal-masculine=;", + "10: '\u0438 =%spellout-ordinal-masculine=;", + "%%spellout-ordinal-masculine-million-and-suffix:", + "0: \u0435\u043D;", + "1: ' \u0438 =%spellout-ordinal-masculine=;", + "10: ' =%spellout-ordinal-masculine=;", + "%spellout-ordinal-feminine:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: =#,##0.#=;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u043F\u044A\u0440\u0432\u0430;", + "2: \u0432\u0442\u043E\u0440\u0430;", + "3: \u0442\u0440\u0435\u0442\u0430;", + "4: \u0447\u0435\u0442\u0432\u044A\u0440\u0442\u0430;", + "5: \u043F\u0435\u0442\u0430;", + "6: \u0448\u0435\u0441\u0442\u0430;", + "7: \u0441\u0435\u0434\u043C\u0430;", + "8: \u043E\u0441\u043C\u0430;", + "9: \u0434\u0435\u0432\u0435\u0442\u0430;", + "10: \u0434\u0435\u0441\u0435\u0442\u0430;", + "11: \u0435\u0434\u0438\u043D\u0430\u0439\u0441\u0435\u0442\u0430;", + "12: >%spellout-cardinal-masculine>\u043D\u0430\u0439\u0441\u0435\u0442\u0430;", + "20: \u0434\u0432\u0430\u0439\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "30: \u0442\u0440\u0438\u0439\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "50: \u043F\u0435\u0442\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "60: \u0448\u0435\u0439\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-feminine-and-suffix>;", + "100: \u0441\u0442\u043E>%%spellout-ordinal-feminine-hundreds-and-suffix>;", + "200: \u0434\u0432\u0435\u0441\u0442\u0430>%%spellout-ordinal-feminine-hundreds-and-suffix>;", + "300: \u0442\u0440\u0438\u0441\u0442\u0430>%%spellout-ordinal-feminine-hundreds-and-suffix>;", + "400: <%spellout-cardinal-masculine<\u0441\u0442\u043E\u0442\u0438\u043D>%%spellout-ordinal-feminine-hundreds-and-suffix>;", + "1000: \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-feminine-thousand-and-suffix>;", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-feminine-thousands-and-suffix>;", + "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-million-and-suffix>;", + "2000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-thousand-and-suffix>;", + "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-feminine-million-and-suffix>;", + "2000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-feminine-thousand-and-suffix>;", + "1000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-million-and-suffix>;", + "2000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-thousand-and-suffix>;", + "1000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-million-and-suffix>;", + "2000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-feminine-thousand-and-suffix>;", + "1000000000000000000: =#,##0=-\u0430;", + "%%spellout-ordinal-feminine-and-suffix:", + "0: \u0430;", + "1: ' \u0438 =%spellout-ordinal-feminine=;", + "%%spellout-ordinal-feminine-hundreds-and-suffix:", + "0: \u0442\u043D\u0430;", + "1: ' \u0438 =%spellout-ordinal-feminine=;", + "10: ' =%spellout-ordinal-feminine=;", + "%%spellout-ordinal-feminine-thousand-and-suffix:", + "0: \u043D\u0430;", + "1: '\u0430 \u0438 =%spellout-ordinal-feminine=;", + "10: '\u0430 =%spellout-ordinal-feminine=;", + "%%spellout-ordinal-feminine-thousands-and-suffix:", + "0: \u043D\u0430;", + "1: '\u0438 \u0438 =%spellout-ordinal-feminine=;", + "10: '\u0438 =%spellout-ordinal-feminine=;", + "%%spellout-ordinal-feminine-million-and-suffix:", + "0: \u043D\u0430;", + "1: ' \u0438 =%spellout-ordinal-feminine=;", + "10: ' =%spellout-ordinal-feminine=;", + "%spellout-ordinal-neuter:", + "-x: \u043C\u0438\u043D\u0443\u0441 >>;", + "x.x: =#,##0.#=;", + "0: \u043D\u0443\u043B\u0430;", + "1: \u043F\u044A\u0440\u0432\u043E;", + "2: \u0432\u0442\u043E\u0440\u043E;", + "3: \u0442\u0440\u0435\u0442\u043E;", + "4: \u0447\u0435\u0442\u0432\u044A\u0440\u0442\u043E;", + "5: \u043F\u0435\u0442\u043E;", + "6: \u0448\u0435\u0441\u0442\u043E;", + "7: \u0441\u0435\u0434\u043C\u043E;", + "8: \u043E\u0441\u043C\u043E;", + "9: \u0434\u0435\u0432\u0435\u0442\u043E;", + "10: \u0434\u0435\u0441\u0435\u0442\u043E;", + "11: \u0435\u0434\u0438\u043D\u0430\u0439\u0441\u0435\u0442\u043E;", + "12: >%spellout-cardinal-masculine>\u043D\u0430\u0439\u0441\u0435\u0442\u043E;", + "20: \u0434\u0432\u0430\u0439\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "30: \u0442\u0440\u0438\u0439\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "40: \u0447\u0435\u0442\u0438\u0440\u0435\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "50: \u043F\u0435\u0442\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "60: \u0448\u0435\u0439\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "70: <%spellout-cardinal-masculine<\u0434\u0435\u0441\u0435\u0442>%%spellout-ordinal-neuter-and-suffix>;", + "100: \u0441\u0442\u043E>%%spellout-ordinal-neuter-hundreds-and-suffix>;", + "200: \u0434\u0432\u0435\u0441\u0442\u0430>%%spellout-ordinal-neuter-hundreds-and-suffix>;", + "300: \u0442\u0440\u0438\u0441\u0442\u0430>%%spellout-ordinal-neuter-hundreds-and-suffix>;", + "400: <%spellout-cardinal-masculine<\u0441\u0442\u043E\u0442\u0438\u043D>%%spellout-ordinal-neuter-hundreds-and-suffix>;", + "1000: \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-neuter-thousand-and-suffix>;", + "2000: <%spellout-cardinal-feminine< \u0445\u0438\u043B\u044F\u0434>%%spellout-ordinal-neuter-thousands-and-suffix>;", + "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-million-and-suffix>;", + "2000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-thousand-and-suffix>;", + "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-neuter-million-and-suffix>;", + "2000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0430\u0440\u0434>%%spellout-ordinal-neuter-thousand-and-suffix>;", + "1000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-million-and-suffix>;", + "2000000000000: <%spellout-cardinal-masculine< \u0442\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-thousand-and-suffix>;", + "1000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-million-and-suffix>;", + "2000000000000000: <%spellout-cardinal-masculine< \u043A\u0432\u0430\u0434\u0440\u0438\u043B\u0438\u043E\u043D>%%spellout-ordinal-neuter-thousand-and-suffix>;", + "1000000000000000000: =#,##0=-\u043E;", + "%%spellout-ordinal-neuter-and-suffix:", + "0: \u043E;", + "1: ' \u0438 =%spellout-ordinal-neuter=;", + "%%spellout-ordinal-neuter-hundreds-and-suffix:", + "0: \u0442\u043D\u043E;", + "1: ' \u0438 =%spellout-ordinal-neuter=;", + "10: ' =%spellout-ordinal-neuter=;", + "%%spellout-ordinal-neuter-thousand-and-suffix:", + "0: \u043D\u043E;", + "1: '\u0430 \u0438 =%spellout-ordinal-neuter=;", + "10: '\u0430 =%spellout-ordinal-neuter=;", + "%%spellout-ordinal-neuter-thousands-and-suffix:", + "0: \u043D\u043E;", + "1: '\u0438 \u0438 =%spellout-ordinal-neuter=;", + "10: '\u0438 =%spellout-ordinal-neuter=;", + "%%spellout-ordinal-neuter-million-and-suffix:", + "0: \u043D\u043E;", + "1: ' \u0438 =%spellout-ordinal-neuter=;", + "10: ' =%spellout-ordinal-neuter=;", } } } diff --git a/icu4c/source/data/region/bgc.txt b/icu4c/source/data/region/bgc.txt index 2a60f082341..cf82654b76a 100644 --- a/icu4c/source/data/region/bgc.txt +++ b/icu4c/source/data/region/bgc.txt @@ -3,6 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bgc{ Countries{ + IN{"भारत"} ZZ{"अणजाण जगह"} } } diff --git a/icu4c/source/data/region/bho.txt b/icu4c/source/data/region/bho.txt index d47096441c2..ed196829a73 100644 --- a/icu4c/source/data/region/bho.txt +++ b/icu4c/source/data/region/bho.txt @@ -3,6 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bho{ Countries{ + IN{"भारत"} ZZ{"अनजान इलाका"} } } diff --git a/icu4c/source/data/region/bn.txt b/icu4c/source/data/region/bn.txt index 48067a4ff1c..8c0a72cf3db 100644 --- a/icu4c/source/data/region/bn.txt +++ b/icu4c/source/data/region/bn.txt @@ -188,10 +188,7 @@ bn{ ML{"মালি"} MM{"মায়ানমার (বার্মা)"} MN{"মঙ্গোলিয়া"} - MO{ - "ম্যাকাও এসএআর চীনা চীনা (ম্যাকাও এসএআর চীনা) চীনা (ঐতিহ্যবাহী, ম্যাকাও এ" - "সএআর চীনা) অঞ্চল: ম্যাকাও এসএআর চীন" - } + MO{"ম্যাকাও এসএআর চীন"} MP{"উত্তরাঞ্চলীয় মারিয়ানা দ্বীপপুঞ্জ"} MQ{"মার্টিনিক"} MR{"মরিতানিয়া"} diff --git a/icu4c/source/data/region/en_001.txt b/icu4c/source/data/region/en_001.txt index d3b9559aa46..ebb7dabbe48 100644 --- a/icu4c/source/data/region/en_001.txt +++ b/icu4c/source/data/region/en_001.txt @@ -3,7 +3,14 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ Countries{ + BL{"St Barthélemy"} + KN{"St Kitts & Nevis"} + LC{"St Lucia"} + MF{"St Martin"} + PM{"St Pierre & Miquelon"} + SH{"St Helena"} UM{"US Outlying Islands"} + VC{"St Vincent & the Grenadines"} VI{"US Virgin Islands"} } } diff --git a/icu4c/source/data/region/en_AU.txt b/icu4c/source/data/region/en_AU.txt index a1a7e2f9ba4..1834c40835a 100644 --- a/icu4c/source/data/region/en_AU.txt +++ b/icu4c/source/data/region/en_AU.txt @@ -5,5 +5,10 @@ en_AU{ %%Parent{"en_001"} Countries{ 001{"World"} + BL{"St. Barthélemy"} + KN{"St. Kitts & Nevis"} + LC{"St. Lucia"} + MF{"St. Martin"} + VC{"St. Vincent & Grenadines"} } } diff --git a/icu4c/source/data/region/en_GB.txt b/icu4c/source/data/region/en_GB.txt index 2450432fd07..2691dc3e28f 100644 --- a/icu4c/source/data/region/en_GB.txt +++ b/icu4c/source/data/region/en_GB.txt @@ -3,13 +3,4 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} - Countries{ - BL{"St Barthélemy"} - KN{"St Kitts & Nevis"} - LC{"St Lucia"} - MF{"St Martin"} - PM{"St Pierre & Miquelon"} - SH{"St Helena"} - VC{"St Vincent & the Grenadines"} - } } diff --git a/icu4c/source/data/region/hi_Latn.txt b/icu4c/source/data/region/hi_Latn.txt index f282117e6e3..2f4d2c2c90e 100644 --- a/icu4c/source/data/region/hi_Latn.txt +++ b/icu4c/source/data/region/hi_Latn.txt @@ -8,9 +8,15 @@ hi_Latn{ BL{"St. Barthelemy"} CI{"Cote d’Ivoire"} CW{"Curacao"} + KN{"St. Kitts & Nevis"} + LC{"St. Lucia"} + MF{"St. Martin"} + PM{"St. Pierre & Miquelon"} RE{"Reunion"} + SH{"St. Helena"} ST{"Sao Tome & Principe"} UM{"U.S. Outlying Islands"} + VC{"St. Vincent & Grenadines"} VI{"U.S. Virgin Islands"} XB{"Pseudo-Bidirectional"} } diff --git a/icu4c/source/data/region/raj.txt b/icu4c/source/data/region/raj.txt index 2bedf88c715..9e8b43eb889 100644 --- a/icu4c/source/data/region/raj.txt +++ b/icu4c/source/data/region/raj.txt @@ -3,6 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml raj{ Countries{ + IN{"भारत"} ZZ{"अज्ञात"} } } diff --git a/icu4c/source/data/region/sw_KE.txt b/icu4c/source/data/region/sw_KE.txt index 20d1be17ef3..9cfd64b97b6 100644 --- a/icu4c/source/data/region/sw_KE.txt +++ b/icu4c/source/data/region/sw_KE.txt @@ -7,7 +7,6 @@ sw_KE{ 011{"Afrika Magharibi"} 014{"Afrika Mashariki"} 015{"Afrika Kaskazini"} - 018{"Afrika Kusini"} 030{"Asia Mashariki"} 034{"Asia Kusini"} 035{"Kusini Mashariki mwa Asia"} @@ -19,7 +18,6 @@ sw_KE{ 154{"Ulaya Kaskazini"} 155{"Ulaya Magharibi"} 202{"Kusini mwa Jangwa la Sahara"} - 419{"Amerika Kusini"} AF{"Afghanistani"} AG{"Antigua na Babuda"} AI{"Anguila"} diff --git a/icu4c/source/data/translit/Hans_Hant.txt b/icu4c/source/data/translit/Hans_Hant.txt index 30c62f8a90a..c23db4b8f7e 100644 --- a/icu4c/source/data/translit/Hans_Hant.txt +++ b/icu4c/source/data/translit/Hans_Hant.txt @@ -894,8 +894,28 @@ $SCDigit { 出 } 戏 → 齣; # 骂↔罵; 骂←駡; -脏↔臟; -脏←髒; +# exceptions to converting 脏→髒 +五脏→五臟; +六脏→六臟; +内脏→內臟; +心脏→心臟; +牝脏→牝臟; +肝脏→肝臟; +肺脏→肺臟; +肾脏→腎臟; +胃脏→胃臟; +胰脏→胰臟; +脏器→臟器; +脏毒→臟毒; +脏气→臟氣; +脏症→臟症; +脏腑→臟腑; +脏象→臟象; +脏躁→臟躁; +脾脏→脾臟; +# standard conversions for 脏 +脏↔髒; +脏←臟; 鳄↔鰐; 鳄←鱷; 凫↔鳧; diff --git a/icu4c/source/data/unit/af.txt b/icu4c/source/data/unit/af.txt index 0ead023908b..f3f364dd964 100644 --- a/icu4c/source/data/unit/af.txt +++ b/icu4c/source/data/unit/af.txt @@ -669,11 +669,6 @@ af{ other{"{0} kilogram"} per{"{0} per kilogram"} } - metric-ton{ - dnam{"metrieke ton"} - one{"{0} metrieke ton"} - other{"{0} metrieke ton"} - } microgram{ dnam{"mikrogram"} one{"{0} mikrogram"} @@ -716,6 +711,11 @@ af{ one{"{0} VSA-ton"} other{"{0} VSA-ton"} } + tonne{ + dnam{"metrieke ton"} + one{"{0} metrieke ton"} + other{"{0} metrieke ton"} + } } power{ gigawatt{ @@ -1562,10 +1562,6 @@ af{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - one{"{0}t"} - other{"{0}t"} - } microgram{ one{"{0}μg"} other{"{0}μg"} @@ -1603,6 +1599,10 @@ af{ one{"{0}VSA-t."} other{"{0}VSA-t."} } + tonne{ + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2476,11 +2476,6 @@ af{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2523,6 +2518,11 @@ af{ one{"{0} VSA-t."} other{"{0} VSA-t."} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/am.txt b/icu4c/source/data/unit/am.txt index 96e538b8ad4..399a34b8871 100644 --- a/icu4c/source/data/unit/am.txt +++ b/icu4c/source/data/unit/am.txt @@ -1113,17 +1113,6 @@ am{ other{"{0} ኪሎግራም"} per{"{0}/ኪሎግራም"} } - metric-ton{ - case{ - accusative{ - one{"{0} ሜትሪክ ቶን"} - other{"{0} ሜትሪክ ቶኖች"} - } - } - dnam{"t"} - one{"{0} ሜትሪክ ቶን"} - other{"{0} ሜትሪክ ቶኖች"} - } microgram{ case{ accusative{ @@ -1178,6 +1167,17 @@ am{ one{"{0} ቶን"} other{"{0} ቶን"} } + tonne{ + case{ + accusative{ + one{"{0} ሜትሪክ ቶን"} + other{"{0} ሜትሪክ ቶኖች"} + } + } + dnam{"t"} + one{"{0} ሜትሪክ ቶን"} + other{"{0} ሜትሪክ ቶኖች"} + } } power{ gigawatt{ @@ -1919,11 +1919,6 @@ am{ one{"{0} ኪግ"} other{"{0} ኪግ"} } - metric-ton{ - dnam{"ቶ"} - one{"{0} ቶ"} - other{"{0} ቶ"} - } milligram{ dnam{"ሚሊግራም"} one{"{0} ሚሊግራም"} @@ -1937,6 +1932,11 @@ am{ one{"{0} ፓውንድ"} other{"{0} ፓውንድ"} } + tonne{ + dnam{"ቶ"} + one{"{0} ቶ"} + other{"{0} ቶ"} + } } power{ horsepower{ @@ -2655,11 +2655,6 @@ am{ other{"{0} ኪግ"} per{"{0}/ኪሎግራም"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2700,6 +2695,11 @@ am{ one{"{0} ቶን"} other{"{0} ቶን"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ar.txt b/icu4c/source/data/unit/ar.txt index d3c144b25e0..559341b64cc 100644 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.txt @@ -1295,16 +1295,6 @@ ar{ two{"{0} كيلوغرام"} zero{"{0} كيلوغرام"} } - metric-ton{ - dnam{"طن متري"} - few{"{0} طن متري"} - gender{"masculine"} - many{"{0} طن متري"} - one{"{0} طن متري"} - other{"{0} طن متري"} - two{"{0} طن متري"} - zero{"{0} طن متري"} - } microgram{ dnam{"ميكروغرام"} few{"{0} ميكروغرام"} @@ -1381,6 +1371,16 @@ ar{ two{"طنان"} zero{"{0} طن"} } + tonne{ + dnam{"طن متري"} + few{"{0} طن متري"} + gender{"masculine"} + many{"{0} طن متري"} + one{"{0} طن متري"} + other{"{0} طن متري"} + two{"{0} طن متري"} + zero{"{0} طن متري"} + } } power{ gigawatt{ @@ -3732,15 +3732,6 @@ ar{ two{"{0} كغم"} zero{"{0} كغم"} } - metric-ton{ - dnam{"ط.م"} - few{"{0} ط.م"} - many{"{0} ط.م"} - one{"{0} ط.م"} - other{"{0} ط.م"} - two{"{0} ط.م"} - zero{"{0} ط.م"} - } microgram{ dnam{"مكغم"} few{"{0} مكغم"} @@ -3815,6 +3806,15 @@ ar{ two{"{0} طن"} zero{"{0} طن"} } + tonne{ + dnam{"ط.م"} + few{"{0} ط.م"} + many{"{0} ط.م"} + one{"{0} ط.م"} + other{"{0} ط.م"} + two{"{0} ط.م"} + zero{"{0} ط.م"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ar_SA.txt b/icu4c/source/data/unit/ar_SA.txt index 8c7235451cf..2212f638081 100644 --- a/icu4c/source/data/unit/ar_SA.txt +++ b/icu4c/source/data/unit/ar_SA.txt @@ -236,14 +236,6 @@ ar_SA{ two{"كيلوغرامان"} zero{"{0} كيلوغرام"} } - metric-ton{ - few{"{0} أطنان مترية"} - many{"{0} طنًا متريًا"} - one{"{0} طن متري"} - other{"{0} طن متري"} - two{"طنان متريان"} - zero{"{0} طن متري"} - } microgram{ few{"{0} ميكروغرامات"} many{"{0} ميكروغرامًا"} @@ -276,6 +268,14 @@ ar_SA{ two{"كتلتان شمسيتان"} zero{"{0} كتلة شمسية"} } + tonne{ + few{"{0} أطنان مترية"} + many{"{0} طنًا متريًا"} + one{"{0} طن متري"} + other{"{0} طن متري"} + two{"طنان متريان"} + zero{"{0} طن متري"} + } } pressure{ pound-force-per-square-inch{ diff --git a/icu4c/source/data/unit/as.txt b/icu4c/source/data/unit/as.txt index 6586ccafa8c..cd30c562591 100644 --- a/icu4c/source/data/unit/as.txt +++ b/icu4c/source/data/unit/as.txt @@ -646,11 +646,6 @@ as{ other{"{0} কিলোগ্ৰাম"} per{"{0} প্ৰতি কিলোগ্ৰাম"} } - metric-ton{ - dnam{"মেট্রিক টন"} - one{"{0} মেট্রিক টন"} - other{"{0} মেট্ৰিক টন"} - } microgram{ dnam{"মাইক্ৰোগ্ৰাম"} one{"{0} মাইক্ৰোগ্ৰাম"} @@ -693,6 +688,11 @@ as{ one{"{0} টন"} other{"{0} টন"} } + tonne{ + dnam{"মেট্রিক টন"} + one{"{0} মেট্রিক টন"} + other{"{0} মেট্ৰিক টন"} + } } power{ gigawatt{ @@ -1767,11 +1767,6 @@ as{ other{"{0} কিঃ গ্ৰাঃ"} per{"{0}/কিঃ গ্ৰাঃ"} } - metric-ton{ - dnam{"ট"} - one{"{0} ট"} - other{"{0} ট"} - } microgram{ dnam{"মাঃ গ্ৰাঃ"} one{"{0} মাঃ গ্ৰাঃ"} @@ -1814,6 +1809,11 @@ as{ one{"{0} টন"} other{"{0} টন"} } + tonne{ + dnam{"ট"} + one{"{0} ট"} + other{"{0} ট"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ast.txt b/icu4c/source/data/unit/ast.txt index a4dd5af63df..94a87625c4b 100644 --- a/icu4c/source/data/unit/ast.txt +++ b/icu4c/source/data/unit/ast.txt @@ -476,11 +476,6 @@ ast{ other{"{0} quilogramos"} per{"{0} per quilogramu"} } - metric-ton{ - dnam{"tonelaes métriques"} - one{"{0} tonelada métrica"} - other{"{0} tonelaes métriques"} - } microgram{ dnam{"microgramos"} one{"{0} microgramu"} @@ -518,6 +513,11 @@ ast{ one{"{0} tonelada"} other{"{0} tonelaes"} } + tonne{ + dnam{"tonelaes métriques"} + one{"{0} tonelada métrica"} + other{"{0} tonelaes métriques"} + } } power{ gigawatt{ @@ -1219,11 +1219,6 @@ ast{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -1261,6 +1256,11 @@ ast{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -1967,11 +1967,6 @@ ast{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2009,6 +2004,11 @@ ast{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/az.txt b/icu4c/source/data/unit/az.txt index 01af54bf980..e251553bf05 100644 --- a/icu4c/source/data/unit/az.txt +++ b/icu4c/source/data/unit/az.txt @@ -670,11 +670,6 @@ az{ other{"{0} kiloqram"} per{"{0}/kq"} } - metric-ton{ - dnam{"metrik ton"} - one{"{0} metrik ton"} - other{"{0} metrik ton"} - } microgram{ dnam{"mikroqram"} one{"{0} mikroqram"} @@ -717,6 +712,11 @@ az{ one{"{0} ton"} other{"{0} ton"} } + tonne{ + dnam{"metrik ton"} + one{"{0} metrik ton"} + other{"{0} metrik ton"} + } } power{ gigawatt{ @@ -2061,11 +2061,6 @@ az{ other{"{0} kq"} per{"{0}/kq"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μq"} one{"{0} μq"} @@ -2106,6 +2101,11 @@ az{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/be.txt b/icu4c/source/data/unit/be.txt index 1a67867bed0..4345e916b34 100644 --- a/icu4c/source/data/unit/be.txt +++ b/icu4c/source/data/unit/be.txt @@ -937,13 +937,6 @@ be{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"тоны"} - few{"{0} тоны"} - many{"{0} тон"} - one{"{0} тона"} - other{"{0} тоны"} - } microgram{ dnam{"мікраграмы"} few{"{0} мкг"} @@ -1002,6 +995,13 @@ be{ one{"{0} амерыканская тона"} other{"{0} амерыканскай тоны"} } + tonne{ + dnam{"тоны"} + few{"{0} тоны"} + many{"{0} тон"} + one{"{0} тона"} + other{"{0} тоны"} + } } power{ gigawatt{ @@ -2624,13 +2624,6 @@ be{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - few{"{0} т"} - many{"{0} т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"мкг"} few{"{0} мкг"} @@ -2689,6 +2682,13 @@ be{ one{"{0} амер. т"} other{"{0} амер. т"} } + tonne{ + dnam{"т"} + few{"{0} т"} + many{"{0} т"} + one{"{0} т"} + other{"{0} т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/bg.txt b/icu4c/source/data/unit/bg.txt index f8b18251370..a0a74f0b0b2 100644 --- a/icu4c/source/data/unit/bg.txt +++ b/icu4c/source/data/unit/bg.txt @@ -687,11 +687,6 @@ bg{ other{"{0} килограма"} per{"{0} на килограм"} } - metric-ton{ - dnam{"метрични тонове"} - one{"{0} метричен тон"} - other{"{0} метрични тона"} - } microgram{ dnam{"микрограмове"} one{"{0} микрограм"} @@ -734,6 +729,11 @@ bg{ one{"{0} къс тон"} other{"{0} къси тона"} } + tonne{ + dnam{"метрични тонове"} + one{"{0} метричен тон"} + other{"{0} метрични тона"} + } } power{ gigawatt{ @@ -1974,10 +1974,6 @@ bg{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2016,6 +2012,10 @@ bg{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/bn.txt b/icu4c/source/data/unit/bn.txt index 83cd7009bb2..e993c670ddf 100644 --- a/icu4c/source/data/unit/bn.txt +++ b/icu4c/source/data/unit/bn.txt @@ -675,11 +675,6 @@ bn{ other{"{0} কিলোগ্রাম"} per{"{0} প্রতি কিলোগ্রাম"} } - metric-ton{ - dnam{"মেট্রিক টন"} - one{"{0} মেট্রিক টন"} - other{"{0} মেট্রিক টন"} - } microgram{ dnam{"মাইক্রোগ্রাম"} one{"{0} মাইক্রোগ্রাম"} @@ -722,6 +717,11 @@ bn{ one{"{0} টন"} other{"{0} টন"} } + tonne{ + dnam{"মেট্রিক টন"} + one{"{0} মেট্রিক টন"} + other{"{0} মেট্রিক টন"} + } } power{ gigawatt{ @@ -1411,11 +1411,6 @@ bn{ other{"{0} কেজি"} per{"{0}/কেজি"} } - metric-ton{ - dnam{"টন"} - one{"{0} টন"} - other{"{0} টন"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1453,6 +1448,11 @@ bn{ one{"{0} টন"} other{"{0} টন"} } + tonne{ + dnam{"টন"} + one{"{0} টন"} + other{"{0} টন"} + } } power{ horsepower{ @@ -2206,11 +2206,6 @@ bn{ other{"{0} কেজি"} per{"{0} প্রতি কেজি"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2251,6 +2246,11 @@ bn{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/br.txt b/icu4c/source/data/unit/br.txt index 26b0fa78345..f43fad6fd99 100644 --- a/icu4c/source/data/unit/br.txt +++ b/icu4c/source/data/unit/br.txt @@ -1005,14 +1005,6 @@ br{ per{"{0} dre gilogramm"} two{"{0} gilogramm"} } - metric-ton{ - dnam{"tonennoù metrek"} - few{"{0} zonenn metrek"} - many{"{0} a donennoù metrek"} - one{"{0} donenn vetrek"} - other{"{0} tonenn vetrek"} - two{"{0} donenn vetrek"} - } microgram{ dnam{"mikrogrammoù"} few{"{0} mikrogramm"} @@ -1079,6 +1071,14 @@ br{ other{"{0} tonenn"} two{"{0} donenn"} } + tonne{ + dnam{"tonennoù metrek"} + few{"{0} zonenn metrek"} + many{"{0} a donennoù metrek"} + one{"{0} donenn vetrek"} + other{"{0} tonenn vetrek"} + two{"{0} donenn vetrek"} + } } power{ gigawatt{ @@ -2485,14 +2485,6 @@ br{ per{"{0}/kg"} two{"{0}kg"} } - metric-ton{ - dnam{"t"} - few{"{0}t"} - many{"{0}t"} - one{"{0}t"} - other{"{0}t"} - two{"{0}t"} - } microgram{ dnam{"μg"} few{"{0}μg"} @@ -2556,6 +2548,14 @@ br{ other{"{0}tn"} two{"{0}tn"} } + tonne{ + dnam{"t"} + few{"{0}t"} + many{"{0}t"} + one{"{0}t"} + other{"{0}t"} + two{"{0}t"} + } } power{ gigawatt{ @@ -3843,14 +3843,6 @@ br{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -3901,6 +3893,14 @@ br{ other{"{0} tn"} two{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/bs.txt b/icu4c/source/data/unit/bs.txt index c28153ff21e..5d7f374753c 100644 --- a/icu4c/source/data/unit/bs.txt +++ b/icu4c/source/data/unit/bs.txt @@ -745,12 +745,6 @@ bs{ other{"{0} kilograma"} per{"{0} po kilogramu"} } - metric-ton{ - dnam{"metričke tone"} - few{"{0} metričke tone"} - one{"{0} metrička tona"} - other{"{0} metričkih tona"} - } microgram{ dnam{"mikrogrami"} few{"{0} mikrograma"} @@ -801,6 +795,12 @@ bs{ one{"{0} tona"} other{"{0} tona"} } + tonne{ + dnam{"metričke tone"} + few{"{0} metričke tone"} + one{"{0} metrička tona"} + other{"{0} metričkih tona"} + } } power{ gigawatt{ @@ -2197,12 +2197,6 @@ bs{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -2247,6 +2241,12 @@ bs{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ca.txt b/icu4c/source/data/unit/ca.txt index 6332ab0ae5c..a57843b97ba 100644 --- a/icu4c/source/data/unit/ca.txt +++ b/icu4c/source/data/unit/ca.txt @@ -778,12 +778,6 @@ ca{ other{"{0} quilograms"} per{"{0} per quilogram"} } - metric-ton{ - dnam{"tones mètriques"} - gender{"feminine"} - one{"{0} tona mètrica"} - other{"{0} tones mètriques"} - } microgram{ dnam{"micrograms"} gender{"masculine"} @@ -828,6 +822,12 @@ ca{ one{"{0} tona"} other{"{0} tones"} } + tonne{ + dnam{"tones mètriques"} + gender{"feminine"} + one{"{0} tona mètrica"} + other{"{0} tones mètriques"} + } } power{ gigawatt{ @@ -1431,11 +1431,6 @@ ca{ one{"{0} kg"} other{"{0} kg"} } - metric-ton{ - dnam{"t mètriques"} - one{"{0} t mètr."} - other{"{0} t mètr."} - } ounce-troy{ dnam{"ozt"} one{"{0} ozt"} @@ -1446,6 +1441,11 @@ ca{ one{"{0} t"} other{"{0} t"} } + tonne{ + dnam{"t mètriques"} + one{"{0} t mètr."} + other{"{0} t mètr."} + } } power{ kilowatt{ @@ -2104,11 +2104,6 @@ ca{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t mètriques"} - one{"{0} t mètr."} - other{"{0} t mètr."} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2146,6 +2141,11 @@ ca{ one{"{0} t"} other{"{0} t"} } + tonne{ + dnam{"t mètriques"} + one{"{0} t mètr."} + other{"{0} t mètr."} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ccp.txt b/icu4c/source/data/unit/ccp.txt index 2288d16d69e..a39810db365 100644 --- a/icu4c/source/data/unit/ccp.txt +++ b/icu4c/source/data/unit/ccp.txt @@ -461,11 +461,6 @@ ccp{ other{"{0} 𑄇𑄨𑄣𑄮𑄉𑄳𑄢𑄟𑄴"} per{"{0} 𑄛𑄳𑄢𑄧𑄖𑄨 𑄇𑄨𑄣𑄮𑄉𑄳𑄢𑄟𑄴"} } - metric-ton{ - dnam{"𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} - one{"{0} 𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} - other{"{0} 𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} - } microgram{ dnam{"𑄟𑄭𑄇𑄳𑄢𑄮𑄉𑄳𑄢𑄟𑄴"} one{"{0} 𑄟𑄭𑄇𑄳𑄢𑄮𑄉𑄳𑄢𑄟𑄴"} @@ -498,6 +493,11 @@ ccp{ one{"{0} 𑄑𑄧𑄚𑄴"} other{"{0} 𑄑𑄧𑄚𑄴"} } + tonne{ + dnam{"𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} + one{"{0} 𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} + other{"{0} 𑄟𑄬𑄑𑄳𑄢𑄨𑄇𑄴 𑄑𑄧𑄚𑄴"} + } } power{ gigawatt{ @@ -1425,11 +1425,6 @@ ccp{ other{"{0} 𑄇𑄬𑄎𑄨"} per{"{0} 𑄛𑄳𑄢𑄧𑄖𑄨 𑄇𑄬𑄎𑄨"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1462,6 +1457,11 @@ ccp{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ceb.txt b/icu4c/source/data/unit/ceb.txt index 569fecda2cf..273edceeb9c 100644 --- a/icu4c/source/data/unit/ceb.txt +++ b/icu4c/source/data/unit/ceb.txt @@ -660,11 +660,6 @@ ceb{ other{"{0} ka mga kilogramo"} per{"{0} kada kilogramo"} } - metric-ton{ - dnam{"mga metrikong tonelada"} - one{"{0} ka metrikong tonelada"} - other{"{0} ka mga metrikong tonelada"} - } microgram{ dnam{"mga microgram"} one{"{0} ka microgram"} @@ -702,6 +697,11 @@ ceb{ one{"{0} ka tonelada"} other{"{0} ka mga tonelada"} } + tonne{ + dnam{"mga metrikong tonelada"} + one{"{0} ka metrikong tonelada"} + other{"{0} ka mga metrikong tonelada"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/chr.txt b/icu4c/source/data/unit/chr.txt index 20ed421607c..95da20c6f15 100644 --- a/icu4c/source/data/unit/chr.txt +++ b/icu4c/source/data/unit/chr.txt @@ -681,11 +681,6 @@ chr{ other{"{0} ᎠᎦᏴᎵ ᎤᏍᏗ ᏂᏚᏓᎨᏒ"} per{"{0} ᎠᎦᏴᎵ ᎤᏍᏗ ᎤᏓᎨᏒ ᎢᏳᏓᎵ"} } - metric-ton{ - dnam{"ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏗᏈᏂ"} - one{"{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏈᏂ"} - other{"{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏗᏈᏂ"} - } microgram{ dnam{"ᏌᏉ ᎢᏳᏆᏗᏅᏛ ᎤᏍᏗ ᏂᏚᏓᎨᏒ"} one{"{0} ᏌᏉ ᎢᏳᏆᏗᏅᏛ ᎤᏍᏗ ᎤᏓᎨᏒ"} @@ -728,6 +723,11 @@ chr{ one{"{0} ᏈᏂ"} other{"{0} ᏗᏈᏂ"} } + tonne{ + dnam{"ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏗᏈᏂ"} + one{"{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏈᏂ"} + other{"{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏗᏈᏂ"} + } } power{ gigawatt{ @@ -1594,11 +1594,6 @@ chr{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -1640,6 +1635,11 @@ chr{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2493,11 +2493,6 @@ chr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2540,6 +2535,11 @@ chr{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/cs.txt b/icu4c/source/data/unit/cs.txt index 225025988a8..7bf0ae9d468 100644 --- a/icu4c/source/data/unit/cs.txt +++ b/icu4c/source/data/unit/cs.txt @@ -3707,46 +3707,6 @@ cs{ other{"{0} kilogramů"} per{"{0} na kilogram"} } - metric-ton{ - case{ - accusative{ - few{"{0} tuny"} - many{"{0} tuny"} - one{"{0} tunu"} - other{"{0} tun"} - } - dative{ - few{"{0} tunám"} - many{"{0} tuny"} - one{"{0} tuně"} - other{"{0} tunám"} - } - genitive{ - few{"{0} tun"} - many{"{0} tuny"} - one{"{0} tuny"} - other{"{0} tun"} - } - instrumental{ - few{"{0} tunami"} - many{"{0} tuny"} - one{"{0} tunou"} - other{"{0} tunami"} - } - locative{ - few{"{0} tunách"} - many{"{0} tuny"} - one{"{0} tuně"} - other{"{0} tunách"} - } - } - dnam{"tuny"} - few{"{0} tuny"} - gender{"feminine"} - many{"{0} tuny"} - one{"{0} tuna"} - other{"{0} tun"} - } microgram{ case{ accusative{ @@ -3871,6 +3831,46 @@ cs{ one{"{0} americká tuna"} other{"{0} amerických tun"} } + tonne{ + case{ + accusative{ + few{"{0} tuny"} + many{"{0} tuny"} + one{"{0} tunu"} + other{"{0} tun"} + } + dative{ + few{"{0} tunám"} + many{"{0} tuny"} + one{"{0} tuně"} + other{"{0} tunám"} + } + genitive{ + few{"{0} tun"} + many{"{0} tuny"} + one{"{0} tuny"} + other{"{0} tun"} + } + instrumental{ + few{"{0} tunami"} + many{"{0} tuny"} + one{"{0} tunou"} + other{"{0} tunami"} + } + locative{ + few{"{0} tunách"} + many{"{0} tuny"} + one{"{0} tuně"} + other{"{0} tunách"} + } + } + dnam{"tuny"} + few{"{0} tuny"} + gender{"feminine"} + many{"{0} tuny"} + one{"{0} tuna"} + other{"{0} tun"} + } } power{ gigawatt{ @@ -6198,13 +6198,6 @@ cs{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -6263,6 +6256,13 @@ cs{ one{"{0} sht"} other{"{0} sht"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -7632,13 +7632,6 @@ cs{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -7697,6 +7690,13 @@ cs{ one{"{0} sht"} other{"{0} sht"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/cy.txt b/icu4c/source/data/unit/cy.txt index c9ad41f6cfe..f4465bd38b8 100644 --- a/icu4c/source/data/unit/cy.txt +++ b/icu4c/source/data/unit/cy.txt @@ -1157,15 +1157,6 @@ cy{ two{"{0} kg"} zero{"{0} kg"} } - metric-ton{ - dnam{"tunelli metrig"} - few{"{0} t"} - many{"{0} t"} - one{"{0} dunnell fetrig"} - other{"{0} tunnell fetrig"} - two{"{0} t"} - zero{"{0} t"} - } microgram{ dnam{"microgramau"} few{"{0} μg"} @@ -1240,6 +1231,15 @@ cy{ two{"{0} dunnell"} zero{"{0} tn"} } + tonne{ + dnam{"tunelli metrig"} + few{"{0} t"} + many{"{0} t"} + one{"{0} dunnell fetrig"} + other{"{0} tunnell fetrig"} + two{"{0} t"} + zero{"{0} t"} + } } power{ gigawatt{ @@ -2561,15 +2561,6 @@ cy{ two{"{0} kg"} zero{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0}t"} - many{"{0}t"} - one{"{0}t"} - other{"{0}t"} - two{"{0}t"} - zero{"{0}t"} - } microgram{ dnam{"μg"} few{"{0}μg"} @@ -2617,6 +2608,15 @@ cy{ two{"{0}st"} zero{"{0}st"} } + tonne{ + dnam{"t"} + few{"{0}t"} + many{"{0}t"} + one{"{0}t"} + other{"{0}t"} + two{"{0}t"} + zero{"{0}t"} + } } power{ gigawatt{ @@ -3928,15 +3928,6 @@ cy{ two{"{0} kg"} zero{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - zero{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -4005,6 +3996,15 @@ cy{ two{"{0} tn"} zero{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + zero{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/da.txt b/icu4c/source/data/unit/da.txt index fb2665e9f52..4e0afbb9aff 100644 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.txt @@ -1240,18 +1240,6 @@ da{ other{"{0} kilogram"} per{"{0} pr. kg"} } - metric-ton{ - case{ - genitive{ - one{"{0} tons"} - other{"{0} tons"} - } - } - dnam{"tons"} - gender{"neuter"} - one{"{0} ton"} - other{"{0} tons"} - } microgram{ case{ genitive{ @@ -1311,6 +1299,18 @@ da{ one{"{0} short ton"} other{"{0} short ton"} } + tonne{ + case{ + genitive{ + one{"{0} tons"} + other{"{0} tons"} + } + } + dnam{"tons"} + gender{"neuter"} + one{"{0} ton"} + other{"{0} tons"} + } } power{ gigawatt{ @@ -2859,11 +2859,6 @@ da{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2899,6 +2894,11 @@ da{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/de.txt b/icu4c/source/data/unit/de.txt index 8bb0f2f8077..46998743d00 100644 --- a/icu4c/source/data/unit/de.txt +++ b/icu4c/source/data/unit/de.txt @@ -2176,26 +2176,6 @@ de{ other{"{0} Kilogramm"} per{"{0} pro Kilogramm"} } - metric-ton{ - case{ - accusative{ - one{"{0} Tonne"} - other{"{0} Tonnen"} - } - dative{ - one{"{0} Tonne"} - other{"{0} Tonnen"} - } - genitive{ - one{"{0} Tonne"} - other{"{0} Tonnen"} - } - } - dnam{"Tonnen"} - gender{"feminine"} - one{"{0} Tonne"} - other{"{0} Tonnen"} - } microgram{ case{ accusative{ @@ -2313,6 +2293,26 @@ de{ one{"{0} Short Ton"} other{"{0} Short Tons"} } + tonne{ + case{ + accusative{ + one{"{0} Tonne"} + other{"{0} Tonnen"} + } + dative{ + one{"{0} Tonne"} + other{"{0} Tonnen"} + } + genitive{ + one{"{0} Tonne"} + other{"{0} Tonnen"} + } + } + dnam{"Tonnen"} + gender{"feminine"} + one{"{0} Tonne"} + other{"{0} Tonnen"} + } } power{ gigawatt{ @@ -3824,11 +3824,6 @@ de{ kilogram{ per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3866,6 +3861,11 @@ de{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/dsb.txt b/icu4c/source/data/unit/dsb.txt index 81edd45a14e..7e1fa7a73f9 100644 --- a/icu4c/source/data/unit/dsb.txt +++ b/icu4c/source/data/unit/dsb.txt @@ -917,13 +917,6 @@ dsb{ per{"{0} na kilogram"} two{"{0} kilograma"} } - metric-ton{ - dnam{"tony"} - few{"{0} tony"} - one{"{0} tona"} - other{"{0} tonow"} - two{"{0} tonje"} - } microgram{ dnam{"mikrogramy"} few{"{0} mikrogramy"} @@ -982,6 +975,13 @@ dsb{ other{"{0} ameriskich tonow"} two{"{0} ameriskej tonje"} } + tonne{ + dnam{"tony"} + few{"{0} tony"} + one{"{0} tona"} + other{"{0} tonow"} + two{"{0} tonje"} + } } power{ gigawatt{ @@ -2631,13 +2631,6 @@ dsb{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -2696,6 +2689,13 @@ dsb{ other{"{0} tn"} two{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/el.txt b/icu4c/source/data/unit/el.txt index d69efdf75da..733e80080ba 100644 --- a/icu4c/source/data/unit/el.txt +++ b/icu4c/source/data/unit/el.txt @@ -1607,22 +1607,6 @@ el{ other{"{0} χιλιόγραμμα"} per{"{0} ανά χιλιόγραμμο"} } - metric-ton{ - case{ - accusative{ - one{"{0} τόνο"} - other{"{0} τόνους"} - } - genitive{ - one{"{0} τόνου"} - other{"{0} τόνων"} - } - } - dnam{"τόνοι"} - gender{"masculine"} - one{"{0} τόνος"} - other{"{0} τόνοι"} - } microgram{ case{ accusative{ @@ -1687,6 +1671,22 @@ el{ one{"{0} τόνος ΗΠΑ"} other{"{0} τόνοι ΗΠΑ"} } + tonne{ + case{ + accusative{ + one{"{0} τόνο"} + other{"{0} τόνους"} + } + genitive{ + one{"{0} τόνου"} + other{"{0} τόνων"} + } + } + dnam{"τόνοι"} + gender{"masculine"} + one{"{0} τόνος"} + other{"{0} τόνοι"} + } } power{ gigawatt{ @@ -3447,11 +3447,6 @@ el{ other{"{0} κιλά"} per{"{0}/κιλό"} } - metric-ton{ - dnam{"τ."} - one{"{0} τ."} - other{"{0} τ."} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3493,6 +3488,11 @@ el{ one{"{0} τ. ΗΠΑ"} other{"{0} τ. ΗΠΑ"} } + tonne{ + dnam{"τ."} + one{"{0} τ."} + other{"{0} τ."} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index b659c680534..82cb6b9dc4d 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -684,11 +684,6 @@ en{ other{"{0} kilograms"} per{"{0} per kilogram"} } - metric-ton{ - dnam{"metric tons"} - one{"{0} metric ton"} - other{"{0} metric tons"} - } microgram{ dnam{"micrograms"} one{"{0} microgram"} @@ -731,6 +726,11 @@ en{ one{"{0} ton"} other{"{0} tons"} } + tonne{ + dnam{"metric tons"} + one{"{0} metric ton"} + other{"{0} metric tons"} + } } power{ gigawatt{ @@ -1659,11 +1659,6 @@ en{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -1704,6 +1699,11 @@ en{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2622,11 +2622,6 @@ en{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2669,6 +2664,11 @@ en{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/en_001.txt b/icu4c/source/data/unit/en_001.txt index 64038ce72af..2fc5da5759d 100644 --- a/icu4c/source/data/unit/en_001.txt +++ b/icu4c/source/data/unit/en_001.txt @@ -35,7 +35,7 @@ en_001{ } concentr{ karat{ - dnam{"carat"} + dnam{"carats"} one{"{0} carat"} other{"{0} carats"} } @@ -168,16 +168,16 @@ en_001{ } } mass{ - metric-ton{ - dnam{"tonnes"} - one{"{0} tonne"} - other{"{0} tonnes"} - } stone{ dnam{"stone"} one{"{0} stone"} other{"{0} stone"} } + tonne{ + dnam{"tonnes"} + one{"{0} tonne"} + other{"{0} tonnes"} + } } pressure{ millimeter-ofhg{ @@ -258,6 +258,11 @@ en_001{ one{"{0} US fluid ounce"} other{"{0} US fluid ounces"} } + fluid-ounce-imperial{ + dnam{"fluid ounces"} + one{"{0} fluid ounce"} + other{"{0} fluid ounces"} + } gallon{ dnam{"US gallons"} one{"{0} US gallon"} @@ -398,6 +403,11 @@ en_001{ one{"{0}dsp"} other{"{0}dsp"} } + fluid-ounce{ + dnam{"US fl oz"} + one{"{0}US fl oz"} + other{"{0}US fl oz"} + } fluid-ounce-imperial{ dnam{"fl oz"} one{"{0}fl oz"} @@ -588,6 +598,11 @@ en_001{ one{"{0} US fl oz"} other{"{0} US fl oz"} } + fluid-ounce-imperial{ + dnam{"fl oz"} + one{"{0} fl oz"} + other{"{0} fl oz"} + } gallon{ dnam{"US gal"} one{"{0} US gal"} @@ -606,6 +621,7 @@ en_001{ other{"{0} hl"} } jigger{ + one{"{0} jigger"} other{"{0} jiggers"} } liter{ diff --git a/icu4c/source/data/unit/en_AU.txt b/icu4c/source/data/unit/en_AU.txt index 2c73f057fa9..8a2764f662b 100644 --- a/icu4c/source/data/unit/en_AU.txt +++ b/icu4c/source/data/unit/en_AU.txt @@ -32,7 +32,7 @@ en_AU{ } } mass{ - metric-ton{ + tonne{ one{"tonne"} other{"{0} tonnes"} } @@ -57,6 +57,11 @@ en_AU{ one{"{0} fluid ounce"} other{"{0} fluid ounces"} } + fluid-ounce-imperial{ + dnam{"Imp. fluid ounces"} + one{"{0} Imp. fluid ounce"} + other{"{0} Imp. fluid ounces"} + } } } unitsNarrow{ @@ -150,8 +155,15 @@ en_AU{ one{"{0}dsp-Imp"} other{"{0}dsp-Imp"} } + fluid-ounce{ + dnam{"fl oz"} + one{"{0}fl oz"} + other{"{0}fl oz"} + } fluid-ounce-imperial{ - dnam{"Imp. fl oz"} + dnam{"Imp fl oz"} + one{"{0}fl oz Im"} + other{"{0}fl oz Im"} } gallon{ dnam{"gal US"} @@ -345,6 +357,11 @@ en_AU{ one{"{0} fl oz"} other{"{0} fl oz"} } + fluid-ounce-imperial{ + dnam{"Imp. fl oz"} + one{"{0} fl oz Imp."} + other{"{0} fl oz Imp."} + } gallon{ dnam{"gal US"} one{"{0} gal US"} diff --git a/icu4c/source/data/unit/en_CA.txt b/icu4c/source/data/unit/en_CA.txt index c574382993e..2f567b071d3 100644 --- a/icu4c/source/data/unit/en_CA.txt +++ b/icu4c/source/data/unit/en_CA.txt @@ -173,16 +173,16 @@ en_CA{ } } mass{ - metric-ton{ - dnam{"tonnes"} - one{"{0} tonne"} - other{"{0} tonnes"} - } stone{ dnam{"stone"} one{"{0} stone"} other{"{0} stone"} } + tonne{ + dnam{"tonnes"} + one{"{0} tonne"} + other{"{0} tonnes"} + } } pressure{ millimeter-ofhg{ diff --git a/icu4c/source/data/unit/en_GB.txt b/icu4c/source/data/unit/en_GB.txt index eb2603bdd8d..d4ee4a0ab82 100644 --- a/icu4c/source/data/unit/en_GB.txt +++ b/icu4c/source/data/unit/en_GB.txt @@ -8,31 +8,4 @@ en_GB{ hms{"h:mm:ss"} ms{"m:ss"} } - units{ - concentr{ - karat{ - dnam{"carats"} - } - } - volume{ - fluid-ounce-imperial{ - dnam{"fluid ounces"} - one{"{0} fluid ounce"} - other{"{0} fluid ounces"} - } - } - } - unitsShort{ - volume{ - fluid-ounce-imperial{ - dnam{"fl oz"} - one{"{0} fl oz"} - other{"{0} fl oz"} - } - jigger{ - one{"{0} jigger"} - other{"{0} jiggers"} - } - } - } } diff --git a/icu4c/source/data/unit/es.txt b/icu4c/source/data/unit/es.txt index ab3c5947d4d..275528ab722 100644 --- a/icu4c/source/data/unit/es.txt +++ b/icu4c/source/data/unit/es.txt @@ -800,12 +800,6 @@ es{ other{"{0} kilogramos"} per{"{0} por kilogramo"} } - metric-ton{ - dnam{"toneladas"} - gender{"feminine"} - one{"{0} tonelada"} - other{"{0} toneladas"} - } microgram{ dnam{"microgramos"} gender{"masculine"} @@ -853,6 +847,12 @@ es{ one{"{0} tonelada corta"} other{"{0} toneladas cortas"} } + tonne{ + dnam{"toneladas"} + gender{"feminine"} + one{"{0} tonelada"} + other{"{0} toneladas"} + } } power{ gigawatt{ @@ -1817,10 +1817,6 @@ es{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - one{"{0}t"} - other{"{0}t"} - } microgram{ one{"{0}μg"} other{"{0}μg"} @@ -1858,6 +1854,10 @@ es{ one{"{0}tc"} other{"{0}tc"} } + tonne{ + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2746,10 +2746,6 @@ es{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2782,6 +2778,10 @@ es{ one{"{0} tc"} other{"{0} tc"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/es_419.txt b/icu4c/source/data/unit/es_419.txt index 6a82308b84b..2357cc2c363 100644 --- a/icu4c/source/data/unit/es_419.txt +++ b/icu4c/source/data/unit/es_419.txt @@ -55,16 +55,16 @@ es_419{ } } mass{ - metric-ton{ - dnam{"toneladas métricas"} - one{"{0} tonelada métrica"} - other{"{0} toneladas métricas"} - } ton{ dnam{"toneladas"} one{"{0} tonelada"} other{"{0} toneladas"} } + tonne{ + dnam{"toneladas métricas"} + one{"{0} tonelada métrica"} + other{"{0} toneladas métricas"} + } } power{ horsepower{ @@ -200,9 +200,6 @@ es_419{ carat{ dnam{"ct"} } - metric-ton{ - dnam{"t"} - } microgram{ dnam{"μg"} } @@ -219,6 +216,9 @@ es_419{ one{"{0}ton"} other{"{0}ton"} } + tonne{ + dnam{"t"} + } } power{ horsepower{ @@ -324,11 +324,6 @@ es_419{ } } mass{ - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } ounce-troy{ dnam{"ozt"} one{"{0} ozt"} @@ -342,6 +337,11 @@ es_419{ one{"{0} ton"} other{"{0} ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ diff --git a/icu4c/source/data/unit/et.txt b/icu4c/source/data/unit/et.txt index 0a023d04ea2..3be652eea74 100644 --- a/icu4c/source/data/unit/et.txt +++ b/icu4c/source/data/unit/et.txt @@ -690,11 +690,6 @@ et{ other{"{0} kilogrammi"} per{"{0} kilogrammi kohta"} } - metric-ton{ - dnam{"tonnid"} - one{"{0} tonn"} - other{"{0} tonni"} - } microgram{ dnam{"mikrogrammid"} one{"{0} mikrogramm"} @@ -737,6 +732,11 @@ et{ one{"{0} lühike tonn"} other{"{0} lühikest tonni"} } + tonne{ + dnam{"tonnid"} + one{"{0} tonn"} + other{"{0} tonni"} + } } power{ gigawatt{ @@ -1998,11 +1998,6 @@ et{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2043,6 +2038,11 @@ et{ one{"{0} lüh t"} other{"{0} lüh t"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/eu.txt b/icu4c/source/data/unit/eu.txt index 1a0cece817f..ebc274e294d 100644 --- a/icu4c/source/data/unit/eu.txt +++ b/icu4c/source/data/unit/eu.txt @@ -669,11 +669,6 @@ eu{ other{"{0} kilogramo"} per{"{0} kilogramo bakoitzeko"} } - metric-ton{ - dnam{"tona metrikoak"} - one{"{0} tona metriko"} - other{"{0} tona metriko"} - } microgram{ dnam{"mikrogramoak"} one{"{0} mikrogramo"} @@ -715,6 +710,11 @@ eu{ one{"{0} AEBko tona"} other{"{0} AEBko tona"} } + tonne{ + dnam{"tona metrikoak"} + one{"{0} tona metriko"} + other{"{0} tona metriko"} + } } power{ gigawatt{ @@ -2013,11 +2013,6 @@ eu{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2059,6 +2054,11 @@ eu{ one{"{0} AEBko tona"} other{"{0} AEBko tona"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fa.txt b/icu4c/source/data/unit/fa.txt index 0ba3b90dd84..c16480500c4 100644 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -686,11 +686,6 @@ fa{ other{"{0} کیلوگرم"} per{"{0} در کیلوگرم"} } - metric-ton{ - dnam{"تن متریک"} - one{"{0} تن متریک"} - other{"{0} تن متریک"} - } microgram{ dnam{"میکروگرم"} one{"{0} میکروگرم"} @@ -733,6 +728,11 @@ fa{ one{"{0} تن"} other{"{0} تن"} } + tonne{ + dnam{"تن متریک"} + one{"{0} تن متریک"} + other{"{0} تن متریک"} + } } power{ gigawatt{ @@ -1455,11 +1455,6 @@ fa{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - dnam{"تن متریک"} - one{"{0} تن"} - other{"{0} تن"} - } microgram{ dnam{"میکروگرم"} one{"{0}μg"} @@ -1500,6 +1495,11 @@ fa{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"تن متریک"} + one{"{0} تن"} + other{"{0} تن"} + } } power{ horsepower{ @@ -2339,10 +2339,6 @@ fa{ other{"{0} کیلوگرم"} per{"{0}‎/kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ one{"{0} میکروگرم"} other{"{0} میکروگرم"} @@ -2383,6 +2379,10 @@ fa{ one{"{0} تن"} other{"{0} تن"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ff_Adlm.txt b/icu4c/source/data/unit/ff_Adlm.txt index 8e269b77c92..674b25f417f 100644 --- a/icu4c/source/data/unit/ff_Adlm.txt +++ b/icu4c/source/data/unit/ff_Adlm.txt @@ -695,11 +695,6 @@ ff_Adlm{ other{"{0} 𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤭"} per{"{0} 𞤲𞤣𞤫𞤪 𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤵"} } - metric-ton{ - dnam{"𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} - one{"{0} 𞤼𞤮𞥅𞤲𞤵 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} - other{"{0} 𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} - } microgram{ dnam{"𞤻𞤭𞤤𞤢𞤺𞤢𞤪𞤬𞤭"} one{"{0} 𞤻𞤭𞤤𞤢𞤺𞤢𞤪𞤬𞤵"} @@ -742,6 +737,11 @@ ff_Adlm{ one{"{0} 𞤼𞤮𞥅𞤲𞤵"} other{"{0} 𞤼𞤮𞥅𞤲𞤭"} } + tonne{ + dnam{"𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + one{"{0} 𞤼𞤮𞥅𞤲𞤵 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + other{"{0} 𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + } } power{ gigawatt{ @@ -1744,11 +1744,6 @@ ff_Adlm{ other{"{0}𞤳𞤺"} per{"{0}/𞤳𞤺"} } - metric-ton{ - dnam{"𞤼"} - one{"{0}𞤼"} - other{"{0}𞤼"} - } microgram{ dnam{"𞤻𞤺"} one{"{0}𞤻𞤺"} @@ -1791,6 +1786,11 @@ ff_Adlm{ one{"{0}𞤼𞤲"} other{"{0}𞤼𞤲"} } + tonne{ + dnam{"𞤼"} + one{"{0}𞤼"} + other{"{0}𞤼"} + } } power{ gigawatt{ @@ -2789,11 +2789,6 @@ ff_Adlm{ other{"{0} 𞤳𞤺"} per{"{0}/𞤳𞤺"} } - metric-ton{ - dnam{"𞤼"} - one{"{0} 𞤼"} - other{"{0} 𞤼"} - } microgram{ dnam{"𞤻𞤺"} one{"{0} 𞤻𞤺"} @@ -2836,6 +2831,11 @@ ff_Adlm{ one{"{0} 𞤼𞤲"} other{"{0} 𞤼𞤲"} } + tonne{ + dnam{"𞤼"} + one{"{0} 𞤼"} + other{"{0} 𞤼"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index 74045af011e..5db736485fb 100644 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.txt @@ -2078,29 +2078,6 @@ fi{ other{"{0} kilogrammaa"} per{"{0} / kilogramma"} } - metric-ton{ - case{ - elative{ - one{"{0} tonnista"} - other{"{0} tonnista"} - } - genitive{ - one{"{0} tonnin"} - other{"{0} tonnin"} - } - illative{ - one{"{0} tonniin"} - other{"{0} tonniin"} - } - partitive{ - one{"{0} tonnia"} - other{"{0} tonnia"} - } - } - dnam{"tonnit"} - one{"{0} tonni"} - other{"{0} tonnia"} - } microgram{ case{ elative{ @@ -2179,6 +2156,29 @@ fi{ one{"{0} am. tonni"} other{"{0} am. tonnia"} } + tonne{ + case{ + elative{ + one{"{0} tonnista"} + other{"{0} tonnista"} + } + genitive{ + one{"{0} tonnin"} + other{"{0} tonnin"} + } + illative{ + one{"{0} tonniin"} + other{"{0} tonniin"} + } + partitive{ + one{"{0} tonnia"} + other{"{0} tonnia"} + } + } + dnam{"tonnit"} + one{"{0} tonni"} + other{"{0} tonnia"} + } } power{ gigawatt{ @@ -3648,11 +3648,6 @@ fi{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -3695,6 +3690,11 @@ fi{ one{"{0}am.tn"} other{"{0}am.tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -4585,11 +4585,6 @@ fi{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -4632,6 +4627,11 @@ fi{ one{"{0} am. tn"} other{"{0} am. tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fil.txt b/icu4c/source/data/unit/fil.txt index 929e5d9b04c..208a0dea20c 100644 --- a/icu4c/source/data/unit/fil.txt +++ b/icu4c/source/data/unit/fil.txt @@ -676,11 +676,6 @@ fil{ other{"{0} kilo"} per{"{0} kada kilo"} } - metric-ton{ - dnam{"toneladang metriko"} - one{"{0} toneladang metriko"} - other{"{0} na toneladang metriko"} - } microgram{ dnam{"micrograms"} one{"{0} microgram"} @@ -723,6 +718,11 @@ fil{ one{"{0} tonelada"} other{"{0} tonelada"} } + tonne{ + dnam{"toneladang metriko"} + one{"{0} toneladang metriko"} + other{"{0} na toneladang metriko"} + } } power{ gigawatt{ @@ -1382,11 +1382,6 @@ fil{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -1422,6 +1417,11 @@ fil{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ horsepower{ @@ -2190,11 +2190,6 @@ fil{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2237,6 +2232,11 @@ fil{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fo.txt b/icu4c/source/data/unit/fo.txt index dc0e113f287..f0c7fe1ceb2 100644 --- a/icu4c/source/data/unit/fo.txt +++ b/icu4c/source/data/unit/fo.txt @@ -656,11 +656,6 @@ fo{ other{"{0} kilogramm"} per{"{0} fyri hvørt kilogramm"} } - metric-ton{ - dnam{"tons"} - one{"{0} tons"} - other{"{0} tons"} - } microgram{ dnam{"mikrogramm"} one{"{0} mikrogramm"} @@ -703,6 +698,11 @@ fo{ one{"{0} stutt tons"} other{"{0} stutt tons"} } + tonne{ + dnam{"tons"} + one{"{0} tons"} + other{"{0} tons"} + } } power{ gigawatt{ @@ -1743,11 +1743,6 @@ fo{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1788,6 +1783,11 @@ fo{ one{"{0} stutt t"} other{"{0} stutt t"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fr.txt b/icu4c/source/data/unit/fr.txt index 629573ddac6..846ca17435d 100644 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.txt @@ -798,12 +798,6 @@ fr{ other{"{0} kilogrammes"} per{"{0} par kilogramme"} } - metric-ton{ - dnam{"tonnes"} - gender{"feminine"} - one{"{0} tonne"} - other{"{0} tonnes"} - } microgram{ dnam{"microgrammes"} gender{"masculine"} @@ -851,6 +845,12 @@ fr{ one{"{0} tonne courte"} other{"{0} tonnes courtes"} } + tonne{ + dnam{"tonnes"} + gender{"feminine"} + one{"{0} tonne"} + other{"{0} tonnes"} + } } power{ gigawatt{ @@ -1810,11 +1810,6 @@ fr{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -1857,6 +1852,11 @@ fr{ one{"{0} sh tn"} other{"{0} sh tn"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2764,11 +2764,6 @@ fr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2811,6 +2806,11 @@ fr{ one{"{0} sh tn"} other{"{0} sh tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/fr_CA.txt b/icu4c/source/data/unit/fr_CA.txt index 9e5f2068062..3204ce96706 100644 --- a/icu4c/source/data/unit/fr_CA.txt +++ b/icu4c/source/data/unit/fr_CA.txt @@ -344,10 +344,6 @@ fr_CA{ one{"{0} kilogramme"} other{"{0} kilogrammes"} } - metric-ton{ - one{"{0} tonne"} - other{"{0} tonnes"} - } milligram{ one{"{0} milligramme"} other{"{0} milligrammes"} @@ -372,6 +368,10 @@ fr_CA{ one{"{0} tonne courte"} other{"{0} tonnes courtes"} } + tonne{ + one{"{0} tonne"} + other{"{0} tonnes"} + } } power{ gigawatt{ @@ -1128,10 +1128,6 @@ fr_CA{ one{"{0} kg"} other{"{0} kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ one{"{0} μg"} other{"{0} μg"} @@ -1157,6 +1153,10 @@ fr_CA{ one{"{0} tc"} other{"{0} tc"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ga.txt b/icu4c/source/data/unit/ga.txt index b5e28bcb999..9f67b840734 100644 --- a/icu4c/source/data/unit/ga.txt +++ b/icu4c/source/data/unit/ga.txt @@ -1050,14 +1050,6 @@ ga{ per{"{0} sa chileagram"} two{"{0} chileagram"} } - metric-ton{ - dnam{"tonnaí méadracha"} - few{"{0} thonna mhéadracha"} - many{"{0} dtonna mhéadracha"} - one{"{0} tonna méadrach"} - other{"{0} tonna méadrach"} - two{"{0} thonna mhéadracha"} - } microgram{ dnam{"micreagraim"} few{"{0} mhicreagram"} @@ -1124,6 +1116,14 @@ ga{ other{"{0} tonna gearr"} two{"{0} thonna ghearra"} } + tonne{ + dnam{"tonnaí méadracha"} + few{"{0} thonna mhéadracha"} + many{"{0} dtonna mhéadracha"} + one{"{0} tonna méadrach"} + other{"{0} tonna méadrach"} + two{"{0} thonna mhéadracha"} + } } power{ gigawatt{ @@ -2384,14 +2384,6 @@ ga{ per{"{0}/kg"} two{"{0}kg"} } - metric-ton{ - dnam{"t"} - few{"{0}t"} - many{"{0}t"} - one{"{0}t"} - other{"{0}t"} - two{"{0}t"} - } microgram{ dnam{"μg"} few{"{0}μg"} @@ -2450,6 +2442,14 @@ ga{ other{"{0} t.g."} two{"{0} t.g."} } + tonne{ + dnam{"t"} + few{"{0}t"} + many{"{0}t"} + one{"{0}t"} + other{"{0}t"} + two{"{0}t"} + } } power{ gigawatt{ @@ -3725,14 +3725,6 @@ ga{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -3799,6 +3791,14 @@ ga{ other{"{0} t.g."} two{"{0} t.g."} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/gd.txt b/icu4c/source/data/unit/gd.txt index a6cf7f166c4..4f6c7326d81 100644 --- a/icu4c/source/data/unit/gd.txt +++ b/icu4c/source/data/unit/gd.txt @@ -933,13 +933,6 @@ gd{ per{"{0} sa chileagram"} two{"{0} chileagram"} } - metric-ton{ - dnam{"tunna meatrach"} - few{"{0} tunnaichean meatrach"} - one{"{0} tunna meatrach"} - other{"{0} tunna meatrach"} - two{"{0} thunna meatrach"} - } microgram{ dnam{"micreo-gram"} few{"{0} micreo-gramaichean"} @@ -998,6 +991,13 @@ gd{ other{"{0} tunna"} two{"{0} thunna"} } + tonne{ + dnam{"tunna meatrach"} + few{"{0} tunnaichean meatrach"} + one{"{0} tunna meatrach"} + other{"{0} tunna meatrach"} + two{"{0} thunna meatrach"} + } } power{ gigawatt{ @@ -2299,13 +2299,6 @@ gd{ per{"{0}/kg"} two{"{0}kg"} } - metric-ton{ - dnam{"t"} - few{"{0}t"} - one{"{0}t"} - other{"{0}t"} - two{"{0}t"} - } microgram{ dnam{"μg"} few{"{0}μg"} @@ -2364,6 +2357,13 @@ gd{ other{"{0}tn"} two{"{0}tn"} } + tonne{ + dnam{"t"} + few{"{0}t"} + one{"{0}t"} + other{"{0}t"} + two{"{0}t"} + } } power{ gigawatt{ @@ -3582,13 +3582,6 @@ gd{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -3643,6 +3636,13 @@ gd{ other{"{0} tn"} two{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/gl.txt b/icu4c/source/data/unit/gl.txt index 3c46d052903..49efaeac5ee 100644 --- a/icu4c/source/data/unit/gl.txt +++ b/icu4c/source/data/unit/gl.txt @@ -689,11 +689,6 @@ gl{ other{"{0} quilogramos"} per{"{0} por quilogramo"} } - metric-ton{ - dnam{"toneladas métricas"} - one{"{0} tonelada métrica"} - other{"{0} toneladas métricas"} - } microgram{ dnam{"microgramos"} one{"{0} microgramo"} @@ -736,6 +731,11 @@ gl{ one{"{0} tonelada estadounidense"} other{"{0} toneladas estadounidenses"} } + tonne{ + dnam{"toneladas métricas"} + one{"{0} tonelada métrica"} + other{"{0} toneladas métricas"} + } } power{ gigawatt{ @@ -2031,11 +2031,6 @@ gl{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2071,6 +2066,11 @@ gl{ one{"{0} tn EUA"} other{"{0} tn EUA"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/gu.txt b/icu4c/source/data/unit/gu.txt index 6e597040697..34d2a2acb9e 100644 --- a/icu4c/source/data/unit/gu.txt +++ b/icu4c/source/data/unit/gu.txt @@ -722,12 +722,6 @@ gu{ other{"{0} કિલોગ્રામ"} per{"{0} પ્રતિ કિલોગ્રામ"} } - metric-ton{ - dnam{"મેટ્રિક ટન"} - gender{"masculine"} - one{"{0} મેટ્રિક ટન"} - other{"{0} મેટ્રિક ટન"} - } microgram{ dnam{"માઇક્રોગ્રામ"} one{"{0} માઇક્રોગ્રામ"} @@ -769,6 +763,12 @@ gu{ one{"{0} ટન"} other{"{0} ટન"} } + tonne{ + dnam{"મેટ્રિક ટન"} + gender{"masculine"} + one{"{0} મેટ્રિક ટન"} + other{"{0} મેટ્રિક ટન"} + } } power{ gigawatt{ @@ -2088,11 +2088,6 @@ gu{ other{"{0} કિગ્રા"} per{"{0}/કિગ્રા"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μગ્રામ"} one{"{0} μગ્રામ"} @@ -2135,6 +2130,11 @@ gu{ one{"{0} ટન"} other{"{0} ટન"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ha.txt b/icu4c/source/data/unit/ha.txt index 7feb5fbff87..1853d6a4b4b 100644 --- a/icu4c/source/data/unit/ha.txt +++ b/icu4c/source/data/unit/ha.txt @@ -673,11 +673,6 @@ ha{ other{"kilogiramgiram {0}"} per{"{0} a kilogiram"} } - metric-ton{ - dnam{"metric tons"} - one{"metric ton {0}"} - other{"metric tons {0}"} - } microgram{ dnam{"makirogiramgiram"} one{"Makirogiram {0}"} @@ -718,6 +713,11 @@ ha{ one{"tan {0}"} other{"tan-tan {0}"} } + tonne{ + dnam{"metric tons"} + one{"metric ton {0}"} + other{"metric tons {0}"} + } } power{ gigawatt{ @@ -1573,10 +1573,6 @@ ha{ one{"kg{0}"} other{"kg{0}"} } - metric-ton{ - one{"t{0}"} - other{"t{0}"} - } microgram{ one{"μg{0}"} other{"μg{0}"} @@ -1614,6 +1610,10 @@ ha{ one{"tn{0}"} other{"tn{0}"} } + tonne{ + one{"t{0}"} + other{"t{0}"} + } } power{ gigawatt{ @@ -2463,10 +2463,6 @@ ha{ one{"kg {0}"} other{"kg {0}"} } - metric-ton{ - one{"t {0}"} - other{"t {0}"} - } microgram{ one{"μg {0}"} other{"μg {0}"} @@ -2504,6 +2500,10 @@ ha{ one{"tn {0}"} other{"tn {0}"} } + tonne{ + one{"t {0}"} + other{"t {0}"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/he.txt b/icu4c/source/data/unit/he.txt index 31e4aace735..332b6202dd4 100644 --- a/icu4c/source/data/unit/he.txt +++ b/icu4c/source/data/unit/he.txt @@ -184,9 +184,6 @@ he{ _{ _{"{0} בריבוע"} } - feminine{ - _{"{0} בריבוע"} - } } one{ _{ @@ -218,9 +215,6 @@ he{ _{ _{"{0} מעוקב"} } - feminine{ - _{"{0} מעוקב"} - } } one{ _{ @@ -1033,14 +1027,6 @@ he{ per{"{0}/קילוגרם"} two{"{0} קילוגרם"} } - metric-ton{ - dnam{"טון מטרי"} - gender{"masculine"} - many{"{0} טון מטרי"} - one{"טון מטרי אחד"} - other{"{0} טון מטרי"} - two{"שני טון מטרי"} - } microgram{ dnam{"מיקרוגרם"} gender{"masculine"} @@ -1101,6 +1087,14 @@ he{ other{"{0} טונות"} two{"שתי טונות"} } + tonne{ + dnam{"טון מטרי"} + gender{"masculine"} + many{"{0} טון מטרי"} + one{"טון מטרי אחד"} + other{"{0} טון מטרי"} + two{"שני טון מטרי"} + } } power{ gigawatt{ @@ -1992,13 +1986,6 @@ he{ per{"{0}/ק״ג"} two{"{0}kg"} } - metric-ton{ - dnam{"t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"מק״ג"} many{"{0} מק״ג"} @@ -2035,6 +2022,13 @@ he{ other{"{0} ט׳"} two{"{0} ט׳"} } + tonne{ + dnam{"t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ horsepower{ @@ -2951,13 +2945,6 @@ he{ per{"{0}/ק״ג"} two{"{0} ק״ג"} } - metric-ton{ - dnam{"t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"מק״ג"} many{"{0} מק״ג"} @@ -3009,6 +2996,13 @@ he{ other{"{0} ט׳"} two{"{0} ט׳"} } + tonne{ + dnam{"t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/hi.txt b/icu4c/source/data/unit/hi.txt index 8b30252ec4a..09a2bfb0f2f 100644 --- a/icu4c/source/data/unit/hi.txt +++ b/icu4c/source/data/unit/hi.txt @@ -1355,18 +1355,6 @@ hi{ other{"{0} किलोग्राम"} per{"{0}/किलोग्राम"} } - metric-ton{ - case{ - oblique{ - one{"{0} मीट्रिक टन"} - other{"{0} मीट्रिक टन"} - } - } - dnam{"मीट्रिक टन"} - gender{"masculine"} - one{"{0} मीट्रिक टन"} - other{"{0} मीट्रिक टन"} - } microgram{ case{ oblique{ @@ -1444,6 +1432,18 @@ hi{ one{"{0} टन"} other{"{0} टन"} } + tonne{ + case{ + oblique{ + one{"{0} मीट्रिक टन"} + other{"{0} मीट्रिक टन"} + } + } + dnam{"मीट्रिक टन"} + gender{"masculine"} + one{"{0} मीट्रिक टन"} + other{"{0} मीट्रिक टन"} + } } power{ gigawatt{ @@ -2438,10 +2438,6 @@ hi{ one{"{0} किग्रा"} other{"{0} किग्रा"} } - metric-ton{ - one{"{0} ट"} - other{"{0} ट"} - } milligram{ one{"{0} मिग्रा"} other{"{0} मिग्रा"} @@ -2458,6 +2454,10 @@ hi{ one{"{0} ला"} other{"{0}st"} } + tonne{ + one{"{0} ट"} + other{"{0} ट"} + } } power{ horsepower{ @@ -3231,11 +3231,6 @@ hi{ other{"{0} कि॰ग्रा॰"} per{"{0}/कि॰ग्रा॰"} } - metric-ton{ - dnam{"मीट्रिक टन"} - one{"{0} मीट्रिक टन"} - other{"{0} मी टन"} - } microgram{ dnam{"मा॰ग्रा॰"} one{"{0} मा॰ग्रा॰"} @@ -3273,6 +3268,11 @@ hi{ one{"{0} टन"} other{"{0} टन"} } + tonne{ + dnam{"मीट्रिक टन"} + one{"{0} मीट्रिक टन"} + other{"{0} मी टन"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/hi_Latn.txt b/icu4c/source/data/unit/hi_Latn.txt index 3586fbe4f20..70ee6ea9391 100644 --- a/icu4c/source/data/unit/hi_Latn.txt +++ b/icu4c/source/data/unit/hi_Latn.txt @@ -101,11 +101,6 @@ hi_Latn{ one{"{0} Imp. dessert spoon"} other{"{0} Imp. dessert spoons"} } - fluid-ounce{ - dnam{"fluid ounces"} - one{"{0} fluid ounce"} - other{"{0} fluid ounces"} - } gallon-imperial{ dnam{"Imp. gallons"} one{"{0} Imp. gallon"} @@ -187,6 +182,11 @@ hi_Latn{ one{"{0}dsp-Imp"} other{"{0}dsp-Imp"} } + fluid-ounce{ + dnam{"fl oz"} + one{"{0}fl oz"} + other{"{0}fl oz"} + } fluid-ounce-imperial{ dnam{"Imp fl oz"} one{"{0}fl oz Im"} @@ -281,6 +281,11 @@ hi_Latn{ one{"{0} drop"} other{"{0} drop"} } + fluid-ounce-imperial{ + dnam{"Imp. fl oz"} + one{"{0} fl oz Imp."} + other{"{0} fl oz Imp."} + } gallon{ one{"{0} gal US"} other{"{0} gal US"} diff --git a/icu4c/source/data/unit/hr.txt b/icu4c/source/data/unit/hr.txt index 8c3c14ab3f6..f316f2eb5b2 100644 --- a/icu4c/source/data/unit/hr.txt +++ b/icu4c/source/data/unit/hr.txt @@ -2330,30 +2330,6 @@ hr{ other{"{0} kilograma"} per{"{0}/kg"} } - metric-ton{ - case{ - accusative{ - few{"{0} tone"} - one{"{0} tonu"} - other{"{0} tona"} - } - genitive{ - few{"{0} tone"} - one{"{0} tone"} - other{"{0} tona"} - } - instrumental{ - few{"{0} tone"} - one{"{0} tonom"} - other{"{0} tona"} - } - } - dnam{"tone"} - few{"{0} tone"} - gender{"feminine"} - one{"{0} tona"} - other{"{0} tona"} - } microgram{ case{ accusative{ @@ -2440,6 +2416,30 @@ hr{ one{"{0} kratka tona"} other{"{0} kratkih tona"} } + tonne{ + case{ + accusative{ + few{"{0} tone"} + one{"{0} tonu"} + other{"{0} tona"} + } + genitive{ + few{"{0} tone"} + one{"{0} tone"} + other{"{0} tona"} + } + instrumental{ + few{"{0} tone"} + one{"{0} tonom"} + other{"{0} tona"} + } + } + dnam{"tone"} + few{"{0} tone"} + gender{"feminine"} + one{"{0} tona"} + other{"{0} tona"} + } } power{ gigawatt{ @@ -3827,11 +3827,6 @@ hr{ one{"{0} kg"} other{"{0} kg"} } - metric-ton{ - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ few{"{0} μg"} one{"{0} μg"} @@ -3868,6 +3863,11 @@ hr{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -4790,12 +4790,6 @@ hr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -4840,6 +4834,12 @@ hr{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/hsb.txt b/icu4c/source/data/unit/hsb.txt index aeba443bd7a..661b479ffaf 100644 --- a/icu4c/source/data/unit/hsb.txt +++ b/icu4c/source/data/unit/hsb.txt @@ -917,13 +917,6 @@ hsb{ per{"{0} na kilogram"} two{"{0} kilogramaj"} } - metric-ton{ - dnam{"tony"} - few{"{0} tony"} - one{"{0} tona"} - other{"{0} tonow"} - two{"{0} tonje"} - } microgram{ dnam{"mikrogramy"} few{"{0} mikrogramy"} @@ -982,6 +975,13 @@ hsb{ other{"{0} ameriskich tonow"} two{"{0} ameriskej tonje"} } + tonne{ + dnam{"tony"} + few{"{0} tony"} + one{"{0} tona"} + other{"{0} tonow"} + two{"{0} tonje"} + } } power{ gigawatt{ @@ -2731,13 +2731,6 @@ hsb{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -2796,6 +2789,13 @@ hsb{ other{"{0} tn"} two{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/hu.txt b/icu4c/source/data/unit/hu.txt index a1575b216a3..f63a51a50c4 100644 --- a/icu4c/source/data/unit/hu.txt +++ b/icu4c/source/data/unit/hu.txt @@ -2109,29 +2109,6 @@ hu{ other{"{0} kilogramm"} per{"{0}/kilogramm"} } - metric-ton{ - case{ - accusative{ - one{"{0} metrikus tonnát"} - other{"{0} metrikus tonnát"} - } - instrumental{ - one{"{0} metrikus tonnával"} - other{"{0} metrikus tonnával"} - } - terminative{ - one{"{0} metrikus tonnáig"} - other{"{0} metrikus tonnáig"} - } - translative{ - one{"{0} metrikus tonnává"} - other{"{0} metrikus tonnává"} - } - } - dnam{"metrikus tonna"} - one{"{0} metrikus tonna"} - other{"{0} metrikus tonna"} - } microgram{ case{ accusative{ @@ -2210,6 +2187,29 @@ hu{ one{"{0} amerikai tonna"} other{"{0} amerikai tonna"} } + tonne{ + case{ + accusative{ + one{"{0} metrikus tonnát"} + other{"{0} metrikus tonnát"} + } + instrumental{ + one{"{0} metrikus tonnával"} + other{"{0} metrikus tonnával"} + } + terminative{ + one{"{0} metrikus tonnáig"} + other{"{0} metrikus tonnáig"} + } + translative{ + one{"{0} metrikus tonnává"} + other{"{0} metrikus tonnává"} + } + } + dnam{"metrikus tonna"} + one{"{0} metrikus tonna"} + other{"{0} metrikus tonna"} + } } power{ gigawatt{ @@ -3995,11 +3995,6 @@ hu{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -4032,6 +4027,11 @@ hu{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/hy.txt b/icu4c/source/data/unit/hy.txt index c988c49e5ae..859694a183f 100644 --- a/icu4c/source/data/unit/hy.txt +++ b/icu4c/source/data/unit/hy.txt @@ -2073,29 +2073,6 @@ hy{ other{"{0} կիլոգրամ"} per{"{0} կիլոգրամի վրա"} } - metric-ton{ - case{ - ablative{ - one{"{0} տոննայից"} - other{"{0} տոննայից"} - } - dative{ - one{"{0} տոննային"} - other{"{0} տոննային"} - } - instrumental{ - one{"{0} տոննայով"} - other{"{0} տոննայով"} - } - locative{ - one{"{0} տոննայում"} - other{"{0} տոննայում"} - } - } - dnam{"տոննաներ"} - one{"{0} տոննա"} - other{"{0} տոննա"} - } microgram{ case{ ablative{ @@ -2174,6 +2151,29 @@ hy{ one{"{0} ամերիկյան տոննա"} other{"{0} ամերիկյան տոննա"} } + tonne{ + case{ + ablative{ + one{"{0} տոննայից"} + other{"{0} տոննայից"} + } + dative{ + one{"{0} տոննային"} + other{"{0} տոննային"} + } + instrumental{ + one{"{0} տոննայով"} + other{"{0} տոննայով"} + } + locative{ + one{"{0} տոննայում"} + other{"{0} տոննայում"} + } + } + dnam{"տոննաներ"} + one{"{0} տոննա"} + other{"{0} տոննա"} + } } power{ gigawatt{ @@ -4058,11 +4058,6 @@ hy{ other{"{0} կգ"} per{"{0}/կգ"} } - metric-ton{ - dnam{"տ"} - one{"{0} տ"} - other{"{0} տ"} - } microgram{ dnam{"մկգ"} one{"{0} մկգ"} @@ -4100,6 +4095,11 @@ hy{ one{"{0} ամեր․ տ"} other{"{0} ամեր․ տ"} } + tonne{ + dnam{"տ"} + one{"{0} տ"} + other{"{0} տ"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ia.txt b/icu4c/source/data/unit/ia.txt index a9e181bb27b..3f19edc35e2 100644 --- a/icu4c/source/data/unit/ia.txt +++ b/icu4c/source/data/unit/ia.txt @@ -518,11 +518,6 @@ ia{ other{"{0} kilogrammas"} per{"{0} per kilogramma"} } - metric-ton{ - dnam{"tonnas"} - one{"{0} tonna"} - other{"{0} tonnas"} - } microgram{ dnam{"microgrammas"} one{"{0} microgramma"} @@ -555,6 +550,11 @@ ia{ one{"{0} tonna curte"} other{"{0} tonnas curte"} } + tonne{ + dnam{"tonnas"} + one{"{0} tonna"} + other{"{0} tonnas"} + } } power{ gigawatt{ @@ -1393,9 +1393,6 @@ ia{ dnam{"kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - } microgram{ dnam{"μg"} } @@ -1416,6 +1413,9 @@ ia{ ton{ dnam{"tn"} } + tonne{ + dnam{"t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/id.txt b/icu4c/source/data/unit/id.txt index 94cab65ccf8..696f5b6cf22 100644 --- a/icu4c/source/data/unit/id.txt +++ b/icu4c/source/data/unit/id.txt @@ -552,10 +552,6 @@ id{ other{"{0} kilogram"} per{"{0} per kilogram"} } - metric-ton{ - dnam{"metrik ton"} - other{"{0} metrik ton"} - } microgram{ dnam{"mikrogram"} other{"{0} mikrogram"} @@ -590,6 +586,10 @@ id{ dnam{"ton Amerika Serikat"} other{"{0} ton Amerika Serikat"} } + tonne{ + dnam{"metrik ton"} + other{"{0} metrik ton"} + } } power{ gigawatt{ @@ -1721,10 +1721,6 @@ id{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1757,6 +1753,10 @@ id{ dnam{"ton AS"} other{"{0} tn AS"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/is.txt b/icu4c/source/data/unit/is.txt index bea1e09b82c..3205cbbb3f6 100644 --- a/icu4c/source/data/unit/is.txt +++ b/icu4c/source/data/unit/is.txt @@ -1918,26 +1918,6 @@ is{ other{"{0} kílógrömm"} per{"{0} á kílógramm"} } - metric-ton{ - case{ - accusative{ - one{"{0} tonn"} - other{"{0} tonn"} - } - dative{ - one{"{0} tonni"} - other{"{0} tonnum"} - } - genitive{ - one{"{0} tonns"} - other{"{0} tonna"} - } - } - dnam{"tonn"} - gender{"neuter"} - one{"{0} tonn"} - other{"{0} tonn"} - } microgram{ case{ accusative{ @@ -2010,6 +1990,26 @@ is{ one{"{0} bandarískt tonn"} other{"{0} bandarísk tonn"} } + tonne{ + case{ + accusative{ + one{"{0} tonn"} + other{"{0} tonn"} + } + dative{ + one{"{0} tonni"} + other{"{0} tonnum"} + } + genitive{ + one{"{0} tonns"} + other{"{0} tonna"} + } + } + dnam{"tonn"} + gender{"neuter"} + one{"{0} tonn"} + other{"{0} tonn"} + } } power{ gigawatt{ @@ -3103,11 +3103,6 @@ is{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3145,6 +3140,11 @@ is{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ kilowatt{ @@ -3874,11 +3874,6 @@ is{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"tn"} - one{"{0} tn"} - other{"{0} tn"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3921,6 +3916,11 @@ is{ one{"{0} BNA tn"} other{"{0} BNA tn"} } + tonne{ + dnam{"tn"} + one{"{0} tn"} + other{"{0} tn"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/it.txt b/icu4c/source/data/unit/it.txt index b21de54d8e6..f06123b4c47 100644 --- a/icu4c/source/data/unit/it.txt +++ b/icu4c/source/data/unit/it.txt @@ -798,12 +798,6 @@ it{ other{"{0} chilogrammi"} per{"{0} per chilogrammo"} } - metric-ton{ - dnam{"tonnellate metriche"} - gender{"feminine"} - one{"{0} tonnellata metrica"} - other{"{0} tonnellate metriche"} - } microgram{ dnam{"microgrammi"} gender{"masculine"} @@ -851,6 +845,12 @@ it{ one{"{0} tonnellata"} other{"{0} tonnellate"} } + tonne{ + dnam{"tonnellate metriche"} + gender{"feminine"} + one{"{0} tonnellata metrica"} + other{"{0} tonnellate metriche"} + } } power{ gigawatt{ @@ -1724,10 +1724,6 @@ it{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - one{"{0}t"} - other{"{0}t"} - } microgram{ one{"{0}μg"} other{"{0}μg"} @@ -1760,6 +1756,10 @@ it{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2555,11 +2555,6 @@ it{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2592,6 +2587,11 @@ it{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ja.txt b/icu4c/source/data/unit/ja.txt index 12f22f99eac..1e1f90113f7 100644 --- a/icu4c/source/data/unit/ja.txt +++ b/icu4c/source/data/unit/ja.txt @@ -564,10 +564,6 @@ ja{ other{"{0} キログラム"} per{"{0}/キログラム"} } - metric-ton{ - dnam{"トン"} - other{"{0} トン"} - } microgram{ dnam{"マイクログラム"} other{"{0} マイクログラム"} @@ -602,6 +598,10 @@ ja{ dnam{"米トン"} other{"{0} 米トン"} } + tonne{ + dnam{"トン"} + other{"{0} トン"} + } } power{ gigawatt{ @@ -1331,10 +1331,6 @@ ja{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0}t"} - } microgram{ dnam{"μg"} other{"{0}μg"} @@ -1366,6 +1362,10 @@ ja{ ton{ other{"{0}s/t"} } + tonne{ + dnam{"t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2122,10 +2122,6 @@ ja{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"トン"} - other{"{0} t"} - } microgram{ dnam{"マイクログラム"} other{"{0} μg"} @@ -2160,6 +2156,10 @@ ja{ dnam{"米トン"} other{"{0} s/t"} } + tonne{ + dnam{"トン"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/jv.txt b/icu4c/source/data/unit/jv.txt index 5b052c3aed4..09b759c4dbd 100644 --- a/icu4c/source/data/unit/jv.txt +++ b/icu4c/source/data/unit/jv.txt @@ -549,10 +549,6 @@ jv{ other{"{0} kilogram"} per{"{0} saben kilogram"} } - metric-ton{ - dnam{"metrik ton"} - other{"{0} metrik ton"} - } microgram{ dnam{"mikrogram"} other{"{0} mikrogram"} @@ -587,6 +583,10 @@ jv{ dnam{"ton"} other{"{0} ton"} } + tonne{ + dnam{"metrik ton"} + other{"{0} metrik ton"} + } } power{ gigawatt{ @@ -966,7 +966,7 @@ jv{ dnam{"kg"} other{"{0} kg"} } - metric-ton{ + tonne{ other{"{0}t"} } } @@ -1494,10 +1494,6 @@ jv{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"metrik ton"} - other{"{0} metrik ton"} - } microgram{ dnam{"mikrogram"} } @@ -1530,6 +1526,10 @@ jv{ dnam{"ton"} other{"{0} ton"} } + tonne{ + dnam{"metrik ton"} + other{"{0} metrik ton"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ka.txt b/icu4c/source/data/unit/ka.txt index 59a3095f14d..1eff7505cee 100644 --- a/icu4c/source/data/unit/ka.txt +++ b/icu4c/source/data/unit/ka.txt @@ -669,11 +669,6 @@ ka{ other{"{0} კილოგრამი"} per{"{0} კილოგრამში"} } - metric-ton{ - dnam{"მეტრული ტონა"} - one{"{0} მეტრული ტონა"} - other{"{0} მეტრული ტონა"} - } microgram{ dnam{"მიკროგრამი"} one{"მიკროგრამი"} @@ -716,6 +711,11 @@ ka{ one{"{0} ტონა"} other{"{0} ტ"} } + tonne{ + dnam{"მეტრული ტონა"} + one{"{0} მეტრული ტონა"} + other{"{0} მეტრული ტონა"} + } } power{ gigawatt{ @@ -2010,11 +2010,6 @@ ka{ other{"{0} კგ"} per{"{0}/კგ"} } - metric-ton{ - dnam{"მტ"} - one{"{0} მტ"} - other{"{0} მტ"} - } microgram{ dnam{"მკგ"} one{"{0} მკგ"} @@ -2052,6 +2047,11 @@ ka{ one{"{0} ტ"} other{"{0} ტ"} } + tonne{ + dnam{"მტ"} + one{"{0} მტ"} + other{"{0} მტ"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/kea.txt b/icu4c/source/data/unit/kea.txt index f7d737181d1..0174652e4cc 100644 --- a/icu4c/source/data/unit/kea.txt +++ b/icu4c/source/data/unit/kea.txt @@ -522,10 +522,6 @@ kea{ other{"{0} kilograma"} per{"{0} pur kilograma"} } - metric-ton{ - dnam{"tonelada métriku"} - other{"{0} tonelada métriku"} - } microgram{ dnam{"mikrograma"} other{"{0} mikrograma"} @@ -556,6 +552,10 @@ kea{ dnam{"tonelada"} other{"{0} tonelada"} } + tonne{ + dnam{"tonelada métriku"} + other{"{0} tonelada métriku"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/kgp.txt b/icu4c/source/data/unit/kgp.txt index b8b9ed89ec9..7544bca9869 100644 --- a/icu4c/source/data/unit/kgp.txt +++ b/icu4c/source/data/unit/kgp.txt @@ -589,11 +589,6 @@ kgp{ other{"{0} kirogrỹmỹ ag"} per{"{0} kirogrỹmỹ ki"} } - metric-ton{ - dnam{"tãnẽrada mẽtirika ag"} - one{"{0} tãnẽrada mẽtirika"} - other{"{0} tãnẽrada mẽtirika ag"} - } microgram{ dnam{"mĩkrugrỹmỹ ag"} one{"{0} mĩkrugrỹmỹ"} @@ -636,6 +631,11 @@ kgp{ one{"{0} tãnẽrada"} other{"{0} tãnẽrada ag"} } + tonne{ + dnam{"tãnẽrada mẽtirika ag"} + one{"{0} tãnẽrada mẽtirika"} + other{"{0} tãnẽrada mẽtirika ag"} + } } power{ gigawatt{ @@ -1545,11 +1545,6 @@ kgp{ gram{ dnam{"grỹmỹ ag"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } ounce-troy{ dnam{"oz troy"} } @@ -1567,6 +1562,11 @@ kgp{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ diff --git a/icu4c/source/data/unit/kk.txt b/icu4c/source/data/unit/kk.txt index bd5a96cdfe9..d1cd42edb2b 100644 --- a/icu4c/source/data/unit/kk.txt +++ b/icu4c/source/data/unit/kk.txt @@ -688,11 +688,6 @@ kk{ other{"{0} килограмм"} per{"{0}/килограмм"} } - metric-ton{ - dnam{"метрлік тонна"} - one{"{0} метрлік тонна"} - other{"{0} метрлік тонна"} - } microgram{ dnam{"микрограмм"} one{"{0} микрограмм"} @@ -735,6 +730,11 @@ kk{ one{"{0} тонна"} other{"{0} тонна"} } + tonne{ + dnam{"метрлік тонна"} + one{"{0} метрлік тонна"} + other{"{0} метрлік тонна"} + } } power{ gigawatt{ @@ -2177,11 +2177,6 @@ kk{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"мкг"} one{"{0} мкг"} @@ -2224,6 +2219,11 @@ kk{ one{"{0} тн"} other{"{0} тн"} } + tonne{ + dnam{"т"} + one{"{0} т"} + other{"{0} т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/km.txt b/icu4c/source/data/unit/km.txt index 7718fe7bc7c..4b93d347dd8 100644 --- a/icu4c/source/data/unit/km.txt +++ b/icu4c/source/data/unit/km.txt @@ -521,10 +521,6 @@ km{ other{"{0} គីឡូក្រាម"} per{"{0} ក្នុងមួយគីឡូក្រាម"} } - metric-ton{ - dnam{"តោនម៉ែត្រ"} - other{"{0} តោនម៉ែត្រ"} - } microgram{ dnam{"មីក្រូក្រាម"} other{"{0} មីក្រូក្រាម"} @@ -555,6 +551,10 @@ km{ dnam{"តោនអាមេរិក"} other{"{0} តោនអាមេរិក"} } + tonne{ + dnam{"តោនម៉ែត្រ"} + other{"{0} តោនម៉ែត្រ"} + } } power{ gigawatt{ @@ -1482,10 +1482,6 @@ km{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1516,6 +1512,10 @@ km{ dnam{"តោនអាមេរិក"} other{"{0} tn"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/kn.txt b/icu4c/source/data/unit/kn.txt index bf2ab95e06c..cb5694baf0f 100644 --- a/icu4c/source/data/unit/kn.txt +++ b/icu4c/source/data/unit/kn.txt @@ -2224,30 +2224,6 @@ kn{ other{"{0} ಕಿಲೋಗ್ರಾಂಗಳು"} per{"{0} ಪ್ರತಿ ಕಿಲೋಗ್ರಾಂಗೆ"} } - metric-ton{ - case{ - accusative{ - one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ ಅನ್ನು"} - other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳನ್ನು"} - } - dative{ - one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ಗೆ"} - other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳಿಗೆ"} - } - genitive{ - one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ನ"} - other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳ"} - } - locative{ - one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ನಲ್ಲಿ"} - other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳಲ್ಲಿ"} - } - } - dnam{"ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳು"} - gender{"neuter"} - one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌"} - other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳು"} - } microgram{ case{ accusative{ @@ -2328,6 +2304,30 @@ kn{ one{"{0} ಟನ್‌"} other{"{0} ಟನ್‌ಗಳು"} } + tonne{ + case{ + accusative{ + one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ ಅನ್ನು"} + other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳನ್ನು"} + } + dative{ + one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ಗೆ"} + other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳಿಗೆ"} + } + genitive{ + one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ನ"} + other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳ"} + } + locative{ + one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌ನಲ್ಲಿ"} + other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳಲ್ಲಿ"} + } + } + dnam{"ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳು"} + gender{"neuter"} + one{"{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌"} + other{"{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳು"} + } } power{ gigawatt{ @@ -3755,10 +3755,6 @@ kn{ other{"{0}ಕೆಜಿ"} per{"{0}/ಕೆಜಿ"} } - metric-ton{ - one{"{0}ಟ"} - other{"{0}ಟ"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -3799,6 +3795,10 @@ kn{ one{"{0}ಟನ್‌"} other{"{0}ಟನ್‌"} } + tonne{ + one{"{0}ಟ"} + other{"{0}ಟ"} + } } power{ gigawatt{ @@ -4703,11 +4703,6 @@ kn{ other{"{0} ಕೆಜಿ"} per{"{0}/ಕೆಜಿ"} } - metric-ton{ - dnam{"ಟ"} - one{"{0} ಟ"} - other{"{0} ಟ"} - } microgram{ dnam{"ಮೈ.ಗ್ರಾಂ"} one{"{0} ಮೈ.ಗ್ರಾಂ"} @@ -4750,6 +4745,11 @@ kn{ one{"{0} ಟನ್‌"} other{"{0} ಟನ್‌"} } + tonne{ + dnam{"ಟ"} + one{"{0} ಟ"} + other{"{0} ಟ"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ko.txt b/icu4c/source/data/unit/ko.txt index be6b1efd94f..d3419b84bba 100644 --- a/icu4c/source/data/unit/ko.txt +++ b/icu4c/source/data/unit/ko.txt @@ -546,10 +546,6 @@ ko{ other{"{0}킬로그램"} per{"킬로그램당 {0}"} } - metric-ton{ - dnam{"메트릭 톤"} - other{"{0}메트릭 톤"} - } microgram{ dnam{"마이크로그램"} other{"{0}마이크로그램"} @@ -584,6 +580,10 @@ ko{ dnam{"톤"} other{"{0}톤"} } + tonne{ + dnam{"메트릭 톤"} + other{"{0}메트릭 톤"} + } } power{ gigawatt{ @@ -1079,10 +1079,6 @@ ko{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0}t"} - } microgram{ dnam{"μg"} other{"{0}μg"} @@ -1113,6 +1109,10 @@ ko{ dnam{"tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + other{"{0}t"} + } } power{ horsepower{ @@ -1704,10 +1704,6 @@ ko{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0}t"} - } microgram{ dnam{"μg"} other{"{0}μg"} @@ -1742,6 +1738,10 @@ ko{ dnam{"tn"} other{"{0}tn"} } + tonne{ + dnam{"t"} + other{"{0}t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/kok.txt b/icu4c/source/data/unit/kok.txt index 7f29ad46138..b55e03461f0 100644 --- a/icu4c/source/data/unit/kok.txt +++ b/icu4c/source/data/unit/kok.txt @@ -561,10 +561,6 @@ kok{ other{"{0} किलोग्राम"} per{"{0}/किलोग्राम"} } - metric-ton{ - dnam{"मॅट्रिक टन"} - other{"{0} मॅट्रिक टन"} - } milligram{ dnam{"मिलिग्राम"} other{"{0} मिलिग्राम"} @@ -595,6 +591,10 @@ kok{ dnam{"टन"} other{"{0} टन"} } + tonne{ + dnam{"मॅट्रिक टन"} + other{"{0} मॅट्रिक टन"} + } } power{ gigawatt{ @@ -1400,10 +1400,6 @@ kok{ other{"{0}किग्रा"} per{"{0}/किग्रा"} } - metric-ton{ - dnam{"t"} - other{"{0}t"} - } microgram{ dnam{"μg"} other{"{0}μg"} @@ -1438,6 +1434,10 @@ kok{ dnam{"टन"} other{"{0}टन"} } + tonne{ + dnam{"t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2250,10 +2250,6 @@ kok{ other{"{0} किग्रा"} per{"{0}/किग्रा"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -2288,6 +2284,10 @@ kok{ dnam{"टन"} other{"{0} टन"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ky.txt b/icu4c/source/data/unit/ky.txt index 02cc9e86aa9..54f6b53527d 100644 --- a/icu4c/source/data/unit/ky.txt +++ b/icu4c/source/data/unit/ky.txt @@ -634,11 +634,6 @@ ky{ other{"{0} килограмм"} per{"килограммына {0}"} } - metric-ton{ - dnam{"метр тонна"} - one{"{0} метр тонна"} - other{"{0} метр тонна"} - } microgram{ dnam{"микрограмм"} one{"{0} микрограмм"} @@ -676,6 +671,11 @@ ky{ one{"Америкалык тонна"} other{"{0} тонна"} } + tonne{ + dnam{"метр тонна"} + one{"{0} метр тонна"} + other{"{0} метр тонна"} + } } power{ gigawatt{ @@ -1913,11 +1913,6 @@ ky{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"мкг"} one{"{0} мкг"} @@ -1955,6 +1950,11 @@ ky{ one{"{0} АКШ тон."} other{"{0} АКШ тон."} } + tonne{ + dnam{"т"} + one{"{0} т"} + other{"{0} т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/lb.txt b/icu4c/source/data/unit/lb.txt index a663c35c7b8..86ed5c30aac 100644 --- a/icu4c/source/data/unit/lb.txt +++ b/icu4c/source/data/unit/lb.txt @@ -400,11 +400,6 @@ lb{ one{"{0} Kilogramm"} other{"{0} Kilogramm"} } - metric-ton{ - dnam{"Tonnen"} - one{"{0} Tonn"} - other{"{0} Tonnen"} - } microgram{ dnam{"Mikrogramm"} one{"{0} Mikrogramm"} @@ -440,6 +435,11 @@ lb{ one{"{0} Long ton"} other{"{0} Long tons"} } + tonne{ + dnam{"Tonnen"} + one{"{0} Tonn"} + other{"{0} Tonnen"} + } } power{ gigawatt{ @@ -843,10 +843,6 @@ lb{ one{"{0} kg"} other{"{0} kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ one{"{0} μg"} other{"{0} μg"} @@ -876,6 +872,10 @@ lb{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ @@ -1434,11 +1434,6 @@ lb{ one{"{0} kg"} other{"{0} kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1474,6 +1469,11 @@ lb{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/lo.txt b/icu4c/source/data/unit/lo.txt index 0f30ff59bdc..b0c7883a6d5 100644 --- a/icu4c/source/data/unit/lo.txt +++ b/icu4c/source/data/unit/lo.txt @@ -525,10 +525,6 @@ lo{ other{"{0} ກິໂລກຣາມ"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -563,6 +559,10 @@ lo{ dnam{"ໂຕນ"} other{"{0} ໂຕນ"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -1472,10 +1472,6 @@ lo{ other{"{0} ກິໂລ"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1502,6 +1498,10 @@ lo{ dnam{"ຕ"} other{"{0} ຕ"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/lt.txt b/icu4c/source/data/unit/lt.txt index 772504a02bc..7cb1c50870b 100644 --- a/icu4c/source/data/unit/lt.txt +++ b/icu4c/source/data/unit/lt.txt @@ -3562,46 +3562,6 @@ lt{ other{"{0} kilogramų"} per{"{0}/kg"} } - metric-ton{ - case{ - accusative{ - few{"{0} metrines tonas"} - many{"{0} metrinės tonos"} - one{"{0} metrinę toną"} - other{"{0} metrinių tonų"} - } - dative{ - few{"{0} metrinėms tonoms"} - many{"{0} metrinės tonos"} - one{"{0} metrinei tonai"} - other{"{0} metrinių tonų"} - } - genitive{ - few{"{0} metrinių tonų"} - many{"{0} metrinės tonos"} - one{"{0} metrinės tonos"} - other{"{0} metrinių tonų"} - } - instrumental{ - few{"{0} metrinėmis tonomis"} - many{"{0} metrinės tonos"} - one{"{0} metrine tona"} - other{"{0} metrinių tonų"} - } - locative{ - few{"{0} metrinėse tonose"} - many{"{0} metrinės tonos"} - one{"{0} metrinėje tonoje"} - other{"{0} metrinių tonų"} - } - } - dnam{"metrinės tonos"} - few{"{0} metrinės tonos"} - gender{"feminine"} - many{"{0} metrinės tonos"} - one{"{0} metrinė tona"} - other{"{0} metrinių tonų"} - } microgram{ case{ accusative{ @@ -3722,6 +3682,46 @@ lt{ one{"{0} tona"} other{"{0} tonų"} } + tonne{ + case{ + accusative{ + few{"{0} metrines tonas"} + many{"{0} metrinės tonos"} + one{"{0} metrinę toną"} + other{"{0} metrinių tonų"} + } + dative{ + few{"{0} metrinėms tonoms"} + many{"{0} metrinės tonos"} + one{"{0} metrinei tonai"} + other{"{0} metrinių tonų"} + } + genitive{ + few{"{0} metrinių tonų"} + many{"{0} metrinės tonos"} + one{"{0} metrinės tonos"} + other{"{0} metrinių tonų"} + } + instrumental{ + few{"{0} metrinėmis tonomis"} + many{"{0} metrinės tonos"} + one{"{0} metrine tona"} + other{"{0} metrinių tonų"} + } + locative{ + few{"{0} metrinėse tonose"} + many{"{0} metrinės tonos"} + one{"{0} metrinėje tonoje"} + other{"{0} metrinių tonų"} + } + } + dnam{"metrinės tonos"} + few{"{0} metrinės tonos"} + gender{"feminine"} + many{"{0} metrinės tonos"} + one{"{0} metrinė tona"} + other{"{0} metrinių tonų"} + } } power{ gigawatt{ @@ -6410,13 +6410,6 @@ lt{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"mt"} - few{"{0} mt"} - many{"{0} mt"} - one{"{0} mt"} - other{"{0} mt"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -6468,6 +6461,13 @@ lt{ one{"{0} t"} other{"{0} t"} } + tonne{ + dnam{"mt"} + few{"{0} mt"} + many{"{0} mt"} + one{"{0} mt"} + other{"{0} mt"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/lv.txt b/icu4c/source/data/unit/lv.txt index 4f87525eac1..2f0176e4bf0 100644 --- a/icu4c/source/data/unit/lv.txt +++ b/icu4c/source/data/unit/lv.txt @@ -2643,35 +2643,6 @@ lv{ per{"{0} uz kilogramu"} zero{"{0} kilogramu"} } - metric-ton{ - case{ - accusative{ - one{"{0} metrisko tonnu"} - other{"{0} metriskās tonnas"} - zero{"{0} metrisko tonnu"} - } - dative{ - one{"{0} metriskajai tonnai"} - other{"{0} metriskajām tonnām"} - zero{"{0} metrisko tonnu"} - } - genitive{ - one{"{0} metriskās tonnas"} - other{"{0} metrisko tonnu"} - zero{"{0} metrisko tonnu"} - } - locative{ - one{"{0} metriskajā tonnā"} - other{"{0} metriskajās tonnās"} - zero{"{0} metrisko tonnu"} - } - } - dnam{"metriskās tonnas"} - gender{"feminine"} - one{"{0} metriskā tonna"} - other{"{0} metriskās tonnas"} - zero{"{0} metrisko tonnu"} - } microgram{ case{ accusative{ @@ -2768,6 +2739,35 @@ lv{ other{"{0} tonnas"} zero{"{0} tonnu"} } + tonne{ + case{ + accusative{ + one{"{0} metrisko tonnu"} + other{"{0} metriskās tonnas"} + zero{"{0} metrisko tonnu"} + } + dative{ + one{"{0} metriskajai tonnai"} + other{"{0} metriskajām tonnām"} + zero{"{0} metrisko tonnu"} + } + genitive{ + one{"{0} metriskās tonnas"} + other{"{0} metrisko tonnu"} + zero{"{0} metrisko tonnu"} + } + locative{ + one{"{0} metriskajā tonnā"} + other{"{0} metriskajās tonnās"} + zero{"{0} metrisko tonnu"} + } + } + dnam{"metriskās tonnas"} + gender{"feminine"} + one{"{0} metriskā tonna"} + other{"{0} metriskās tonnas"} + zero{"{0} metrisko tonnu"} + } } power{ gigawatt{ @@ -4885,12 +4885,6 @@ lv{ per{"{0}/kg"} zero{"{0} kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - zero{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -4940,6 +4934,12 @@ lv{ other{"{0} tonnas"} zero{"{0} tonnas"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + zero{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/mk.txt b/icu4c/source/data/unit/mk.txt index 322be0e3f82..f84f7d825c9 100644 --- a/icu4c/source/data/unit/mk.txt +++ b/icu4c/source/data/unit/mk.txt @@ -650,11 +650,6 @@ mk{ other{"{0} килограми"} per{"{0} на килограм"} } - metric-ton{ - dnam{"тони"} - one{"{0} тон"} - other{"{0} тони"} - } microgram{ dnam{"микрограми"} one{"{0} микрограм"} @@ -697,6 +692,11 @@ mk{ one{"{0} американски тон"} other{"{0} американски тони"} } + tonne{ + dnam{"тони"} + one{"{0} тон"} + other{"{0} тони"} + } } power{ gigawatt{ @@ -2104,11 +2104,6 @@ mk{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2151,6 +2146,11 @@ mk{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ml.txt b/icu4c/source/data/unit/ml.txt index 34a198c0dbd..12ff14a9a9e 100644 --- a/icu4c/source/data/unit/ml.txt +++ b/icu4c/source/data/unit/ml.txt @@ -1461,38 +1461,6 @@ ml{ other{"{0} കിലോഗ്രാം"} per{"{0}/കിലോഗ്രാം"} } - metric-ton{ - case{ - accusative{ - one{"{0} മെട്രിക് ടണ്ണിനെ"} - other{"{0} മെട്രിക് ടണ്ണിനെ"} - } - dative{ - one{"{0} മെട്രിക് ടണ്ണിന്"} - other{"{0} മെട്രിക് ടണ്ണിന്"} - } - genitive{ - one{"{0} മെട്രിക് ടണ്ണിന്റെ"} - other{"{0} മെട്രിക് ടണ്ണിന്റെ"} - } - instrumental{ - one{"{0} മെട്രിക് ടണ്ണിനാൽ"} - other{"{0} മെട്രിക് ടണ്ണിനാൽ"} - } - locative{ - one{"{0} മെട്രിക് ടണ്ണിൽ"} - other{"{0} മെട്രിക് ടണ്ണിൽ"} - } - sociative{ - one{"{0} മെട്രിക് ടണ്ണിനോട്"} - other{"{0} മെട്രിക് ടണ്ണിനോട്"} - } - } - dnam{"മെട്രിക് ടൺ"} - gender{"neuter"} - one{"{0} മെട്രിക് ടൺ"} - other{"{0} മെട്രിക് ടൺ"} - } microgram{ dnam{"മൈക്രോഗ്രാം"} one{"{0} മൈക്രോഗ്രാം"} @@ -1535,6 +1503,38 @@ ml{ one{"{0} ടൺ"} other{"{0} ടൺ"} } + tonne{ + case{ + accusative{ + one{"{0} മെട്രിക് ടണ്ണിനെ"} + other{"{0} മെട്രിക് ടണ്ണിനെ"} + } + dative{ + one{"{0} മെട്രിക് ടണ്ണിന്"} + other{"{0} മെട്രിക് ടണ്ണിന്"} + } + genitive{ + one{"{0} മെട്രിക് ടണ്ണിന്റെ"} + other{"{0} മെട്രിക് ടണ്ണിന്റെ"} + } + instrumental{ + one{"{0} മെട്രിക് ടണ്ണിനാൽ"} + other{"{0} മെട്രിക് ടണ്ണിനാൽ"} + } + locative{ + one{"{0} മെട്രിക് ടണ്ണിൽ"} + other{"{0} മെട്രിക് ടണ്ണിൽ"} + } + sociative{ + one{"{0} മെട്രിക് ടണ്ണിനോട്"} + other{"{0} മെട്രിക് ടണ്ണിനോട്"} + } + } + dnam{"മെട്രിക് ടൺ"} + gender{"neuter"} + one{"{0} മെട്രിക് ടൺ"} + other{"{0} മെട്രിക് ടൺ"} + } } power{ gigawatt{ @@ -2319,11 +2319,6 @@ ml{ other{"{0}കി.ഗ്രാം"} per{"{0}/കി.ഗ്രാം"} } - metric-ton{ - dnam{"ട."} - one{"{0}ട."} - other{"{0}ട."} - } microgram{ dnam{"μ.ഗ്രാം."} one{"{0}μ.ഗ്രാം."} @@ -2359,6 +2354,11 @@ ml{ one{"{0}ടൺ"} other{"{0}ടൺ"} } + tonne{ + dnam{"ട."} + one{"{0}ട."} + other{"{0}ട."} + } } power{ kilowatt{ @@ -3065,11 +3065,6 @@ ml{ other{"{0} കി.ഗ്രാം"} per{"{0}/കി.ഗ്രാം"} } - metric-ton{ - dnam{"ട."} - one{"{0} ട."} - other{"{0} ട."} - } microgram{ dnam{"μ.ഗ്രാം."} one{"{0} μ.ഗ്രാം."} @@ -3110,6 +3105,11 @@ ml{ one{"{0} ടൺ"} other{"{0} ടൺ"} } + tonne{ + dnam{"ട."} + one{"{0} ട."} + other{"{0} ട."} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/mn.txt b/icu4c/source/data/unit/mn.txt index 035f542c7bd..f6eb2a15c02 100644 --- a/icu4c/source/data/unit/mn.txt +++ b/icu4c/source/data/unit/mn.txt @@ -669,11 +669,6 @@ mn{ other{"{0} килограмм"} per{"килограмм тутамд {0}"} } - metric-ton{ - dnam{"тонн"} - one{"{0} тонн"} - other{"{0} тонн"} - } microgram{ dnam{"микрограмм"} one{"{0} микрограмм"} @@ -716,6 +711,11 @@ mn{ one{"{0} америк тонн"} other{"{0} америк тонн"} } + tonne{ + dnam{"тонн"} + one{"{0} тонн"} + other{"{0} тонн"} + } } power{ gigawatt{ @@ -2061,11 +2061,6 @@ mn{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"μг"} one{"{0} μг"} @@ -2106,6 +2101,11 @@ mn{ one{"{0} ам. тн"} other{"{0} ам. тн"} } + tonne{ + dnam{"т"} + one{"{0} т"} + other{"{0} т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/mr.txt b/icu4c/source/data/unit/mr.txt index aeb8b18aa8f..e5185b8dd3d 100644 --- a/icu4c/source/data/unit/mr.txt +++ b/icu4c/source/data/unit/mr.txt @@ -2891,38 +2891,6 @@ mr{ other{"{0} किलोग्रॅम"} per{"{0} दर किलोग्रॅम"} } - metric-ton{ - case{ - ablative{ - one{"{0} मेट्रिक टनपासून"} - other{"{0} मेट्रिक टनहून"} - } - accusative{ - one{"{0} मेट्रिक टनला"} - other{"{0} मेट्रिक टनना"} - } - dative{ - one{"{0} मेट्रिक टनला"} - other{"{0} मेट्रिक टनना"} - } - ergative{ - one{"{0} मेट्रिक टनने"} - other{"{0} मेट्रिक टनसाठी"} - } - genitive{ - one{"{0} मेट्रिक टनचा"} - other{"{0} मेट्रिक टननी"} - } - locative{ - one{"{0} मेट्रिक टनशी"} - other{"{0} मेट्रिक टनचे"} - } - } - dnam{"मेट्रिक टन"} - gender{"neuter"} - one{"{0} मेट्रिक टन"} - other{"{0} मेट्रिक टन"} - } microgram{ case{ ablative{ @@ -3019,6 +2987,38 @@ mr{ one{"{0} टन"} other{"{0} टन"} } + tonne{ + case{ + ablative{ + one{"{0} मेट्रिक टनपासून"} + other{"{0} मेट्रिक टनहून"} + } + accusative{ + one{"{0} मेट्रिक टनला"} + other{"{0} मेट्रिक टनना"} + } + dative{ + one{"{0} मेट्रिक टनला"} + other{"{0} मेट्रिक टनना"} + } + ergative{ + one{"{0} मेट्रिक टनने"} + other{"{0} मेट्रिक टनसाठी"} + } + genitive{ + one{"{0} मेट्रिक टनचा"} + other{"{0} मेट्रिक टननी"} + } + locative{ + one{"{0} मेट्रिक टनशी"} + other{"{0} मेट्रिक टनचे"} + } + } + dnam{"मेट्रिक टन"} + gender{"neuter"} + one{"{0} मेट्रिक टन"} + other{"{0} मेट्रिक टन"} + } } power{ gigawatt{ @@ -5318,11 +5318,6 @@ mr{ other{"{0} किग्रॅ"} per{"{0}/किग्रॅ"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -5363,6 +5358,11 @@ mr{ one{"{0} टन"} other{"{0} टन"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ms.txt b/icu4c/source/data/unit/ms.txt index aac0c72280a..2543f448db0 100644 --- a/icu4c/source/data/unit/ms.txt +++ b/icu4c/source/data/unit/ms.txt @@ -544,10 +544,6 @@ ms{ other{"{0} kilogram"} per{"{0} setiap kilogram"} } - metric-ton{ - dnam{"metrik tan"} - other{"{0} metrik tan"} - } microgram{ dnam{"mikrogram"} other{"{0} mikrogram"} @@ -582,6 +578,10 @@ ms{ dnam{"tan"} other{"{0} tan"} } + tonne{ + dnam{"metrik tan"} + other{"{0} metrik tan"} + } } power{ gigawatt{ @@ -1190,10 +1190,6 @@ ms{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1224,6 +1220,10 @@ ms{ dnam{"tan"} other{"{0} tn"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -1813,10 +1813,6 @@ ms{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1847,6 +1843,10 @@ ms{ dnam{"tan"} other{"{0} tn"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/my.txt b/icu4c/source/data/unit/my.txt index dacf37b45aa..ac4d2fd2376 100644 --- a/icu4c/source/data/unit/my.txt +++ b/icu4c/source/data/unit/my.txt @@ -557,10 +557,6 @@ my{ other{"{0} ကီလိုဂရမ်"} per{"တစ်ကီလိုဂရမ်လျှင် {0}"} } - metric-ton{ - dnam{"မက်ထရစ်တန်"} - other{"{0} မက်ထရစ်တန်"} - } microgram{ dnam{"မိုက်ခရို ဂရမ်"} other{"{0} မိုက်ခရို ဂရမ်"} @@ -595,6 +591,10 @@ my{ dnam{"တန်"} other{"{0} တန်"} } + tonne{ + dnam{"မက်ထရစ်တန်"} + other{"{0} မက်ထရစ်တန်"} + } } power{ gigawatt{ @@ -1616,10 +1616,6 @@ my{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"မက်ထရစ်တန်"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -1654,6 +1650,10 @@ my{ dnam{"တန်"} other{"{0} tn"} } + tonne{ + dnam{"မက်ထရစ်တန်"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/mzn.txt b/icu4c/source/data/unit/mzn.txt index 64fb69472a0..77cabde0839 100644 --- a/icu4c/source/data/unit/mzn.txt +++ b/icu4c/source/data/unit/mzn.txt @@ -246,10 +246,6 @@ mzn{ other{"{0} کیلوگرم"} per{"{0} هر کیلوگرم دله"} } - metric-ton{ - dnam{"متریک تُن"} - other{"{0} متریک تُن"} - } microgram{ dnam{"میکروگرم"} other{"{0} میکروگرم"} @@ -276,6 +272,10 @@ mzn{ dnam{"تُن"} other{"{0} تُن"} } + tonne{ + dnam{"متریک تُن"} + other{"{0} متریک تُن"} + } } power{ gigawatt{ @@ -756,10 +756,6 @@ mzn{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"میکروگرم"} other{"{0} μg"} @@ -786,6 +782,10 @@ mzn{ dnam{"تُن"} other{"{0} tn"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ne.txt b/icu4c/source/data/unit/ne.txt index 4b4c2831f32..cec2b0ffa57 100644 --- a/icu4c/source/data/unit/ne.txt +++ b/icu4c/source/data/unit/ne.txt @@ -687,11 +687,6 @@ ne{ other{"{0} किलोग्राम"} per{"{0} प्रति किलोग्राम"} } - metric-ton{ - dnam{"मेट्रिक टन"} - one{"{0}मेट्रिक टन"} - other{"{0}मेट्रिक टन"} - } microgram{ dnam{"माइक्रोग्राम"} one{"{0}माइक्रोग्राम"} @@ -734,6 +729,11 @@ ne{ one{"{0}टन"} other{"{0} टन"} } + tonne{ + dnam{"मेट्रिक टन"} + one{"{0}मेट्रिक टन"} + other{"{0}मेट्रिक टन"} + } } power{ gigawatt{ @@ -2026,11 +2026,6 @@ ne{ other{"{0} किलो"} per{"{0}प्रति किलो"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2071,6 +2066,11 @@ ne{ one{"{0}टन"} other{"{0}टन"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index 102ae813e61..df785db928e 100644 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.txt @@ -792,12 +792,6 @@ nl{ other{"{0} kilogram"} per{"{0} per kilogram"} } - metric-ton{ - dnam{"metrische ton"} - gender{"common"} - one{"{0} metrische ton"} - other{"{0} metrische ton"} - } microgram{ dnam{"microgram"} gender{"neuter"} @@ -845,6 +839,12 @@ nl{ one{"{0} ton"} other{"{0} ton"} } + tonne{ + dnam{"metrische ton"} + gender{"common"} + one{"{0} metrische ton"} + other{"{0} metrische ton"} + } } power{ gigawatt{ @@ -1737,11 +1737,6 @@ nl{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1779,6 +1774,11 @@ nl{ one{"{0} ton"} other{"{0} ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -2592,11 +2592,6 @@ nl{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2634,6 +2629,11 @@ nl{ one{"{0} ton"} other{"{0} ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/no.txt b/icu4c/source/data/unit/no.txt index fa8acecd60c..0dadf575c31 100644 --- a/icu4c/source/data/unit/no.txt +++ b/icu4c/source/data/unit/no.txt @@ -1273,18 +1273,6 @@ no{ other{"{0} kilogram"} per{"{0} per kilogram"} } - metric-ton{ - case{ - genitive{ - one{"{0} tonns"} - other{"{0} tonns"} - } - } - dnam{"tonn"} - gender{"neuter"} - one{"{0} tonn"} - other{"{0} tonn"} - } microgram{ case{ genitive{ @@ -1344,6 +1332,18 @@ no{ one{"{0} amerikansk tonn"} other{"{0} amerikanske tonn"} } + tonne{ + case{ + genitive{ + one{"{0} tonns"} + other{"{0} tonns"} + } + } + dnam{"tonn"} + gender{"neuter"} + one{"{0} tonn"} + other{"{0} tonn"} + } } power{ gigawatt{ @@ -2351,11 +2351,6 @@ no{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ one{"{0}μg"} other{"{0}μg"} @@ -2383,6 +2378,11 @@ no{ one{"{0} am. tn."} other{"{0} am. tn."} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ horsepower{ @@ -3164,11 +3164,6 @@ no{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"tonn"} - one{"{0} tonn"} - other{"{0} tonn"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3209,6 +3204,11 @@ no{ one{"{0} am. tonn"} other{"{0} am. tonn"} } + tonne{ + dnam{"tonn"} + one{"{0} tonn"} + other{"{0} tonn"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/or.txt b/icu4c/source/data/unit/or.txt index 0d64d69ef42..d72d911c724 100644 --- a/icu4c/source/data/unit/or.txt +++ b/icu4c/source/data/unit/or.txt @@ -614,11 +614,6 @@ or{ other{"{0} କିଲୋଗ୍ରାମ୍"} per{"{0} ପ୍ରତି କିଲୋଗ୍ରାମ୍"} } - metric-ton{ - dnam{"ମେଟ୍ରିକ୍ ଟନ୍"} - one{"{0} ମେଟ୍ରିକ୍ ଟନ୍"} - other{"{0} ମେଟ୍ରିକ୍ ଟନ୍"} - } microgram{ dnam{"ମାଇକ୍ରୋଗ୍ରାମ୍"} one{"{0} ମାଇକ୍ରୋଗ୍ରାମ୍"} @@ -661,6 +656,11 @@ or{ one{"{0} ଟନ୍"} other{"{0} ଟନ୍"} } + tonne{ + dnam{"ମେଟ୍ରିକ୍ ଟନ୍"} + one{"{0} ମେଟ୍ରିକ୍ ଟନ୍"} + other{"{0} ମେଟ୍ରିକ୍ ଟନ୍"} + } } power{ gigawatt{ @@ -1270,11 +1270,6 @@ or{ other{"{0}କିଗ୍ରା"} per{"{0}/କି. ଗ୍ରା."} } - metric-ton{ - dnam{"ମେଟ୍ରିକଟନ"} - one{"{0} ମେଟ୍ରିକଟନ"} - other{"{0} ମେଟ୍ରିକଟନ"} - } microgram{ dnam{"ମା. ଗ୍ରା."} one{"{0} ମା. ଗ୍ରା."} @@ -1296,6 +1291,11 @@ or{ one{"{0} ଅନ୍ସ-ଟ୍ରାଇ"} other{"{0} ଅନ୍ସ-ଟ୍ରାଇ"} } + tonne{ + dnam{"ମେଟ୍ରିକଟନ"} + one{"{0} ମେଟ୍ରିକଟନ"} + other{"{0} ମେଟ୍ରିକଟନ"} + } } power{ horsepower{ @@ -1999,11 +1999,6 @@ or{ other{"{0} କିଗ୍ରା"} per{"{0}/କିଗ୍ରା"} } - metric-ton{ - dnam{"ଟ"} - one{"{0} ଟ"} - other{"{0} ଟ"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2044,6 +2039,11 @@ or{ one{"{0} ଟନ୍"} other{"{0} ଟନ୍"} } + tonne{ + dnam{"ଟ"} + one{"{0} ଟ"} + other{"{0} ଟ"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/pa.txt b/icu4c/source/data/unit/pa.txt index 71341bb764d..fd640b9d3b3 100644 --- a/icu4c/source/data/unit/pa.txt +++ b/icu4c/source/data/unit/pa.txt @@ -1253,18 +1253,6 @@ pa{ other{"{0} ਕਿਲੋਗ੍ਰਾਮ"} per{"{0} ਪ੍ਰਤੀ ਕਿਲੋਗ੍ਰਾਮ"} } - metric-ton{ - case{ - oblique{ - one{"{0} ਮੀਟਰਿਕ ਟਨ"} - other{"{0} ਮੀਟਰਿਕ ਟਨ"} - } - } - dnam{"ਮੀਟਰਿਕ ਟਨ"} - gender{"masculine"} - one{"{0} ਮੀਟਰਿਕ ਟਨ"} - other{"{0} ਮੀਟਰਿਕ ਟਨ"} - } microgram{ case{ oblique{ @@ -1321,6 +1309,18 @@ pa{ one{"{0} ਅਮਰੀਕੀ ਟਨ"} other{"{0} ਅਮਰੀਕੀ ਟਨ"} } + tonne{ + case{ + oblique{ + one{"{0} ਮੀਟਰਿਕ ਟਨ"} + other{"{0} ਮੀਟਰਿਕ ਟਨ"} + } + } + dnam{"ਮੀਟਰਿਕ ਟਨ"} + gender{"masculine"} + one{"{0} ਮੀਟਰਿਕ ਟਨ"} + other{"{0} ਮੀਟਰਿਕ ਟਨ"} + } } power{ gigawatt{ @@ -3192,11 +3192,6 @@ pa{ other{"{0} ਕਿ.ਗ੍ਰਾ."} per{"{0}/ਕਿ.ਗ੍ਰਾ."} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3237,6 +3232,11 @@ pa{ one{"{0} ਅਮਰੀਕੀ ਟਨ"} other{"{0} ਅਮਰੀਕੀ ਟਨ"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/pcm.txt b/icu4c/source/data/unit/pcm.txt index ffca4cae409..5a50e61dba8 100644 --- a/icu4c/source/data/unit/pcm.txt +++ b/icu4c/source/data/unit/pcm.txt @@ -680,11 +680,6 @@ pcm{ other{"{0} Kílógram"} per{"{0} Fọ Ích Kílógram"} } - metric-ton{ - dnam{"Mẹ́trík Tọn-dẹm"} - one{"{0} Mẹ́trík Tọn"} - other{"{0} Mẹ́trík Tọn"} - } microgram{ dnam{"Maíkrógram-dẹm"} one{"{0} Maíkrógram"} @@ -727,6 +722,11 @@ pcm{ one{"{0} Tọn"} other{"{0} Tọn"} } + tonne{ + dnam{"Mẹ́trík Tọn-dẹm"} + one{"{0} Mẹ́trík Tọn"} + other{"{0} Mẹ́trík Tọn"} + } } power{ gigawatt{ @@ -2035,11 +2035,6 @@ pcm{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"T"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2082,6 +2077,11 @@ pcm{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"T"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/pl.txt b/icu4c/source/data/unit/pl.txt index 538191fb2ce..b3e8cf0ce8d 100644 --- a/icu4c/source/data/unit/pl.txt +++ b/icu4c/source/data/unit/pl.txt @@ -3229,28 +3229,6 @@ pl{ other{"{0} kilograma"} per{"{0} na kilogram"} } - metric-ton{ - case{ - accusative{ - few{"{0} tony"} - many{"{0} ton"} - one{"{0} tonę"} - other{"{0} tony"} - } - genitive{ - few{"{0} ton"} - many{"{0} ton"} - one{"{0} tony"} - other{"{0} tony"} - } - } - dnam{"tony"} - few{"{0} tony"} - gender{"feminine"} - many{"{0} ton"} - one{"{0} tona"} - other{"{0} tony"} - } microgram{ case{ accusative{ @@ -3460,6 +3438,28 @@ pl{ one{"{0} krótka tona"} other{"{0} krótkiej tony"} } + tonne{ + case{ + accusative{ + few{"{0} tony"} + many{"{0} ton"} + one{"{0} tonę"} + other{"{0} tony"} + } + genitive{ + few{"{0} ton"} + many{"{0} ton"} + one{"{0} tony"} + other{"{0} tony"} + } + } + dnam{"tony"} + few{"{0} tony"} + gender{"feminine"} + many{"{0} ton"} + one{"{0} tona"} + other{"{0} tony"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ps.txt b/icu4c/source/data/unit/ps.txt index 7b284ac92f0..094b927a9a5 100644 --- a/icu4c/source/data/unit/ps.txt +++ b/icu4c/source/data/unit/ps.txt @@ -597,11 +597,6 @@ ps{ other{"{0} کيلو ګرامز"} per{"{0} في کيلو ګرام"} } - metric-ton{ - dnam{"ميټرک ټنز"} - one{"{0} ميټرک ټن"} - other{"{0} ميټرک ټنز"} - } microgram{ dnam{"مايکرو ګرامز"} one{"{0} مايکرو ګرام"} @@ -639,6 +634,11 @@ ps{ one{"{0} ټن"} other{"{0} ټنز"} } + tonne{ + dnam{"ميټرک ټنز"} + one{"{0} ميټرک ټن"} + other{"{0} ميټرک ټنز"} + } } power{ gigawatt{ @@ -1691,11 +1691,6 @@ ps{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1731,6 +1726,11 @@ ps{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/pt.txt b/icu4c/source/data/unit/pt.txt index b27a2614c19..cae095d5dbc 100644 --- a/icu4c/source/data/unit/pt.txt +++ b/icu4c/source/data/unit/pt.txt @@ -797,12 +797,6 @@ pt{ other{"{0} quilogramas"} per{"{0} por quilograma"} } - metric-ton{ - dnam{"toneladas métricas"} - gender{"feminine"} - one{"{0} tonelada métrica"} - other{"{0} toneladas métricas"} - } microgram{ dnam{"microgramas"} gender{"masculine"} @@ -850,6 +844,12 @@ pt{ one{"{0} tonelada americana"} other{"{0} toneladas americanas"} } + tonne{ + dnam{"toneladas métricas"} + gender{"feminine"} + one{"{0} tonelada métrica"} + other{"{0} toneladas métricas"} + } } power{ gigawatt{ @@ -2005,11 +2005,6 @@ pt{ gram{ dnam{"gramas"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } ounce-troy{ dnam{"oz troy"} } @@ -2027,6 +2022,11 @@ pt{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ diff --git a/icu4c/source/data/unit/ro.txt b/icu4c/source/data/unit/ro.txt index 2b70a789070..06a22d8318a 100644 --- a/icu4c/source/data/unit/ro.txt +++ b/icu4c/source/data/unit/ro.txt @@ -1480,20 +1480,6 @@ ro{ other{"{0} de kilograme"} per{"{0} per kilogram"} } - metric-ton{ - case{ - genitive{ - few{"{0} tone"} - one{"{0} tonă"} - other{"{0} de tone"} - } - } - dnam{"tone"} - few{"{0} tone"} - gender{"feminine"} - one{"{0} tonă"} - other{"{0} de tone"} - } microgram{ case{ genitive{ @@ -1560,6 +1546,20 @@ ro{ one{"{0} tonă scurtă"} other{"{0} de tone scurte"} } + tonne{ + case{ + genitive{ + few{"{0} tone"} + one{"{0} tonă"} + other{"{0} de tone"} + } + } + dnam{"tone"} + few{"{0} tone"} + gender{"feminine"} + one{"{0} tonă"} + other{"{0} de tone"} + } } power{ gigawatt{ @@ -2560,12 +2560,6 @@ ro{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -2610,6 +2604,12 @@ ro{ one{"{0} t.s."} other{"{0} t.s."} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ @@ -3484,12 +3484,6 @@ ro{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -3534,6 +3528,12 @@ ro{ one{"{0} t.s."} other{"{0} t.s."} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/root.txt b/icu4c/source/data/unit/root.txt index 3e1c078eee9..1e27363dfbb 100644 --- a/icu4c/source/data/unit/root.txt +++ b/icu4c/source/data/unit/root.txt @@ -561,10 +561,6 @@ root{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - other{"{0} t"} - } microgram{ dnam{"μg"} other{"{0} μg"} @@ -599,6 +595,10 @@ root{ dnam{"tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index 9a92d5b7c65..2bb3282ac79 100644 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.txt @@ -4646,46 +4646,6 @@ ru{ other{"{0} килограмма"} per{"{0} на килограмм"} } - metric-ton{ - case{ - accusative{ - few{"{0} тонны"} - many{"{0} тонн"} - one{"{0} тонна"} - other{"{0} тонны"} - } - dative{ - few{"{0} тоннам"} - many{"{0} тоннам"} - one{"{0} тонне"} - other{"{0} тонны"} - } - genitive{ - few{"{0} тонн"} - many{"{0} тонн"} - one{"{0} тонны"} - other{"{0} тонны"} - } - instrumental{ - few{"{0} тоннами"} - many{"{0} тоннами"} - one{"{0} тонной"} - other{"{0} тонны"} - } - prepositional{ - few{"{0} тоннах"} - many{"{0} тоннах"} - one{"{0} тонне"} - other{"{0} тонны"} - } - } - dnam{"тонны"} - few{"{0} тонны"} - gender{"feminine"} - many{"{0} тонн"} - one{"{0} тонна"} - other{"{0} тонны"} - } microgram{ case{ accusative{ @@ -4940,6 +4900,46 @@ ru{ one{"{0} американская тонна"} other{"{0} американской тонны"} } + tonne{ + case{ + accusative{ + few{"{0} тонны"} + many{"{0} тонн"} + one{"{0} тонна"} + other{"{0} тонны"} + } + dative{ + few{"{0} тоннам"} + many{"{0} тоннам"} + one{"{0} тонне"} + other{"{0} тонны"} + } + genitive{ + few{"{0} тонн"} + many{"{0} тонн"} + one{"{0} тонны"} + other{"{0} тонны"} + } + instrumental{ + few{"{0} тоннами"} + many{"{0} тоннами"} + one{"{0} тонной"} + other{"{0} тонны"} + } + prepositional{ + few{"{0} тоннах"} + many{"{0} тоннах"} + one{"{0} тонне"} + other{"{0} тонны"} + } + } + dnam{"тонны"} + few{"{0} тонны"} + gender{"feminine"} + many{"{0} тонн"} + one{"{0} тонна"} + other{"{0} тонны"} + } } power{ gigawatt{ @@ -7682,13 +7682,6 @@ ru{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - few{"{0} т"} - many{"{0} т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"мкг"} few{"{0} мкг"} @@ -7731,6 +7724,13 @@ ru{ one{"{0} ам. т"} other{"{0} ам. т"} } + tonne{ + dnam{"т"} + few{"{0} т"} + many{"{0} т"} + one{"{0} т"} + other{"{0} т"} + } } power{ kilowatt{ @@ -8737,13 +8737,6 @@ ru{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - few{"{0} т"} - many{"{0} т"} - one{"{0} т"} - other{"{0} т"} - } microgram{ dnam{"мкг"} few{"{0} мкг"} @@ -8795,6 +8788,13 @@ ru{ one{"{0} амер. т"} other{"{0} амер. т"} } + tonne{ + dnam{"т"} + few{"{0} т"} + many{"{0} т"} + one{"{0} т"} + other{"{0} т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sah.txt b/icu4c/source/data/unit/sah.txt index 1b51e7f3d8c..8226b6bcade 100644 --- a/icu4c/source/data/unit/sah.txt +++ b/icu4c/source/data/unit/sah.txt @@ -484,14 +484,14 @@ sah{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - other{"{0} т"} - } milligram{ dnam{"мг"} other{"{0} мг"} } + tonne{ + dnam{"т"} + other{"{0} т"} + } } temperature{ celsius{ diff --git a/icu4c/source/data/unit/sc.txt b/icu4c/source/data/unit/sc.txt index f371ff7cf44..219a8817c77 100644 --- a/icu4c/source/data/unit/sc.txt +++ b/icu4c/source/data/unit/sc.txt @@ -684,11 +684,6 @@ sc{ other{"{0} chilogrammos"} per{"{0} pro chilogrammu"} } - metric-ton{ - dnam{"tonnelladas mètricas"} - one{"{0} tonnellada mètrica"} - other{"{0} tonnelladas mètricas"} - } microgram{ dnam{"microgrammos"} one{"{0} microgrammu"} @@ -731,6 +726,11 @@ sc{ one{"{0} tonnellada"} other{"{0} tonnelladas"} } + tonne{ + dnam{"tonnelladas mètricas"} + one{"{0} tonnellada mètrica"} + other{"{0} tonnelladas mètricas"} + } } power{ gigawatt{ @@ -1563,10 +1563,6 @@ sc{ one{"{0}kg"} other{"{0}kg"} } - metric-ton{ - one{"{0}t"} - other{"{0}t"} - } microgram{ one{"{0}μg"} other{"{0}μg"} @@ -1599,6 +1595,10 @@ sc{ one{"{0}tn"} other{"{0}tn"} } + tonne{ + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sd.txt b/icu4c/source/data/unit/sd.txt index 83d87436bc8..720db8daf1b 100644 --- a/icu4c/source/data/unit/sd.txt +++ b/icu4c/source/data/unit/sd.txt @@ -672,11 +672,6 @@ sd{ other{"{0}ڪلوگرامَ"} per{"{0} في ڪلوگرام"} } - metric-ton{ - dnam{"ميٽرڪ ٽَنَ"} - one{"{0} ميٽرڪ ٽَنُ"} - other{"{0} ميٽرڪ ٽَنَ"} - } microgram{ dnam{"مائڪروگرامَ"} one{"{0} مائڪروگرام"} @@ -714,6 +709,11 @@ sd{ one{"{0} ٽن"} other{"{0} ٽن"} } + tonne{ + dnam{"ميٽرڪ ٽَنَ"} + one{"{0} ميٽرڪ ٽَنُ"} + other{"{0} ميٽرڪ ٽَنَ"} + } } power{ gigawatt{ @@ -1183,16 +1183,16 @@ sd{ other{"{0} kg"} per{"{0}/ڪ.گـ."} } - metric-ton{ - dnam{"ٽَـ"} - one{"{0}ٽَـ"} - other{"{0}ٽَـ"} - } milligram{ dnam{"مـ.گـ."} one{"{0}مـ.گـ."} other{"{0}مـ.گـ."} } + tonne{ + dnam{"ٽَـ"} + one{"{0}ٽَـ"} + other{"{0}ٽَـ"} + } } speed{ kilometer-per-hour{ @@ -1832,10 +1832,6 @@ sd{ one{"{0} ڪلو گرام"} other{"{0} kg"} } - metric-ton{ - one{"{0} t"} - other{"{0} t"} - } microgram{ one{"{0} μg"} other{"{0} μg"} @@ -1871,6 +1867,10 @@ sd{ one{"{0} ٽن"} other{"{0} ٽن"} } + tonne{ + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/si.txt b/icu4c/source/data/unit/si.txt index 0174b5224bb..ea247adb10d 100644 --- a/icu4c/source/data/unit/si.txt +++ b/icu4c/source/data/unit/si.txt @@ -687,11 +687,6 @@ si{ other{"කිලෝග්‍රෑම් {0}"} per{"කිලෝග්‍රෑමයට {0}"} } - metric-ton{ - dnam{"මෙට්ට්‍රික් ටොන්"} - one{"මෙට්ට්‍රික් ටොන් {0}"} - other{"මෙට්ට්‍රික් ටොන් {0}"} - } microgram{ dnam{"මයික්‍රෝ ග්‍රෑම්"} one{"මයික්‍රෝ ග්‍රෑම් {0}"} @@ -734,6 +729,11 @@ si{ one{"ටොන් {0}"} other{"ටොන් {0}"} } + tonne{ + dnam{"මෙට්ට්‍රික් ටොන්"} + one{"මෙට්ට්‍රික් ටොන් {0}"} + other{"මෙට්ට්‍රික් ටොන් {0}"} + } } power{ gigawatt{ @@ -2086,11 +2086,6 @@ si{ other{"කි.ග්‍රෑ. {0}"} per{"{0}/කි.ග්‍රෑ."} } - metric-ton{ - dnam{"ටො"} - one{"ටො {0}"} - other{"ටො {0}"} - } microgram{ dnam{"මග්‍රෑ"} one{"මග්‍රෑ {0}"} @@ -2133,6 +2128,11 @@ si{ one{"ටොන් {0}"} other{"ටොන් {0}"} } + tonne{ + dnam{"ටො"} + one{"ටො {0}"} + other{"ටො {0}"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sk.txt b/icu4c/source/data/unit/sk.txt index f64aefc211e..9b8b5aef65d 100644 --- a/icu4c/source/data/unit/sk.txt +++ b/icu4c/source/data/unit/sk.txt @@ -3626,46 +3626,6 @@ sk{ other{"{0} kilogramov"} per{"{0} na kilogram"} } - metric-ton{ - case{ - accusative{ - few{"{0} tony"} - many{"{0} tony"} - one{"{0} tonu"} - other{"{0} ton"} - } - dative{ - few{"{0} tonám"} - many{"{0} tony"} - one{"{0} tone"} - other{"{0} tonám"} - } - genitive{ - few{"{0} ton"} - many{"{0} tony"} - one{"{0} tony"} - other{"{0} ton"} - } - instrumental{ - few{"{0} tonami"} - many{"{0} tony"} - one{"{0} tonou"} - other{"{0} tonami"} - } - locative{ - few{"{0} tonách"} - many{"{0} tony"} - one{"{0} tone"} - other{"{0} tonách"} - } - } - dnam{"tony"} - few{"{0} tony"} - gender{"feminine"} - many{"{0} tony"} - one{"{0} tona"} - other{"{0} ton"} - } microgram{ case{ accusative{ @@ -3790,6 +3750,46 @@ sk{ one{"{0} americká tona"} other{"{0} amerických ton"} } + tonne{ + case{ + accusative{ + few{"{0} tony"} + many{"{0} tony"} + one{"{0} tonu"} + other{"{0} ton"} + } + dative{ + few{"{0} tonám"} + many{"{0} tony"} + one{"{0} tone"} + other{"{0} tonám"} + } + genitive{ + few{"{0} ton"} + many{"{0} tony"} + one{"{0} tony"} + other{"{0} ton"} + } + instrumental{ + few{"{0} tonami"} + many{"{0} tony"} + one{"{0} tonou"} + other{"{0} tonami"} + } + locative{ + few{"{0} tonách"} + many{"{0} tony"} + one{"{0} tone"} + other{"{0} tonách"} + } + } + dnam{"tony"} + few{"{0} tony"} + gender{"feminine"} + many{"{0} tony"} + one{"{0} tona"} + other{"{0} ton"} + } } power{ gigawatt{ @@ -5611,13 +5611,6 @@ sk{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -5669,6 +5662,13 @@ sk{ one{"{0} to"} other{"{0} to"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ megawatt{ @@ -6749,13 +6749,6 @@ sk{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -6814,6 +6807,13 @@ sk{ one{"{0} to"} other{"{0} to"} } + tonne{ + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sl.txt b/icu4c/source/data/unit/sl.txt index 800722fd35d..8e0f7669c81 100644 --- a/icu4c/source/data/unit/sl.txt +++ b/icu4c/source/data/unit/sl.txt @@ -3660,46 +3660,6 @@ sl{ per{"{0} na kilogram"} two{"{0} kilograma"} } - metric-ton{ - case{ - accusative{ - few{"{0} metrične tone"} - one{"{0} metrično tono"} - other{"{0} metričnih ton"} - two{"{0} metrični toni"} - } - dative{ - few{"{0} metričnim tonam"} - one{"{0} metrični toni"} - other{"{0} metričnim tonam"} - two{"{0} metričnima tonama"} - } - genitive{ - few{"{0} metričnih ton"} - one{"{0} metrične tone"} - other{"{0} metričnih ton"} - two{"{0} metričnih ton"} - } - instrumental{ - few{"{0} metričnimi tonami"} - one{"{0} metrično tono"} - other{"{0} metričnimi tonami"} - two{"{0} metričnima tonama"} - } - locative{ - few{"{0} metričnih tonah"} - one{"{0} metrični toni"} - other{"{0} metričnih tonah"} - two{"{0} metričnih tonah"} - } - } - dnam{"metrične tone"} - few{"{0} metrične tone"} - gender{"feminine"} - one{"{0} metrična tona"} - other{"{0} metričnih ton"} - two{"{0} metrični toni"} - } microgram{ case{ accusative{ @@ -3824,6 +3784,46 @@ sl{ other{"{0} ameriških ton"} two{"{0} ameriški toni"} } + tonne{ + case{ + accusative{ + few{"{0} metrične tone"} + one{"{0} metrično tono"} + other{"{0} metričnih ton"} + two{"{0} metrični toni"} + } + dative{ + few{"{0} metričnim tonam"} + one{"{0} metrični toni"} + other{"{0} metričnim tonam"} + two{"{0} metričnima tonama"} + } + genitive{ + few{"{0} metričnih ton"} + one{"{0} metrične tone"} + other{"{0} metričnih ton"} + two{"{0} metričnih ton"} + } + instrumental{ + few{"{0} metričnimi tonami"} + one{"{0} metrično tono"} + other{"{0} metričnimi tonami"} + two{"{0} metričnima tonama"} + } + locative{ + few{"{0} metričnih tonah"} + one{"{0} metrični toni"} + other{"{0} metričnih tonah"} + two{"{0} metričnih tonah"} + } + } + dnam{"metrične tone"} + few{"{0} metrične tone"} + gender{"feminine"} + one{"{0} metrična tona"} + other{"{0} metričnih ton"} + two{"{0} metrični toni"} + } } power{ gigawatt{ @@ -6459,13 +6459,6 @@ sl{ per{"{0}/kg"} two{"{0} kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - two{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -6524,6 +6517,13 @@ sl{ other{"{0} sh tn"} two{"{0} sh tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + two{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/so.txt b/icu4c/source/data/unit/so.txt index a6740941075..43fb2e07e86 100644 --- a/icu4c/source/data/unit/so.txt +++ b/icu4c/source/data/unit/so.txt @@ -591,11 +591,6 @@ so{ other{"{0} kiilogaraam"} per{"{0} kiilogaraam"} } - metric-ton{ - dnam{"metrik tan"} - one{"{0} metrik tan"} - other{"{0} metrik tan"} - } microgram{ dnam{"maykrogaraam"} one{"{0} maykrogaraam"} @@ -633,6 +628,11 @@ so{ one{"{0} tan"} other{"{0} tan"} } + tonne{ + dnam{"metrik tan"} + one{"{0} metrik tan"} + other{"{0} metrik tan"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sq.txt b/icu4c/source/data/unit/sq.txt index cf0dd5e170b..938c256bc99 100644 --- a/icu4c/source/data/unit/sq.txt +++ b/icu4c/source/data/unit/sq.txt @@ -674,11 +674,6 @@ sq{ other{"{0} kilogramë"} per{"{0}/kilogram"} } - metric-ton{ - dnam{"tonë metrik"} - one{"{0} ton metrik"} - other{"{0} tonë metrik"} - } microgram{ dnam{"mikrogramë"} one{"{0} mikrogram"} @@ -716,6 +711,11 @@ sq{ one{"{0} ton"} other{"{0} tonë"} } + tonne{ + dnam{"tonë metrik"} + one{"{0} ton metrik"} + other{"{0} tonë metrik"} + } } power{ gigawatt{ @@ -1625,11 +1625,6 @@ sq{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1672,6 +1667,11 @@ sq{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -2502,11 +2502,6 @@ sq{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2539,6 +2534,11 @@ sq{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sr.txt b/icu4c/source/data/unit/sr.txt index 487bcece1d1..b9fbccec990 100644 --- a/icu4c/source/data/unit/sr.txt +++ b/icu4c/source/data/unit/sr.txt @@ -2236,30 +2236,6 @@ sr{ other{"{0} килограма"} per{"{0} по килограму"} } - metric-ton{ - case{ - accusative{ - few{"{0} метричке тоне"} - one{"{0} метричку тону"} - other{"{0} метричких тона"} - } - genitive{ - few{"{0} метричке тоне"} - one{"{0} метричке тоне"} - other{"{0} метричких тона"} - } - instrumental{ - few{"{0} метричке тоне"} - one{"{0} метричком тоном"} - other{"{0} метричких тона"} - } - } - dnam{"метричке тоне"} - few{"{0} метричке тоне"} - gender{"feminine"} - one{"{0} метричка тона"} - other{"{0} метричких тона"} - } microgram{ case{ accusative{ @@ -2346,6 +2322,30 @@ sr{ one{"{0} тона"} other{"{0} тона"} } + tonne{ + case{ + accusative{ + few{"{0} метричке тоне"} + one{"{0} метричку тону"} + other{"{0} метричких тона"} + } + genitive{ + few{"{0} метричке тоне"} + one{"{0} метричке тоне"} + other{"{0} метричких тона"} + } + instrumental{ + few{"{0} метричке тоне"} + one{"{0} метричком тоном"} + other{"{0} метричких тона"} + } + } + dnam{"метричке тоне"} + few{"{0} метричке тоне"} + gender{"feminine"} + one{"{0} метричка тона"} + other{"{0} метричких тона"} + } } power{ gigawatt{ @@ -4302,12 +4302,6 @@ sr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -4346,6 +4340,12 @@ sr{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index c4f180c0143..c0e60169c61 100644 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -1990,30 +1990,6 @@ sr_Latn{ other{"{0} kilograma"} per{"{0} po kilogramu"} } - metric-ton{ - case{ - accusative{ - few{"{0} metričke tone"} - one{"{0} metričku tonu"} - other{"{0} metričkih tona"} - } - genitive{ - few{"{0} metričke tone"} - one{"{0} metričke tone"} - other{"{0} metričkih tona"} - } - instrumental{ - few{"{0} metričke tone"} - one{"{0} metričkom tonom"} - other{"{0} metričkih tona"} - } - } - dnam{"metričke tone"} - few{"{0} metričke tone"} - gender{"feminine"} - one{"{0} metrička tona"} - other{"{0} metričkih tona"} - } microgram{ case{ genitive{ @@ -2090,6 +2066,30 @@ sr_Latn{ one{"{0} tona"} other{"{0} tona"} } + tonne{ + case{ + accusative{ + few{"{0} metričke tone"} + one{"{0} metričku tonu"} + other{"{0} metričkih tona"} + } + genitive{ + few{"{0} metričke tone"} + one{"{0} metričke tone"} + other{"{0} metričkih tona"} + } + instrumental{ + few{"{0} metričke tone"} + one{"{0} metričkom tonom"} + other{"{0} metričkih tona"} + } + } + dnam{"metričke tone"} + few{"{0} metričke tone"} + gender{"feminine"} + one{"{0} metrička tona"} + other{"{0} metričkih tona"} + } } power{ gigawatt{ @@ -3934,12 +3934,6 @@ sr_Latn{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - few{"{0} t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} few{"{0} μg"} @@ -3978,6 +3972,12 @@ sr_Latn{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + few{"{0} t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sv.txt b/icu4c/source/data/unit/sv.txt index d2b0d977c1c..1cee7fe470e 100644 --- a/icu4c/source/data/unit/sv.txt +++ b/icu4c/source/data/unit/sv.txt @@ -1266,18 +1266,6 @@ sv{ other{"{0} kilogram"} per{"{0} per kilogram"} } - metric-ton{ - case{ - genitive{ - one{"{0} tons"} - other{"{0} tons"} - } - } - dnam{"ton"} - gender{"neuter"} - one{"{0} ton"} - other{"{0} ton"} - } microgram{ case{ genitive{ @@ -1337,6 +1325,18 @@ sv{ one{"{0} engelskt kort ton"} other{"{0} engelska korta ton"} } + tonne{ + case{ + genitive{ + one{"{0} tons"} + other{"{0} tons"} + } + } + dnam{"ton"} + gender{"neuter"} + one{"{0} ton"} + other{"{0} ton"} + } } power{ gigawatt{ @@ -2473,11 +2473,6 @@ sv{ other{"{0}kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0}t"} - other{"{0}t"} - } microgram{ dnam{"μg"} one{"{0}μg"} @@ -2515,6 +2510,11 @@ sv{ one{"{0} en.k.ton"} other{"{0} en.k.ton"} } + tonne{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } } power{ gigawatt{ @@ -3387,11 +3387,6 @@ sv{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -3429,6 +3424,11 @@ sv{ one{"{0} eng. k. ton"} other{"{0} eng. k. ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/sw.txt b/icu4c/source/data/unit/sw.txt index 0bf3ce1265e..b59adf7313a 100644 --- a/icu4c/source/data/unit/sw.txt +++ b/icu4c/source/data/unit/sw.txt @@ -689,11 +689,6 @@ sw{ other{"kilogramu {0}"} per{"{0} kwa kila kilogramu"} } - metric-ton{ - dnam{"tani mita"} - one{"tani mita {0}"} - other{"tani mita {0}"} - } microgram{ dnam{"mikrogramu"} one{"mikrogramu {0}"} @@ -736,6 +731,11 @@ sw{ one{"tani fupi {0}"} other{"tani fupi {0}"} } + tonne{ + dnam{"tani mita"} + one{"tani mita {0}"} + other{"tani mita {0}"} + } } power{ gigawatt{ @@ -2037,11 +2037,6 @@ sw{ other{"kg {0}"} per{"{0}/kg"} } - metric-ton{ - dnam{"tani mita"} - one{"tani mita {0}"} - other{"tani mita {0}"} - } microgram{ dnam{"mikrogramu"} one{"mikrogramu {0}"} @@ -2084,6 +2079,11 @@ sw{ one{"tani fupi {0}"} other{"tani fupi {0}"} } + tonne{ + dnam{"tani mita"} + one{"tani mita {0}"} + other{"tani mita {0}"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ta.txt b/icu4c/source/data/unit/ta.txt index 13f5886bddf..b2c5b9f3eb8 100644 --- a/icu4c/source/data/unit/ta.txt +++ b/icu4c/source/data/unit/ta.txt @@ -1800,25 +1800,6 @@ ta{ other{"{0} கிலோகிராம்கள்"} per{"{0}/கிலோகிராம்"} } - metric-ton{ - case{ - ablative{ - one{"{0} மெட்ரிக் டன்னில்"} - other{"{0} மெட்ரிக் டன்களில்"} - } - accusative{ - one{"{0} மெட்ரிக் டன்னை"} - other{"{0} மெட்ரிக் டன்களை"} - } - dative{ - one{"{0} மெட்ரிக் டன்னுக்கு"} - other{"{0} மெட்ரிக் டன்களுக்கு"} - } - } - dnam{"மெட்ரிக் டன்கள்"} - one{"{0} மெட்ரிக் டன்"} - other{"{0} மெட்ரிக் டன்கள்"} - } microgram{ case{ ablative{ @@ -1889,6 +1870,25 @@ ta{ one{"{0} டன்"} other{"{0} டன்கள்"} } + tonne{ + case{ + ablative{ + one{"{0} மெட்ரிக் டன்னில்"} + other{"{0} மெட்ரிக் டன்களில்"} + } + accusative{ + one{"{0} மெட்ரிக் டன்னை"} + other{"{0} மெட்ரிக் டன்களை"} + } + dative{ + one{"{0} மெட்ரிக் டன்னுக்கு"} + other{"{0} மெட்ரிக் டன்களுக்கு"} + } + } + dnam{"மெட்ரிக் டன்கள்"} + one{"{0} மெட்ரிக் டன்"} + other{"{0} மெட்ரிக் டன்கள்"} + } } power{ gigawatt{ @@ -3186,10 +3186,6 @@ ta{ other{"{0}கி.கி."} per{"{0}/கி.கி."} } - metric-ton{ - one{"{0}ட."} - other{"{0}ட."} - } microgram{ one{"{0}μகி"} other{"{0}μகி"} @@ -3228,6 +3224,10 @@ ta{ one{"{0}டன்"} other{"{0}டன்"} } + tonne{ + one{"{0}ட."} + other{"{0}ட."} + } } power{ gigawatt{ @@ -4141,11 +4141,6 @@ ta{ other{"{0} கி.கி."} per{"{0}/கி.கி."} } - metric-ton{ - dnam{"ட."} - one{"{0} ட."} - other{"{0} ட."} - } microgram{ dnam{"μகி"} one{"{0} μகி"} @@ -4186,6 +4181,11 @@ ta{ one{"{0} டன்"} other{"{0} டன்"} } + tonne{ + dnam{"ட."} + one{"{0} ட."} + other{"{0} ட."} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/te.txt b/icu4c/source/data/unit/te.txt index 3f412dd7f95..d0fdb42ae3e 100644 --- a/icu4c/source/data/unit/te.txt +++ b/icu4c/source/data/unit/te.txt @@ -688,11 +688,6 @@ te{ other{"{0} కిలోగ్రాములు"} per{"కిలోగ్రాముకు {0}"} } - metric-ton{ - dnam{"మెట్రిక్ టన్నులు"} - one{"{0} మెట్రిక్ టన్ను"} - other{"{0} మెట్రిక్ టన్నులు"} - } microgram{ dnam{"మైక్రోగ్రాములు"} one{"{0} మైక్రోగ్రాము"} @@ -735,6 +730,11 @@ te{ one{"{0} టన్ను"} other{"{0} టన్నులు"} } + tonne{ + dnam{"మెట్రిక్ టన్నులు"} + one{"{0} మెట్రిక్ టన్ను"} + other{"{0} మెట్రిక్ టన్నులు"} + } } power{ gigawatt{ @@ -2144,11 +2144,6 @@ te{ other{"{0} కి.గ్రా."} per{"{0}/కి.గ్రా."} } - metric-ton{ - dnam{"ట"} - one{"{0} ట"} - other{"{0} ట"} - } microgram{ dnam{"మై.గ్రా."} one{"{0} మై.గ్రా."} @@ -2189,6 +2184,11 @@ te{ one{"{0} టన్ను"} other{"{0} టన్ను"} } + tonne{ + dnam{"ట"} + one{"{0} ట"} + other{"{0} ట"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/th.txt b/icu4c/source/data/unit/th.txt index ff175da27ae..e9407138aec 100644 --- a/icu4c/source/data/unit/th.txt +++ b/icu4c/source/data/unit/th.txt @@ -560,10 +560,6 @@ th{ other{"{0} กิโลกรัม"} per{"{0} ต่อกิโลกรัม"} } - metric-ton{ - dnam{"เมตริกตัน"} - other{"{0} เมตริกตัน"} - } microgram{ dnam{"ไมโครกรัม"} other{"{0} ไมโครกรัม"} @@ -598,6 +594,10 @@ th{ dnam{"ตัน"} other{"{0} ตัน"} } + tonne{ + dnam{"เมตริกตัน"} + other{"{0} เมตริกตัน"} + } } power{ gigawatt{ @@ -1304,9 +1304,6 @@ th{ dnam{"กก."} other{"{0}กก."} } - metric-ton{ - other{"{0}ต."} - } microgram{ other{"{0}มคก."} } @@ -1333,6 +1330,9 @@ th{ ton{ other{"{0}ตัน"} } + tonne{ + other{"{0}ต."} + } } power{ gigawatt{ @@ -2033,10 +2033,6 @@ th{ other{"{0} กก."} per{"{0}/กก."} } - metric-ton{ - dnam{"ต."} - other{"{0} ต."} - } microgram{ dnam{"มคก."} other{"{0} มคก."} @@ -2069,6 +2065,10 @@ th{ dnam{"ตัน"} other{"{0} ตัน"} } + tonne{ + dnam{"ต."} + other{"{0} ต."} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/tk.txt b/icu4c/source/data/unit/tk.txt index 68a8f80dba6..086faabd6b4 100644 --- a/icu4c/source/data/unit/tk.txt +++ b/icu4c/source/data/unit/tk.txt @@ -684,11 +684,6 @@ tk{ other{"{0} kilogram"} per{"{0}/kilogram"} } - metric-ton{ - dnam{"metrik tonna"} - one{"{0} metrik tonna"} - other{"{0} metrik tonna"} - } microgram{ dnam{"mikrogram"} one{"{0} mikrogram"} @@ -731,6 +726,11 @@ tk{ one{"{0} tonna"} other{"{0} tonna"} } + tonne{ + dnam{"metrik tonna"} + one{"{0} metrik tonna"} + other{"{0} metrik tonna"} + } } power{ gigawatt{ @@ -1893,11 +1893,6 @@ tk{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1940,6 +1935,11 @@ tk{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/to.txt b/icu4c/source/data/unit/to.txt index 7680fd1d520..9e0fc293bc3 100644 --- a/icu4c/source/data/unit/to.txt +++ b/icu4c/source/data/unit/to.txt @@ -564,10 +564,6 @@ to{ other{"kilokalami ʻe {0}"} per{"{0} he kilokalami"} } - metric-ton{ - dnam{"toni"} - other{"toni ʻe {0}"} - } microgram{ dnam{"maikolokalami"} other{"maikolokalami ʻe {0}"} @@ -602,6 +598,10 @@ to{ dnam{"toni nounou"} other{"toni nounou ʻe {0}"} } + tonne{ + dnam{"toni"} + other{"toni ʻe {0}"} + } } power{ gigawatt{ @@ -1369,10 +1369,6 @@ to{ other{"{0} kk"} per{"{0}/kk"} } - metric-ton{ - dnam{"to"} - other{"{0} to"} - } microgram{ dnam{"μk"} other{"{0} μk"} @@ -1407,6 +1403,10 @@ to{ dnam{"tn"} other{"{0} tn"} } + tonne{ + dnam{"to"} + other{"{0} to"} + } } power{ gigawatt{ @@ -2176,10 +2176,6 @@ to{ other{"kk ʻe {0}"} per{"{0}/kk"} } - metric-ton{ - dnam{"to"} - other{"to ʻe {0}"} - } microgram{ dnam{"μk"} other{"μk ʻe {0}"} @@ -2214,6 +2210,10 @@ to{ dnam{"tn"} other{"tn ʻe {0}"} } + tonne{ + dnam{"to"} + other{"to ʻe {0}"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/tr.txt b/icu4c/source/data/unit/tr.txt index 92892bc8e2c..4b879791a8d 100644 --- a/icu4c/source/data/unit/tr.txt +++ b/icu4c/source/data/unit/tr.txt @@ -682,11 +682,6 @@ tr{ other{"{0} kilogram"} per{"{0}/kg"} } - metric-ton{ - dnam{"ton"} - one{"{0} ton"} - other{"{0} ton"} - } microgram{ dnam{"mikrogram"} one{"{0} mikrogram"} @@ -729,6 +724,11 @@ tr{ one{"{0} Amerikan tonu"} other{"{0} Amerikan tonu"} } + tonne{ + dnam{"ton"} + one{"{0} ton"} + other{"{0} ton"} + } } power{ gigawatt{ @@ -1549,11 +1549,6 @@ tr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1594,6 +1589,11 @@ tr{ one{"{0} kısa ton"} other{"{0} kısa ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -2387,11 +2387,6 @@ tr{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2434,6 +2429,11 @@ tr{ one{"{0} kısa ton"} other{"{0} kısa ton"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/uk.txt b/icu4c/source/data/unit/uk.txt index 2bff73941e5..c4cd53eae6b 100644 --- a/icu4c/source/data/unit/uk.txt +++ b/icu4c/source/data/unit/uk.txt @@ -3700,46 +3700,6 @@ uk{ other{"{0} кілограма"} per{"{0} на кілограм"} } - metric-ton{ - case{ - accusative{ - few{"{0} метричні тонни"} - many{"{0} метричних тонн"} - one{"{0} метричну тонну"} - other{"{0} метричної тонни"} - } - dative{ - few{"{0} метричним тоннам"} - many{"{0} метричним тоннам"} - one{"{0} метричній тонні"} - other{"{0} метричної тонни"} - } - genitive{ - few{"{0} метричних тонн"} - many{"{0} метричних тонн"} - one{"{0} метричної тонни"} - other{"{0} метричної тонни"} - } - instrumental{ - few{"{0} метричними тоннами"} - many{"{0} метричними тоннами"} - one{"{0} метричною тонною"} - other{"{0} метричної тонни"} - } - locative{ - few{"{0} метричних тоннах"} - many{"{0} метричних тоннах"} - one{"{0} метричній тонні"} - other{"{0} метричної тонни"} - } - } - dnam{"метричні тонни"} - few{"{0} метричні тонни"} - gender{"feminine"} - many{"{0} метричних тонн"} - one{"{0} метрична тонна"} - other{"{0} метричної тонни"} - } microgram{ case{ accusative{ @@ -3864,6 +3824,46 @@ uk{ one{"{0} тонна"} other{"{0} тонни"} } + tonne{ + case{ + accusative{ + few{"{0} метричні тонни"} + many{"{0} метричних тонн"} + one{"{0} метричну тонну"} + other{"{0} метричної тонни"} + } + dative{ + few{"{0} метричним тоннам"} + many{"{0} метричним тоннам"} + one{"{0} метричній тонні"} + other{"{0} метричної тонни"} + } + genitive{ + few{"{0} метричних тонн"} + many{"{0} метричних тонн"} + one{"{0} метричної тонни"} + other{"{0} метричної тонни"} + } + instrumental{ + few{"{0} метричними тоннами"} + many{"{0} метричними тоннами"} + one{"{0} метричною тонною"} + other{"{0} метричної тонни"} + } + locative{ + few{"{0} метричних тоннах"} + many{"{0} метричних тоннах"} + one{"{0} метричній тонні"} + other{"{0} метричної тонни"} + } + } + dnam{"метричні тонни"} + few{"{0} метричні тонни"} + gender{"feminine"} + many{"{0} метричних тонн"} + one{"{0} метрична тонна"} + other{"{0} метричної тонни"} + } } power{ gigawatt{ @@ -5898,13 +5898,6 @@ uk{ other{"{0}кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"т"} - few{"{0}т"} - many{"{0}т"} - one{"{0}т"} - other{"{0}т"} - } microgram{ few{"{0}мкг"} many{"{0}мкг"} @@ -5961,6 +5954,13 @@ uk{ one{"{0}т"} other{"{0}т"} } + tonne{ + dnam{"т"} + few{"{0}т"} + many{"{0}т"} + one{"{0}т"} + other{"{0}т"} + } } power{ horsepower{ @@ -7082,13 +7082,6 @@ uk{ other{"{0} кг"} per{"{0}/кг"} } - metric-ton{ - dnam{"метр. т"} - few{"{0} метр. т"} - many{"{0} метр. т"} - one{"{0} метр. т"} - other{"{0} метр. т"} - } microgram{ dnam{"мкг"} few{"{0} мкг"} @@ -7143,6 +7136,13 @@ uk{ one{"{0} т"} other{"{0} т"} } + tonne{ + dnam{"метр. т"} + few{"{0} метр. т"} + many{"{0} метр. т"} + one{"{0} метр. т"} + other{"{0} метр. т"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/ur.txt b/icu4c/source/data/unit/ur.txt index 65f501c0c59..e5e6b3699b8 100644 --- a/icu4c/source/data/unit/ur.txt +++ b/icu4c/source/data/unit/ur.txt @@ -780,12 +780,6 @@ ur{ other{"{0} کلو گرام"} per{"{0} فی کلو گرام"} } - metric-ton{ - dnam{"میٹرک ٹن"} - gender{"masculine"} - one{"{0} میٹرک ٹن"} - other{"{0} میٹرک ٹن"} - } microgram{ dnam{"مائکرو گرام"} gender{"masculine"} @@ -830,6 +824,12 @@ ur{ one{"{0} ٹن"} other{"{0} ٹن"} } + tonne{ + dnam{"میٹرک ٹن"} + gender{"masculine"} + one{"{0} میٹرک ٹن"} + other{"{0} میٹرک ٹن"} + } } power{ gigawatt{ @@ -2273,11 +2273,6 @@ ur{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2320,6 +2315,11 @@ ur{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/uz.txt b/icu4c/source/data/unit/uz.txt index 97ba9536fd0..16e9769742c 100644 --- a/icu4c/source/data/unit/uz.txt +++ b/icu4c/source/data/unit/uz.txt @@ -677,11 +677,6 @@ uz{ other{"{0} kilogramm"} per{"{0}/kilogramm"} } - metric-ton{ - dnam{"tonna"} - one{"{0} tonna"} - other{"{0} tonna"} - } microgram{ dnam{"mikrogramm"} one{"{0} mikrogramm"} @@ -724,6 +719,11 @@ uz{ one{"{0} amerika tonnasi"} other{"{0} amerika tonnasi"} } + tonne{ + dnam{"tonna"} + one{"{0} tonna"} + other{"{0} tonna"} + } } power{ gigawatt{ @@ -2053,11 +2053,6 @@ uz{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -2100,6 +2095,11 @@ uz{ one{"{0} amer. t"} other{"{0} amer. t"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/vi.txt b/icu4c/source/data/unit/vi.txt index 29ffa785dbc..61af1c9fa43 100644 --- a/icu4c/source/data/unit/vi.txt +++ b/icu4c/source/data/unit/vi.txt @@ -488,10 +488,6 @@ vi{ dnam{"kilôgam"} other{"{0} kilôgam"} } - metric-ton{ - dnam{"tấn hệ mét"} - other{"{0} tấn hệ mét"} - } microgram{ dnam{"micrôgam"} other{"{0} micrôgam"} @@ -521,6 +517,10 @@ vi{ dnam{"tấn"} other{"{0} tấn"} } + tonne{ + dnam{"tấn hệ mét"} + other{"{0} tấn hệ mét"} + } } power{ gigawatt{ @@ -1315,9 +1315,6 @@ vi{ kilogram{ dnam{"kg"} } - metric-ton{ - dnam{"t"} - } microgram{ dnam{"μg"} } @@ -1338,6 +1335,9 @@ vi{ solar-mass{ dnam{"trọng lượng mặt trời"} } + tonne{ + dnam{"t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/yrl.txt b/icu4c/source/data/unit/yrl.txt index 166fda0b2d6..cd5291d19f5 100644 --- a/icu4c/source/data/unit/yrl.txt +++ b/icu4c/source/data/unit/yrl.txt @@ -591,11 +591,6 @@ yrl{ other{"{0} pusesawa-ita"} per{"{0} pusesawa rupi"} } - metric-ton{ - dnam{"tonerada metirika-ita"} - one{"{0} tonerada metirika-ita"} - other{"{0} tonerada metirika-ita"} - } microgram{ dnam{"mikrugrama-ita"} one{"{0} mikrugrama"} @@ -638,6 +633,11 @@ yrl{ one{"{0} tonerada"} other{"{0} tonerada-ita"} } + tonne{ + dnam{"tonerada metirika-ita"} + one{"{0} tonerada metirika-ita"} + other{"{0} tonerada metirika-ita"} + } } power{ gigawatt{ @@ -1546,11 +1546,6 @@ yrl{ gram{ dnam{"grama"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } ounce-troy{ dnam{"oz troy"} } @@ -1568,6 +1563,11 @@ yrl{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ horsepower{ diff --git a/icu4c/source/data/unit/yue.txt b/icu4c/source/data/unit/yue.txt index 88d4d5e6b06..0bdf323c2f5 100644 --- a/icu4c/source/data/unit/yue.txt +++ b/icu4c/source/data/unit/yue.txt @@ -565,10 +565,6 @@ yue{ other{"{0} 公斤"} per{"每公斤 {0}"} } - metric-ton{ - dnam{"公噸"} - other{"{0} 公噸"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -603,6 +599,10 @@ yue{ dnam{"英噸"} other{"{0} 英噸"} } + tonne{ + dnam{"公噸"} + other{"{0} 公噸"} + } } power{ gigawatt{ @@ -1617,10 +1617,6 @@ yue{ other{"{0} 公斤"} per{"每公斤{0}"} } - metric-ton{ - dnam{"公噸"} - other{"{0} 公噸"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -1655,6 +1651,10 @@ yue{ dnam{"英噸"} other{"{0} 英噸"} } + tonne{ + dnam{"公噸"} + other{"{0} 公噸"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/yue_Hans.txt b/icu4c/source/data/unit/yue_Hans.txt index 5682d7c3e3e..a22e240093e 100644 --- a/icu4c/source/data/unit/yue_Hans.txt +++ b/icu4c/source/data/unit/yue_Hans.txt @@ -566,10 +566,6 @@ yue_Hans{ other{"{0} 公斤"} per{"每公斤 {0}"} } - metric-ton{ - dnam{"公吨"} - other{"{0} 公吨"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -604,6 +600,10 @@ yue_Hans{ dnam{"英吨"} other{"{0} 英吨"} } + tonne{ + dnam{"公吨"} + other{"{0} 公吨"} + } } power{ gigawatt{ @@ -1618,10 +1618,6 @@ yue_Hans{ other{"{0} 公斤"} per{"每公斤{0}"} } - metric-ton{ - dnam{"公吨"} - other{"{0} 公吨"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -1656,6 +1652,10 @@ yue_Hans{ dnam{"英吨"} other{"{0} 英吨"} } + tonne{ + dnam{"公吨"} + other{"{0} 公吨"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/zh.txt b/icu4c/source/data/unit/zh.txt index 41497cf5679..11797e31d31 100644 --- a/icu4c/source/data/unit/zh.txt +++ b/icu4c/source/data/unit/zh.txt @@ -538,10 +538,6 @@ zh{ other{"{0}千克"} per{"每千克{0}"} } - metric-ton{ - dnam{"公吨"} - other{"{0}公吨"} - } microgram{ dnam{"微克"} other{"{0}微克"} @@ -576,6 +572,10 @@ zh{ dnam{"吨"} other{"{0}吨"} } + tonne{ + dnam{"公吨"} + other{"{0}公吨"} + } } power{ gigawatt{ @@ -1224,9 +1224,6 @@ zh{ dnam{"kg"} other{"{0}kg"} } - metric-ton{ - other{"{0}t"} - } microgram{ other{"{0}μg"} } @@ -1252,6 +1249,9 @@ zh{ ton{ other{"{0}tn"} } + tonne{ + other{"{0}t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index 8585e506569..292bdd95e5d 100644 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.txt @@ -539,10 +539,6 @@ zh_Hant{ other{"{0} 公斤"} per{"每公斤 {0}"} } - metric-ton{ - dnam{"公噸"} - other{"{0} 公噸"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -577,6 +573,10 @@ zh_Hant{ dnam{"美噸"} other{"{0} 美噸"} } + tonne{ + dnam{"公噸"} + other{"{0} 公噸"} + } } power{ gigawatt{ @@ -1325,10 +1325,6 @@ zh_Hant{ dnam{"公斤"} other{"{0} 公斤"} } - metric-ton{ - dnam{"公噸"} - other{"{0}t"} - } microgram{ dnam{"微克"} other{"{0}μg"} @@ -1361,6 +1357,10 @@ zh_Hant{ dnam{"英噸"} other{"{0}tn"} } + tonne{ + dnam{"公噸"} + other{"{0}t"} + } } power{ gigawatt{ @@ -2101,10 +2101,6 @@ zh_Hant{ other{"{0} 公斤"} per{"{0}/公斤"} } - metric-ton{ - dnam{"公噸"} - other{"{0} 公噸"} - } microgram{ dnam{"微克"} other{"{0} 微克"} @@ -2139,6 +2135,10 @@ zh_Hant{ dnam{"美噸"} other{"{0} 美噸"} } + tonne{ + dnam{"公噸"} + other{"{0} 公噸"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/unit/zu.txt b/icu4c/source/data/unit/zu.txt index cc84b418392..4900fc212e9 100644 --- a/icu4c/source/data/unit/zu.txt +++ b/icu4c/source/data/unit/zu.txt @@ -544,11 +544,6 @@ zu{ other{"{0} kg"} per{"{0}kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -581,6 +576,11 @@ zu{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ @@ -1572,11 +1572,6 @@ zu{ other{"{0} kg"} per{"{0}/kg"} } - metric-ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} - } microgram{ dnam{"μg"} one{"{0} μg"} @@ -1609,6 +1604,11 @@ zu{ one{"{0} tn"} other{"{0} tn"} } + tonne{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } } power{ gigawatt{ diff --git a/icu4c/source/data/zone/en_001.txt b/icu4c/source/data/zone/en_001.txt index 351504a98e4..a86cfe038a2 100644 --- a/icu4c/source/data/zone/en_001.txt +++ b/icu4c/source/data/zone/en_001.txt @@ -27,6 +27,12 @@ en_001{ "Atlantic:St_Helena"{ ec{"St Helena"} } + "Australia:Currie"{ + ec{"Currie"} + } + "Pacific:Enderbury"{ + ec{"Enderbury"} + } "Pacific:Honolulu"{ sd{"∅∅∅"} sg{"∅∅∅"} diff --git a/icu4c/source/data/zone/en_AU.txt b/icu4c/source/data/zone/en_AU.txt index 3b414909a23..1208f367a19 100644 --- a/icu4c/source/data/zone/en_AU.txt +++ b/icu4c/source/data/zone/en_AU.txt @@ -4,12 +4,6 @@ en_AU{ %%Parent{"en_001"} zoneStrings{ - "Australia:Currie"{ - ec{"Currie"} - } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Johnston"{ ec{"Johnston"} } diff --git a/icu4c/source/data/zone/en_GB.txt b/icu4c/source/data/zone/en_GB.txt index bb49917f061..b97dd38fed8 100644 --- a/icu4c/source/data/zone/en_GB.txt +++ b/icu4c/source/data/zone/en_GB.txt @@ -853,9 +853,6 @@ en_GB{ "Australia:Broken_Hill"{ ec{"Broken Hill"} } - "Australia:Currie"{ - ec{"Currie"} - } "Australia:Darwin"{ ec{"Darwin"} } @@ -940,9 +937,6 @@ en_GB{ "Europe:Kaliningrad"{ ec{"Kaliningrad"} } - "Europe:Kiev"{ - ec{"Kiev"} - } "Europe:Lisbon"{ ec{"Lisbon"} } @@ -1088,9 +1082,6 @@ en_GB{ "Pacific:Efate"{ ec{"Efate"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fakaofo"{ ec{"Fakaofo"} } diff --git a/icu4c/source/data/zone/hi_Latn.txt b/icu4c/source/data/zone/hi_Latn.txt index 6c32810d862..955d60c81c4 100644 --- a/icu4c/source/data/zone/hi_Latn.txt +++ b/icu4c/source/data/zone/hi_Latn.txt @@ -862,9 +862,6 @@ hi_Latn{ "Australia:Broken_Hill"{ ec{"Broken Hill"} } - "Australia:Currie"{ - ec{"Currie"} - } "Australia:Darwin"{ ec{"Darwin"} } @@ -1117,9 +1114,6 @@ hi_Latn{ "Pacific:Efate"{ ec{"Efate"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fakaofo"{ ec{"Fakaofo"} } diff --git a/icu4c/source/data/zone/ti.txt b/icu4c/source/data/zone/ti.txt index e283d29a211..d79e502ee71 100644 --- a/icu4c/source/data/zone/ti.txt +++ b/icu4c/source/data/zone/ti.txt @@ -1383,6 +1383,9 @@ ti{ "meta:French_Southern"{ ls{"ግዜ ፈረንሳዊ ደቡባዊ ግዝኣታትን ኣንታርቲክን"} } + "meta:GMT"{ + ls{"GMT"} + } "meta:Galapagos"{ ls{"ግዜ ጋላፓጎስ"} } diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index e1e3003807f..f53137c48cd 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -514,7 +514,6 @@ static const char * const gSubTypes[] = { "grain", "gram", "kilogram", - "metric-ton", "microgram", "milligram", "ounce", @@ -523,6 +522,7 @@ static const char * const gSubTypes[] = { "solar-mass", "stone", "ton", + "tonne", "", "gigawatt", "horsepower", @@ -1543,74 +1543,82 @@ MeasureUnit MeasureUnit::getKilogram() { } MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { - return MeasureUnit::create(15, 6, status); -} - -MeasureUnit MeasureUnit::getMetricTon() { - return MeasureUnit(15, 6); -} - -MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { - return MeasureUnit::create(15, 7, status); -} - -MeasureUnit MeasureUnit::getMicrogram() { - return MeasureUnit(15, 7); -} - -MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { - return MeasureUnit::create(15, 8, status); -} - -MeasureUnit MeasureUnit::getMilligram() { - return MeasureUnit(15, 8); -} - -MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { - return MeasureUnit::create(15, 9, status); -} - -MeasureUnit MeasureUnit::getOunce() { - return MeasureUnit(15, 9); -} - -MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { - return MeasureUnit::create(15, 10, status); -} - -MeasureUnit MeasureUnit::getOunceTroy() { - return MeasureUnit(15, 10); -} - -MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { - return MeasureUnit::create(15, 11, status); -} - -MeasureUnit MeasureUnit::getPound() { - return MeasureUnit(15, 11); -} - -MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { - return MeasureUnit::create(15, 12, status); -} - -MeasureUnit MeasureUnit::getSolarMass() { - return MeasureUnit(15, 12); -} - -MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { - return MeasureUnit::create(15, 13, status); -} - -MeasureUnit MeasureUnit::getStone() { - return MeasureUnit(15, 13); -} - -MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { return MeasureUnit::create(15, 14, status); } +MeasureUnit MeasureUnit::getMetricTon() { + return MeasureUnit(15, 14); +} + +MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { + return MeasureUnit::create(15, 6, status); +} + +MeasureUnit MeasureUnit::getMicrogram() { + return MeasureUnit(15, 6); +} + +MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { + return MeasureUnit::create(15, 7, status); +} + +MeasureUnit MeasureUnit::getMilligram() { + return MeasureUnit(15, 7); +} + +MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { + return MeasureUnit::create(15, 8, status); +} + +MeasureUnit MeasureUnit::getOunce() { + return MeasureUnit(15, 8); +} + +MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { + return MeasureUnit::create(15, 9, status); +} + +MeasureUnit MeasureUnit::getOunceTroy() { + return MeasureUnit(15, 9); +} + +MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { + return MeasureUnit::create(15, 10, status); +} + +MeasureUnit MeasureUnit::getPound() { + return MeasureUnit(15, 10); +} + +MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { + return MeasureUnit::create(15, 11, status); +} + +MeasureUnit MeasureUnit::getSolarMass() { + return MeasureUnit(15, 11); +} + +MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { + return MeasureUnit::create(15, 12, status); +} + +MeasureUnit MeasureUnit::getStone() { + return MeasureUnit(15, 12); +} + +MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { + return MeasureUnit::create(15, 13, status); +} + MeasureUnit MeasureUnit::getTon() { + return MeasureUnit(15, 13); +} + +MeasureUnit *MeasureUnit::createTonne(UErrorCode &status) { + return MeasureUnit::create(15, 14, status); +} + +MeasureUnit MeasureUnit::getTonne() { return MeasureUnit(15, 14); } diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index 55717020f8e..21e9bb7f154 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -2586,6 +2586,7 @@ class U_I18N_API MeasureUnit: public UObject { /** * Returns by pointer, unit of mass: metric-ton. + * (renamed to tonne in CLDR 42 / ICU 72) * Caller owns returned value and must free it. * Also see {@link #getMetricTon()}. * @param status ICU error code. @@ -2595,7 +2596,8 @@ class U_I18N_API MeasureUnit: public UObject { /** * Returns by value, unit of mass: metric-ton. - * Also see {@link #createMetricTon()}. + * (renamed to tonne in CLDR 42 / ICU 72) + * Also see {@link #createMetricTon()}. * @stable ICU 64 */ static MeasureUnit getMetricTon(); @@ -2728,6 +2730,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getTon(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of mass: tonne. + * Caller owns returned value and must free it. + * Also see {@link #getTonne()}. + * @param status ICU error code. + * @draft ICU 72 + */ + static MeasureUnit *createTonne(UErrorCode &status); + + /** + * Returns by value, unit of mass: tonne. + * Also see {@link #createTonne()}. + * @draft ICU 72 + */ + static MeasureUnit getTonne(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of power: gigawatt. * Caller owns returned value and must free it. diff --git a/icu4c/source/i18n/units_converter.cpp b/icu4c/source/i18n/units_converter.cpp index 82b8eea3d8c..b89f4951210 100644 --- a/icu4c/source/i18n/units_converter.cpp +++ b/icu4c/source/i18n/units_converter.cpp @@ -389,8 +389,14 @@ void U_I18N_API addSingleFactorConstant(StringPiece baseStr, int32_t power, Sign factor.constantExponents[CONSTANT_GLUCOSE_MOLAR_MASS] += power * signum; } else if (baseStr == "item_per_mole") { factor.constantExponents[CONSTANT_ITEM_PER_MOLE] += power * signum; + } else if (baseStr == "meters_per_AU") { + factor.constantExponents[CONSTANT_METERS_PER_AU] += power * signum; } else if (baseStr == "PI") { factor.constantExponents[CONSTANT_PI] += power * signum; + } else if (baseStr == "sec_per_julian_year") { + factor.constantExponents[CONSTANT_SEC_PER_JULIAN_YEAR] += power * signum; + } else if (baseStr == "speed_of_light_meters_per_second") { + factor.constantExponents[CONSTANT_SPEED_OF_LIGHT_METERS_PER_SECOND] += power * signum; } else { if (signum == Signum::NEGATIVE) { factor.factorDen *= std::pow(strToDouble(baseStr, status), power); diff --git a/icu4c/source/i18n/units_converter.h b/icu4c/source/i18n/units_converter.h index 5c002f4147e..fd1d6ec4227 100644 --- a/icu4c/source/i18n/units_converter.h +++ b/icu4c/source/i18n/units_converter.h @@ -30,6 +30,9 @@ enum Constants { CONSTANT_LB2KG, // Pound to Kilogram CONSTANT_GLUCOSE_MOLAR_MASS, CONSTANT_ITEM_PER_MOLE, + CONSTANT_METERS_PER_AU, + CONSTANT_SEC_PER_JULIAN_YEAR, + CONSTANT_SPEED_OF_LIGHT_METERS_PER_SECOND, // Must be the last element. CONSTANTS_COUNT @@ -49,6 +52,9 @@ static const double constantsValues[CONSTANTS_COUNT] = { 0.45359237, // CONSTANT_LB2KG 180.1557, // CONSTANT_GLUCOSE_MOLAR_MASS 6.02214076E+23, // CONSTANT_ITEM_PER_MOLE + 149597870700, // CONSTANT_METERS_PER_AU + 31557600, // CONSTANT_SEC_PER_JULIAN_YEAR + 299792458, // CONSTANT_SPEED_OF_LIGHT_METERS_PER_SECOND }; typedef enum Signum { diff --git a/icu4c/source/test/cintltst/cpluralrulestest.c b/icu4c/source/test/cintltst/cpluralrulestest.c index e695154eee6..57fcb2968a9 100644 --- a/icu4c/source/test/cintltst/cpluralrulestest.c +++ b/icu4c/source/test/cintltst/cpluralrulestest.c @@ -187,7 +187,7 @@ static const KeywordsForLang getKeywordsItems[] = { { "lv", { "zero", "one", "other" } }, { "hr", { "one", "few", "other" } }, { "sl", { "one", "two", "few", "other" } }, - { "he", { "one", "two", "many", "other" } }, + { "he", { "one", "two", "other" } }, { "cs", { "one", "few", "many", "other" } }, { "ar", { "zero", "one", "two", "few", "many" , "other" } }, { NULL, { NULL } } diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 70a76c536c6..c887be266ea 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -3311,8 +3311,6 @@ void MeasureFormatTest::TestCompatible72() { measureUnitValue = MeasureUnit::getGram(); measureUnit.adoptInstead(MeasureUnit::createKilogram(status)); measureUnitValue = MeasureUnit::getKilogram(); - measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); - measureUnitValue = MeasureUnit::getMetricTon(); measureUnit.adoptInstead(MeasureUnit::createMicrogram(status)); measureUnitValue = MeasureUnit::getMicrogram(); measureUnit.adoptInstead(MeasureUnit::createMilligram(status)); @@ -3329,6 +3327,8 @@ void MeasureFormatTest::TestCompatible72() { measureUnitValue = MeasureUnit::getStone(); measureUnit.adoptInstead(MeasureUnit::createTon(status)); measureUnitValue = MeasureUnit::getTon(); + measureUnit.adoptInstead(MeasureUnit::createTonne(status)); + measureUnitValue = MeasureUnit::getTonne(); measureUnit.adoptInstead(MeasureUnit::createGigawatt(status)); measureUnitValue = MeasureUnit::getGigawatt(); measureUnit.adoptInstead(MeasureUnit::createHorsepower(status)); diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp index 14cf3103f45..83b8eb5a0fa 100644 --- a/icu4c/source/test/intltest/numbertest_api.cpp +++ b/icu4c/source/test/intltest/numbertest_api.cpp @@ -755,10 +755,10 @@ void NumberFormatterApiTest::unitMeasure() { assertFormatSingle( u"Mixed Unit (Narrow Version)", - u"unit/metric-ton-and-kilogram-and-gram unit-width-narrow", - u"unit/metric-ton-and-kilogram-and-gram unit-width-narrow", + u"unit/tonne-and-kilogram-and-gram unit-width-narrow", + u"unit/tonne-and-kilogram-and-gram unit-width-narrow", NumberFormatter::with() - .unit(MeasureUnit::forIdentifier("metric-ton-and-kilogram-and-gram", status)) + .unit(MeasureUnit::forIdentifier("tonne-and-kilogram-and-gram", status)) .unitWidth(UNUM_UNIT_WIDTH_NARROW), Locale("en-US"), 4.28571, @@ -766,10 +766,10 @@ void NumberFormatterApiTest::unitMeasure() { assertFormatSingle( u"Mixed Unit (Short Version)", - u"unit/metric-ton-and-kilogram-and-gram unit-width-short", - u"unit/metric-ton-and-kilogram-and-gram unit-width-short", + u"unit/tonne-and-kilogram-and-gram unit-width-short", + u"unit/tonne-and-kilogram-and-gram unit-width-short", NumberFormatter::with() - .unit(MeasureUnit::forIdentifier("metric-ton-and-kilogram-and-gram", status)) + .unit(MeasureUnit::forIdentifier("tonne-and-kilogram-and-gram", status)) .unitWidth(UNUM_UNIT_WIDTH_SHORT), Locale("en-US"), 4.28571, @@ -777,10 +777,10 @@ void NumberFormatterApiTest::unitMeasure() { assertFormatSingle( u"Mixed Unit (Full Name Version)", - u"unit/metric-ton-and-kilogram-and-gram unit-width-full-name", - u"unit/metric-ton-and-kilogram-and-gram unit-width-full-name", + u"unit/tonne-and-kilogram-and-gram unit-width-full-name", + u"unit/tonne-and-kilogram-and-gram unit-width-full-name", NumberFormatter::with() - .unit(MeasureUnit::forIdentifier("metric-ton-and-kilogram-and-gram", status)) + .unit(MeasureUnit::forIdentifier("tonne-and-kilogram-and-gram", status)) .unitWidth(UNUM_UNIT_WIDTH_FULL_NAME), Locale("en-US"), 4.28571, @@ -2609,7 +2609,7 @@ void NumberFormatterApiTest::unitNounClass() { // {"de", "lux", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"de", "candela", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"de", "lumen", UNounClass::UNOUN_CLASS_ UNDEFINED}, - // {"de", "metric-ton", UNounClass::UNOUN_CLASS_UNDEFINED}, + // {"de", "tonne", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"de", "microgram", UNounClass::UNOUN_CLASS_NEUTER}, // PREFIX // {"de", "ton", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"de", "stone", UNounClass::UNOUN_CLASS_ UNDEFINED}, @@ -2705,7 +2705,7 @@ void NumberFormatterApiTest::unitNounClass() { // {"fr", "lux", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"fr", "candela", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"fr", "lumen", UNounClass::UNOUN_CLASS_ UNDEFINED}, - // {"fr", "metric-ton", UNounClass::UNOUN_CLASS_UNDEFINED}, + // {"fr", "tonne", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"fr", "microgram", UNounClass::UNOUN_CLASS_MASCULINE}, // PREFIX // {"fr", "ton", UNounClass::UNOUN_CLASS_UNDEFINED}, // {"fr", "stone", UNounClass::UNOUN_CLASS_ UNDEFINED}, @@ -2915,7 +2915,7 @@ void NumberFormatterApiTest::unitGender() { // {"de", "lux", ""}, // {"de", "candela", ""}, // {"de", "lumen", ""}, - // {"de", "metric-ton", ""}, + // {"de", "tonne", ""}, // {"de", "microgram", "neuter"}, // PREFIX // {"de", "ton", ""}, // {"de", "stone", ""}, @@ -3007,7 +3007,7 @@ void NumberFormatterApiTest::unitGender() { // {"fr", "lux", ""}, // {"fr", "candela", ""}, // {"fr", "lumen", ""}, - // {"fr", "metric-ton", ""}, + // {"fr", "tonne", ""}, // {"fr", "microgram", "masculine"}, // PREFIX // {"fr", "ton", ""}, // {"fr", "stone", ""}, @@ -4255,39 +4255,39 @@ void NumberFormatterApiTest::grouping() { u"8,765", u"0"); - // NOTE: Bulgarian is interesting because it has no grouping in the default currency format. + // NOTE: en_US_POSIX is interesting because it has no grouping in the default currency format. // If this test breaks due to data changes, find another locale that has no default grouping. assertFormatDescendingBig( - u"Bulgarian Currency Grouping", + u"en_US_POSIX Currency Grouping", u"currency/USD group-auto", u"currency/USD", NumberFormatter::with().grouping(UNUM_GROUPING_AUTO).unit(USD), - Locale("bg"), - u"87650000,00 щ.д.", - u"8765000,00 щ.д.", - u"876500,00 щ.д.", - u"87650,00 щ.д.", - u"8765,00 щ.д.", - u"876,50 щ.д.", - u"87,65 щ.д.", - u"8,76 щ.д.", - u"0,00 щ.д."); + Locale("en_US_POSIX"), + u"$ 87650000.00", + u"$ 8765000.00", + u"$ 876500.00", + u"$ 87650.00", + u"$ 8765.00", + u"$ 876.50", + u"$ 87.65", + u"$ 8.76", + u"$ 0.00"); assertFormatDescendingBig( - u"Bulgarian Currency Grouping, Always", + u"en_US_POSIX Currency Grouping, Always", u"currency/USD group-on-aligned", u"currency/USD ,!", NumberFormatter::with().grouping(UNUM_GROUPING_ON_ALIGNED).unit(USD), - Locale("bg"), - u"87 650 000,00 щ.д.", - u"8 765 000,00 щ.д.", - u"876 500,00 щ.д.", - u"87 650,00 щ.д.", - u"8 765,00 щ.д.", - u"876,50 щ.д.", - u"87,65 щ.д.", - u"8,76 щ.д.", - u"0,00 щ.д."); + Locale("en_US_POSIX"), + u"$ 87,650,000.00", + u"$ 8,765,000.00", + u"$ 876,500.00", + u"$ 87,650.00", + u"$ 8,765.00", + u"$ 876.50", + u"$ 87.65", + u"$ 8.76", + u"$ 0.00"); MacroProps macros; macros.grouper = Grouper(4, 1, 3, UNUM_GROUPING_COUNT); @@ -4689,15 +4689,15 @@ void NumberFormatterApiTest::symbols() { u"currency/USD latin", NumberFormatter::with().adoptSymbols(new NumberingSystem(LATN)).unit(USD), Locale("ar"), - u"US$ 87,650.00", - u"US$ 8,765.00", - u"US$ 876.50", - u"US$ 87.65", - u"US$ 8.76", - u"US$ 0.88", - u"US$ 0.09", - u"US$ 0.01", - u"US$ 0.00"); + u"\u200FUS$ 87,650.00", + u"\u200FUS$ 8,765.00", + u"\u200FUS$ 876.50", + u"\u200FUS$ 87.65", + u"\u200FUS$ 8.76", + u"\u200FUS$ 0.88", + u"\u200FUS$ 0.09", + u"\u200FUS$ 0.01", + u"\u200FUS$ 0.00"); assertFormatDescending( u"Math Numbering System with French Data", @@ -4742,7 +4742,7 @@ void NumberFormatterApiTest::symbols() { NumberFormatter::with().adoptSymbols(new NumberingSystem(LATN)).unit(USD), Locale("ar"), 12345.67, - u"US$ 12,345.67"); + u"\u200FUS$ 12,345.67"); assertFormatSingle( u"Currency symbol should precede number in ar@numbers=latn", @@ -4751,7 +4751,7 @@ void NumberFormatterApiTest::symbols() { NumberFormatter::with().unit(USD), Locale("ar@numbers=latn"), 12345.67, - u"US$ 12,345.67"); + u"\u200FUS$ 12,345.67"); assertFormatSingle( u"Currency symbol should follow number in ar-EG with NS arab", @@ -4760,7 +4760,7 @@ void NumberFormatterApiTest::symbols() { NumberFormatter::with().unit(USD), Locale("ar-EG"), 12345.67, - u"١٢٬٣٤٥٫٦٧ US$"); + u"\u200F١٢٬٣٤٥٫٦٧ US$"); assertFormatSingle( u"Currency symbol should follow number in ar@numbers=arab", @@ -4769,7 +4769,7 @@ void NumberFormatterApiTest::symbols() { NumberFormatter::with().unit(USD), Locale("ar@numbers=arab"), 12345.67, - u"١٢٬٣٤٥٫٦٧ US$"); + u"\u200F١٢٬٣٤٥٫٦٧ US$"); assertFormatSingle( u"NumberingSystem in API should win over @numbers keyword", @@ -4778,12 +4778,12 @@ void NumberFormatterApiTest::symbols() { NumberFormatter::with().adoptSymbols(new NumberingSystem(LATN)).unit(USD), Locale("ar@numbers=arab"), 12345.67, - u"US$ 12,345.67"); + u"\u200FUS$ 12,345.67"); UErrorCode status = U_ZERO_ERROR; assertEquals( "NumberingSystem in API should win over @numbers keyword in reverse order", - u"US$ 12,345.67", + u"\u200FUS$ 12,345.67", NumberFormatter::withLocale(Locale("ar@numbers=arab")).adoptSymbols(new NumberingSystem(LATN)) .unit(USD) .formatDouble(12345.67, status) diff --git a/icu4c/source/test/intltest/plurfmts.cpp b/icu4c/source/test/intltest/plurfmts.cpp index 3103f53ac81..ca37525bb1e 100644 --- a/icu4c/source/test/intltest/plurfmts.cpp +++ b/icu4c/source/test/intltest/plurfmts.cpp @@ -385,7 +385,7 @@ PluralFormatTest::pluralFormatLocaleTest(/*char *par*/) pluralResults[100+i] = PFT_FEW; // note override after loop } pluralResults[1]= PFT_ONE; - pluralResults[101]= PFT_OTHER; + pluralResults[100]= PFT_OTHER; helperTestResults(singularZeroSomeLocales, 1, testPattern, pluralResults); // ======== Test Special 12/19. diff --git a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt index f1e711e4219..7df25542923 100644 --- a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt +++ b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt @@ -257,8 +257,8 @@ length; visiblty; GB; 905256 / 625; 1448.4096; meter; 4752; 4752.0; foot length; visiblty; GB; 381 / 1250; 0.3048; meter; 1; 1.0; foot length; visiblty; GB; 3429 / 12500; 0.27432; meter; 9 / 10; 0.9; foot -mass; default; 001; 1100; 1100.0; kilogram; 11 / 10; 1.1; metric-ton -mass; default; 001; 1000; 1000.0; kilogram; 1; 1.0; metric-ton +mass; default; 001; 1100; 1100.0; kilogram; 11 / 10; 1.1; tonne +mass; default; 001; 1000; 1000.0; kilogram; 1; 1.0; tonne mass; default; 001; 900; 900.0; kilogram; 900; 900.0; kilogram mass; default; 001; 1; 1.0; kilogram; 1; 1.0; kilogram mass; default; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram diff --git a/icu4c/source/test/testdata/cldr/units/unitsTest.txt b/icu4c/source/test/testdata/cldr/units/unitsTest.txt index c606911b981..f24f0526499 100644 --- a/icu4c/source/test/testdata/cldr/units/unitsTest.txt +++ b/icu4c/source/test/testdata/cldr/units/unitsTest.txt @@ -120,7 +120,7 @@ mass ; pound ; kilogram ; 0.45359237 * x ; 453.5924 mass ; kilogram ; kilogram ; 1 * x ; 1,000.00 mass ; stone ; kilogram ; 6.35029318 * x ; 6350.293 mass ; ton ; kilogram ; 907.18474 * x ; 907184.7 -mass ; metric-ton ; kilogram ; 1,000 * x ; 1000000.0 +mass ; tonne ; kilogram ; 1,000 * x ; 1000000.0 mass ; earth-mass ; kilogram ; 5,972,200,000,000,000,000,000,000 * x ; 5.9722E27 mass ; solar-mass ; kilogram ; 1,988,470,000,000,000,000,000,000,000,000 * x ; 1.98847E33 portion ; permillion ; portion ; 0.000001 * x ; 0.001 diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index a0784b95031..300b7363cdc 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -32930,6 +32930,9 @@ structLocale:table(nofallback){ } } islamic-civil:alias{"structLocale/calendar/islamic"} + islamic-rgsa:alias{"structLocale/calendar/islamic"} + islamic-tbla:alias{"structLocale/calendar/islamic"} + islamic-umalqura:alias{"structLocale/calendar/islamic"} japanese{ AmPmMarkers{ "", diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java index fba34528f3f..21a1d23c2d3 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java @@ -187,6 +187,12 @@ public class UnitsConverter { private int exponentGlucoseMolarMass = 0; /** Exponent for the item per mole conversion rate constant */ private int exponentItemPerMole = 0; + /** Exponent for the meters per AU conversion rate constant */ + private int exponentMetersPerAU = 0; + /** Exponent for the sec per julian year conversion rate constant */ + private int exponentSecPerJulianYear = 0; + /** Exponent for the speed of light meters per second" conversion rate constant */ + private int exponentSpeedOfLightMetersPerSecond = 0; /** * Creates Empty Factor @@ -240,6 +246,9 @@ public class UnitsConverter { result.exponentLbToKg = this.exponentLbToKg; result.exponentGlucoseMolarMass = this.exponentGlucoseMolarMass; result.exponentItemPerMole = this.exponentItemPerMole; + result.exponentMetersPerAU = this.exponentMetersPerAU; + result.exponentSecPerJulianYear = this.exponentSecPerJulianYear; + result.exponentSpeedOfLightMetersPerSecond = this.exponentSpeedOfLightMetersPerSecond; return result; } @@ -267,6 +276,9 @@ public class UnitsConverter { resultCollector.multiply(new BigDecimal("0.45359237"), this.exponentLbToKg); resultCollector.multiply(new BigDecimal("180.1557"), this.exponentGlucoseMolarMass); resultCollector.multiply(new BigDecimal("6.02214076E+23"), this.exponentItemPerMole); + resultCollector.multiply(new BigDecimal("149597870700"), this.exponentMetersPerAU); + resultCollector.multiply(new BigDecimal("31557600"), this.exponentSecPerJulianYear); + resultCollector.multiply(new BigDecimal("299792458"), this.exponentSpeedOfLightMetersPerSecond); return resultCollector.factorNum.divide(resultCollector.factorDen, DECIMAL128); } @@ -323,6 +335,10 @@ public class UnitsConverter { result.exponentLbToKg = this.exponentLbToKg * power; result.exponentGlucoseMolarMass = this.exponentGlucoseMolarMass * power; result.exponentItemPerMole = this.exponentItemPerMole * power; + result.exponentMetersPerAU = this.exponentMetersPerAU * power; + result.exponentSecPerJulianYear = this.exponentSecPerJulianYear * power; + result.exponentSpeedOfLightMetersPerSecond = + this.exponentSpeedOfLightMetersPerSecond * power; return result; } @@ -341,6 +357,10 @@ public class UnitsConverter { result.exponentGlucoseMolarMass = this.exponentGlucoseMolarMass - other.exponentGlucoseMolarMass; result.exponentItemPerMole = this.exponentItemPerMole - other.exponentItemPerMole; + result.exponentMetersPerAU = this.exponentMetersPerAU - other.exponentMetersPerAU; + result.exponentSecPerJulianYear = this.exponentSecPerJulianYear - other.exponentSecPerJulianYear; + result.exponentSpeedOfLightMetersPerSecond = + this.exponentSpeedOfLightMetersPerSecond - other.exponentSpeedOfLightMetersPerSecond; return result; } @@ -359,6 +379,10 @@ public class UnitsConverter { result.exponentGlucoseMolarMass = this.exponentGlucoseMolarMass + other.exponentGlucoseMolarMass; result.exponentItemPerMole = this.exponentItemPerMole + other.exponentItemPerMole; + result.exponentMetersPerAU = this.exponentMetersPerAU + other.exponentMetersPerAU; + result.exponentSecPerJulianYear = this.exponentSecPerJulianYear + other.exponentSecPerJulianYear; + result.exponentSpeedOfLightMetersPerSecond = + this.exponentSpeedOfLightMetersPerSecond + other.exponentSpeedOfLightMetersPerSecond; return result; } @@ -402,9 +426,15 @@ public class UnitsConverter { this.exponentGlucoseMolarMass += power; } else if ("item_per_mole".equals(entity)) { this.exponentItemPerMole += power; + } else if ("meters_per_AU".equals(entity)) { + this.exponentMetersPerAU += power; } else if ("PI".equals(entity)) { this.exponentPi += power; - } else { + } else if ("sec_per_julian_year".equals(entity)) { + this.exponentSecPerJulianYear += power; + } else if ("speed_of_light_meters_per_second".equals(entity)) { + this.exponentSpeedOfLightMetersPerSecond += power; + } else { BigDecimal decimalEntity = new BigDecimal(entity).pow(power, DECIMAL128); this.factorNum = this.factorNum.multiply(decimalEntity); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java index 80a11220ad1..d96589e5820 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java @@ -1606,10 +1606,10 @@ public class MeasureUnit implements Serializable { public static final MeasureUnit KILOGRAM = MeasureUnit.internalGetInstance("mass", "kilogram"); /** - * Constant for unit of mass: metric-ton + * Constant for unit of mass: metric-ton (renamed to tonne in CLDR 42 / ICU 72) * @stable ICU 54 */ - public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "metric-ton"); + public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "tonne"); /** * Constant for unit of mass: microgram @@ -1659,6 +1659,12 @@ public class MeasureUnit implements Serializable { */ public static final MeasureUnit TON = MeasureUnit.internalGetInstance("mass", "ton"); + /** + * Constant for unit of mass: tonne + * @draft ICU 72 + */ + public static final MeasureUnit TONNE = MeasureUnit.internalGetInstance("mass", "tonne"); + /** * Constant for unit of power: gigawatt * @stable ICU 54 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 68f5c651f5f..d7ae1881400 100644 --- 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:e4ae80b6ce99473eef6cbdaf0c1a79ce12154456805852c1ef2b8307ef1f46f1 -size 14157165 +oid sha256:f130b10f6ab4ed44245cf628efd3a9de54304cee3b5ab0541af9e153f1345f40 +size 14163711 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index e082f7baecf..ec6d10cdd47 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5da283841169e1fe0cfb64601224efa097ea078e80f219014929eedcca8a536a +oid sha256:d5d48f6014434bd4aca3246eefb606474fc716f61858f21bf72885d943d1e117 size 93663 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 958e7dde9c5..70e5bc4b451 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:089ebe48b1b8db3143f8f24d70707b618dfafda8b158ad7714bbd71a16928238 -size 828462 +oid sha256:b4ff15d24f1e7078c9dd04a6c881cd0fd34b483fda8c2a6ade6ae87dd4df1053 +size 828452 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt index f1e711e4219..7df25542923 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt @@ -257,8 +257,8 @@ length; visiblty; GB; 905256 / 625; 1448.4096; meter; 4752; 4752.0; foot length; visiblty; GB; 381 / 1250; 0.3048; meter; 1; 1.0; foot length; visiblty; GB; 3429 / 12500; 0.27432; meter; 9 / 10; 0.9; foot -mass; default; 001; 1100; 1100.0; kilogram; 11 / 10; 1.1; metric-ton -mass; default; 001; 1000; 1000.0; kilogram; 1; 1.0; metric-ton +mass; default; 001; 1100; 1100.0; kilogram; 11 / 10; 1.1; tonne +mass; default; 001; 1000; 1000.0; kilogram; 1; 1.0; tonne mass; default; 001; 900; 900.0; kilogram; 900; 900.0; kilogram mass; default; 001; 1; 1.0; kilogram; 1; 1.0; kilogram mass; default; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt index c606911b981..f24f0526499 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt @@ -120,7 +120,7 @@ mass ; pound ; kilogram ; 0.45359237 * x ; 453.5924 mass ; kilogram ; kilogram ; 1 * x ; 1,000.00 mass ; stone ; kilogram ; 6.35029318 * x ; 6350.293 mass ; ton ; kilogram ; 907.18474 * x ; 907184.7 -mass ; metric-ton ; kilogram ; 1,000 * x ; 1000000.0 +mass ; tonne ; kilogram ; 1,000 * x ; 1000000.0 mass ; earth-mass ; kilogram ; 5,972,200,000,000,000,000,000,000 * x ; 5.9722E27 mass ; solar-mass ; kilogram ; 1,988,470,000,000,000,000,000,000,000,000 * x ; 1.98847E33 portion ; permillion ; portion ; 0.000001 * x ; 0.001 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 720a34a871e..290141b34ba 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 @@ -280,6 +280,7 @@ public class MeasureUnitTest extends TestFmwk { {"ITEM", "70"}, {"KILOWATT_HOUR_PER_100_KILOMETER", "70"}, {"QUARTER", "72"}, + {"TONNE", "72"}, }; private static final HashMap JAVA_VERSION_MAP = new HashMap<>(); @@ -328,7 +329,7 @@ public class MeasureUnitTest extends TestFmwk { //generateCXXHConstants("72"); // for measunit.h, update generated createXXX methods //generateCXXConstants(); // for measunit.cpp, update generated code //generateCXXBackwardCompatibilityTest("72"); // for measfmttest.cpp, create TestCompatible72 - updateJAVAVersions("72"); // for MeasureUnitTest.java, JAVA_VERSIONS + //updateJAVAVersions("72"); // for MeasureUnitTest.java, JAVA_VERSIONS } @Test @@ -2403,7 +2404,6 @@ public class MeasureUnitTest extends TestFmwk { MeasureUnit.GRAIN, MeasureUnit.GRAM, MeasureUnit.KILOGRAM, - MeasureUnit.METRIC_TON, MeasureUnit.MICROGRAM, MeasureUnit.MILLIGRAM, MeasureUnit.OUNCE, @@ -2412,6 +2412,7 @@ public class MeasureUnitTest extends TestFmwk { MeasureUnit.SOLAR_MASS, MeasureUnit.STONE, MeasureUnit.TON, + MeasureUnit.TONNE, MeasureUnit.GIGAWATT, MeasureUnit.HORSEPOWER, MeasureUnit.KILOWATT, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index c009e4793b9..3351f8d6ea9 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -780,7 +780,7 @@ public class NumberFormatTest extends TestFmwk { {"root@numbers=latn", "-1.23", "USD", "-US$ 1.23", "-USD 1.23", "-1.23 USD"}, // ensure that the root locale is still used with modifiers {"root@numbers=arab", "-1.23", "USD", "\u061C-\u0661\u066B\u0662\u0663\u00A0US$", "\u061C-\u0661\u066B\u0662\u0663\u00A0USD", "\u061C-\u0661\u066B\u0662\u0663 USD"}, // ensure that the root locale is still used with modifiers {"es_AR", "1", "INR", "INR\u00A01,00", "INR\u00A01,00", "1,00 rupia india"}, - {"ar_EG", "1", "USD", "١٫٠٠\u00A0US$", "١٫٠٠\u00A0USD", "١٫٠٠ دولار أمريكي"}, + {"ar_EG", "1", "USD", "\u200F١٫٠٠\u00A0US$", "\u200F١٫٠٠\u00A0USD", "١٫٠٠ دولار أمريكي"}, }; for (int i=0; i com.ibm.icu icu4j-for-cldr - 72.0.1-SNAPSHOT-cldr-2022-08-01 + 72.0.1-SNAPSHOT-cldr-2022-08-17