From f0b770700805e37335b448bad482a26d9dd2f3e4 Mon Sep 17 00:00:00 2001 From: Jennifer Chye Date: Fri, 3 Aug 2012 21:05:03 +0000 Subject: [PATCH] ICU-8471 Add compact decimal formats from CLDR. X-SVN-Rev: 32096 --- icu4c/source/data/cldr-icu-readme.txt | 5 +- icu4c/source/data/locales/af.txt | 40 +++++++++++ icu4c/source/data/locales/am.txt | 40 +++++++++++ icu4c/source/data/locales/ar.txt | 80 +++++++++++++++++++++ icu4c/source/data/locales/bg.txt | 40 +++++++++++ icu4c/source/data/locales/bn.txt | 40 +++++++++++ icu4c/source/data/locales/ca.txt | 40 +++++++++++ icu4c/source/data/locales/cs.txt | 40 +++++++++++ icu4c/source/data/locales/da.txt | 40 +++++++++++ icu4c/source/data/locales/de.txt | 40 +++++++++++ icu4c/source/data/locales/ee.txt | 31 ++++++++ icu4c/source/data/locales/el.txt | 40 +++++++++++ icu4c/source/data/locales/en.txt | 40 +++++++++++ icu4c/source/data/locales/es.txt | 40 +++++++++++ icu4c/source/data/locales/es_419.txt | 40 +++++++++++ icu4c/source/data/locales/et.txt | 40 +++++++++++ icu4c/source/data/locales/eu.txt | 40 +++++++++++ icu4c/source/data/locales/fa.txt | 40 +++++++++++ icu4c/source/data/locales/fi.txt | 40 +++++++++++ icu4c/source/data/locales/fil.txt | 40 +++++++++++ icu4c/source/data/locales/fr.txt | 40 +++++++++++ icu4c/source/data/locales/fr_CA.txt | 13 ++++ icu4c/source/data/locales/gl.txt | 40 +++++++++++ icu4c/source/data/locales/gu.txt | 40 +++++++++++ icu4c/source/data/locales/he.txt | 40 +++++++++++ icu4c/source/data/locales/hi.txt | 40 +++++++++++ icu4c/source/data/locales/hr.txt | 40 +++++++++++ icu4c/source/data/locales/hu.txt | 40 +++++++++++ icu4c/source/data/locales/id.txt | 40 +++++++++++ icu4c/source/data/locales/is.txt | 40 +++++++++++ icu4c/source/data/locales/it.txt | 40 +++++++++++ icu4c/source/data/locales/ja.txt | 40 +++++++++++ icu4c/source/data/locales/kk.txt | 40 +++++++++++ icu4c/source/data/locales/kn.txt | 40 +++++++++++ icu4c/source/data/locales/ko.txt | 40 +++++++++++ icu4c/source/data/locales/lt.txt | 40 +++++++++++ icu4c/source/data/locales/lv.txt | 40 +++++++++++ icu4c/source/data/locales/ml.txt | 40 +++++++++++ icu4c/source/data/locales/mr.txt | 40 +++++++++++ icu4c/source/data/locales/ms.txt | 40 +++++++++++ icu4c/source/data/locales/nb.txt | 40 +++++++++++ icu4c/source/data/locales/nl.txt | 40 +++++++++++ icu4c/source/data/locales/pl.txt | 40 +++++++++++ icu4c/source/data/locales/pt.txt | 40 +++++++++++ icu4c/source/data/locales/pt_PT.txt | 40 +++++++++++ icu4c/source/data/locales/resfiles.mk | 2 +- icu4c/source/data/locales/ro.txt | 40 +++++++++++ icu4c/source/data/locales/root.txt | 40 +++++++++++ icu4c/source/data/locales/ru.txt | 40 +++++++++++ icu4c/source/data/locales/sk.txt | 40 +++++++++++ icu4c/source/data/locales/sl.txt | 40 +++++++++++ icu4c/source/data/locales/sr.txt | 40 +++++++++++ icu4c/source/data/locales/sv.txt | 40 +++++++++++ icu4c/source/data/locales/sw.txt | 40 +++++++++++ icu4c/source/data/locales/ta.txt | 40 +++++++++++ icu4c/source/data/locales/te.txt | 40 +++++++++++ icu4c/source/data/locales/th.txt | 40 +++++++++++ icu4c/source/data/locales/tr.txt | 40 +++++++++++ icu4c/source/data/locales/uk.txt | 40 +++++++++++ icu4c/source/data/locales/ur.txt | 40 +++++++++++ icu4c/source/data/locales/vi.txt | 40 +++++++++++ icu4c/source/data/locales/zh.txt | 40 +++++++++++ icu4c/source/data/locales/zh_Hant.txt | 40 +++++++++++ icu4c/source/data/locales/zu.txt | 13 ++++ icu4c/source/test/testdata/structLocale.txt | 80 +++++++++++++++++++++ 65 files changed, 2542 insertions(+), 2 deletions(-) diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index 1fdcfdf71b8..3b5ab5ffae9 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -203,11 +203,14 @@ make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt # 9. Investigate each test case failure. The first run processing new CLDR data # from the Survey Tool can result in thousands of failures (in many cases, one -# CLDR data fix can resolve hundres of test failures). If the error is caused +# CLDR data fix can resolve hundreds of test failures). If the error is caused # by bad CLDR data, then file a CLDR bug, fix the data, and regenerate from # step 5a. If the data is OK but the testcase needs to be updated because the # data has legitimately changed, then update the testcase. You will check in # the updated testcases along with the new ICU data at the end of this process. +# Note that if the new data has any differences in structure, you will have to +# update test/testdata/structLocale.txt or /tsutil/cldrtest/TestLocaleStructure +# may fail. # Repeat steps 5-8 until there are no errors. # 10. Now run the make check tests in exhaustive mode: diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index e0836a509dc..d6cec0b5534 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -25,6 +25,46 @@ af{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mil"} + } + 10000000{ + other{"00 mil"} + } + 100000000{ + other{"000 mil"} + } + 1000000000{ + other{"0.0 mjd"} + } + 10000000000{ + other{"00 mjd"} + } + 100000000000{ + other{"000 mjd"} + } + 1000000000000{ + other{"0.0 bil"} + } + 10000000000000{ + other{"00 bil"} + } + 100000000000000{ + other{"000 bil"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/am.txt b/icu4c/source/data/locales/am.txt index 2a8f49299ab..300e0a43dc2 100644 --- a/icu4c/source/data/locales/am.txt +++ b/icu4c/source/data/locales/am.txt @@ -21,6 +21,46 @@ am{ patterns{ currencyFormat{"¤#,##0.00;(¤#,##0.00)"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000ኪባ"} + } + 1000000{ + other{"0.0 ሜትር"} + } + 10000000{ + other{"00 ሜትር"} + } + 100000000{ + other{"000 ሜትር"} + } + 1000000000{ + other{"0.0G"} + } + 10000000000{ + other{"00G"} + } + 100000000000{ + other{"000G"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } } native{"latn"} traditional{"ethi"} diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 867fad4bf45..c18fe11dc08 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -26,6 +26,46 @@ ar{ currencyFormat{"¤ #0.00;¤ #0.00-"} decimalFormat{"#0.###;#0.###-"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"٫"} exponential{"اس"} @@ -45,6 +85,46 @@ ar{ currencyFormat{"¤ #,##0.00;¤ #,##0.00-"} decimalFormat{"#,##0.###;#,##0.###-"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index 8d2def8d926..ef9c4671a84 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -23,6 +23,46 @@ bg{ decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 Х"} + } + 10000{ + other{"00 Х"} + } + 100000{ + other{"000 Х"} + } + 1000000{ + other{"0.0 М"} + } + 10000000{ + other{"00 М"} + } + 100000000{ + other{"000 М"} + } + 1000000000{ + other{"0.0 Б"} + } + 10000000000{ + other{"00 Б"} + } + 100000000000{ + other{"000 Б"} + } + 1000000000000{ + other{"0.0 Т"} + } + 10000000000000{ + other{"00 Т"} + } + 100000000000000{ + other{"000 Т"} + } + } + } symbols{ decimal{","} group{" "} diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt index 71fca08048f..304e21482a5 100644 --- a/icu4c/source/data/locales/bn.txt +++ b/icu4c/source/data/locales/bn.txt @@ -38,6 +38,46 @@ bn{ percentFormat{"#,##,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index ba3445e6b35..e01be695904 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -25,6 +25,46 @@ ca{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0000 M"} + } + 10000000000{ + other{"00k M"} + } + 100000000000{ + other{"000k M"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index fde0f9c7a5f..fc2eda927b1 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -28,6 +28,46 @@ cs{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 tis'.'"} + } + 10000{ + other{"00 tis'.'"} + } + 100000{ + other{"000 tis'.'"} + } + 1000000{ + other{"0.0 mil'.'"} + } + 10000000{ + other{"00 mil'.'"} + } + 100000000{ + other{"000 mil'.'"} + } + 1000000000{ + other{"0.0 mld'.'"} + } + 10000000000{ + other{"00 mld'.'"} + } + 100000000000{ + other{"000 mld'.'"} + } + 1000000000000{ + other{"0.0 bil'.'"} + } + 10000000000000{ + other{"00 bil'.'"} + } + 100000000000000{ + other{"000 bil'.'"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 99591d7e0c8..fd8b78b20c6 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -26,6 +26,46 @@ da{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mio"} + } + 10000000{ + other{"00 mio"} + } + 100000000{ + other{"000 mio"} + } + 1000000000{ + other{"0.0 mia"} + } + 10000000000{ + other{"00 mia"} + } + 100000000000{ + other{"000 mia"} + } + 1000000000000{ + other{"0.0 bill"} + } + 10000000000000{ + other{"00 bill"} + } + 100000000000000{ + other{"000 bill"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index 51dd3471713..7dd08e1efb4 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -26,6 +26,46 @@ de{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 Mio"} + } + 10000000{ + other{"00 Mio"} + } + 100000000{ + other{"000 Mio"} + } + 1000000000{ + other{"0.0 Mrd"} + } + 10000000000{ + other{"00 Mrd"} + } + 100000000000{ + other{"000 Mrd"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/ee.txt b/icu4c/source/data/locales/ee.txt index d16d5d520f3..a7bb7def48d 100755 --- a/icu4c/source/data/locales/ee.txt +++ b/icu4c/source/data/locales/ee.txt @@ -24,6 +24,37 @@ ee{ patterns{ currencyFormat{"¤#,##0.00;(¤#,##0.00)"} } + patternsShort{ + decimalFormat{ + 100000{ + other{"00K"} + } + 10000000{ + other{"0M"} + } + 100000000{ + other{"00M"} + } + 1000000000{ + other{"0.000M"} + } + 10000000000{ + other{"00000M"} + } + 100000000000{ + other{"0000M"} + } + 1000000000000{ + other{"0.0B"} + } + 10000000000000{ + other{"0B"} + } + 100000000000000{ + other{"00B"} + } + } + } symbols{ nan{"mnn"} } diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index 86e00c56cc1..c5741421bf2 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -26,6 +26,46 @@ el{ decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 χιλ'.'"} + } + 10000{ + other{"00 χιλ'.'"} + } + 100000{ + other{"000 χιλ'.'"} + } + 1000000{ + other{"0.0 εκ'.'"} + } + 10000000{ + other{"00 εκ'.'"} + } + 100000000{ + other{"000 εκ'.'"} + } + 1000000000{ + other{"0.0 δις"} + } + 10000000000{ + other{"00 δις"} + } + 100000000000{ + other{"000 δις"} + } + 1000000000000{ + other{"0.0 τρις"} + } + 10000000000000{ + other{"00 τρις"} + } + 100000000000000{ + other{"000 τρις"} + } + } + } symbols{ decimal{","} exponential{"e"} diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 919166ff997..1990f817d39 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -29,6 +29,46 @@ en{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index 57d8517e121..d8ff54b5d63 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -29,6 +29,46 @@ es{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00k"} + } + 100000{ + other{"000k"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0000 M"} + } + 10000000000{ + other{"00k M"} + } + 100000000000{ + other{"000k M"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/es_419.txt b/icu4c/source/data/locales/es_419.txt index 101256b1255..18e753051a6 100644 --- a/icu4c/source/data/locales/es_419.txt +++ b/icu4c/source/data/locales/es_419.txt @@ -12,6 +12,46 @@ es_419{ patterns{ currencyFormat{"¤#,##0.00"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00k"} + } + 100000{ + other{"000k"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0.0k M"} + } + 10000000000{ + other{"00k M"} + } + 100000000000{ + other{"000k M"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{"."} group{","} diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 860e9a37558..b8778b79a15 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -25,6 +25,46 @@ et{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 tuh"} + } + 10000{ + other{"00 tuh"} + } + 100000{ + other{"000 tuh"} + } + 1000000{ + other{"0.0 mln"} + } + 10000000{ + other{"00 mln"} + } + 100000000{ + other{"000 mln"} + } + 1000000000{ + other{"0.0 mld"} + } + 10000000000{ + other{"00 mld"} + } + 100000000000{ + other{"000 mld"} + } + 1000000000000{ + other{"0.0 trl"} + } + 10000000000000{ + other{"00 trl"} + } + 100000000000000{ + other{"000 trl"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index 519f8a38bc7..5f1dae26495 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -24,6 +24,46 @@ eu{ decimalFormat{"#,##0.###"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0000 M"} + } + 10000000000{ + other{"00k M"} + } + 100000000000{ + other{"000k M"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index fdd89d3c579..26817caff53 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -43,6 +43,46 @@ fa{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index e4a49a18260..5523f44d519 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -25,6 +25,46 @@ fi{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 t"} + } + 10000{ + other{"00 t"} + } + 100000{ + other{"000 t"} + } + 1000000{ + other{"0.0 ml"} + } + 10000000{ + other{"00 ml"} + } + 100000000{ + other{"000 ml"} + } + 1000000000{ + other{"0.0 mr"} + } + 10000000000{ + other{"00 mr"} + } + 100000000000{ + other{"000 mr"} + } + 1000000000000{ + other{"0.0 b"} + } + 10000000000000{ + other{"00 b"} + } + 100000000000000{ + other{"000 b"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/fil.txt b/icu4c/source/data/locales/fil.txt index 4d4bc4c0bb0..2634cc80557 100755 --- a/icu4c/source/data/locales/fil.txt +++ b/icu4c/source/data/locales/fil.txt @@ -25,6 +25,46 @@ fil{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 68ebee74400..5db7dbf8fd3 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -29,6 +29,46 @@ fr{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0.0 Md"} + } + 10000000000{ + other{"00 Mds"} + } + 100000000000{ + other{"000 Mds"} + } + 1000000000000{ + other{"0.0 Bn"} + } + 10000000000000{ + other{"00 Bn"} + } + 100000000000000{ + other{"000 Bn"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt index 40377972345..8bc957b22a2 100644 --- a/icu4c/source/data/locales/fr_CA.txt +++ b/icu4c/source/data/locales/fr_CA.txt @@ -12,6 +12,19 @@ fr_CA{ patterns{ currencyFormat{"#,##0.00 ¤;(#,##0.00 ¤)"} } + patternsShort{ + decimalFormat{ + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + } + } } } PaperSize:intvector{ diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index b0f6247a8f2..a4e5686b5dd 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -25,6 +25,46 @@ gl{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00k"} + } + 100000{ + other{"000k"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0000 M"} + } + 10000000000{ + other{"00k M"} + } + 100000000000{ + other{"000k M"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index 559d8494685..353d32d6a66 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -32,6 +32,46 @@ gu{ decimalFormat{"#,##,##0.###"} percentFormat{"#,##,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ exponential{"પૂર્વ"} nan{"સંખ્યા નથીં"} diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 18661509179..69eb487c942 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -29,6 +29,46 @@ he{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 0268be5f14c..fad2789bdd9 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -33,6 +33,46 @@ hi{ percentFormat{"#,##,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index d4d06d8fc3e..51e5b247bfc 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -25,6 +25,46 @@ hr{ patterns{ currencyFormat{"#,##0.00 ¤"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mil'.'"} + } + 10000000{ + other{"00 mil'.'"} + } + 100000000{ + other{"000 mil'.'"} + } + 1000000000{ + other{"0.0 mlr"} + } + 10000000000{ + other{"00 mlr"} + } + 100000000000{ + other{"000 mlr"} + } + 1000000000000{ + other{"0.0 bil'.'"} + } + 10000000000000{ + other{"00 bil'.'"} + } + 100000000000000{ + other{"000 bil'.'"} + } + } + } symbols{ decimal{","} group{"."} diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index 184811a771d..27fbb521b0d 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -31,6 +31,46 @@ hu{ decimalFormat{"#,##0.###"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 e"} + } + 10000{ + other{"00 e"} + } + 100000{ + other{"000 e"} + } + 1000000{ + other{"0.0 m"} + } + 10000000{ + other{"00 m"} + } + 100000000{ + other{"000 m"} + } + 1000000000{ + other{"0.0 mrd"} + } + 10000000000{ + other{"00 mrd"} + } + 100000000000{ + other{"000 mrd"} + } + 1000000000000{ + other{"0.0 b"} + } + 10000000000000{ + other{"00 b"} + } + 100000000000000{ + other{"000 b"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index 19686d6feb4..6e5c676b460 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -22,6 +22,46 @@ id{ patterns{ currencyFormat{"¤#,##0.00"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00 rb"} + } + 100000{ + other{"000 rb"} + } + 1000000{ + other{"0.0 jt"} + } + 10000000{ + other{"00 jt"} + } + 100000000{ + other{"000 jt"} + } + 1000000000{ + other{"0.0 M"} + } + 10000000000{ + other{"00 M"} + } + 100000000000{ + other{"000 M"} + } + 1000000000000{ + other{"0.0 T"} + } + 10000000000000{ + other{"00 T"} + } + 100000000000000{ + other{"000 T"} + } + } + } symbols{ decimal{","} group{"."} diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index 2b00e573bbd..418165b26ad 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -25,6 +25,46 @@ is{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 þ'.'"} + } + 10000{ + other{"00 þ'.'"} + } + 100000{ + other{"000 þ'.'"} + } + 1000000{ + other{"0.0 m'.'"} + } + 10000000{ + other{"00 m'.'"} + } + 100000000{ + other{"000 m'.'"} + } + 1000000000{ + other{"0.0 ma'.'"} + } + 10000000000{ + other{"00 ma'.'"} + } + 100000000000{ + other{"000 ma'.'"} + } + 1000000000000{ + other{"0.0 tr'.'"} + } + 10000000000000{ + other{"00 tr'.'"} + } + 100000000000000{ + other{"000 tr'.'"} + } + } + } symbols{ decimal{","} exponential{"×10^"} diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt index bebfff9db3e..eed3479b346 100644 --- a/icu4c/source/data/locales/it.txt +++ b/icu4c/source/data/locales/it.txt @@ -26,6 +26,46 @@ it{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0.0 Md"} + } + 10000000000{ + other{"00 Md"} + } + 100000000000{ + other{"000 Md"} + } + 1000000000000{ + other{"0.0 B"} + } + 10000000000000{ + other{"00 B"} + } + 100000000000000{ + other{"000 B"} + } + } + } symbols{ decimal{","} group{"."} diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index af482c50b08..4ac45036f13 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -83,6 +83,46 @@ ja{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"0.0万"} + } + 100000{ + other{"00万"} + } + 1000000{ + other{"000万"} + } + 10000000{ + other{"0000万"} + } + 100000000{ + other{"0.0億"} + } + 1000000000{ + other{"00億"} + } + 10000000000{ + other{"000億"} + } + 100000000000{ + other{"0000億"} + } + 1000000000000{ + other{"0.0兆"} + } + 10000000000000{ + other{"00兆"} + } + 100000000000000{ + other{"000兆"} + } + } + } symbols{ decimal{"."} group{","} diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index 0c33ae5f6b7..6b4cf00c721 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -27,6 +27,46 @@ kk{ patterns{ currencyFormat{"#,##0.00 ¤"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 мың"} + } + 10000{ + other{"00 мың"} + } + 100000{ + other{"000 мың"} + } + 1000000{ + other{"0.0 млн"} + } + 10000000{ + other{"00 млн"} + } + 100000000{ + other{"000 млн"} + } + 1000000000{ + other{"0.0 млрд"} + } + 10000000000{ + other{"00 млрд"} + } + 100000000000{ + other{"000 млрд"} + } + 1000000000000{ + other{"0.0 трлн"} + } + 10000000000000{ + other{"00 трлн"} + } + 100000000000000{ + other{"000 трлн"} + } + } + } symbols{ decimal{","} group{" "} diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt index 9c83d364702..c75ff42d1e1 100644 --- a/icu4c/source/data/locales/kn.txt +++ b/icu4c/source/data/locales/kn.txt @@ -32,6 +32,46 @@ kn{ decimalFormat{"#,##,##0.###"} percentFormat{"#,##,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ exponential{"ಪೂರ್ವ"} nan{"ಸಂಖ್ಯೆಯಲ್ಲ"} diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index d3a69a10de9..fa1cc922e81 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -47,6 +47,46 @@ ko{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"0.0만"} + } + 100000{ + other{"00만"} + } + 1000000{ + other{"000만"} + } + 10000000{ + other{"0000만"} + } + 100000000{ + other{"0.0억"} + } + 1000000000{ + other{"00억"} + } + 10000000000{ + other{"000억"} + } + 100000000000{ + other{"0000억"} + } + 1000000000000{ + other{"0.0조"} + } + 10000000000000{ + other{"00조"} + } + 100000000000000{ + other{"000조"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index 5de72ce88d1..ce9b662c20d 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -29,6 +29,46 @@ lt{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 K"} + } + 10000{ + other{"00 K"} + } + 100000{ + other{"000 K"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0.0 G"} + } + 10000000000{ + other{"00 G"} + } + 100000000000{ + other{"000 G"} + } + 1000000000000{ + other{"0.0 T"} + } + 10000000000000{ + other{"00 T"} + } + 100000000000000{ + other{"000 T"} + } + } + } symbols{ decimal{"."} exponential{"×10^"} diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index 75e558af415..2e7e493033c 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -26,6 +26,46 @@ lv{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 K"} + } + 10000{ + other{"00 K"} + } + 100000{ + other{"000 K"} + } + 1000000{ + other{"0.0 M"} + } + 10000000{ + other{"00 M"} + } + 100000000{ + other{"000 M"} + } + 1000000000{ + other{"0.0 G"} + } + 10000000000{ + other{"00 G"} + } + 100000000000{ + other{"000 G"} + } + 1000000000000{ + other{"0.0 T"} + } + 10000000000000{ + other{"00 T"} + } + 100000000000000{ + other{"000 T"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/ml.txt b/icu4c/source/data/locales/ml.txt index 67511f7bf42..b4495934bd4 100644 --- a/icu4c/source/data/locales/ml.txt +++ b/icu4c/source/data/locales/ml.txt @@ -33,6 +33,46 @@ ml{ percentFormat{"#,##,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 301cf4f10fc..2aee9369544 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -32,6 +32,46 @@ mr{ decimalFormat{"#,##,##0.###"} percentFormat{"#,##,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ exponential{"पू"} nan{"नान"} diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index b5411e7bc5b..79a9b9a57a3 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -27,6 +27,46 @@ ms{ patterns{ currencyFormat{"¤#,##0.00;(¤#,##0.00)"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } } } Version{"2.0.65.46"} diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index cc9146a9d5e..e7f120043ff 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -25,6 +25,46 @@ nb{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mill"} + } + 10000000{ + other{"00 mill"} + } + 100000000{ + other{"000 mill"} + } + 1000000000{ + other{"0.0 mrd"} + } + 10000000000{ + other{"00 mrd"} + } + 100000000000{ + other{"000 mrd"} + } + 1000000000000{ + other{"0.0 bill"} + } + 10000000000000{ + other{"00 bill"} + } + 100000000000000{ + other{"000 bill"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 42d53156903..2d732a46408 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -29,6 +29,46 @@ nl{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mln"} + } + 10000000{ + other{"00 mln"} + } + 100000000{ + other{"000 mln"} + } + 1000000000{ + other{"0.0 mld"} + } + 10000000000{ + other{"00 mld"} + } + 100000000000{ + other{"000 mld"} + } + 1000000000000{ + other{"0.0 bilj"} + } + 10000000000000{ + other{"00 bilj"} + } + 100000000000000{ + other{"000 bilj"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index 298cbe1202a..06c190bdd4e 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -25,6 +25,46 @@ pl{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00 tys'.'"} + } + 100000{ + other{"000 tys'.'"} + } + 1000000{ + other{"0.0 mln"} + } + 10000000{ + other{"00 mln"} + } + 100000000{ + other{"000 mln"} + } + 1000000000{ + other{"0.0 mld"} + } + 10000000000{ + other{"00 mld"} + } + 100000000000{ + other{"000 mld"} + } + 1000000000000{ + other{"0.0 bln"} + } + 10000000000000{ + other{"00 bln"} + } + 100000000000000{ + other{"000 bln"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index fb0b616530f..519c33167a5 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -28,6 +28,46 @@ pt{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 mil"} + } + 10000{ + other{"00 mil"} + } + 100000{ + other{"000 mil"} + } + 1000000{ + other{"0.0 mi"} + } + 10000000{ + other{"00 mi"} + } + 100000000{ + other{"000 mi"} + } + 1000000000{ + other{"0.0 bi"} + } + 10000000000{ + other{"00 bi"} + } + 100000000000{ + other{"000 bi"} + } + 1000000000000{ + other{"0.0 tri"} + } + 10000000000000{ + other{"00 tri"} + } + 100000000000000{ + other{"000 tri"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt index 2399de05c21..e5ce4ac098c 100644 --- a/icu4c/source/data/locales/pt_PT.txt +++ b/icu4c/source/data/locales/pt_PT.txt @@ -13,6 +13,46 @@ pt_PT{ patterns{ currencyFormat{"#,##0.00 ¤"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 Mi"} + } + 10000000{ + other{"00 Mi"} + } + 100000000{ + other{"000 Mi"} + } + 1000000000{ + other{"0.0 MM"} + } + 10000000000{ + other{"00 MM"} + } + 100000000000{ + other{"000 MM"} + } + 1000000000000{ + other{"0.0 Bi"} + } + 10000000000000{ + other{"00 Bi"} + } + 100000000000000{ + other{"000 Bi"} + } + } + } symbols{ group{" "} } diff --git a/icu4c/source/data/locales/resfiles.mk b/icu4c/source/data/locales/resfiles.mk index 35984b8bb41..7677d190faf 100644 --- a/icu4c/source/data/locales/resfiles.mk +++ b/icu4c/source/data/locales/resfiles.mk @@ -1,6 +1,6 @@ # * Copyright (C) 1998-2012, International Business Machines # * Corporation and others. All Rights Reserved. -GENRB_CLDR_VERSION = 21.0.1 +GENRB_CLDR_VERSION = 22.0 # A list of txt's to build # Note: # diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index e5d576ecca7..9320898db44 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -25,6 +25,46 @@ ro{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 mii"} + } + 10000{ + other{"00 mii"} + } + 100000{ + other{"000 mii"} + } + 1000000{ + other{"0.0 mil'.'"} + } + 10000000{ + other{"00 mil'.'"} + } + 100000000{ + other{"000 mil'.'"} + } + 1000000000{ + other{"0.0 mld'.'"} + } + 10000000000{ + other{"00 mld'.'"} + } + 100000000000{ + other{"000 mld'.'"} + } + 1000000000000{ + other{"0.0 bln'.'"} + } + 10000000000000{ + other{"00 bln'.'"} + } + 100000000000000{ + other{"000 bln'.'"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index cc7ece01efe..bbd558c0282 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -55,6 +55,46 @@ root{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0G"} + } + 10000000000{ + other{"00G"} + } + 100000000000{ + other{"000G"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 0ba00a92e63..6628d0350b9 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -26,6 +26,46 @@ ru{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 тыс'.'"} + } + 10000{ + other{"00 тыс'.'"} + } + 100000{ + other{"000 тыс'.'"} + } + 1000000{ + other{"0.0 млн"} + } + 10000000{ + other{"00 млн"} + } + 100000000{ + other{"000 млн"} + } + 1000000000{ + other{"0.0 млрд"} + } + 10000000000{ + other{"00 млрд"} + } + 100000000000{ + other{"000 млрд"} + } + 1000000000000{ + other{"0.0 трлн"} + } + 10000000000000{ + other{"00 трлн"} + } + 100000000000000{ + other{"000 трлн"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt index 0051242db4b..691d463932c 100644 --- a/icu4c/source/data/locales/sk.txt +++ b/icu4c/source/data/locales/sk.txt @@ -25,6 +25,46 @@ sk{ currencyFormat{"#,##0.00 ¤"} percentFormat{"#,##0 %"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 tis'.'"} + } + 10000{ + other{"00 tis'.'"} + } + 100000{ + other{"000 tis'.'"} + } + 1000000{ + other{"0.0 mil'.'"} + } + 10000000{ + other{"00 mil'.'"} + } + 100000000{ + other{"000 mil'.'"} + } + 1000000000{ + other{"0.0 mld'.'"} + } + 10000000000{ + other{"00 mld'.'"} + } + 100000000000{ + other{"000 mld'.'"} + } + 1000000000000{ + other{"0.0 bil'.'"} + } + 10000000000000{ + other{"00 bil'.'"} + } + 100000000000000{ + other{"000 bil'.'"} + } + } + } symbols{ decimal{","} group{" "} diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index 4c051361f7a..382361b1234 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -28,6 +28,46 @@ sl{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 tis'.'"} + } + 10000{ + other{"00 tis'.'"} + } + 100000{ + other{"000 tis'.'"} + } + 1000000{ + other{"0.0 mio'.'"} + } + 10000000{ + other{"00 mio'.'"} + } + 100000000{ + other{"000 mio'.'"} + } + 1000000000{ + other{"0.0 mrd'.'"} + } + 10000000000{ + other{"00 mrd'.'"} + } + 100000000000{ + other{"000 mrd'.'"} + } + 1000000000000{ + other{"0.0 bil'.'"} + } + 10000000000000{ + other{"00 bil'.'"} + } + 100000000000000{ + other{"000 bil'.'"} + } + } + } symbols{ decimal{","} exponential{"e"} diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index 3131f857889..f6005fb62a9 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -25,6 +25,46 @@ sr{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00 хиљ"} + } + 100000{ + other{"000 хиљ"} + } + 1000000{ + other{"0.0 мил"} + } + 10000000{ + other{"00 мил"} + } + 100000000{ + other{"000 мил"} + } + 1000000000{ + other{"0.0 млрд"} + } + 10000000000{ + other{"00 млрд"} + } + 100000000000{ + other{"000 млрд"} + } + 1000000000000{ + other{"0.0 бил"} + } + 10000000000000{ + other{"00 бил"} + } + 100000000000000{ + other{"000 бил"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 5a8cc4a1977..5f6bfe49207 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -26,6 +26,46 @@ sv{ percentFormat{"#,##0 %"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00000"} + } + 100000{ + other{"000000"} + } + 1000000{ + other{"0.0 mjn"} + } + 10000000{ + other{"00 mjn"} + } + 100000000{ + other{"000 mjn"} + } + 1000000000{ + other{"0.0 mjd"} + } + 10000000000{ + other{"00 mjd"} + } + 100000000000{ + other{"000 mjd"} + } + 1000000000000{ + other{"0.0 trl"} + } + 10000000000000{ + other{"00 trl"} + } + 100000000000000{ + other{"000 trl"} + } + } + } symbols{ decimal{","} exponential{"×10^"} diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index c698fb5f404..7502a1fed1b 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -21,6 +21,46 @@ sw{ patterns{ currencyFormat{"#,##0.00 ¤"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"elfu 0.0"} + } + 10000{ + other{"elfu 00"} + } + 100000{ + other{"laki0.0"} + } + 1000000{ + other{"M0.0"} + } + 10000000{ + other{"M00"} + } + 100000000{ + other{"M000"} + } + 1000000000{ + other{"B0.0"} + } + 10000000000{ + other{"B00"} + } + 100000000000{ + other{"B000"} + } + 1000000000000{ + other{"T0.0"} + } + 10000000000000{ + other{"T00"} + } + 100000000000000{ + other{"T000"} + } + } + } } } Version{"2.0.65.46"} diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt index 843d6ebc0a9..d0460bfe324 100644 --- a/icu4c/source/data/locales/ta.txt +++ b/icu4c/source/data/locales/ta.txt @@ -30,6 +30,46 @@ ta{ decimalFormat{"#,##,##0.###"} percentFormat{"#,##,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} group{","} diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index 61450d2bad2..3b51f3064c9 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -31,6 +31,46 @@ te{ decimalFormat{"#,##,##0.###"} percentFormat{"#,##,##0%"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ exponential{"తూ"} } diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 33a0327a65a..4ea4f747606 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -33,6 +33,46 @@ th{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 พัน"} + } + 10000{ + other{"0.0หมื่น"} + } + 100000{ + other{"0.0แสน"} + } + 1000000{ + other{"0.0 ล้าน"} + } + 10000000{ + other{"00 ล้าน"} + } + 100000000{ + other{"000 ล'.'"} + } + 1000000000{ + other{"0.0 พ'.'ล'.'"} + } + 10000000000{ + other{"0.0 ม'.'ล'.'"} + } + 100000000000{ + other{"0.0 ส'.'ล'.'"} + } + 1000000000000{ + other{"0.0 ล'.'ล'.'"} + } + 10000000000000{ + other{"00 ล'.'ล"} + } + 100000000000000{ + other{"000 ล'.'ล'.'"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index afaff161252..821a3f275d2 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -26,6 +26,46 @@ tr{ percentFormat{"%#,##0"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"00 B"} + } + 100000{ + other{"000 B"} + } + 1000000{ + other{"0.0 Mn"} + } + 10000000{ + other{"00 Mn"} + } + 100000000{ + other{"000 Mn"} + } + 1000000000{ + other{"0.0 Mr"} + } + 10000000000{ + other{"00 Mr"} + } + 100000000000{ + other{"000 Mr"} + } + 1000000000000{ + other{"0.0 T"} + } + 10000000000000{ + other{"00 T"} + } + 100000000000000{ + other{"000 T"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index a4e0e2cfe94..a41d2290903 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -25,6 +25,46 @@ uk{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 тис"} + } + 10000{ + other{"00 тис"} + } + 100000{ + other{"000 тис"} + } + 1000000{ + other{"0.0 млн"} + } + 10000000{ + other{"00 млн"} + } + 100000000{ + other{"000 млн"} + } + 1000000000{ + other{"0.0 млрд"} + } + 10000000000{ + other{"00 млрд"} + } + 100000000000{ + other{"000 млрд"} + } + 1000000000000{ + other{"0.0 трлн"} + } + 10000000000000{ + other{"00 трлн"} + } + 100000000000000{ + other{"000 трлн"} + } + } + } symbols{ decimal{","} exponential{"Е"} diff --git a/icu4c/source/data/locales/ur.txt b/icu4c/source/data/locales/ur.txt index 5f7b5d1d901..de2437da5db 100644 --- a/icu4c/source/data/locales/ur.txt +++ b/icu4c/source/data/locales/ur.txt @@ -27,6 +27,46 @@ ur{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0K"} + } + 10000{ + other{"00K"} + } + 100000{ + other{"000K"} + } + 1000000{ + other{"0.0M"} + } + 10000000{ + other{"00M"} + } + 100000000{ + other{"000M"} + } + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"00B"} + } + 100000000000{ + other{"000B"} + } + 1000000000000{ + other{"0.0T"} + } + 10000000000000{ + other{"00T"} + } + 100000000000000{ + other{"000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt index 05f9d32b826..a6f32e3909e 100644 --- a/icu4c/source/data/locales/vi.txt +++ b/icu4c/source/data/locales/vi.txt @@ -29,6 +29,46 @@ vi{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0.0 N"} + } + 10000{ + other{"00 N"} + } + 100000{ + other{"000 N"} + } + 1000000{ + other{"0.0 Tr"} + } + 10000000{ + other{"00 Tr"} + } + 100000000{ + other{"000 Tr"} + } + 1000000000{ + other{"0.0 Tỷ"} + } + 10000000000{ + other{"00 Tỷ"} + } + 100000000000{ + other{"000 Tỷ"} + } + 1000000000000{ + other{"0.0 NT"} + } + 10000000000000{ + other{"00 NT"} + } + 100000000000000{ + other{"000 NT"} + } + } + } symbols{ decimal{","} exponential{"E"} diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index ed2b0439118..52e7adae98c 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -82,6 +82,46 @@ zh{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"0.0万"} + } + 100000{ + other{"00万"} + } + 1000000{ + other{"000万"} + } + 10000000{ + other{"0000万"} + } + 100000000{ + other{"0.0亿"} + } + 1000000000{ + other{"00亿"} + } + 10000000000{ + other{"000亿"} + } + 100000000000{ + other{"0000亿"} + } + 1000000000000{ + other{"0.0兆"} + } + 10000000000000{ + other{"00兆"} + } + 100000000000000{ + other{"000兆"} + } + } + } symbols{ decimal{"."} group{","} diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index 3aadb48ed29..c9d38c6a7f2 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -81,6 +81,46 @@ zh_Hant{ patterns{ currencyFormat{"¤#,##0.00"} } + patternsShort{ + decimalFormat{ + 1000{ + other{"0000"} + } + 10000{ + other{"0.0萬"} + } + 100000{ + other{"00萬"} + } + 1000000{ + other{"000萬"} + } + 10000000{ + other{"0000萬"} + } + 100000000{ + other{"0.0億"} + } + 1000000000{ + other{"00億"} + } + 10000000000{ + other{"000億"} + } + 100000000000{ + other{"0000億"} + } + 1000000000000{ + other{"0.0兆"} + } + 10000000000000{ + other{"00兆"} + } + 100000000000000{ + other{"000兆"} + } + } + } symbols{ nan{"非數值"} } diff --git a/icu4c/source/data/locales/zu.txt b/icu4c/source/data/locales/zu.txt index ce8b2fb4dc7..6cfb3178f21 100644 --- a/icu4c/source/data/locales/zu.txt +++ b/icu4c/source/data/locales/zu.txt @@ -32,6 +32,19 @@ zu{ percentFormat{"#,##0%"} scientificFormat{"#E0"} } + patternsShort{ + decimalFormat{ + 1000000000{ + other{"0.0B"} + } + 10000000000{ + other{"000B"} + } + 100000000000{ + other{"000B"} + } + } + } symbols{ decimal{","} group{" "} diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index 98a6e267218..f46472f7fd9 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -4465,6 +4465,46 @@ structLocale:table(nofallback){ percentFormat{""} scientificFormat{""} } + patternsShort{ + decimalFormat{ + 1000{ + other{""} + } + 10000{ + other{""} + } + 100000{ + other{""} + } + 1000000{ + other{""} + } + 10000000{ + other{""} + } + 100000000{ + other{""} + } + 1000000000{ + other{""} + } + 10000000000{ + other{""} + } + 100000000000{ + other{""} + } + 1000000000000{ + other{""} + } + 10000000000000{ + other{""} + } + 100000000000000{ + other{""} + } + } + } symbols{ decimal{""} exponential{""} @@ -4807,6 +4847,46 @@ structLocale:table(nofallback){ percentFormat{""} scientificFormat{""} } + patternsShort{ + decimalFormat{ + 1000{ + other{""} + } + 10000{ + other{""} + } + 100000{ + other{""} + } + 1000000{ + other{""} + } + 10000000{ + other{""} + } + 100000000{ + other{""} + } + 1000000000{ + other{""} + } + 10000000000{ + other{""} + } + 100000000000{ + other{""} + } + 1000000000000{ + other{""} + } + 10000000000000{ + other{""} + } + 100000000000000{ + other{""} + } + } + } symbols{ decimal{""} exponential{""} -- 2.40.0