ICU-20987 integrate CLDR release-37-alpha2 to master (new tools)
diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index b73a46b..1e8b149 100644
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -97,9 +97,9 @@
#
# $TOOLS_ROOT/cldr/cldr-to-icu/build-icu-data.xml
#
-# The files used in previous versions are the following; unsure whether these
-# are still used at all in the ICU-67-and-later process. For now they should be
-# kept up to date to enable paralel use of the older build process for verification.
+# The files used in previous versions are the following. These are not used in
+# the ICU-67-and-later process, but for now they should be kept up to date to
+# enable parallel use of the older build process for verification.
#
# $ICU4C_DIR/source/data/icu-config.xml - Update <locales> to add or remove
# CLDR locales for inclusion in ICU. Update <paths> to prefer
@@ -170,6 +170,7 @@
# 2. Build the CLDR Java tools and jar
cd $CLDR_DIR/tools/java
+ant clean
ant all
ant jar
@@ -205,50 +206,55 @@
cd $ICU4C_DIR/source
./runConfigureICU <platform>
-make all 2>&1 | tee /tmp/icu4c-oldData-makeAll.txt
+make clean
make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt
-# 4a. Generate the CLDR production data, and clean out the existing ICU4C
-# data in preparation for the newly generated data (this is important when
-# the new data may no longer generate a data file that is currently present).
-# This process uses ant with ICU's data/build.xml
+# 4a. Generate the CLDR production data. This process uses ant with ICU's
+# data/build.xml
#
# Running "ant cleanprod" is necessary to clean out the production data directory
# (usually $CLDR_TMP_DIR/production ), required if any CLDR data has changed.
#
# Running "ant setup" is not required, but it will print useful errors to
# debug issues with your path when it fails.
-#
-# Running "ant clean" cleans out the existing ICU4C data.
cd $ICU4C_DIR/source/data
ant cleanprod
ant setup
-ant clean
ant proddata 2>&1 | tee /tmp/cldr-newData-proddataLog.txt
# 4b. Build the new ICU4C data files; these include .txt files and .py files.
# These new files will replace whatever was already present in the ICU4C sources.
-# This process uses the LdmlConverter in $TOOLS_ROOT/cldr/cldr-to-icu/
+# This process uses the LdmlConverter in $TOOLS_ROOT/cldr/cldr-to-icu/;
+# see $TOOLS_ROOT/cldr/cldr-to-icu/README.txt
#
-# This process will take several minutes,, during most of which there will be no log
+# This process will take several minutes, during most of which there will be no log
# output (so do not assume nothing is happening). Keep a log so you can investigate
# anything that looks suspicious.
#
# This also requires temporarily redefining CLDR_DIR.
+#
+# Note that "ant clean" should not be run before this. The build-icu-data.xml process
+# will automatically run its own "clean" step to delete files it cannot determine to
+# be ones that it would generate, except for pasts listed in <retain> elements such as
+# coll/de__PHONEBOOK.txt, coll/de_.txt, etc.
+#
+# Before this step, make any necessary changes to
+# build-icu-data.xml$TOOLS_ROOT/cldr/cldr-to-icu/ to add new locales, etc.
-export SAVE_CLDR_DIR= $CLDR_DIR
-export CLDR_DIR=$CLDR_TMP_DIR/production
cd $TOOLS_ROOT/cldr/cldr-to-icu/
-ant -f build-icu-data.xml | tee /tmp/cldr-newData-builddataLog.txt
-
-# restore CLDR_DIR
-export CLDR_DIR=$SAVE_CLDR_DIR
+CLDR_DIR=$CLDR_TMP_DIR/production ant -f build-icu-data.xml | tee /tmp/cldr-newData-builddataLog.txt
# 5. Check which data files have modifications, which have been added or removed
# (if there are no changes, you may not need to proceed further). Make sure the
# list seems reasonable.
+cd $ICU4C_DIR/source/data
+git status
+
+# 5a. You may also want to check which files were modified in CLDR production data:
+
+cd $CLDR_TMP_DIR
git status
# 6. Fix any errors, investigate any warnings.
@@ -279,7 +285,9 @@
# may fail.
# Repeat steps 4-7 until there are no errors.
-# 9. Now run the make check tests in exhaustive mode:
+# 9. You can also run the make check tests in exhaustive mode (these will also
+# be run automatically on the master branch after the merge resulting from this
+# integration):
cd $ICU4C_DIR/source
export INTLTEST_OPTS="-e"
@@ -306,8 +314,8 @@
# 12b. Now build the jar files.
cd $ICU4C_DIR/source/data
# The following 2 lines are required to include the unicore data:
- make clean
- make -j6
+make clean
+make -j6
make icu4j-data-install
cd $ICU4C_DIR/source/test/testdata
make icu4j-data-install
@@ -345,7 +353,7 @@
cd $HOME/icu/
cd ..
git status
-# add or remove as necessary
+# git add or remove as necessary
# commit
# 16. For an official CLDR data integration into ICU, now tag the CLDR and
@@ -360,4 +368,14 @@
git tag ...
git push --tags
+# 17. You should also commit and tag the update production data in CLDR_TMP_DIR
+# using the same tag as for CLDR_DIR above:
+
+cd $CLDR_TMP_DIR
+# git add or remove as necessary
+# commit
+git tag ...
+git push --tags
+
+
diff --git a/icu4c/source/data/coll/de_.txt b/icu4c/source/data/coll/de_.txt
new file mode 100644
index 0000000..8d0a434
--- /dev/null
+++ b/icu4c/source/data/coll/de_.txt
@@ -0,0 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+de_{
+ ___{""}
+}
diff --git a/icu4c/source/data/coll/de__PHONEBOOK.txt b/icu4c/source/data/coll/de__PHONEBOOK.txt
new file mode 100644
index 0000000..00fdc33
--- /dev/null
+++ b/icu4c/source/data/coll/de__PHONEBOOK.txt
@@ -0,0 +1,7 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+de__PHONEBOOK{
+ collations{
+ default{"phonebook"}
+ }
+}
diff --git a/icu4c/source/data/coll/es_.txt b/icu4c/source/data/coll/es_.txt
new file mode 100644
index 0000000..b0de09e
--- /dev/null
+++ b/icu4c/source/data/coll/es_.txt
@@ -0,0 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+es_{
+ ___{""}
+}
diff --git a/icu4c/source/data/coll/es__TRADITIONAL.txt b/icu4c/source/data/coll/es__TRADITIONAL.txt
new file mode 100644
index 0000000..1b2efc3
--- /dev/null
+++ b/icu4c/source/data/coll/es__TRADITIONAL.txt
@@ -0,0 +1,7 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+es__TRADITIONAL{
+ collations{
+ default{"traditional"}
+ }
+}
diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt
index 76b6bda..27129b7 100644
--- a/icu4c/source/data/coll/root.txt
+++ b/icu4c/source/data/coll/root.txt
@@ -124,7 +124,7 @@
"<*💂"
"< 💂♂ << 💂🏻♂ << 💂🏼♂ << 💂🏽♂ << 💂🏾♂ << 💂🏿♂"
"< 💂♀ << 💂🏻♀ << 💂🏼♀ << 💂🏽♀ << 💂🏾♀ << 💂🏿♀"
- "<*👷"
+ "<*🥷👷"
"< 👷♂ << 👷🏻♂ << 👷🏼♂ << 👷🏽♂ << 👷🏾♂ << 👷🏿♂"
"< 👷♀ << 👷🏻♀ << 👷🏼♀ << 👷🏽♀ << 👷🏾♀ << 👷🏿♀"
"<*🤴👸👳"
@@ -205,7 +205,6 @@
"<*🧗"
"< 🧗♂ << 🧗🏻♂ << 🧗🏼♂ << 🧗🏽♂ << 🧗🏾♂ << 🧗🏿♂"
"< 🧗♀ << 🧗🏻♀ << 🧗🏼♀ << 🧗🏽♀ << 🧗🏾♀ << 🧗🏿♀"
- "<*🥷"
"<*🤺🏇⛷🏂🏌"
"< 🏌♂ = 🏌️♂ << 🏌🏻♂ << 🏌🏼♂ << 🏌🏽♂ << 🏌🏾♂ << 🏌🏿♂"
"< 🏌♀ = 🏌️♀ << 🏌🏻♀ << 🏌🏼♀ << 🏌🏽♀ << 🏌🏾♀ << 🏌🏿♀"
diff --git a/icu4c/source/data/curr/yo_BJ.txt b/icu4c/source/data/curr/yo_BJ.txt
index bd64d33..8a49d2a 100644
--- a/icu4c/source/data/curr/yo_BJ.txt
+++ b/icu4c/source/data/curr/yo_BJ.txt
@@ -6,14 +6,38 @@
"AED",
"Diami ti Awon Orílɛ́ède Arabu",
}
+ ALL{
+ "ALL",
+ "Lɛ́kɛ̀ Àlìbéníà",
+ }
+ AMD{
+ "AMD",
+ "Dírààmù Àmɛ́níà",
+ }
AOA{
"AOA",
"Wansa ti Orílɛ́ède Àngólà",
}
+ ARS{
+ "ARS",
+ "Pɛ́sò Agɛntínà",
+ }
AUD{
"A$",
"Dɔla ti Orílɛ́ède Ástràlìá",
}
+ BBD{
+ "BBD",
+ "Dɔ́là Bábádɔ̀ɔ̀sì",
+ }
+ BDT{
+ "BDT",
+ "Tákà Báńgíládɛ̀ɛ̀shì",
+ }
+ BGN{
+ "BGN",
+ "Owó Lɛ́fì Bɔ̀lìgéríà",
+ }
BHD{
"BHD",
"Dina ti Orílɛ́ède Báránì",
@@ -22,14 +46,42 @@
"BIF",
"Faransi ti Orílɛ́ède Bùùrúndì",
}
+ BMD{
+ "BMD",
+ "Dɔ́là Bɛ̀múdà",
+ }
+ BND{
+ "BND",
+ "Dɔ́là Bùrùnéì",
+ }
+ BOB{
+ "BOB",
+ "Bɔlifiánò Bɔ̀lífíà",
+ }
BRL{
"R$",
"Owó ti Orílɛ̀-èdè Brazil",
}
+ BSD{
+ "BSD",
+ "Dɔ́là Bàhámà",
+ }
+ BTN{
+ "BTN",
+ "Ìngɔ́tírɔ̀mù Bútàànì",
+ }
BWP{
"BWP",
"Pula ti Orílɛ́ède Bɔ̀tìsúwánà",
}
+ BYN{
+ "BYN",
+ "Rɔ́bù Bɛ̀lárùùsì",
+ }
+ BZD{
+ "BZD",
+ "Dɔ́là Bɛ̀lísè",
+ }
CAD{
"CA$",
"Dɔla ti Orílɛ́ède Kánádà",
@@ -42,18 +94,50 @@
"CHF",
"Faransi ti Orílɛ́ède Siwisi",
}
+ CLP{
+ "CLP",
+ "Pɛ́sò Shílè",
+ }
CNY{
"CN¥",
"Reminibi ti Orílɛ́ède sháínà",
}
+ COP{
+ "COP",
+ "Pɛ́sò Kòlóḿbíà",
+ }
+ CRC{
+ "CRC",
+ "Kólɔ́ɔ̀nì Kosita Ríkà",
+ }
+ CUC{
+ "CUC",
+ "Pɛ́sò Yíyípadà Kúbà",
+ }
+ CUP{
+ "CUP",
+ "Pɛ́sò Kúbà",
+ }
CVE{
"CVE",
"Kabofediano ti Orílɛ́ède Esuodo",
}
+ CZK{
+ "CZK",
+ "Koruna Shɛ́ɛ̀kì",
+ }
DJF{
"DJF",
"Faransi ti Orílɛ́ède Dibouti",
}
+ DKK{
+ "DKK",
+ "Kírónì Dáníshì",
+ }
+ DOP{
+ "DOP",
+ "Pɛ́sò Dòníníkà",
+ }
DZD{
"DZD",
"Dina ti Orílɛ́ède Àlùgèríánì",
@@ -70,14 +154,30 @@
"ETB",
"Biri ti Orílɛ́ède Eutopia",
}
+ FJD{
+ "FJD",
+ "Dɔ́là Fíjì",
+ }
+ FKP{
+ "FKP",
+ "Pɔ́n-ùn Erékùsù Falkland",
+ }
GBP{
"£",
"Pɔ́n-ùn ti Orilɛ̀-èdè Gɛ̀ɛ́sì",
}
+ GEL{
+ "GEL",
+ "Lárì Jɔ́jíà",
+ }
GHC{
"GHC",
"shidi ti Orílɛ́ède Gana",
}
+ GIP{
+ "GIP",
+ "Pɔ́n-ùn Gibraltar",
+ }
GMD{
"GMD",
"Dalasi ti Orílɛ́ède Gamibia",
@@ -86,10 +186,46 @@
"GNS",
"Faransi ti Orílɛ́ède Gini",
}
+ GTQ{
+ "GTQ",
+ "Kúɛ́tísààlì Guatimílà",
+ }
+ GYD{
+ "GYD",
+ "Dɔ́là Gùyánà",
+ }
+ HKD{
+ "HK$",
+ "Dɔ́là Hong Kong",
+ }
+ HNL{
+ "HNL",
+ "Lɛmipírà Ɔ́ńdúrà",
+ }
+ HTG{
+ "HTG",
+ "Gɔ́dì Àítì",
+ }
+ HUF{
+ "HUF",
+ "Fɔ́ríǹtì Hɔ̀ngérí",
+ }
+ ILS{
+ "₪",
+ "Shékélì Tuntun Ísírɛ̀ɛ̀lì",
+ }
INR{
"₹",
"Rupi ti Orílɛ́ède Indina",
}
+ JMD{
+ "JMD",
+ "Dɔ́là Jàmáíkà",
+ }
+ JOD{
+ "JOD",
+ "Dínárì Jɔ́dàànì",
+ }
JPY{
"JP¥",
"Yeni ti Orílɛ́ède Japani",
@@ -98,10 +234,34 @@
"KES",
"shiili ti Orílɛ́ède Kenya",
}
+ KHR{
+ "KHR",
+ "Ráyò Kàm̀bɔ́díà",
+ }
KMF{
"KMF",
"Faransi ti Orílɛ́ède shomoriani",
}
+ KPW{
+ "KPW",
+ "Wɔ́ɔ̀nù Àríwá Kòríà",
+ }
+ KRW{
+ "₩",
+ "Wɔ́ɔ̀nù Gúúsù Kòríà",
+ }
+ KYD{
+ "KYD",
+ "Dɔ́là Erékùsù Cayman",
+ }
+ KZT{
+ "KZT",
+ "Tɛngé Kasakísítàànì",
+ }
+ LBP{
+ "LBP",
+ "Pɔ́n-ùn Lebanese",
+ }
LRD{
"LRD",
"Dɔla ti Orílɛ́ède Liberia",
@@ -122,6 +282,10 @@
"MGA",
"Faransi ti Orílɛ́ède Malagasi",
}
+ MKD{
+ "MKD",
+ "Dɛ́nà Masidóníà",
+ }
MRO{
"MRO",
"Ouguiya ti Orílɛ́ède Maritania (1973–2017)",
@@ -134,14 +298,30 @@
"MUR",
"Rupi ti Orílɛ́ède Maritiusi",
}
+ MVR{
+ "MVR",
+ "Rúfìyá Mɔ̀lìdífà",
+ }
MWK{
"MWK",
"Kasha ti Orílɛ́ède Malawi",
}
+ MXN{
+ "MX$",
+ "Pɛ́sò Mɛ́síkò",
+ }
+ MYR{
+ "MYR",
+ "Ríngìtì Màléshíà",
+ }
MZM{
"MZM",
"Metika ti Orílɛ́ède Mosamibiki",
}
+ MZN{
+ "MZN",
+ "Mɛ́tíkààlì Mòsáḿbíìkì",
+ }
NAD{
"NAD",
"Dɔla ti Orílɛ́ède Namibia",
@@ -150,6 +330,26 @@
"₦",
"Náìrà ti Orílɛ̀-èdè Nàìjíríà",
}
+ NIO{
+ "NIO",
+ "Kɔ̀dóbà Naikarágúà",
+ }
+ NOK{
+ "NOK",
+ "Kírónì Nɔ́ɔ́wè",
+ }
+ NPR{
+ "NPR",
+ "Rúpìì Nɛ̵́pààlì",
+ }
+ NZD{
+ "NZ$",
+ "Dɔ́là New Zealand",
+ }
+ PLN{
+ "PLN",
+ "Sílɔ̀tì Pɔ́líshì",
+ }
RUB{
"₽",
"Owó ruble ti ilɛ̀ Rɔ́shíà",
@@ -162,6 +362,10 @@
"SAR",
"Riya ti Orílɛ́ède Saudi",
}
+ SBD{
+ "SBD",
+ "Dɔ́là Erékùsù Sɔ́lómɔ́nì",
+ }
SCR{
"SCR",
"Rupi ti Orílɛ́ède Sayiselesi",
@@ -174,6 +378,10 @@
"SDP",
"Pɔɔun ti Orílɛ́ède Sudani",
}
+ SGD{
+ "SGD",
+ "Dɔ́là Síngápɔ̀",
+ }
SHP{
"SHP",
"Pɔɔun ti Orílɛ́ède ̣Elena",
@@ -182,6 +390,14 @@
"SOS",
"Sile ti Orílɛ́ède Somali",
}
+ SRD{
+ "SRD",
+ "Dɔ́là Súrínámì",
+ }
+ SSP{
+ "SSP",
+ "Pɔ́n-ùn Gúúsù Sùdáànì",
+ }
STD{
"STD",
"Dobira ti Orílɛ́ède Sao tome Ati Pirisipe (1977–2017)",
@@ -190,14 +406,38 @@
"STN",
"Dobira ti Orílɛ́ède Sao tome Ati Pirisipe",
}
+ SYP{
+ "SYP",
+ "Pɔ́n-ùn Sírìà",
+ }
+ TMT{
+ "TMT",
+ "Mánààtì Tɔkimɛnístàànì",
+ }
TND{
"TND",
"Dina ti Orílɛ́ède Tunisia",
}
+ TRY{
+ "TRY",
+ "Lírà Tɔ́kì",
+ }
+ TTD{
+ "TTD",
+ "Dɔ́là Trinidad & Tobago",
+ }
+ TWD{
+ "NT$",
+ "Dɔ́là Tàìwánì Tuntun",
+ }
TZS{
"TZS",
"Sile ti Orílɛ́ède Tansania",
}
+ UAH{
+ "UAH",
+ "Ɔrifiníyà Yukiréníà",
+ }
UGX{
"UGX",
"Siile ti Orílɛ́ède Uganda",
@@ -206,10 +446,26 @@
"$",
"Dɔ́là",
}
+ UYU{
+ "UYU",
+ "Pɛ́sò Úrúgúwè",
+ }
+ UZS{
+ "UZS",
+ "Sómú Usibɛkísítàànì",
+ }
+ VES{
+ "VES",
+ "Bɔ̀lífà Fɛnɛsuɛ́là",
+ }
XAF{
"FCFA",
"Faransi ti Orílɛ́ède BEKA",
}
+ XCD{
+ "EC$",
+ "Dɔ́là Ilà Oòrùn Karíbíà",
+ }
XOF{
"CFA",
"Faransi ti Orílɛ́ède BIKEAO",
@@ -218,6 +474,10 @@
"¤",
"owóníná àìmɔ̀",
}
+ YER{
+ "YER",
+ "Ráyò Yɛ́mɛ̀nì",
+ }
ZAR{
"ZAR",
"Randi ti Orílɛ́ède Ariwa Afirika",
diff --git a/icu4c/source/data/lang/de_CH.txt b/icu4c/source/data/lang/de_CH.txt
index 8643ee3..66d00b9 100644
--- a/icu4c/source/data/lang/de_CH.txt
+++ b/icu4c/source/data/lang/de_CH.txt
@@ -27,9 +27,6 @@
zh_Hans{"Chinesisch (vereinfacht)"}
zh_Hant{"Chinesisch (traditionell)"}
}
- Languages%menu{
- ars{"Arabisch (Nadschd)"}
- }
Types{
colCaseFirst{
upper{"Grossbuchstaben zuerst aufführen"}
diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt
index 7f44c0f..faa1dff 100644
--- a/icu4c/source/data/lang/en.txt
+++ b/icu4c/source/data/lang/en.txt
@@ -1175,6 +1175,7 @@
roman{"Roman Numerals"}
romanlow{"Roman Lowercase Numerals"}
saur{"Saurashtra Digits"}
+ segment{"Segmented Digits"}
shrd{"Sharada Digits"}
sind{"Khudawadi Digits"}
sinh{"Sinhala Lith Digits"}
diff --git a/icu4c/source/data/lang/sr_Latn.txt b/icu4c/source/data/lang/sr_Latn.txt
index 894c518..21c8b3c 100644
--- a/icu4c/source/data/lang/sr_Latn.txt
+++ b/icu4c/source/data/lang/sr_Latn.txt
@@ -84,6 +84,7 @@
cad{"kado"}
car{"karipski"}
cch{"atsam"}
+ ccp{"čakma"}
ce{"čečenski"}
ceb{"sebuanski"}
cgg{"čiga"}
@@ -146,6 +147,7 @@
eu{"baskijski"}
ewo{"evondo"}
fa{"persijski"}
+ fa_AF{"dari"}
fan{"fang"}
fat{"fanti"}
ff{"fula"}
diff --git a/icu4c/source/data/lang/yo_BJ.txt b/icu4c/source/data/lang/yo_BJ.txt
index d900e47..cd07bc7 100644
--- a/icu4c/source/data/lang/yo_BJ.txt
+++ b/icu4c/source/data/lang/yo_BJ.txt
@@ -1,10 +1,25 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
yo_BJ{
+ Keys{
+ calendar{"Kàlɛ́ńdà"}
+ cf{"Ìgúnrégé Kɔ́rɛ́ńsì"}
+ collation{"Ètò Ɛlɛ́sɛɛsɛ"}
+ currency{"Kɔ́rɛ́ńsì"}
+ ms{"Èto Ìdiwɔ̀n"}
+ numbers{"Àwɔn nɔ́ńbà"}
+ }
Languages{
+ agq{"Ágɛ̀ɛ̀mù"}
+ bez{"Bɛ́nà"}
+ chr{"Shɛ́rókiì"}
+ cu{"Síláfííkì Ilé Ìjɔ́sìn"}
da{"Èdè Ilɛ̀ Denmark"}
de_AT{"Èdè Jámánì (Ɔ́síríà )"}
de_CH{"Èdè Ilɛ̀ Jámánì (Orílɛ́ède swítsàlandì)"}
+ dje{"Shárúmà"}
+ dsb{"Shobíànù Ìpìlɛ̀"}
+ ebu{"Ɛmbù"}
en{"Èdè Gɛ̀ɛ́sì"}
en_AU{"Èdè Gɛ̀ɛ́sì (órílɛ̀-èdè Ɔsirélíà)"}
en_CA{"Èdè Gɛ̀ɛ́sì (Orílɛ̀-èdè Kánádà)"}
@@ -19,14 +34,48 @@
fr_CA{"Èdè Faransé (orílɛ̀-èdè Kánádà)"}
fr_CH{"Èdè Faranshé (Súwísàlaǹdì)"}
id{"Èdè Indonéshíà"}
+ ii{"Shíkuán Yì"}
+ jmc{"Máshámè"}
+ khq{"Koira Shíínì"}
+ kk{"Kashakì"}
+ kln{"Kálɛnjín"}
+ ks{"Kashímirì"}
+ ksb{"Sháńbálà"}
+ ku{"Kɔdishì"}
+ kw{"Kɔ́nììshì"}
+ lb{"Lùshɛ́mbɔ́ɔ̀gì"}
+ mul{"Ɔlɔ́pɔ̀ èdè"}
+ nb{"Nɔ́ɔ́wè Bokímàl"}
+ nds{"Jámánì ìpìlɛ̀"}
nl{"Èdè Dɔ́ɔ̀shì"}
+ nmg{"Kíwáshíò"}
+ nn{"Nɔ́ɔ́wè Nínɔ̀sìkì"}
+ nus{"Núɛ̀"}
+ nyn{"Ńyákɔ́lè"}
+ om{"Òròmɔ́"}
+ os{"Ɔshɛ́tíìkì"}
+ prg{"Púrúshíànù"}
pt{"Èdè Pɔtogí"}
pt_BR{"Èdè Pɔtogí (Orilɛ̀-èdè Bràsíl)"}
pt_PT{"Èdè Pɔtogí (orílɛ̀-èdè Yúróòpù)"}
+ qu{"Kúɛ́ńjùà"}
+ rm{"Rómáǹshì"}
ru{"Èdè Rɔ́shíà"}
+ seh{"Shɛnà"}
+ shi{"Tashelíìtì"}
+ sn{"Shɔnà"}
+ teo{"Tɛ́sò"}
tr{"Èdè Tɔɔkisi"}
+ ug{"Yúgɔ̀"}
und{"Èdè àìmɔ̀"}
+ vo{"Fɔ́lápùùkù"}
+ wae{"Wɔsà"}
+ wo{"Wɔ́lɔ́ɔ̀fù"}
+ xog{"Shógà"}
+ yav{"Yangbɛn"}
+ zgh{"Àfɛnùkò Támásáìtì ti Mòrókò"}
zh{"Èdè Mandarin tí wɔ́n ń sɔ lórílɛ̀-èdè Sháínà"}
+ zh_Hant{"Èdè Ìbílɛ̀ Sháínà"}
zu{"Èdè Shulu"}
}
Languages%menu{
@@ -37,10 +86,21 @@
en_US{"Èdè Gɛ̀ɛ́sì (US)"}
}
Scripts{
+ Armn{"Àmɛ́níà"}
Cyrl{"èdè ilɛ̀ Rɔ́shíà"}
+ Deva{"Dɛfanagárì"}
+ Ethi{"Ɛtiópíìkì"}
+ Geor{"Jɔ́jíànù"}
+ Grek{"Jɔ́jíà"}
+ Hanb{"Han pɛ̀lú Bopomófò"}
Hans{"tí wɔ́n mú rɔrùn."}
Hant{"Hans àtɔwɔ́dɔ́wɔ́"}
+ Hrkt{"ìlànà àfɔwɔ́kɔ ará Jàpánù"}
+ Khmr{"Kɛmɛ̀"}
+ Zmth{"Àmì Ìshèsìrò"}
+ Zsym{"Àwɔn àmì"}
Zxxx{"Aikɔsilɛ"}
+ Zyyy{"Wɔ́pɔ̀"}
Zzzz{"Ìshɔwɔ́kɔ̀wé àìmɔ̀"}
}
Scripts%stand-alone{
@@ -49,11 +109,67 @@
}
Types{
calendar{
+ buddhist{"Kàlɛ̀ńdà Buddhist"}
+ chinese{"Kàlɛ̀ńdà ti Sháìnà"}
+ dangi{"Kàlɛ̀ńdà dangi"}
+ ethiopic{"Kàlɛ̀ńdà Ɛtíópíìkì"}
gregorian{"Kàlɛ́ńdà Gregory"}
+ hebrew{"Kàlɛ̀ńdà Hébérù"}
+ islamic{"Kàlɛ̀ńdà Lárúbáwá"}
iso8601{"Kàlɛ́ńdà ISO-8601"}
+ japanese{"Kàlɛ̀ńdà ti Jàpánù"}
+ persian{"Kàlɛ̀ńdà Pásíànù"}
+ roc{"Kàlɛ̀ńdà Minguo"}
+ }
+ cf{
+ account{"Ìgúnrégé Ìshirò Owó Kɔ́rɛ́ńsì"}
+ standard{"Ìgúnrégé Gbèdéke Kɔ́rɛ́ńsì"}
+ }
+ collation{
+ ducet{"Ètò Ɛlɛ́sɛɛsɛ Àkùàyàn Unicode"}
+ search{"Ìshàwárí Ète-Gbogbogbò"}
+ }
+ ms{
+ metric{"Èto Mɛ́tíríìkì"}
+ uksystem{"Èto Ìdiwɔ̀n Ɔba"}
+ ussystem{"Èto Ìdiwɔ̀n US"}
}
numbers{
+ arab{"àwɔn díjítì Làrubáwá-Índíà"}
+ arabext{"Àwɔn Díjíìtì Lárúbáwá-Índíà fífɛ̀"}
+ armn{"Àwɔn nɔ́ńbà Àmɛ́níà"}
+ armnlow{"Àwɔn Nɔ́ńbà Kékèké ti Amɛ́ríkà"}
+ beng{"Àwɔn díjíìtì Báńgílà"}
+ deva{"Àwɔn díjììtì Defanagárì"}
+ ethi{"Àwɔn nɔ́ńbà Ɛtiópíìkì"}
+ fullwide{"Àwɔn Díjíìtì Fífɛ̀-Ɛ̀kún"}
+ geor{"Àwɔn nɔ́ńbà Jɔ́jíà"}
+ grek{"Àwɔn nɔ́ńbà Gíríìkì"}
+ greklow{"Àwɔn Nɔ́ńbà Gíríìkì Kékèké"}
+ gujr{"Àwɔn díjíìtì Gùjárátì"}
+ guru{"Àwɔn Díjíìtì Gurumukì"}
+ hanidec{"Àwɔn nɔ́ńbà Dɛ́símà Sháìnà"}
+ hans{"Àwɔn nɔ́ńbà Ìrɔ̀rùn ti Sháìnà"}
+ hansfin{"Àwɔn nɔ́ńbà Ìshúná Ìrɔ̀rùn Sháìnà"}
+ hant{"Àwɔn nɔ́ńbà Ìbílɛ̀ Sháìnà"}
+ hantfin{"Àwɔn nɔ́ńbà Ìshúná Ìbílɛ̀ Sháìnà"}
+ hebr{"Àwɔn nɔ́ńbà Hébérù"}
+ jpan{"Àwɔn nɔ́ńbà Jápànù"}
+ jpanfin{"Àwɔn nɔ́ńbà Ìshúná Jàpáànù"}
+ khmr{"Àwɔn díjíìtì Kɛ́mɛ̀"}
+ knda{"Àwɔn díjíìtì kanada"}
+ laoo{"Àwɔn díjíìtì Láó"}
latn{"Díjíítì Ìwɔ̀ Oòrùn"}
+ mlym{"Àwɔn díjíìtì Málàyálámù"}
+ mymr{"Àwɔn díjíìtì Myánmarí"}
+ orya{"Àwɔn díjíìtì Òdíà"}
+ roman{"Àwɔn díjíìtì Rómánù"}
+ romanlow{"Àwɔn díjíìtì Rómánù Kékeré"}
+ taml{"Àwɔn díjíìtì Ìbílɛ̀ Támílù"}
+ tamldec{"Àwɔn díjíìtì Tàmílù"}
+ telu{"Àwɔn díjíìtì Télúgù"}
+ thai{"Àwɔn díjíìtì Thai"}
+ tibt{"Àwɔn díjíìtì Tibetán"}
}
}
Version{"37"}
diff --git a/icu4c/source/data/lang/yue_Hans.txt b/icu4c/source/data/lang/yue_Hans.txt
index 9a80859..5025f74 100644
--- a/icu4c/source/data/lang/yue_Hans.txt
+++ b/icu4c/source/data/lang/yue_Hans.txt
@@ -174,6 +174,7 @@
ewo{"依汪都文"}
ext{"埃斯特雷马杜拉文"}
fa{"波斯文"}
+ fa_AF{"达里文"}
fan{"芳族文"}
fat{"芳蒂文"}
ff{"富拉文"}
@@ -639,7 +640,6 @@
Afak{"阿法卡文字"}
Aghb{"高加索阿尔巴尼亚文"}
Arab{"阿拉伯文"}
- Aran{"波斯体"}
Armi{"皇室亚美尼亚文"}
Armn{"亚美尼亚文"}
Avst{"阿维斯陀文"}
diff --git a/icu4c/source/data/locales/ceb.txt b/icu4c/source/data/locales/ceb.txt
index 63e0b0d..9a3c2c0 100644
--- a/icu4c/source/data/locales/ceb.txt
+++ b/icu4c/source/data/locales/ceb.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ceb{
- AuxExemplarCharacters{"[c f j q v x z ñ]"}
+ AuxExemplarCharacters{"[c f j ñ q v x z]"}
ExemplarCharacters{"[a b d e g h i k l m n o p r s t u w 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]"}
ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] @ * / \\& # ′ ″]"}
diff --git a/icu4c/source/data/locales/mai.txt b/icu4c/source/data/locales/mai.txt
index 7a6c0ca..d02242e 100644
--- a/icu4c/source/data/locales/mai.txt
+++ b/icu4c/source/data/locales/mai.txt
@@ -1,17 +1,19 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mai{
- AuxExemplarCharacters{"[अ{अं} {अः} आ-ऌ ॡ ए ऐ ओ औ]"}
+ AuxExemplarCharacters{"[अ {अ\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ]"}
ExemplarCharacters{
- "[क {क्ष} ख-घ च-ज {ज्ञ} झ-डड़{डं} ढढ़ ण त {त्र} थ-न प-र ल व श {श्र} ष-ह ा ि ी "
- "\u0941 \u0942 \u0947 \u0948 ो ौ]"
+ "[\u093C \u0902 ः क {क\u094Dष} ख ग घ च छ ज {ज\u094Dञ} झ ञ ट ठ ड {ड\u0902} ढ ण"
+ " त {त\u094Dर} थ द ध न प फ ब भ म य र ल व श {श\u094Dर} ष स ह ा ि ी \u0941 "
+ "\u0942 \u0947 \u0948 ो ौ]"
}
ExemplarCharactersIndex{
- "[अ{अं} {अः} आ-ऌ ॡ ए ऐ ओ-क {क्ष} ख-घ च-ज {ज्ञ} झ-डड़{डं} ढढ़ ण त {त्र} थ-न प-र "
- "ल व श {श्र} ष-ह]"
+ "[\u093C अ {अ\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ क {क\u094Dष} ख ग घ च छ ज {ज"
+ "\u094Dञ} झ ञ ट ठ ड {ड\u0902} ढ ण त {त\u094Dर} थ द ध न प फ ब भ म य र ल व श {श"
+ "\u094Dर} ष स ह]"
}
ExemplarCharactersPunctuation{
- "[_ \\- – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} § @ * / "
+ "[_ \\- ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} § @ * / "
"\\\\ \\& # ′ ″ ` + | ~]"
}
NumberElements{
diff --git a/icu4c/source/data/locales/pcm.txt b/icu4c/source/data/locales/pcm.txt
index f1b7fbf..dabcaa0 100644
--- a/icu4c/source/data/locales/pcm.txt
+++ b/icu4c/source/data/locales/pcm.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pcm{
- AuxExemplarCharacters{"[c q x à è {ẹ̀} ì ò {ọ̀} ù]"}
+ AuxExemplarCharacters{"[à c è {ẹ\u0300} ì ò {ọ\u0300} q ù x]"}
Ellipsis{
final{"{0}…"}
initial{"…{0}"}
@@ -11,8 +11,8 @@
word-medial{"{0} … {1}"}
}
ExemplarCharacters{
- "[a á b {ch} d e é ẹ {ẹ́}f g {gb} h i í j k {kp} l m n o ó ọ {ọ́} p r s {sh} "
- "t u ú v w y z {zh}]"
+ "[a á b {ch} d e é ẹ {ẹ\u0301} f g {gb} h i í j k {kp} l m n o ó ọ {ọ\u0301} "
+ "p r s {sh} t u ú v w y z {zh}]"
}
ExemplarCharactersIndex{"[A B {CH} D E F G H I J K L M N O P R S T U V W Y Z]"}
ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"}
diff --git a/icu4c/source/data/locales/sd_Deva.txt b/icu4c/source/data/locales/sd_Deva.txt
index eea1c60..2886c07 100644
--- a/icu4c/source/data/locales/sd_Deva.txt
+++ b/icu4c/source/data/locales/sd_Deva.txt
@@ -4,9 +4,9 @@
%%Parent{"root"}
AuxExemplarCharacters{"[\u200C\u200D]"}
ExemplarCharacters{
- "[\u093C अ आ इ ई उ ऊ ए ऐ ओ औ क ख ग ॻ घ ङ च छ ज ॼ झ ञ ट ठ ड ॾ ढ ण त थ द ध न प "
- "फ ब ॿ भ म य र ल व श ष स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 "
- "\u0948 ॉ ो ौ \u094D]"
+ "[\u093C \u0902 अ आ इ ई उ ऊ ए ऐ ओ औ क ख ग ॻ घ ङ च छ ज ॼ झ ञ ट ठ ड ॾ ढ ण त थ द"
+ " ध न प फ ब ॿ भ म य र ल व श ष स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 "
+ "\u0947 \u0948 ॉ ो ौ \u094D]"
}
ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"}
ExemplarCharactersPunctuation{
diff --git a/icu4c/source/data/locales/yo_BJ.txt b/icu4c/source/data/locales/yo_BJ.txt
index ae168ac..fb4ecbf 100644
--- a/icu4c/source/data/locales/yo_BJ.txt
+++ b/icu4c/source/data/locales/yo_BJ.txt
@@ -6,6 +6,48 @@
"\u0301} {ɔ\u0300} p r s {sh} t u ú ù w y]"
}
NumberElements{
+ latn{
+ patternsLong{
+ decimalFormat{
+ 1000{
+ other{"0 ɛgbɛ̀rún"}
+ }
+ 10000{
+ other{"00 ɛgbɛ̀rún"}
+ }
+ 100000{
+ other{"000 ɛgbɛ̀rún"}
+ }
+ 1000000{
+ other{"0 mílíɔ̀nù"}
+ }
+ 10000000{
+ other{"00 mílíɔ̀nù"}
+ }
+ 100000000{
+ other{"000 mílíɔ̀nù"}
+ }
+ 1000000000{
+ other{"0 bilíɔ̀nù"}
+ }
+ 10000000000{
+ other{"00 bilíɔ̀nù"}
+ }
+ 100000000000{
+ other{"000 bilíɔ̀nù"}
+ }
+ 1000000000000{
+ other{"0 tiriliɔ̀nù"}
+ }
+ 10000000000000{
+ other{"00 tiriliɔ̀nù"}
+ }
+ 100000000000000{
+ other{"000 tiriliɔ̀nù"}
+ }
+ }
+ }
+ }
minimalPairs{
ordinal{
other{"Mú {0} apá ɔ̀tún"}
@@ -285,6 +327,13 @@
"1"{"Ɔjɔ́ Àìkú tó ń bɔ̀"}
}
}
+ sun-narrow{
+ relativeTime{
+ future{
+ other{"Ɔjɔ́ Àíkú +{0}"}
+ }
+ }
+ }
week{
dn{"Ɔ̀sɛ̀"}
relative{
diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt
index f04091d..33733ae 100644
--- a/icu4c/source/data/misc/keyTypeData.txt
+++ b/icu4c/source/data/misc/keyTypeData.txt
@@ -668,6 +668,7 @@
roman{""}
romanlow{""}
saur{""}
+ segment{""}
shrd{""}
sind{""}
sinh{""}
diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt
index 4d9423e..36a99ae 100644
--- a/icu4c/source/data/misc/langInfo.txt
+++ b/icu4c/source/data/misc/langInfo.txt
@@ -2435,15 +2435,15 @@
} // lsrs
} // likely
match{
- trie:bin{ // BytesTrie: 2632 bytes
+ trie:bin{ // BytesTrie: 2630 bytes
00196ec41e74c1b077c0ca77a28078a2
-8a79a29a7a036c346db02fe834f51165
+8a79a29a7a036c346daa8ee834f51165
ee5d12ed6df335117ae820022a854834
4c166174ee48616ef34911616e02e99e
f3a245f41248616e01f347f42007b314
-b32ab426b536b605b3c8a8b329b429b6
-2910b5292a2bb026b122b205b3c894b3
-29b429b62905b3c88ab329b429b62912
+b32ab426b536b605b3c8a6b329b429b6
+2910b5292a2bb026b122b205b3c892b3
+29b429b62905b3c888b329b429b62912
48616e01f349f4491348616ef43f0175
2aef1166f25d12f57ae835016d2ae811
65ee5d02eda241f622f7116de7350369
@@ -2452,27 +2452,27 @@
4c6174ee35744a75a2b476016b2c7212
ef65f43501eb22f4116df3350ee171eb
0eeba2a5eea2dbefa2d8f41172f55de1
-4ee592e7aa42e91165ee5c012a854516
+4ee592e7aa40e91165ee5c012a854516
7468e94c6174ee350165427410e12001
2a854c166174ee54616dec4910ee5c01
2a855416616dec4c6174ee3501654274
10e520012a854c166174ee54656cf549
10ee5c012a855416656cf54c6174ee35
-6c1c6c366dac0775367812f96de73512
+6c1c6c366dac0575367812f96de73512
e865ee5d01eda25af9126b6cee356432
65a2dc6b12e76de73512f86de7350472
527a58e75ef2a28ffa1172f55c012a85
4c166174ee437972ec3512eb6df33512
f375fa35117ae84971c16171a2ac72a4
49730011e855f12df130f234f428f5a8
-18f71165ee5d107301e829f220022a85
+16f71165ee5d107301e829f220022a85
43344c166174ee437972ec2b167972ec
4c6174ee2be832e942ee22ef1165ee5d
-0262ac2968227310f2291165ee5c012a
+0262ac2768227310f2291165ee5c012a
855316696ee84c6174ee35702e705272
-58735ee1b0afe41165ee5c012a854116
+58735ee1b0ade41165ee5c012a854116
7261e24c6174ee3512f66ff23512ef73
-e33501e8aef4f91161e1296434674068
+e33501e8aef2f91161e1296434674068
486b12e76de73501e322ee1173e33513
e36b6cee3512f561f23504753a769077
a26478a26df51165f35d0cec16f30bf3
@@ -2484,11 +2484,11 @@
22e51171f53503e12ae326e822f31171
f5350aef14f409f426f522f71171f535
ef26f022f21171f535e12ee32ae826ec
-22ee1171f5351171f5350361a80ced30
+22ee1171f5351171f5350361a80aed30
eea285f71166f25d1164e5496ea26f6f
-a2d370086b4d6bac08735ae168f386f4
-1170f4a28007b3c48eb3aa92b4aa8fb5
-aa8cb601b129b62901e5a2d3f41170f3
+a2d370086b4d6bac06735ae168f386f4
+1170f4a28007b3c48cb3aa90b4aa8db5
+aa8ab601b129b62901e5a2d3f41170f3
351165ee5c012a8547167572f54c6174
ee351165ee5c012a8541167261e24c61
74ee356234633a65406712e161f23512
@@ -2496,111 +2496,111 @@
44ee17ee2eef38f91165ee5d106e01e2
49ef490164786e10e2237948e256e511
65ee5c012a8544166576e14c6174ee35
-01e4a670ee1165ee5d01642c6e01ee49
-ef2310e13161a8776834693a6c427312
+01e4a66eee1165ee5d01642c6e01ee49
+ef2310e13161a8756834693a6c427312
ef65ee5d12e467ee3513f16b6cee3513
-e56c75f935046b54725ce3ae00eda2df
+e56c75f935046b54725ce3acfeeda2dd
f21165ee5c012a854f167279e14c6174
-ee3513e96b6cee3502e3a6c8ee22f311
-6df33567c32e6ac24a6aa2b76ba40f6c
-a4b26d0011e768ee35eea40cf24ef374
-f4a29cf91165ee5c012a854d16796df2
-4c6174ee350168a6516d10f220012a85
-4c166174ee446576e1491169e45de7a4
-4ce9a60eeb6aec0165426d10ec20012a
+ee3513e96b6cee3502e3a6c6ee22f311
+6df33567c32c6ac2486aa2b56ba40d6c
+a4b06d00107669ee35eea40af24ef374
+f4a29af91165ee5c012a854d16796df2
+4c6174ee350168a64f6d10f220012a85
+4c166174ee446576e1491169e45d7676
+e7a448e9a60aec0165426d10ec20012a
854c166174ee4d6c79ed4910ee5c012a
-854d166c79ed4c6174ee351162e75d6e
-226e3a7140734675a6a07612e66dee35
-12f07ae83512e76df33501e8ac69e911
-6df3356134653a66406912ee6df33512
-f86df33512ef6df33502e14ae246e511
-65ee5d02612ee13af61169e44901eb22
-f8116df335116ae120032a8548384b78
-4c166174ee4a7061ee2b026136694272
-156bf44a7061ee2b156ee94a7061ee2b
-1172e10148464a127061ee2b12616ee1
-01482c4a127061ee2b12726bf42b0aeb
-73ef36ef2ef57cf91172f55d116bef20
-022a8548464a12616def01482c4b126f
-72e52b12616ee72b11616e01e722e913
-4b6f72e52b1174f25deba89aed6aee01
-65426b10ee20012a854c166174ee4b6e
-64e14910ee5c012a854b166e64e14c61
-74ee351165ee5c012a854b16686df24c
-6174ee357236763c7848e14ee71166f2
-5d12e965ee5d01e222f2116df33512e4
-6df3351165ee5c012a854716656ff24c
-6174ee350e753ee221e24ee7a29dee4c
-ef1165ee5c012a854c16616fef4c6174
-ee351164e5291166f25d753277387a40
-e11169f44912e166f25d13e76c75f935
-12e87ae8356f2a6f48724e735c7402e7
-30ef22f3126c75f935116cf63512fa65
-ee5d01e922ed126c75f93513ed6c75f9
-35634669526b02e226ef22f3126c75f9
-35126c75f93501e522e6116df33512f7
-6df335676a68a2816905e40ae4a88fe7
-34f31165ee49642e6b36e11165ee5d13
-e16c75f93512f469f5350a7531ec1eec
-a40deea40af50167286810e95d10f520
-012a854c166174ee47756af249752ee1
-22e41165ee4901e922ee1167ee356138
-6b4c6e546f5a7312f764e52902e1a257
-eea46ef8116fed3513f06b70e53512f7
-67ee3513ed6b6feb3507e934e94ef26c
-f4a6faf91172f55c012a854116726dee
-437972ec351168e920012a854c166174
-ee446576e1490162287310e82910f329
-61326a4c7352e11165ee5d02e530eba4
-10f71165ee49116fed3512e96df33512
-ee7ae83564c0e0648865a24866036632
-7538ef6af9116eec4912ed66e63506e8
-0be82ae926f122f61166e635e226e522
-e61166e6351166e6351164e149027434
-753ae1106e01e231ef3112f96ee53512
-f06df33507ef46efa468f32ef496f511
-65f3491165f3a28007b30cb342b43eb5
-3ab601b129b6292a2bb026b14eb204b0
-29b229b329b429b52904b029b229b329
-b429b52901b129b6291166e95d6e9879
-a0e5a41eee1165eea28007b317b362b4
-30b55ab601b229b62904b027b127b327
-b427b5272a2bb030b12cb201b229b629
-04b029b129b329b427b52913e26b6cee
-3513ef6b6cee3561a25662a482630a6f
-2c7a167a30efa4b5f91165ee4901e822
-ef117ae835117ae8356f3070367212f3
-66f24912e16df33512f87ae835643865
-3e68466a4c6b12e261f25d12ef7ae835
-13e26669ec5d12f265ee4912f97ae835
-001575afe288f275f24af9a26cfa1172
-f55c012a854c166174ee437972ec3511
-61f220012a5a4c166174ee417261e248
-07b327b364b426b522b605b436b429b5
-29b6298407b313b33cb426b522b605b4
-22b429b529b62910b3292a2bb026b122
-b205b40fb429b529b62905b406b429b5
-29b629b029b129b2291165f349e22ee6
-32eb1165ee5d1172f55d116eec4975a4
-1d7634793a7a4ee1127373f92912ec61
-f23503e82aec26ee22f01161f23512e2
-61fa3566356c1e6c3e70447203f12af3
-26f922fa1161f23512ee73f13501e322
-e41161f235663069366a12f061f23512
-e261f23513e97379f235613e624e635a
-64906501e222e31161f23502e526ef32
-f41173f13501e822f61161f23505f709
-f726f822f91161f235e82eed22f11161
-f2351165ee5d1161f23512e661f2350c
-7655e83de83eee42f286f30168287310
-e82910f2291168e95d0162426510ee5c
-012a854216656ee74c6174ee3510ee20
-012a854c166174ee42656ee7491166f2
-49762e7a3ae51172f54901e522f5116d
-f33512e36de7356a1b6a306d447412ea
-6df33501ee2af1116de735116df33512
-ed6de735623065366812f26de73512fa
-61f23512ed65ee5d
+854d166c79ed4c6174ee3512e66dee35
+6e1f6e34713a73407512e96df33512f0
+7ae83512e76df33501e8ac69e9116df3
+356134653a66406912ee6df33512f86d
+f33512ef6df33502e14ae246e51165ee
+5d02612ee13af61169e44901eb22f811
+6df335116ae120032a8548384b784c16
+6174ee4a7061ee2b026136694272156b
+f44a7061ee2b156ee94a7061ee2b1172
+e10148464a127061ee2b12616ee10148
+2c4a127061ee2b12726bf42b0aeb73ef
+36ef2ef57cf91172f55d116bef20022a
+8548464a12616def01482c4b126f72e5
+2b12616ee72b11616e01e722e9134b6f
+72e52b1174f25deba89aed6aee016542
+6b10ee20012a854c166174ee4b6e64e1
+4910ee5c012a854b166e64e14c6174ee
+351165ee5c012a854b16686df24c6174
+ee357236763c7848e14ee71166f25d12
+e965ee5d01e222f2116df33512e46df3
+351165ee5c012a854716656ff24c6174
+ee350e753ee221e24ee7a29dee4cef11
+65ee5c012a854c16616fef4c6174ee35
+1164e5291166f25d753277387a40e111
+69f44912e166f25d13e76c75f93512e8
+7ae8356f2a6f48724e735c7402e730ef
+22f3126c75f935116cf63512fa65ee5d
+01e922ed126c75f93513ed6c75f93563
+4669526b02e226ef22f3126c75f93512
+6c75f93501e522e6116df33512f76df3
+35676a68a2816905e40ae4a88fe734f3
+1165ee49642e6b36e11165ee5d13e16c
+75f93512f469f5350a7531ec1eeca40d
+eea40af50167286810e95d10f520012a
+854c166174ee47756af249752ee122e4
+1165ee4901e922ee1167ee3561386b4c
+6e546f5a7312f764e52902e1a257eea4
+6ef8116fed3513f06b70e53512f767ee
+3513ed6b6feb3507e934e94ef26cf4a6
+faf91172f55c012a854116726dee4379
+72ec351168e920012a854c166174ee44
+6576e1490162287310e82910f3296132
+6a4c7352e11165ee5d02e530eba410f7
+1165ee49116fed3512e96df33512ee7a
+e83564c0e0648865a248660366327538
+ef6af9116eec4912ed66e63506e80be8
+2ae926f122f61166e635e226e522e611
+66e6351166e6351164e149027434753a
+e1106e01e231ef3112f96ee53512f06d
+f33507ef46efa468f32ef496f51165f3
+491165f3a28007b30cb342b43eb53ab6
+01b129b6292a2bb026b14eb204b029b2
+29b329b429b52904b029b229b329b429
+b52901b129b6291166e95d6e9879a0e5
+a41eee1165eea28007b317b362b430b5
+5ab601b229b62904b027b127b327b427
+b5272a2bb030b12cb201b229b62904b0
+29b129b329b427b52913e26b6cee3513
+ef6b6cee3561a25662a482630a6f2c7a
+167a30efa4b5f91165ee4901e822ef11
+7ae835117ae8356f3070367212f366f2
+4912e16df33512f87ae8356438653e68
+466a4c6b12e261f25d12ef7ae83513e2
+6669ec5d12f265ee4912f97ae8350015
+75afe288f275f24af9a26cfa1172f55c
+012a854c166174ee437972ec351161f2
+20012a5a4c166174ee417261e24807b3
+27b364b426b522b605b436b429b529b6
+298407b313b33cb426b522b605b422b4
+29b529b62910b3292a2bb026b122b205
+b40fb429b529b62905b406b429b529b6
+29b029b129b2291165f349e22ee632eb
+1165ee5d1172f55d116eec4975a41d76
+34793a7a4ee1127373f92912ec61f235
+03e82aec26ee22f01161f23512e261fa
+3566356c1e6c3e70447203f12af326f9
+22fa1161f23512ee73f13501e322e411
+61f235663069366a12f061f23512e261
+f23513e97379f235613e624e635a6490
+6501e222e31161f23502e526ef32f411
+73f13501e822f61161f23505f709f726
+f822f91161f235e82eed22f11161f235
+1165ee5d1161f23512e661f2350c7655
+e83de83eee42f286f30168287310e829
+10f2291168e95d0162426510ee5c012a
+854216656ee74c6174ee3510ee20012a
+854c166174ee42656ee7491166f24976
+2e7a3ae51172f54901e522f5116df335
+12e36de7356a1b6a306d447412ea6df3
+3501ee2af1116de735116df33512ed6d
+e735623065366812f26de73512fa61f2
+3512ed65ee5d
} // trie
regionToPartitions:bin{ // 1677 bytes
000008090a00020000000b0009000201
@@ -2673,7 +2673,7 @@
00020102010101000000010100010000
01010002000200000000000000000000
04010002000100010400000000000000
-00000101010d00000000010000000000
+00000101010100000000010000000000
00000001010200010001000001000000
00000100000105000201020101010000
02010100020101020203000100020000
diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
index 42bea8e..4786ec5 100644
--- a/icu4c/source/data/misc/supplementalData.txt
+++ b/icu4c/source/data/misc/supplementalData.txt
@@ -8007,6 +8007,14 @@
"gr91~4",
"gra1",
"is0",
+ "itci",
+ "itgo",
+ "itog",
+ "itot",
+ "itpn",
+ "itts",
+ "itud",
+ "itvs",
"laxn",
"lud",
"lug",
@@ -8040,6 +8048,7 @@
"nlcw",
"nlsx",
"no16~7",
+ "no23",
"nzn",
"nzs",
"omba",
@@ -9435,7 +9444,7 @@
"itbz",
"itca~b",
"itce",
- "itch~i",
+ "itch",
"itcl",
"itcn~o",
"itcr~t",
@@ -9448,7 +9457,6 @@
"itfm",
"itfr",
"itge",
- "itgo",
"itgr",
"itim",
"itis",
@@ -9466,14 +9474,12 @@
"itna",
"itno",
"itnu",
- "itog",
"itor",
- "itot",
"itpa",
"itpc~e",
"itpg",
"itpi",
- "itpn~o",
+ "itpo",
"itpr",
"itpt~v",
"itpz",
@@ -9484,6 +9490,7 @@
"itri",
"itrm~o",
"itsa",
+ "itsd",
"itsi",
"itso~p",
"itsr~s",
@@ -9491,13 +9498,13 @@
"itta",
"itte",
"ittn~p",
- "ittr~s",
+ "ittr",
"ittv",
- "itud",
"itva~c",
"itve",
"itvi",
- "itvr~t",
+ "itvr",
+ "itvt",
"itvv",
"jm01~9",
"jm10~4",
@@ -10093,7 +10100,8 @@
"no10~2",
"no14~5",
"no18~9",
- "no20~3",
+ "no20~2",
+ "no50",
"np1~5",
"npba",
"npbh",
@@ -11238,10 +11246,19 @@
}
}
unit{
- deprecated{"proportion-karat"}
+ deprecated{
+ "acceleration-meter-per-second-squared",
+ "consumption-liter-per-100kilometers",
+ "concentr-part-per-million",
+ "pressure-inch-hg",
+ "pressure-pound-per-square-inch",
+ "pressure-millimeter-of-mercury",
+ "proportion-karat",
+ "torque-pound-foot",
+ }
regular{
"acceleration-g-force",
- "acceleration-meter-per-second-squared",
+ "acceleration-meter-per-square-second",
"angle-arc-minute",
"angle-arc-second",
"angle-degree",
@@ -11260,12 +11277,14 @@
"concentr-karat",
"concentr-milligram-per-deciliter",
"concentr-millimole-per-liter",
- "concentr-part-per-million",
"concentr-percent",
"concentr-permille",
"concentr-permyriad",
+ "concentr-permillion",
"concentr-mole",
- "consumption-liter-per-100kilometers",
+ "concentr-item",
+ "concentr-portion",
+ "consumption-liter-per-100-kilometer",
"consumption-liter-per-kilometer",
"consumption-mile-per-gallon",
"consumption-mile-per-gallon-imperial",
@@ -11315,6 +11334,7 @@
"frequency-hertz",
"frequency-kilohertz",
"frequency-megahertz",
+ "graphics-dot",
"graphics-dot-per-centimeter",
"graphics-dot-per-inch",
"graphics-em",
@@ -11322,6 +11342,7 @@
"graphics-pixel",
"graphics-pixel-per-centimeter",
"graphics-pixel-per-inch",
+ "length-100-kilometer",
"length-astronomical-unit",
"length-centimeter",
"length-decimeter",
@@ -11342,7 +11363,9 @@
"length-picometer",
"length-point",
"length-yard",
+ "length-earth-radius",
"length-solar-radius",
+ "light-candela",
"light-lux",
"light-solar-luminosity",
"mass-carat",
@@ -11367,14 +11390,15 @@
"power-watt",
"pressure-atmosphere",
"pressure-hectopascal",
- "pressure-inch-hg",
+ "pressure-inch-ofhg",
"pressure-bar",
"pressure-millibar",
- "pressure-millimeter-of-mercury",
- "pressure-pound-per-square-inch",
+ "pressure-millimeter-ofhg",
+ "pressure-pound-force-per-square-inch",
"pressure-pascal",
"pressure-kilopascal",
"pressure-megapascal",
+ "pressure-ofhg",
"speed-kilometer-per-hour",
"speed-knot",
"speed-meter-per-second",
@@ -11383,7 +11407,7 @@
"temperature-fahrenheit",
"temperature-generic",
"temperature-kelvin",
- "torque-pound-foot",
+ "torque-pound-force-foot",
"torque-newton-meter",
"volume-acre-foot",
"volume-bushel",
@@ -18574,12 +18598,6 @@
"1",
}
{
- "mk",
- "bg",
- "30",
- "1",
- }
- {
"ml",
"en",
"30",
@@ -26821,7 +26839,6 @@
"ES",
"FI",
"FR",
- "GB",
"GR",
"HR",
"HU",
@@ -36016,7 +36033,7 @@
}
IN{
length-person{"inch"}
- pressure-baromtrc{"inch-hg"}
+ pressure-baromtrc{"inch-ofhg"}
}
IS{
concentration-blood-glucose{"millimole-per-liter"}
@@ -36091,7 +36108,7 @@
consumption-vehicle-fuel{"liter-per-kilometer"}
length-person-height{"meter-and-centimeter"}
length-vehicle{"meter-and-centimeter"}
- pressure-baromtrc{"millimeter-of-mercury"}
+ pressure-baromtrc{"millimeter-ofhg"}
}
MY{
concentration-blood-glucose{"millimole-per-liter"}
@@ -36143,7 +36160,7 @@
RU{
concentration-blood-glucose{"millimole-per-liter"}
length-person-height{"meter-and-centimeter"}
- pressure-baromtrc{"millimeter-of-mercury"}
+ pressure-baromtrc{"millimeter-ofhg"}
speed-wind{"meter-per-second"}
}
SA{
@@ -36218,7 +36235,7 @@
"pound-and-ounce",
}
power-engine{"horsepower"}
- pressure-baromtrc{"inch-hg"}
+ pressure-baromtrc{"inch-ofhg"}
pressure-default{"pound-force-per-square-inch"}
speed-default{"mile-per-hour"}
speed-wind{"mile-per-hour"}
diff --git a/icu4c/source/data/region/sr_Latn.txt b/icu4c/source/data/region/sr_Latn.txt
index 6a936bd..7b525b7 100644
--- a/icu4c/source/data/region/sr_Latn.txt
+++ b/icu4c/source/data/region/sr_Latn.txt
@@ -288,6 +288,8 @@
VU{"Vanuatu"}
WF{"Valis i Futuna"}
WS{"Samoa"}
+ XA{"Pseudoakcenti"}
+ XB{"Pseudobidi"}
XK{"Kosovo"}
YE{"Jemen"}
YT{"Majot"}
diff --git a/icu4c/source/data/region/yo_BJ.txt b/icu4c/source/data/region/yo_BJ.txt
index 2f308bf..5bc1646 100644
--- a/icu4c/source/data/region/yo_BJ.txt
+++ b/icu4c/source/data/region/yo_BJ.txt
@@ -6,6 +6,7 @@
005{"Gúúshù Amɛ́ríkà"}
011{"Ìwɔ̀ oorùn Afíríkà"}
013{"Ààrin Gbùgbùn Àmɛ́ríkà"}
+ 019{"Amɛ́ríkà"}
021{"Apáàríwá Amɛ́ríkà"}
030{"Ìlà Òòrùn Eshíà"}
034{"Gúúshù Eshíà"}
@@ -32,6 +33,7 @@
AT{"Orílɛ́ède Asítíríà"}
AU{"Orílɛ́ède Ástràlìá"}
AW{"Orílɛ́ède Árúbà"}
+ AX{"Àwɔn Erékùsù ti Åland"}
AZ{"Orílɛ́ède Asɛ́bájánì"}
BA{"Orílɛ́ède Bɔ̀síníà àti Ɛtisɛgófínà"}
BB{"Orílɛ́ède Bábádósì"}
@@ -68,6 +70,7 @@
CY{"Orílɛ́ède Kúrúsì"}
CZ{"Orílɛ́ède shɛ́ɛ́kì"}
DE{"Orílɛèdè Jámánì"}
+ DG{"Diego Gashia"}
DJ{"Orílɛ́ède Díbɔ́ótì"}
DK{"Orílɛ́ède Dɛ́mákì"}
DM{"Orílɛ́ède Dòmíníkà"}
@@ -85,6 +88,7 @@
FJ{"Orílɛ́ède Fiji"}
FK{"Orílɛ́ède Etikun Fakalandi"}
FM{"Orílɛ́ède Makoronesia"}
+ FO{"Àwɔn Erékùsù ti Faroe"}
FR{"Orílɛ́ède Faranse"}
GA{"Orílɛ́ède Gabon"}
GB{"Orílɛ́èdè Gɛ̀ɛ́sì"}
@@ -99,14 +103,17 @@
GP{"Orílɛ́ède Gadelope"}
GQ{"Orílɛ́ède Ekutoria Gini"}
GR{"Orílɛ́ède Geriisi"}
+ GS{"Gúúsù Georgia àti Gúúsù Àwɔn Erékùsù Sandwich"}
GT{"Orílɛ́ède Guatemala"}
GU{"Orílɛ́ède Guamu"}
GW{"Orílɛ́ède Gene-Busau"}
GY{"Orílɛ́ède Guyana"}
+ HK{"Hong Kong SAR ti Sháìnà"}
HN{"Orílɛ́ède Hondurasi"}
HR{"Orílɛ́ède Kòróátíà"}
HT{"Orílɛ́ède Haati"}
HU{"Orílɛ́ède Hungari"}
+ IC{"Ɛrékùsù Kánárì"}
ID{"Orílɛ́ède Indonesia"}
IE{"Orílɛ́ède Ailandi"}
IL{"Orílɛ́ède Iserɛli"}
@@ -149,6 +156,7 @@
ML{"Orílɛ́ède Mali"}
MM{"Orílɛ́ède Manamari"}
MN{"Orílɛ́ède Mogolia"}
+ MO{"Macao SAR ti Sháìnà"}
MP{"Orílɛ́ède Etikun Guusu Mariana"}
MQ{"Orílɛ́ède Matinikuwi"}
MR{"Orílɛ́ède Maritania"}
@@ -228,6 +236,7 @@
TZ{"Orílɛ́ède Tàǹsáníà"}
UA{"Orílɛ́ède Ukarini"}
UG{"Orílɛ́ède Uganda"}
+ UM{"Àwɔn Erékùsù Kékèké Agbègbè US"}
UN{"Ìshɔ̀kan àgbáyé"}
US{"Orílɛ̀-èdè Amɛrikà"}
UY{"Orílɛ́ède Nruguayi"}
diff --git a/icu4c/source/data/zone/be.txt b/icu4c/source/data/zone/be.txt
index 475ea11..05b844e 100644
--- a/icu4c/source/data/zone/be.txt
+++ b/icu4c/source/data/zone/be.txt
@@ -1710,7 +1710,7 @@
ls{"Час Ніуэ"}
}
"meta:Norfolk"{
- ld{"Летні час вострава Норфалк"}
+ ld{"Летні час вострава Норфалк"}
lg{"Час вострава Норфалк"}
ls{"Стандартны час вострава Норфалк"}
}
diff --git a/icu4c/source/data/zone/bn.txt b/icu4c/source/data/zone/bn.txt
index 4516733..1229834 100644
--- a/icu4c/source/data/zone/bn.txt
+++ b/icu4c/source/data/zone/bn.txt
@@ -1723,7 +1723,7 @@
"meta:Norfolk"{
ld{"নরফোক দ্বীপ দিবালোক সময়"}
lg{"নরফোক দ্বীপ সময়"}
- ls{"নরফোক দ্বীপ মানক সময়"}
+ ls{"নরফোক দ্বীপ মানক সময়"}
}
"meta:Noronha"{
ld{"ফার্নান্দো ডি নোরোনহা গ্রীষ্মকালীন সময়"}
diff --git a/icu4c/source/data/zone/yo_BJ.txt b/icu4c/source/data/zone/yo_BJ.txt
index b6f226b..05fa8d5 100644
--- a/icu4c/source/data/zone/yo_BJ.txt
+++ b/icu4c/source/data/zone/yo_BJ.txt
@@ -34,6 +34,16 @@
lg{"Àkókò Àtìláńtíìkì"}
ls{"Àkókò àsikò Àtìláńtíìkì"}
}
+ "meta:China"{
+ ld{"Àkókò Ojúmɔmɔ Sháínà"}
+ lg{"Àkókò Sháínà"}
+ ls{"Àkókò Ìfɛnukòsí Sháínà"}
+ }
+ "meta:Cuba"{
+ ld{"Àkókò Ojúmɔmɔ Kúbà"}
+ lg{"Àkókò Kúbà"}
+ ls{"Àkókò Àfɛnukò Kúbà"}
+ }
"meta:Europe_Central"{
ld{"Àkókò Àárin Sɔmà Europe"}
lg{"Àkókò Àárin Europe"}
@@ -49,6 +59,44 @@
lg{"Àkókò Ìwɔ Oòrùn Europe"}
ls{"Àkókò àsikò Ìwɔ Oòrùn Europe"}
}
+ "meta:Greenland_Eastern"{
+ ld{"Àkókò ìgbà Ooru Greenland"}
+ lg{"Àkókò Ìlà oorùn Greenland"}
+ ls{"Àkókò Ìwɔ̀ Ìfɛnukò oorùn Greenland"}
+ }
+ "meta:Greenland_Western"{
+ ld{"Àkókò Àfɛnukò Ìgba Oòru Greenland"}
+ lg{"Àkókò Ìwɔ̀ oorùn Greenland"}
+ ls{"Àkókò Àfɛnukò Ìwɔ̀ Oòrùn Greenland"}
+ }
+ "meta:Hawaii_Aleutian"{
+ ld{"Àkókò Ojúmɔmɔ Hawaii-Aleutian"}
+ lg{"Àkókò Hawaii-Aleutian"}
+ ls{"Àkókò Àfɛnukò Hawaii-Aleutian"}
+ }
+ "meta:Indonesia_Western"{
+ ls{"Àkókò Ìwɔ̀ oorùn Indonesia"}
+ }
+ "meta:Mexico_Northwest"{
+ ld{"Àkókò Ojúmɔmɔ Apá Ìwɔ̀ Oorùn Mɛ́shíkò"}
+ lg{"Àkókò Apá Ìwɔ̀ Oorùn Mɛ́shíkò"}
+ ls{"Àkókò Àfɛnukò Apá Ìwɔ̀ Oorùn Mɛ́shíkò"}
+ }
+ "meta:Mexico_Pacific"{
+ ld{"Àkókò Ojúmɔmɔ Pásífíìkì Mɛ́síkò"}
+ lg{"Àkókò Pásífíìkì Mɛ́shíkò"}
+ ls{"Àkókò Àfɛnukò Pásífíìkì Mɛ́síkò"}
+ }
+ "meta:Newfoundland"{
+ ld{"Àkókò Ojúmɔmɔ Newfoundland"}
+ lg{"Àkókò Newfoundland"}
+ ls{"Àkókò Àfɛnukò Newfoundland"}
+ }
+ "meta:Pierre_Miquelon"{
+ ld{"Àkókò Ojúmɔmɔ Pierre & Miquelon"}
+ lg{"Àkókò Pierre & Miquelon"}
+ ls{"Àkókò Àfɛnukò Pierre & Miquelon"}
+ }
regionFormatDaylight{"{0} Àkókò ojúmɔmɔ"}
}
}
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 92f8916..4767bcd 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:453b632c0405ea31f14b02e88fd4690d3c1b743467dbedc29a3625aa0562649a
-size 13144410
+oid sha256:edc27908a404a2b2dc5219e13c7867b8f2c1e06df3de7c490e8ccde8d62e6d79
+size 13148695
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 8d8e2c5..7f17a15 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:5684d079279d937729a2211280921ea77fcf18d8f85d6ce7e72e3d63d1ccbc43
+oid sha256:573cfbb44d3c2063fd72b914ad1761735c0148bf105f7e0e6b1ecf11d03c93d0
size 94304
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index b7a951d..1c1ce8b 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:c3d7ece7e15d4d4c8fa6d62d3c9599c73861d18f55db46169392e86cb2dd4a94
+oid sha256:3960402d9560dcf92e0eaa65ed77166524ee5f308da61d331a015a5b69619276
size 723480
