From 892a2005ba4afa7c41d2de5c75c7321566ac0c00 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Sun, 29 Jan 2017 05:08:37 +0000 Subject: [PATCH] ICU-12948 Imported data from CLDR trunk @13199, including UTC/GMT separation. X-SVN-Rev: 39614 --- icu4c/source/data/curr/en.txt | 2 +- icu4c/source/data/curr/my.txt | 2 +- icu4c/source/data/curr/si.txt | 2 +- icu4c/source/data/curr/sw.txt | 2 +- icu4c/source/data/lang/en.txt | 2 +- icu4c/source/data/lang/my.txt | 2 +- icu4c/source/data/lang/si.txt | 2 +- icu4c/source/data/lang/sw.txt | 2 +- icu4c/source/data/locales/en.txt | 2 +- icu4c/source/data/locales/my.txt | 12 +- icu4c/source/data/locales/si.txt | 50 ++--- icu4c/source/data/locales/sw.txt | 146 ++++++------- icu4c/source/data/misc/metaZones.txt | 5 + icu4c/source/data/misc/metadata.txt | 264 ++++++++++++----------- icu4c/source/data/misc/timezoneTypes.txt | 18 +- icu4c/source/data/region/en.txt | 2 +- icu4c/source/data/region/my.txt | 2 +- icu4c/source/data/region/si.txt | 2 +- icu4c/source/data/region/sw.txt | 2 +- icu4c/source/data/unit/en.txt | 2 +- icu4c/source/data/unit/my.txt | 2 +- icu4c/source/data/unit/si.txt | 2 +- icu4c/source/data/unit/sw.txt | 2 +- icu4c/source/data/zone/en.txt | 6 +- icu4c/source/data/zone/my.txt | 2 +- icu4c/source/data/zone/si.txt | 2 +- icu4c/source/data/zone/sw.txt | 2 +- icu4c/source/test/intltest/tztest.cpp | 64 ++++-- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 4 +- icu4j/main/shared/data/testdata.jar | 4 +- 31 files changed, 336 insertions(+), 281 deletions(-) diff --git a/icu4c/source/data/curr/en.txt b/icu4c/source/data/curr/en.txt index 2fabc1d132e..64e0486b16d 100644 --- a/icu4c/source/data/curr/en.txt +++ b/icu4c/source/data/curr/en.txt @@ -2393,5 +2393,5 @@ en{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.31.94"} + Version{"2.1.31.98"} } diff --git a/icu4c/source/data/curr/my.txt b/icu4c/source/data/curr/my.txt index 0566594cafd..96b61c3c858 100644 --- a/icu4c/source/data/curr/my.txt +++ b/icu4c/source/data/curr/my.txt @@ -1301,5 +1301,5 @@ my{ other{"ဇင်ဘာဘွေခွါးချာ"} } } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/curr/si.txt b/icu4c/source/data/curr/si.txt index 5bf22a76288..379dddfe16f 100644 --- a/icu4c/source/data/curr/si.txt +++ b/icu4c/source/data/curr/si.txt @@ -1373,5 +1373,5 @@ si{ one{"{1}{0}"} other{"{1}{0}"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/curr/sw.txt b/icu4c/source/data/curr/sw.txt index d6bd521f333..1bc8aecd92b 100644 --- a/icu4c/source/data/curr/sw.txt +++ b/icu4c/source/data/curr/sw.txt @@ -1408,5 +1408,5 @@ sw{ one{"{1} {0}"} other{"{1} {0}"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index dab59de4322..29fb1a43cc2 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -1220,7 +1220,7 @@ en{ VALENCIA{"Valencian"} WADEGILE{"Wade-Giles Romanization"} } - Version{"2.1.31.94"} + Version{"2.1.31.98"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/my.txt b/icu4c/source/data/lang/my.txt index 273fe95f2eb..0f898ba0e2c 100644 --- a/icu4c/source/data/lang/my.txt +++ b/icu4c/source/data/lang/my.txt @@ -580,7 +580,7 @@ my{ REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"} SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} characterLabelPattern{ all{"{0} — အားလုံး"} category-list{"{0} − {1}"} diff --git a/icu4c/source/data/lang/si.txt b/icu4c/source/data/lang/si.txt index 615cdc65a4d..0b58fd6544e 100644 --- a/icu4c/source/data/lang/si.txt +++ b/icu4c/source/data/lang/si.txt @@ -547,7 +547,7 @@ si{ tibt{"ටිබෙට ඉලක්කම්"} } } - Version{"2.1.31.86"} + Version{"2.1.31.96"} characterLabelPattern{ all{"{0} — සියල්ල"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/sw.txt b/icu4c/source/data/lang/sw.txt index 99f38554abe..d2b542c6d1b 100644 --- a/icu4c/source/data/lang/sw.txt +++ b/icu4c/source/data/lang/sw.txt @@ -637,7 +637,7 @@ sw{ vaii{"Dijiti za Vai"} } } - Version{"2.1.31.86"} + Version{"2.1.31.96"} characterLabelPattern{ all{"{0} — Zote"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index f07e03eddca..85ec99edb9d 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -204,7 +204,7 @@ en{ } } } - Version{"2.1.31.94"} + Version{"2.1.31.98"} calendar{ buddhist{ eras{ diff --git a/icu4c/source/data/locales/my.txt b/icu4c/source/data/locales/my.txt index 7f70c1ac908..94c3a877758 100644 --- a/icu4c/source/data/locales/my.txt +++ b/icu4c/source/data/locales/my.txt @@ -131,19 +131,19 @@ my{ other{"00ကုဋေ"} } 1000000000{ - other{"ကုဋေ000"} + other{"ကုဋေ000;ကုဋေ-000"} } 10000000000{ - other{"ကုဋေ0ထ"} + other{"ကုဋေ0ထ;ကုဋေ-0ထ"} } 100000000000{ - other{"ကုဋေ0သ"} + other{"ကုဋေ0သ;ကုဋေ-0သ"} } 1000000000000{ - other{"ဋေ0သိန်း"} + other{"ဋေ0သိန်း;ဋေ-0သိန်း"} } 10000000000000{ - other{"ဋေ0သန်း"} + other{"ဋေ0သန်း;ဋေ-0သန်း"} } 100000000000000{ other{"0ကောဋိ"} @@ -192,7 +192,7 @@ my{ } native{"mymr"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} calendar{ generic{ DateTimePatterns{ diff --git a/icu4c/source/data/locales/si.txt b/icu4c/source/data/locales/si.txt index 62fa78b2252..9f3ec58e902 100644 --- a/icu4c/source/data/locales/si.txt +++ b/icu4c/source/data/locales/si.txt @@ -41,52 +41,52 @@ si{ patternsLong{ decimalFormat{ 1000{ - one{"දහස 0"} - other{"දහස 0"} + one{"දහස 0;දහස -0"} + other{"දහස 0;දහස -0"} } 10000{ - one{"දහස 00"} - other{"දහස 00"} + one{"දහස 00;දහස -00"} + other{"දහස 00;දහස -00"} } 100000{ - one{"දහස 000"} - other{"දහස 000"} + one{"දහස 000;දහස -000"} + other{"දහස 000;දහස -000"} } 1000000{ - one{"මිලියන 0"} - other{"මිලියන 0"} + one{"මිලියන 0;මිලියන -0"} + other{"මිලියන 0;මිලියන -0"} } 10000000{ - one{"මිලියන 00"} - other{"මිලියන 00"} + one{"මිලියන 00;මිලියන -00"} + other{"මිලියන 00;මිලියන -00"} } 100000000{ - one{"මිලියන 000"} - other{"මිලියන 000"} + one{"මිලියන 000;මිලියන -000"} + other{"මිලියන 000;මිලියන -000"} } 1000000000{ - one{"බිලියන 0"} - other{"බිලියන 0"} + one{"බිලියන 0;බිලියන -0"} + other{"බිලියන 0;බිලියන -0"} } 10000000000{ - one{"බිලියන 00"} - other{"බිලියන 00"} + one{"බිලියන 00;බිලියන -00"} + other{"බිලියන 00;බිලියන -00"} } 100000000000{ - one{"බිලියන 000"} - other{"බිලියන 000"} + one{"බිලියන 000;බිලියන -000"} + other{"බිලියන 000;බිලියන -000"} } 1000000000000{ - one{"ට්‍රිලියන 0"} - other{"ට්‍රිලියන 0"} + one{"ට්‍රිලියන 0;ට්‍රිලියන -0"} + other{"ට්‍රිලියන 0;ට්‍රිලියන -0"} } 10000000000000{ - one{"ට්‍රිලියන 00"} - other{"ට්‍රිලියන 00"} + one{"ට්‍රිලියන 00;ට්‍රිලියන -00"} + other{"ට්‍රිලියන 00;ට්‍රිලියන -00"} } 100000000000000{ - one{"ට්‍රිලියන 000"} - other{"ට්‍රිලියන 000"} + one{"ට්‍රිලියන 000;ට්‍රිලියන -000"} + other{"ට්‍රිලියන 000;ට්‍රිලියන -000"} } } } @@ -218,7 +218,7 @@ si{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} calendar{ generic{ DateTimePatterns{ diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 74ad44a5f00..21656c3bfed 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -29,154 +29,154 @@ sw{ patternsLong{ decimalFormat{ 1000{ - one{"Elfu 0"} - other{"Elfu 0"} + one{"Elfu 0;Elfu -0"} + other{"Elfu 0;Elfu -0"} } 10000{ - one{"Elfu 00"} - other{"Elfu 00"} + one{"Elfu 00;Elfu -00"} + other{"Elfu 00;Elfu -00"} } 100000{ - one{"Elfu 000"} - other{"Elfu 000"} + one{"Elfu 000;Elfu -000"} + other{"Elfu 000;Elfu -000"} } 1000000{ - one{"Milioni 0"} - other{"Milioni 0"} + one{"Milioni 0;Milioni -0"} + other{"Milioni 0;Milioni -0"} } 10000000{ - one{"Milioni 00"} - other{"Milioni 00"} + one{"Milioni 00;Milioni -00"} + other{"Milioni 00;Milioni -00"} } 100000000{ - one{"Milioni 000"} - other{"Milioni 000"} + one{"Milioni 000;Milioni -000"} + other{"Milioni 000;Milioni -000"} } 1000000000{ - one{"Bilioni 0"} - other{"Bilioni 0"} + one{"Bilioni 0;Bilioni -0"} + other{"Bilioni 0;Bilioni -0"} } 10000000000{ - one{"Bilioni 00"} - other{"Bilioni 00"} + one{"Bilioni 00;Bilioni -00"} + other{"Bilioni 00;Bilioni -00"} } 100000000000{ - one{"Bilioni 000"} - other{"Bilioni 000"} + one{"Bilioni 000;Bilioni -000"} + other{"Bilioni 000;Bilioni -000"} } 1000000000000{ - one{"Trilioni 0"} - other{"Trilioni 0"} + one{"Trilioni 0;Trilioni -0"} + other{"Trilioni 0;Trilioni -0"} } 10000000000000{ - one{"Trilioni 00"} - other{"Trilioni 00"} + one{"Trilioni 00;Trilioni -00"} + other{"Trilioni 00;Trilioni -00"} } 100000000000000{ - one{"Trilioni 000"} - other{"Trilioni 000"} + one{"Trilioni 000;Trilioni -000"} + other{"Trilioni 000;Trilioni -000"} } } } patternsShort{ currencyFormat{ 1000{ - one{"¤elfu 0"} - other{"¤elfu 0"} + one{"¤elfu 0;¤elfu -0"} + other{"¤elfu 0;¤elfu -0"} } 10000{ - one{"¤elfu 00"} - other{"¤elfu 00"} + one{"¤elfu 00;¤elfu -00"} + other{"¤elfu 00;¤elfu -00"} } 100000{ - one{"¤laki 000"} - other{"¤laki 000"} + one{"¤laki 000;¤laki -000"} + other{"¤laki 000;¤laki -000"} } 1000000{ - one{"¤M0"} - other{"¤M0"} + one{"¤M0;¤M-0"} + other{"¤M0;¤M-0"} } 10000000{ - one{"¤M00"} - other{"¤M00"} + one{"¤M00;¤M-00"} + other{"¤M00;¤M-00"} } 100000000{ - one{"¤M000"} - other{"¤M000"} + one{"¤M000;¤M-000"} + other{"¤M000;¤M-000"} } 1000000000{ - one{"¤B0"} - other{"¤B0"} + one{"¤B0;¤B-0"} + other{"¤B0;¤B-0"} } 10000000000{ - one{"¤B00"} - other{"¤B00"} + one{"¤B00;¤B-00"} + other{"¤B00;¤B-00"} } 100000000000{ - one{"¤B000"} - other{"¤B000"} + one{"¤B000;¤B-000"} + other{"¤B000;¤B-000"} } 1000000000000{ - one{"¤T0"} - other{"¤T0"} + one{"¤T0;¤T-0"} + other{"¤T0;¤T-0"} } 10000000000000{ - one{"¤T00"} - other{"¤T00"} + one{"¤T00;¤T-00"} + other{"¤T00;¤T-00"} } 100000000000000{ - one{"¤T000"} - other{"¤T000"} + one{"¤T000;¤T-000"} + other{"¤T000;¤T-000"} } } decimalFormat{ 1000{ - one{"elfu 0"} - other{"elfu 0"} + one{"elfu 0;elfu -0"} + other{"elfu 0;elfu -0"} } 10000{ - one{"elfu 00"} - other{"elfu 00"} + one{"elfu 00;elfu -00"} + other{"elfu 00;elfu -00"} } 100000{ - one{"elfu 000"} - other{"elfu 000"} + one{"elfu 000;elfu -000"} + other{"elfu 000;elfu -000"} } 1000000{ - one{"M0"} - other{"M0"} + one{"M0;M-0"} + other{"M0;M-0"} } 10000000{ - one{"M00"} - other{"M00"} + one{"M00;M-00"} + other{"M00;M-00"} } 100000000{ - one{"M000"} - other{"M000"} + one{"M000;M-000"} + other{"M000;M-000"} } 1000000000{ - one{"B0"} - other{"B0"} + one{"B0;B-0"} + other{"B0;B-0"} } 10000000000{ - one{"B00"} - other{"B00"} + one{"B00;B-00"} + other{"B00;B-00"} } 100000000000{ - one{"B000"} - other{"B000"} + one{"B000;B-000"} + other{"B000;B-000"} } 1000000000000{ - one{"T0"} - other{"T0"} + one{"T0;T-0"} + other{"T0;T-0"} } 10000000000000{ - one{"T00"} - other{"T00"} + one{"T00;T-00"} + other{"T00;T-00"} } 100000000000000{ - one{"T000"} - other{"T000"} + one{"T000;T-000"} + other{"T000;T-000"} } } } @@ -207,7 +207,7 @@ sw{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} calendar{ generic{ DateTimePatterns{ diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index e63ae3cefa4..22b638d1632 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -3454,6 +3454,11 @@ metaZones:table(nofallback){ "America_Eastern", } } + "Etc:GMT"{ + { + "GMT", + } + } "Europe:Amsterdam"{ { "Europe_Central", diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index dc71473b406..519c75b6843 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -1347,287 +1347,311 @@ metadata:table(nofallback){ } } subdivision{ - CN-71{ + cn71{ reason{"overlong"} replacement{"TW"} } - CN-91{ + cn91{ reason{"overlong"} replacement{"HK"} } - CN-92{ + cn92{ reason{"overlong"} replacement{"MO"} } - CZ-JC{ + czjc{ reason{"deprecated"} - replacement{"CZ-31"} + replacement{"cz31"} } - CZ-KA{ + czka{ reason{"deprecated"} - replacement{"CZ-41"} + replacement{"cz41"} } - CZ-KR{ + czkr{ reason{"deprecated"} - replacement{"CZ-52"} + replacement{"cz52"} } - CZ-LI{ + czli{ reason{"deprecated"} - replacement{"CZ-51"} + replacement{"cz51"} } - CZ-MO{ + czmo{ reason{"deprecated"} - replacement{"CZ-80"} + replacement{"cz80"} } - CZ-OL{ + czol{ reason{"deprecated"} - replacement{"CZ-71"} + replacement{"cz71"} } - CZ-PA{ + czpa{ reason{"deprecated"} - replacement{"CZ-53"} + replacement{"cz53"} } - CZ-PL{ + czpl{ reason{"deprecated"} - replacement{"CZ-32"} + replacement{"cz32"} } - CZ-ST{ + czst{ reason{"deprecated"} - replacement{"CZ-20"} + replacement{"cz20"} } - CZ-US{ + czus{ reason{"deprecated"} - replacement{"CZ-42"} + replacement{"cz42"} } - CZ-ZL{ + czzl{ reason{"deprecated"} - replacement{"CZ-72"} + replacement{"cz72"} } - FR-A{ + escn{ + reason{"overlong"} + replacement{"IC"} + } + fi01{ + reason{"overlong"} + replacement{"AX"} + } + fra{ reason{"deprecated"} - replacement{"FR-GES"} + replacement{"frges"} } - FR-B{ + frb{ reason{"deprecated"} - replacement{"FR-NAQ"} + replacement{"frnaq"} } - FR-BL{ + frbl{ reason{"overlong"} replacement{"BL"} } - FR-C{ + frc{ reason{"deprecated"} - replacement{"FR-ARA"} + replacement{"frara"} } - FR-D{ + frcp{ + reason{"overlong"} + replacement{"CP"} + } + frd{ reason{"deprecated"} - replacement{"FR-BFC"} + replacement{"frbfc"} } - FR-E{ + fre{ reason{"deprecated"} - replacement{"FR-BRE"} + replacement{"frbre"} } - FR-F{ + frf{ reason{"deprecated"} - replacement{"FR-CVL"} + replacement{"frcvl"} } - FR-G{ + frg{ reason{"deprecated"} - replacement{"FR-GES"} + replacement{"frges"} } - FR-GP{ + frgf{ + reason{"overlong"} + replacement{"GF"} + } + frgp{ reason{"overlong"} replacement{"GP"} } - FR-H{ + frh{ reason{"deprecated"} - replacement{"FR-COR"} + replacement{"frcor"} } - FR-I{ + fri{ reason{"deprecated"} - replacement{"FR-BFC"} + replacement{"frbfc"} } - FR-J{ + frj{ reason{"deprecated"} - replacement{"FR-IDF"} + replacement{"fridf"} } - FR-K{ + frk{ reason{"deprecated"} - replacement{"FR-OCC"} + replacement{"frocc"} } - FR-L{ + frl{ reason{"deprecated"} - replacement{"FR-NAQ"} + replacement{"frnaq"} } - FR-M{ + frm{ reason{"deprecated"} - replacement{"FR-GES"} + replacement{"frges"} } - FR-MF{ + frmf{ reason{"overlong"} replacement{"MF"} } - FR-N{ + frmq{ + reason{"overlong"} + replacement{"MQ"} + } + frn{ reason{"deprecated"} - replacement{"FR-OCC"} + replacement{"frocc"} } - FR-NC{ + frnc{ reason{"overlong"} replacement{"NC"} } - FR-O{ + fro{ reason{"deprecated"} - replacement{"FR-HDF"} + replacement{"frhdf"} } - FR-P{ + frp{ reason{"deprecated"} - replacement{"FR-NOR"} + replacement{"frnor"} } - FR-PF{ + frpf{ reason{"overlong"} replacement{"PF"} } - FR-PM{ + frpm{ reason{"overlong"} replacement{"PM"} } - FR-Q{ + frq{ reason{"deprecated"} - replacement{"FR-NOR"} + replacement{"frnor"} } - FR-R{ + frr{ reason{"deprecated"} - replacement{"FR-PDL"} + replacement{"frpdl"} } - FR-RE{ + frre{ reason{"overlong"} replacement{"RE"} } - FR-S{ + frs{ reason{"deprecated"} - replacement{"FR-HDF"} + replacement{"frhdf"} } - FR-T{ + frt{ reason{"deprecated"} - replacement{"FR-NAQ"} + replacement{"frnaq"} } - FR-TF{ + frtf{ reason{"overlong"} replacement{"TF"} } - FR-U{ + fru{ reason{"deprecated"} - replacement{"FR-PAC"} + replacement{"frpac"} } - FR-V{ + frv{ reason{"deprecated"} - replacement{"FR-ARA"} + replacement{"frara"} } - FR-WF{ + frwf{ reason{"overlong"} replacement{"WF"} } - FR-YT{ + fryt{ reason{"overlong"} replacement{"YT"} } - LA-XN{ + laxn{ reason{"deprecated"} - replacement{"LA-XS"} + replacement{"laxs"} } - LU-D{ + lud{ reason{"deprecated"} - replacement{"LU-CL LU-DI LU-RD LU-VD LU-WI"} + replacement{"lucl ludi lurd luvd luwi"} } - LU-G{ + lug{ reason{"deprecated"} - replacement{"LU-EC LU-GR LU-RM"} + replacement{"luec lugr lurm"} } - LU-L{ + lul{ reason{"deprecated"} - replacement{"LU-CA LU-ES LU-LU LU-ME"} + replacement{"luca lues lulu lume"} } - MR-NKC{ + mrnkc{ reason{"deprecated"} - replacement{"MR-13 MR-14 MR-15"} + replacement{"mr13 mr14 mr15"} } - NL-AW{ + nlaw{ reason{"overlong"} replacement{"AW"} } - NL-CW{ + nlcw{ reason{"overlong"} replacement{"CW"} } - NL-SX{ + nlsx{ reason{"overlong"} replacement{"SX"} } - NZ-N{ + nzn{ reason{"deprecated"} - replacement{"NZ-AUK NZ-BOP NZ-GIS NZ-HKB NZ-MWT NZ-NTL NZ-TKI NZ-WGN NZ-WKO"} + replacement{"nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko"} } - NZ-S{ + nzs{ reason{"deprecated"} - replacement{"NZ-CAN NZ-MBH NZ-NSN NZ-OTA NZ-STL NZ-TAS NZ-WTC"} + replacement{"nzcan nzmbh nznsn nzota nzstl nztas nzwtc"} } - OM-BA{ + omba{ reason{"deprecated"} - replacement{"OM-BJ OM-BS"} + replacement{"ombj ombs"} } - OM-SH{ + omsh{ reason{"deprecated"} - replacement{"OM-SJ OM-SS"} + replacement{"omsj omss"} + } + shta{ + reason{"overlong"} + replacement{"TA"} } - TT-ETO{ + tteto{ reason{"deprecated"} - replacement{"TT-TOB"} + replacement{"tttob"} } - TT-RCM{ + ttrcm{ reason{"deprecated"} - replacement{"TT-MRC"} + replacement{"ttmrc"} } - TT-WTO{ + ttwto{ reason{"deprecated"} - replacement{"TT-TOB"} + replacement{"tttob"} } - TW-KHQ{ + twkhq{ reason{"deprecated"} - replacement{"TW-KHH"} + replacement{"twkhh"} } - TW-TNQ{ + twtnq{ reason{"deprecated"} - replacement{"TW-TNN"} + replacement{"twtnn"} } - TW-TPQ{ + twtpq{ reason{"deprecated"} - replacement{"TW-NWT"} + replacement{"twnwt"} } - TW-TXQ{ + twtxq{ reason{"deprecated"} - replacement{"TW-TXG"} + replacement{"twtxg"} } - US-AS{ + usas{ reason{"overlong"} replacement{"AS"} } - US-GU{ + usgu{ reason{"overlong"} replacement{"GU"} } - US-MP{ + usmp{ reason{"overlong"} replacement{"MP"} } - US-PR{ + uspr{ reason{"overlong"} replacement{"PR"} } - US-UM{ + usum{ reason{"overlong"} replacement{"UM"} } - US-VI{ + usvi{ reason{"overlong"} replacement{"VI"} } diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt index 07a4ac4b5c4..984072d9cda 100644 --- a/icu4c/source/data/misc/timezoneTypes.txt +++ b/icu4c/source/data/misc/timezoneTypes.txt @@ -80,10 +80,9 @@ timezoneTypes:table(nofallback){ "Etc:GMT-0"{"Etc/GMT"} "Etc:GMT0"{"Etc/GMT"} "Etc:Greenwich"{"Etc/GMT"} - "Etc:UCT"{"Etc/GMT"} - "Etc:UTC"{"Etc/GMT"} - "Etc:Universal"{"Etc/GMT"} - "Etc:Zulu"{"Etc/GMT"} + "Etc:UCT"{"Etc/UTC"} + "Etc:Universal"{"Etc/UTC"} + "Etc:Zulu"{"Etc/UTC"} "Europe:Belfast"{"Europe/London"} "Europe:Nicosia"{"Asia/Nicosia"} "Europe:Tiraspol"{"Europe/Chisinau"} @@ -138,11 +137,11 @@ timezoneTypes:table(nofallback){ ROK{"Asia/Seoul"} Singapore{"Asia/Singapore"} Turkey{"Europe/Istanbul"} - UCT{"Etc/GMT"} - UTC{"Etc/GMT"} - Universal{"Etc/GMT"} + UCT{"Etc/UTC"} + UTC{"Etc/UTC"} + Universal{"Etc/UTC"} W-SU{"Europe/Moscow"} - Zulu{"Etc/GMT"} + Zulu{"Etc/UTC"} } } typeMap{ @@ -463,7 +462,7 @@ timezoneTypes:table(nofallback){ "Australia:Melbourne"{"aumel"} "Australia:Perth"{"auper"} "Australia:Sydney"{"ausyd"} - "Etc:GMT"{"utc"} + "Etc:GMT"{"gmt"} "Etc:GMT+1"{"utcw01"} "Etc:GMT+10"{"utcw10"} "Etc:GMT+11"{"utcw11"} @@ -490,6 +489,7 @@ timezoneTypes:table(nofallback){ "Etc:GMT-7"{"utce07"} "Etc:GMT-8"{"utce08"} "Etc:GMT-9"{"utce09"} + "Etc:UTC"{"utc"} "Etc:Unknown"{"unk"} "Europe:Amsterdam"{"nlams"} "Europe:Andorra"{"adalv"} diff --git a/icu4c/source/data/region/en.txt b/icu4c/source/data/region/en.txt index df06be0ba5d..04ed87eb831 100644 --- a/icu4c/source/data/region/en.txt +++ b/icu4c/source/data/region/en.txt @@ -313,5 +313,5 @@ en{ MK{"Macedonia (FYROM)"} TL{"East Timor"} } - Version{"2.1.31.94"} + Version{"2.1.31.98"} } diff --git a/icu4c/source/data/region/my.txt b/icu4c/source/data/region/my.txt index 2b8cc8dd67d..84fc35cb6d6 100644 --- a/icu4c/source/data/region/my.txt +++ b/icu4c/source/data/region/my.txt @@ -309,5 +309,5 @@ my{ FK{"ဖော့ကလန် ကျွန်းစု (အီလားစ် မောလ်ဗီနာစ်)"} MK{"မက်စီဒိုးနီးယား (ယခင် ယူဂိုစလားဗီးယား မက်စီဒိုးနီးယားပြည်ထောင်စု)"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/region/si.txt b/icu4c/source/data/region/si.txt index 04e64688b70..a241d817865 100644 --- a/icu4c/source/data/region/si.txt +++ b/icu4c/source/data/region/si.txt @@ -310,5 +310,5 @@ si{ MK{"මැසිඩෝනියාව (FYROM)"} TL{"නැගෙනහිර ටිමෝරය"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/region/sw.txt b/icu4c/source/data/region/sw.txt index fdf19712018..ea6f3b4cbb2 100644 --- a/icu4c/source/data/region/sw.txt +++ b/icu4c/source/data/region/sw.txt @@ -310,5 +310,5 @@ sw{ MK{"Masedonia (FYROM)"} TL{"Timor ya Mashariki"} } - Version{"2.1.31.86"} + Version{"2.1.31.96"} } diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index 83a5490b82f..1e26add68db 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License en{ - Version{"2.1.31.94"} + Version{"2.1.31.98"} units{ acceleration{ g-force{ diff --git a/icu4c/source/data/unit/my.txt b/icu4c/source/data/unit/my.txt index 775cbd89044..07e837b2eb1 100644 --- a/icu4c/source/data/unit/my.txt +++ b/icu4c/source/data/unit/my.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License my{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/si.txt b/icu4c/source/data/unit/si.txt index 59e49f220e6..31da04cc027 100644 --- a/icu4c/source/data/unit/si.txt +++ b/icu4c/source/data/unit/si.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License si{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} diff --git a/icu4c/source/data/unit/sw.txt b/icu4c/source/data/unit/sw.txt index d39d7eccb81..c0dd3ef954a 100644 --- a/icu4c/source/data/unit/sw.txt +++ b/icu4c/source/data/unit/sw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License sw{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/zone/en.txt b/icu4c/source/data/zone/en.txt index 8c29bd1be43..3ec2edf7e73 100644 --- a/icu4c/source/data/zone/en.txt +++ b/icu4c/source/data/zone/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License en{ - Version{"2.1.31.94"} + Version{"2.1.31.98"} zoneStrings{ "Africa:Sao_Tome"{ ec{"São Tomé"} @@ -21,6 +21,10 @@ en{ "Asia:Saigon"{ ec{"Ho Chi Minh City"} } + "Etc:UTC"{ + ls{"Coordinated Universal Time"} + ss{"UTC"} + } "Etc:Unknown"{ ec{"Unknown City"} } diff --git a/icu4c/source/data/zone/my.txt b/icu4c/source/data/zone/my.txt index 5f952d42301..ef0311d3849 100644 --- a/icu4c/source/data/zone/my.txt +++ b/icu4c/source/data/zone/my.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License my{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} zoneStrings{ "Africa:Abidjan"{ ec{"အာဘီဂျန်"} diff --git a/icu4c/source/data/zone/si.txt b/icu4c/source/data/zone/si.txt index d8322b36ec3..5f5fe5ebea7 100644 --- a/icu4c/source/data/zone/si.txt +++ b/icu4c/source/data/zone/si.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License si{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} zoneStrings{ "Africa:Abidjan"{ ec{"අබිජාන්"} diff --git a/icu4c/source/data/zone/sw.txt b/icu4c/source/data/zone/sw.txt index afccd0e35cb..c280816e4ef 100644 --- a/icu4c/source/data/zone/sw.txt +++ b/icu4c/source/data/zone/sw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License sw{ - Version{"2.1.31.86"} + Version{"2.1.31.96"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 40ff3600ff3..1e2e01de149 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -1205,31 +1205,43 @@ TimeZoneTest::TestAliasedNames() /* Generated by org.unicode.cldr.tool.CountItems */ /* zoneID, canonical zoneID */ - {"Africa/Timbuktu", "Africa/Bamako"}, + {"Africa/Asmara", "Africa/Addis_Ababa"}, + {"Africa/Timbuktu", "Africa/Abidjan"}, {"America/Argentina/Buenos_Aires", "America/Buenos_Aires"}, {"America/Argentina/Catamarca", "America/Catamarca"}, {"America/Argentina/ComodRivadavia", "America/Catamarca"}, {"America/Argentina/Cordoba", "America/Cordoba"}, {"America/Argentina/Jujuy", "America/Jujuy"}, {"America/Argentina/Mendoza", "America/Mendoza"}, + {"America/Atikokan", "America/Coral_Harbour"}, {"America/Atka", "America/Adak"}, {"America/Ensenada", "America/Tijuana"}, - {"America/Fort_Wayne", "America/Indiana/Indianapolis"}, - {"America/Indianapolis", "America/Indiana/Indianapolis"}, + {"America/Fort_Wayne", "America/Indianapolis"}, + {"America/Indiana/Indianapolis", "America/Indianapolis"}, + {"America/Kentucky/Louisville", "America/Louisville"}, {"America/Knox_IN", "America/Indiana/Knox"}, - {"America/Louisville", "America/Kentucky/Louisville"}, {"America/Porto_Acre", "America/Rio_Branco"}, {"America/Rosario", "America/Cordoba"}, - {"America/Virgin", "America/St_Thomas"}, + {"America/Shiprock", "America/Denver"}, + {"America/Virgin", "America/Anguilla"}, + {"Antarctica/South_Pole", "Antarctica/McMurdo"}, {"Asia/Ashkhabad", "Asia/Ashgabat"}, - {"Asia/Chungking", "Asia/Chongqing"}, + {"Asia/Chongqing", "Asia/Shanghai"}, + {"Asia/Chungking", "Asia/Shanghai"}, {"Asia/Dacca", "Asia/Dhaka"}, + {"Asia/Harbin", "Asia/Shanghai"}, + {"Asia/Ho_Chi_Minh", "Asia/Saigon"}, {"Asia/Istanbul", "Europe/Istanbul"}, + {"Asia/Kashgar", "Asia/Urumqi"}, + {"Asia/Kathmandu", "Asia/Katmandu"}, + {"Asia/Kolkata", "Asia/Calcutta"}, {"Asia/Macao", "Asia/Macau"}, {"Asia/Tel_Aviv", "Asia/Jerusalem"}, {"Asia/Thimbu", "Asia/Thimphu"}, {"Asia/Ujung_Pandang", "Asia/Makassar"}, {"Asia/Ulan_Bator", "Asia/Ulaanbaatar"}, + {"Atlantic/Faroe", "Atlantic/Faeroe"}, + {"Atlantic/Jan_Mayen", "Arctic/Longyearbyen"}, {"Australia/ACT", "Australia/Sydney"}, {"Australia/Canberra", "Australia/Sydney"}, {"Australia/LHI", "Australia/Lord_Howe"}, @@ -1257,16 +1269,16 @@ TimeZoneTest::TestAliasedNames() {"Chile/Continental", "America/Santiago"}, {"Chile/EasterIsland", "Pacific/Easter"}, {"Cuba", "America/Havana"}, + {"EST", "Etc/GMT+5"}, {"Egypt", "Africa/Cairo"}, {"Eire", "Europe/Dublin"}, {"Etc/GMT+0", "Etc/GMT"}, {"Etc/GMT-0", "Etc/GMT"}, {"Etc/GMT0", "Etc/GMT"}, {"Etc/Greenwich", "Etc/GMT"}, - {"Etc/UCT", "Etc/GMT"}, - {"Etc/UTC", "Etc/GMT"}, - {"Etc/Universal", "Etc/GMT"}, - {"Etc/Zulu", "Etc/GMT"}, + {"Etc/UCT", "Etc/UTC"}, + {"Etc/Universal", "Etc/UTC"}, + {"Etc/Zulu", "Etc/UTC"}, {"Europe/Belfast", "Europe/London"}, {"Europe/Nicosia", "Asia/Nicosia"}, {"Europe/Tiraspol", "Europe/Chisinau"}, @@ -1277,6 +1289,7 @@ TimeZoneTest::TestAliasedNames() {"GMT-0", "Etc/GMT"}, {"GMT0", "Etc/GMT"}, {"Greenwich", "Etc/GMT"}, + {"HST", "Etc/GMT+10"}, {"Hongkong", "Asia/Hong_Kong"}, {"Iceland", "Atlantic/Reykjavik"}, {"Iran", "Asia/Tehran"}, @@ -1285,27 +1298,37 @@ TimeZoneTest::TestAliasedNames() {"Japan", "Asia/Tokyo"}, {"Kwajalein", "Pacific/Kwajalein"}, {"Libya", "Africa/Tripoli"}, + {"MST", "Etc/GMT+7"}, {"Mexico/BajaNorte", "America/Tijuana"}, {"Mexico/BajaSur", "America/Mazatlan"}, {"Mexico/General", "America/Mexico_City"}, - {"NZ", "Pacific/Auckland"}, + {"NZ", "Antarctica/McMurdo"}, {"NZ-CHAT", "Pacific/Chatham"}, - {"Navajo", "America/Shiprock"}, + {"Navajo", "America/Denver"}, {"PRC", "Asia/Shanghai"}, - {"Pacific/Samoa", "Pacific/Pago_Pago"}, + {"Pacific/Chuuk", "Pacific/Truk"}, + {"Pacific/Pohnpei", "Pacific/Ponape"}, + {"Pacific/Samoa", "Pacific/Midway"}, {"Pacific/Yap", "Pacific/Truk"}, {"Poland", "Europe/Warsaw"}, {"Portugal", "Europe/Lisbon"}, {"ROC", "Asia/Taipei"}, {"ROK", "Asia/Seoul"}, {"Singapore", "Asia/Singapore"}, + {"SystemV/AST4", "Etc/GMT+4"}, + {"SystemV/CST6", "Etc/GMT+6"}, + {"SystemV/EST5", "Etc/GMT+5"}, + {"SystemV/HST10", "Etc/GMT+10"}, + {"SystemV/MST7", "Etc/GMT+7"}, + {"SystemV/PST8", "Etc/GMT+8"}, + {"SystemV/YST9", "Etc/GMT+9"}, {"Turkey", "Europe/Istanbul"}, - {"UCT", "Etc/GMT"}, + {"UCT", "Etc/UTC"}, {"US/Alaska", "America/Anchorage"}, {"US/Aleutian", "America/Adak"}, {"US/Arizona", "America/Phoenix"}, {"US/Central", "America/Chicago"}, - {"US/East-Indiana", "America/Indiana/Indianapolis"}, + {"US/East-Indiana", "America/Indianapolis"}, {"US/Eastern", "America/New_York"}, {"US/Hawaii", "Pacific/Honolulu"}, {"US/Indiana-Starke", "America/Indiana/Knox"}, @@ -1313,13 +1336,12 @@ TimeZoneTest::TestAliasedNames() {"US/Mountain", "America/Denver"}, {"US/Pacific", "America/Los_Angeles"}, {"US/Pacific-New", "America/Los_Angeles"}, - {"US/Samoa", "Pacific/Pago_Pago"}, - {"UTC", "Etc/GMT"}, - {"Universal", "Etc/GMT"}, + {"US/Samoa", "Pacific/Midway"}, + {"UTC", "Etc/UTC"}, + {"Universal", "Etc/UTC"}, {"W-SU", "Europe/Moscow"}, - {"Zulu", "Etc/GMT"}, - /* Total: 113 */ - + {"Zulu", "Etc/UTC"}, + /* Total: 136 */ }; TimeZone::EDisplayType styles[] = { TimeZone::SHORT, TimeZone::LONG }; diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 47944f05dc9..f30965e90e5 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:297144f683a1a46ffcc32a3e5f4e2431fcecc381520978510fe85bec01ab16a3 -size 12149297 +oid sha256:95b530f014803a19df9afcc4d84410624a398fe8883176123ac5fae8f4c55806 +size 12149619 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 67f66be206f..f343dae9766 100755 --- 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:d4592320eb22e83f76f0182fbbf57eb0f5f6808c10f5eb742cf3fb1cf65be0f8 -size 92197 +oid sha256:06688c27b5423eff19aaea21c8a6052d33cbea41ac90f8b5e7713bd22bd01fe7 +size 92210 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index db420037bbe..aba70dc87eb 100755 --- 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:a75923bde01f041396cd6f8eb329676f4b4007316bc1134ac26e5161d5615340 -size 812722 +oid sha256:6c9163ed20dbebfb2ac6c96da35e6202de0e2c5b791e8ab3ea57f42fabbf6ce8 +size 812721 -- 2.40.0