Refresh ICU metadata
Files taken from:
http://bugs.icu-project.org/trac/browser/icu/trunk/source?rev=36999
This data is consistent with tzdata2014j (ICU is not updated to
2015a yet). The tzdata rules used are 2015a.
No effort has been made to maintain the icu tests: this is just a
data update.
Note: Translations for the new metazones have not been pulled in.
Code that uses the ICU data will return GMT[+-]XX:00 instead of a display
name in some cases for some timezones. This affects e.g. Russia (various, e.g
Europe/Minsk), Samoa (Pacific/Apia), Papua New Guinea (Pacific/Bougainville).
This update also affects which timezone name may be returned in some other
cases in the future (e.g. America/Grand_Turk) (correctly)
zoneinfo64.txt and icudt53l.dat updated with:
cd external/icu
mkdir build
cd build
../icu4c/source/runConfigureICU Linux
cd tools/tzcode/
cp ~/Downloads/tzdata2015a.tar.gz .
mkdir ../../bin
ln -S . ../../../icu4c/source/tools/tzcode/icuregions
ln -S . ../../../icu4c/source/tools/tzcode/icuzones
make
cp zoneinfo64.txt ../../../icu4c/source/data/misc/zoneinfo64.txt
cd ../..
make -j32 all
cp data/out/tmp/icudt53l.dat ../icu4c/source/stubdata/
Bug: 19212588
Change-Id: If684f08f10d97e2f006171ad2358a315bba7c9e0
diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt
index 23c7f26..47ee027 100644
--- a/icu4c/source/data/misc/metaZones.txt
+++ b/icu4c/source/data/misc/metaZones.txt
@@ -90,7 +90,6 @@
JM{"America/Jamaica"}
KY{"America/Cayman"}
PA{"America/Panama"}
- TC{"America/Grand_Turk"}
}
America_Mountain{
001{"America/Denver"}
@@ -105,6 +104,9 @@
Anadyr{
001{"Asia/Anadyr"}
}
+ Apia{
+ 001{"Pacific/Apia"}
+ }
Aqtau{
001{"Asia/Aqtau"}
}
@@ -211,9 +213,6 @@
001{"Pacific/Saipan"}
GU{"Pacific/Guam"}
}
- Changbai{
- 001{"Asia/Harbin"}
- }
Chatham{
001{"Pacific/Chatham"}
}
@@ -315,6 +314,10 @@
LB{"Asia/Beirut"}
SY{"Asia/Damascus"}
}
+ Europe_Further_Eastern{
+ 001{"Europe/Minsk"}
+ RU{"Europe/Kaliningrad"}
+ }
Europe_Western{
001{"Atlantic/Canary"}
FO{"Atlantic/Faeroe"}
@@ -402,10 +405,9 @@
001{"Indian/Chagos"}
}
Indochina{
- 001{"Asia/Saigon"}
+ 001{"Asia/Bangkok"}
KH{"Asia/Phnom_Penh"}
LA{"Asia/Vientiane"}
- TH{"Asia/Bangkok"}
}
Indonesia_Central{
001{"Asia/Makassar"}
@@ -437,9 +439,6 @@
Karachi{
001{"Asia/Karachi"}
}
- Kashgar{
- 001{"Asia/Kashgar"}
- }
Kazakhstan_Eastern{
001{"Asia/Almaty"}
}
@@ -477,9 +476,6 @@
Line_Islands{
001{"Pacific/Kiritimati"}
}
- Long_Shu{
- 001{"Asia/Chongqing"}
- }
Lord_Howe{
001{"Australia/Lord_Howe"}
}
@@ -614,7 +610,7 @@
001{"Asia/Samarkand"}
}
Samoa{
- 001{"Pacific/Apia"}
+ 001{"Pacific/Pago_Pago"}
}
Seychelles{
001{"Indian/Mahe"}
@@ -1623,6 +1619,13 @@
"America:Grand_Turk"{
{
"America_Eastern",
+ "1970-01-01 00:00",
+ "2015-11-01 06:00",
+ }
+ {
+ "Atlantic",
+ "2015-11-01 06:00",
+ "9999-12-31 23:59",
}
}
"America:Grenada"{
@@ -2717,6 +2720,18 @@
"India",
}
}
+ "Asia:Chita"{
+ {
+ "Yakutsk",
+ "1970-01-01 00:00",
+ "2014-10-25 16:00",
+ }
+ {
+ "Irkutsk",
+ "2014-10-25 16:00",
+ "9999-12-31 23:59",
+ }
+ }
"Asia:Choibalsan"{
{
"Mongolia",
@@ -2729,18 +2744,6 @@
"9999-12-31 23:59",
}
}
- "Asia:Chongqing"{
- {
- "Long_Shu",
- "1970-01-01 00:00",
- "1980-04-30 17:00",
- }
- {
- "China",
- "1980-04-30 17:00",
- "9999-12-31 23:59",
- }
- }
"Asia:Colombo"{
{
"India",
@@ -2821,18 +2824,6 @@
"9999-12-31 23:59",
}
}
- "Asia:Harbin"{
- {
- "Changbai",
- "1970-01-01 00:00",
- "1980-04-30 15:30",
- }
- {
- "China",
- "1980-04-30 15:30",
- "9999-12-31 23:59",
- }
- }
"Asia:Hebron"{
{
"Israel",
@@ -2883,13 +2874,6 @@
"Asia:Kamchatka"{
{
"Kamchatka",
- "1970-01-01 00:00",
- "2010-03-27 14:00",
- }
- {
- "Magadan",
- "2010-03-27 14:00",
- "9999-12-31 23:59",
}
}
"Asia:Karachi"{
@@ -2904,18 +2888,6 @@
"9999-12-31 23:59",
}
}
- "Asia:Kashgar"{
- {
- "Kashgar",
- "1970-01-01 00:00",
- "1980-04-30 19:00",
- }
- {
- "China",
- "1980-04-30 19:00",
- "9999-12-31 23:59",
- }
- }
"Asia:Katmandu"{
{
"Nepal",
@@ -3018,6 +2990,11 @@
{
"Novosibirsk",
"2010-03-27 19:00",
+ "2014-10-25 19:00",
+ }
+ {
+ "Krasnoyarsk",
+ "2014-10-25 19:00",
"9999-12-31 23:59",
}
}
@@ -3112,6 +3089,8 @@
"Asia:Saigon"{
{
"Indochina",
+ "1975-06-12 16:00",
+ "9999-12-31 23:59",
}
}
"Asia:Sakhalin"{
@@ -3156,6 +3135,13 @@
"Singapore",
}
}
+ "Asia:Srednekolymsk"{
+ {
+ "Magadan",
+ "1970-01-01 00:00",
+ "2014-10-25 14:00",
+ }
+ }
"Asia:Taipei"{
{
"Taipei",
@@ -3215,13 +3201,6 @@
"Asia:Urumqi"{
{
"Urumqi",
- "1970-01-01 00:00",
- "1980-04-30 18:00",
- }
- {
- "China",
- "1980-04-30 18:00",
- "9999-12-31 23:59",
}
}
"Asia:Ust-Nera"{
@@ -3572,6 +3551,16 @@
"1991-03-30 23:00",
"2011-03-27 00:00",
}
+ {
+ "Europe_Further_Eastern",
+ "2011-03-27 00:00",
+ "2014-10-25 23:00",
+ }
+ {
+ "Europe_Eastern",
+ "2014-10-25 23:00",
+ "9999-12-31 23:59",
+ }
}
"Europe:Kiev"{
{
@@ -3655,6 +3644,11 @@
"1991-03-30 23:00",
"2011-03-27 00:00",
}
+ {
+ "Europe_Further_Eastern",
+ "2011-03-27 00:00",
+ "9999-12-31 23:59",
+ }
}
"Europe:Monaco"{
{
@@ -3719,16 +3713,26 @@
{
"Kuybyshev",
"1970-01-01 00:00",
+ "1989-03-25 22:00",
+ }
+ {
+ "Moscow",
+ "1989-03-25 22:00",
+ "1991-03-30 23:00",
+ }
+ {
+ "Europe_Eastern",
+ "1991-03-30 23:00",
+ "1991-09-29 00:00",
+ }
+ {
+ "Kuybyshev",
+ "1991-09-29 00:00",
"1991-10-20 00:00",
}
{
"Samara",
"1991-10-20 00:00",
- "2010-03-27 22:00",
- }
- {
- "Moscow",
- "2010-03-27 22:00",
"9999-12-31 23:59",
}
}
@@ -3858,6 +3862,13 @@
"Europe:Volgograd"{
{
"Volgograd",
+ "1970-01-01 00:00",
+ "1992-03-28 22:00",
+ }
+ {
+ "Moscow",
+ "1992-03-28 22:00",
+ "9999-12-31 23:59",
}
}
"Europe:Warsaw"{
@@ -3954,14 +3965,7 @@
}
"Pacific:Apia"{
{
- "Bering",
- "1970-01-01 00:00",
- "1983-10-30 12:00",
- }
- {
- "Samoa",
- "1983-10-30 12:00",
- "9999-12-31 23:59",
+ "Apia",
}
}
"Pacific:Auckland"{
@@ -3969,6 +3973,13 @@
"New_Zealand",
}
}
+ "Pacific:Bougainville"{
+ {
+ "Papua_New_Guinea",
+ "1970-01-01 00:00",
+ "2014-12-27 16:00",
+ }
+ }
"Pacific:Chatham"{
{
"Chatham",
diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt
index 7f60b3d..366b101 100644
--- a/icu4c/source/data/misc/timezoneTypes.txt
+++ b/icu4c/source/data/misc/timezoneTypes.txt
@@ -7,6 +7,15 @@
// *
// ***************************************************************************
timezoneTypes:table(nofallback){
+ bcpTypeAlias{
+ tz{
+ aqams{"nzakl"}
+ cnckg{"cnsha"}
+ cnhrb{"cnsha"}
+ cnkhg{"cnurc"}
+ usnavajo{"usden"}
+ }
+ }
typeAlias{
timezone{
"Africa:Asmara"{"Africa/Asmera"}
@@ -30,10 +39,13 @@
"America:Virgin"{"America/St_Thomas"}
"Antarctica:South_Pole"{"Pacific/Auckland"}
"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"}
@@ -348,6 +360,7 @@
"Antarctica:Palmer"{"aqplm"}
"Antarctica:Rothera"{"aqrot"}
"Antarctica:Syowa"{"aqsyw"}
+ "Antarctica:Troll"{"aqtrl"}
"Antarctica:Vostok"{"aqvos"}
"Arctic:Longyearbyen"{"sjlyr"}
"Asia:Aden"{"yeade"}
@@ -365,8 +378,8 @@
"Asia:Bishkek"{"kgfru"}
"Asia:Brunei"{"bnbwn"}
"Asia:Calcutta"{"inccu"}
+ "Asia:Chita"{"ruchita"}
"Asia:Choibalsan"{"mncoq"}
- "Asia:Chongqing"{"cnckg"}
"Asia:Colombo"{"lkcmb"}
"Asia:Damascus"{"sydam"}
"Asia:Dhaka"{"bddac"}
@@ -374,7 +387,6 @@
"Asia:Dubai"{"aedxb"}
"Asia:Dushanbe"{"tjdyu"}
"Asia:Gaza"{"gaza"}
- "Asia:Harbin"{"cnhrb"}
"Asia:Hebron"{"hebron"}
"Asia:Hong_Kong"{"hkhkg"}
"Asia:Hovd"{"mnhvd"}
@@ -385,7 +397,6 @@
"Asia:Kabul"{"afkbl"}
"Asia:Kamchatka"{"rupkc"}
"Asia:Karachi"{"pkkhi"}
- "Asia:Kashgar"{"cnkhg"}
"Asia:Katmandu"{"npktm"}
"Asia:Khandyga"{"rukhndg"}
"Asia:Krasnoyarsk"{"rukra"}
@@ -415,6 +426,7 @@
"Asia:Seoul"{"krsel"}
"Asia:Shanghai"{"cnsha"}
"Asia:Singapore"{"sgsin"}
+ "Asia:Srednekolymsk"{"rusred"}
"Asia:Taipei"{"twtpe"}
"Asia:Tashkent"{"uztas"}
"Asia:Tbilisi"{"getbs"}
@@ -548,6 +560,7 @@
"Indian:Reunion"{"rereu"}
"Pacific:Apia"{"wsapw"}
"Pacific:Auckland"{"nzakl"}
+ "Pacific:Bougainville"{"pgraw"}
"Pacific:Chatham"{"nzcht"}
"Pacific:Easter"{"clipc"}
"Pacific:Efate"{"vuvli"}
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index 2a98dec..4a9b9f2 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -78,6 +78,10 @@
BD{"Asia/Dhaka"}
BT{"Asia/Thimphu"}
}
+ "Belarus Standard Time"{
+ 001{"Europe/Minsk"}
+ BY{"Europe/Minsk"}
+ }
"Canada Central Standard Time"{
001{"America/Regina"}
CA{"America/Regina America/Swift_Current"}
@@ -109,6 +113,7 @@
"Central Asia Standard Time"{
001{"Asia/Almaty"}
AQ{"Antarctica/Vostok"}
+ CN{"Asia/Urumqi"}
IO{"Indian/Chagos"}
KG{"Asia/Bishkek"}
KZ{"Asia/Almaty Asia/Qyzylorda"}
@@ -167,7 +172,7 @@
}
"China Standard Time"{
001{"Asia/Shanghai"}
- CN{"Asia/Shanghai Asia/Chongqing Asia/Harbin Asia/Kashgar Asia/Urumqi"}
+ CN{"Asia/Shanghai"}
HK{"Asia/Hong_Kong"}
MO{"Asia/Macau"}
}
@@ -209,7 +214,6 @@
}
CU{"America/Havana"}
HT{"America/Port-au-Prince"}
- TC{"America/Grand_Turk"}
US{
"America/New_York America/Detroit America/Indiana/Petersburg America/"
"Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell"
@@ -309,7 +313,6 @@
}
"Kaliningrad Standard Time"{
001{"Europe/Kaliningrad"}
- BY{"Europe/Minsk"}
RU{"Europe/Kaliningrad"}
}
"Korea Standard Time"{
@@ -321,9 +324,14 @@
001{"Africa/Tripoli"}
LY{"Africa/Tripoli"}
}
+ "Line Islands Standard Time"{
+ 001{"Pacific/Kiritimati"}
+ KI{"Pacific/Kiritimati"}
+ ZZ{"Etc/GMT-14"}
+ }
"Magadan Standard Time"{
001{"Asia/Magadan"}
- RU{"Asia/Magadan Asia/Anadyr Asia/Kamchatka"}
+ RU{"Asia/Magadan"}
}
"Mauritius Standard Time"{
001{"Indian/Mauritius"}
@@ -365,7 +373,7 @@
}
"N. Central Asia Standard Time"{
001{"Asia/Novosibirsk"}
- RU{"Asia/Novosibirsk Asia/Novokuznetsk Asia/Omsk"}
+ RU{"Asia/Novosibirsk Asia/Omsk"}
}
"Namibia Standard Time"{
001{"Africa/Windhoek"}
@@ -386,11 +394,11 @@
}
"North Asia East Standard Time"{
001{"Asia/Irkutsk"}
- RU{"Asia/Irkutsk"}
+ RU{"Asia/Irkutsk Asia/Chita"}
}
"North Asia Standard Time"{
001{"Asia/Krasnoyarsk"}
- RU{"Asia/Krasnoyarsk"}
+ RU{"Asia/Krasnoyarsk Asia/Novokuznetsk"}
}
"Pacific SA Standard Time"{
001{"America/Santiago"}
@@ -423,9 +431,21 @@
ES{"Europe/Madrid Africa/Ceuta"}
FR{"Europe/Paris"}
}
+ "Russia Time Zone 10"{
+ 001{"Asia/Srednekolymsk"}
+ RU{"Asia/Srednekolymsk"}
+ }
+ "Russia Time Zone 11"{
+ 001{"Asia/Kamchatka"}
+ RU{"Asia/Kamchatka Asia/Anadyr"}
+ }
+ "Russia Time Zone 3"{
+ 001{"Europe/Samara"}
+ RU{"Europe/Samara"}
+ }
"Russian Standard Time"{
001{"Europe/Moscow"}
- RU{"Europe/Moscow Europe/Samara Europe/Simferopol Europe/Volgograd"}
+ RU{"Europe/Moscow Europe/Simferopol Europe/Volgograd"}
}
"SA Eastern Standard Time"{
001{"America/Cayenne"}
@@ -475,6 +495,7 @@
MS{"America/Montserrat"}
PR{"America/Puerto_Rico"}
SX{"America/Lower_Princes"}
+ TC{"America/Grand_Turk"}
TT{"America/Port_of_Spain"}
VC{"America/St_Vincent"}
VG{"America/Tortola"}
@@ -665,7 +686,7 @@
FM{"Pacific/Truk"}
GU{"Pacific/Guam"}
MP{"Pacific/Saipan"}
- PG{"Pacific/Port_Moresby"}
+ PG{"Pacific/Port_Moresby Pacific/Bougainville"}
ZZ{"Etc/GMT-10"}
}
"Yakutsk Standard Time"{
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index a1e34e0..ba6c1f8 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,7 +3,7 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Mon Feb 2 16:44:09 2015
+// Build date: Tue Feb 3 15:48:08 2015
// Olson source: ftp://elsie.nci.nih.gov/pub/
// Olson version: 2015a
// ICU version: 53.1.0.1
@@ -3147,7 +3147,7 @@
"ET", //Z#7 Africa/Addis_Ababa
"DZ", //Z#8 Africa/Algiers
"ER", //Z#9 Africa/Asmara
- "KE", //Z#10 Africa/Asmera
+ "ER", //Z#10 Africa/Asmera
"ML", //Z#11 Africa/Bamako
"CF", //Z#12 Africa/Bangui
"GM", //Z#13 Africa/Banjul
diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat
index 66e5668..bbd1965 100644
--- a/icu4c/source/stubdata/icudt53l.dat
+++ b/icu4c/source/stubdata/icudt53l.dat
Binary files differ
diff --git a/icu4c/source/tools/tzcode/icuregions b/icu4c/source/tools/tzcode/icuregions
index 1ea894b..b09f35b 100644
--- a/icu4c/source/tools/tzcode/icuregions
+++ b/icu4c/source/tools/tzcode/icuregions
@@ -1,5 +1,5 @@
######################################################################
-# Copyright (C) 2013, International Business Machines
+# Copyright (C) 2013-2014, International Business Machines
# Corporation and others. All Rights Reserved.
######################################################################
# This is an ICU-specific file including zone/region mapping.
@@ -7,5 +7,6 @@
# Each line below indicates zone and its region in the syntax below -
# <zone_id> <region_code>
#
+Africa/Asmera ER
America/Montreal CA
diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones
index 21b0fa2..f8cbc7c 100644
--- a/icu4c/source/tools/tzcode/icuzones
+++ b/icu4c/source/tools/tzcode/icuzones
@@ -1,5 +1,5 @@
######################################################################
-# Copyright (C) 2007-2010, International Business Machines
+# Copyright (C) 2007-2014, International Business Machines
# Corporation and others. All Rights Reserved.
######################################################################
# This is an ICU-specific file with the same format as regular
@@ -45,7 +45,7 @@
Link America/Anchorage AST
Link America/Sao_Paulo BET
Link Asia/Dhaka BST
-Link Africa/Harare CAT
+Link Africa/Maputo CAT
Link America/St_Johns CNT
Link America/Chicago CST
Link Asia/Shanghai CTT
