From 9b7fc10d13eacf893e5eec9d473049366296d0ab Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 30 Sep 2014 17:31:13 -0700 Subject: Update icu to tzdata 2014h. From the release notes: Changes affecting past time stamps America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01, not 1920-01-06. The old entry was based on a misinterpretation of Shanks. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. Bug: 17731498 (cherry picked from commit b4755566b247197e418976025ac1a8321227433e) Change-Id: I00989f113d0bf8785048a4fc4a0fc8b6c553fbee --- icu4c/source/data/misc/zoneinfo64.txt | 72 +++++++++------------------------- icu4c/source/stubdata/icudt53l.dat | Bin 18716256 -> 18715696 bytes 2 files changed, 18 insertions(+), 54 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 70fb3e69e..82a85323c 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,9 +3,9 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Sep 2 09:44:06 2014 +// Build date: Tue Sep 30 17:28:41 2014 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2014g +// Olson version: 2014h // ICU version: 53.1.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2014g" } + TZVersion { "2014h" } Zones:array { /* ACT */ :int { 347 } //Z#0 /* AET */ :int { 359 } //Z#1 @@ -60,17 +60,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -3740, 0, -3600, 0, 0, 0 } typeMap:bin { "0102" } } //Z#14 - /* Africa/Blantyre */ :table { - trans:intvector { -2109291600 } - typeOffsets:intvector { 8400, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#15 + /* Africa/Blantyre */ :int { 43 } //Z#15 /* Africa/Brazzaville */ :int { 36 } //Z#16 - /* Africa/Bujumbura */ :table { - transPre32:intvector { -1, 1770438648 } - typeOffsets:intvector { 7048, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#17 + /* Africa/Bujumbura */ :int { 43 } //Z#17 /* Africa/Cairo */ :table { transPre32:intvector { -1, 2109558187 } trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400, 1400191200, 1403816400, 1406844000, 1411678800, 1429826400, 1434056400, 1437688800, 1443128400, 1461880800, 1464901200, 1467928800, 1475182800, 1493330400, 1495746000, 1498773600, 1506632400, 1524780000, 1525986000, 1529013600, 1538082000, 1556229600, 1556830800, 1559858400, 1569531600, 1590703200, 1600981200, 1620943200, 1633035600, 1651788000, 1664485200, 1682632800, 1695934800 } @@ -122,23 +114,14 @@ zoneinfo64:table(nofallback) { finalYear:int { 2039 } } //Z#26 /* Africa/Freetown */ :int { 5 } //Z#27 - /* Africa/Gaborone */ :table { - transPre32:intvector { -1, 1612673076 } - trans:intvector { -2109288600, -829526400, -813805200 } - typeOffsets:intvector { 6220, 0, 5400, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "01020302" } - } //Z#28 - /* Africa/Harare */ :table { - trans:intvector { -2109290652 } - typeOffsets:intvector { 7452, 0, 7200, 0 } - typeMap:bin { "01" } - links:intvector { 29, 370 } - } //Z#29 + /* Africa/Gaborone */ :int { 43 } //Z#28 + /* Africa/Harare */ :int { 43 } //Z#29 /* Africa/Johannesburg */ :table { transPre32:intvector { -1, 1836794176 } trans:intvector { -2109288600, -860976000, -845254800, -829526400, -813805200 } typeOffsets:intvector { 6720, 0, 5400, 0, 7200, 0, 7200, 3600 } typeMap:bin { "010203020302" } + links:intvector { 30, 44, 45 } } //Z#30 /* Africa/Juba */ :int { 33 } //Z#31 /* Africa/Kampala */ :table { @@ -152,11 +135,7 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020103" } links:intvector { 31, 33 } } //Z#33 - /* Africa/Kigali */ :table { - trans:intvector { -1091498416 } - typeOffsets:intvector { 7216, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#34 + /* Africa/Kigali */ :int { 43 } //Z#34 /* Africa/Kinshasa */ :int { 36 } //Z#35 /* Africa/Lagos */ :table { trans:intvector { -1588464816 } @@ -167,32 +146,17 @@ zoneinfo64:table(nofallback) { /* Africa/Libreville */ :int { 36 } //Z#37 /* Africa/Lome */ :int { 5 } //Z#38 /* Africa/Luanda */ :int { 36 } //Z#39 - /* Africa/Lubumbashi */ :table { - transPre32:intvector { -1, 2018320704 } - typeOffsets:intvector { 6592, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#40 - /* Africa/Lusaka */ :table { - trans:intvector { -2109289988 } - typeOffsets:intvector { 6788, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#41 + /* Africa/Lubumbashi */ :int { 43 } //Z#40 + /* Africa/Lusaka */ :int { 43 } //Z#41 /* Africa/Malabo */ :int { 36 } //Z#42 /* Africa/Maputo */ :table { trans:intvector { -2109291020 } typeOffsets:intvector { 7820, 0, 7200, 0 } typeMap:bin { "01" } + links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 370 } } //Z#43 - /* Africa/Maseru */ :table { - trans:intvector { -2109289800, -829526400, -813805200 } - typeOffsets:intvector { 6600, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "010201" } - } //Z#44 - /* Africa/Mbabane */ :table { - trans:intvector { -2109290664 } - typeOffsets:intvector { 7464, 0, 7200, 0 } - typeMap:bin { "01" } - } //Z#45 + /* Africa/Maseru */ :int { 30 } //Z#44 + /* Africa/Mbabane */ :int { 30 } //Z#45 /* Africa/Mogadishu */ :table { transPre32:intvector { -1, 1891394808 } trans:intvector { -1230778800, -410236200 } @@ -740,7 +704,7 @@ zoneinfo64:table(nofallback) { finalYear:int { 2008 } } //Z#140 /* America/Jamaica */ :table { - trans:intvector { -1827687169, 136364400, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 } + trans:intvector { -1827687169, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 } typeOffsets:intvector { -18431, 0, -18000, 0, -18000, 3600 } typeMap:bin { "010201020102010201020102010201020102010201" } links:intvector { 141, 517 } @@ -1606,7 +1570,7 @@ zoneinfo64:table(nofallback) { links:intvector { 292, 463 } } //Z#292 /* Asia/Novokuznetsk */ :table { - trans:intvector { -1577512128, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 } + trans:intvector { -1441259328, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 } typeOffsets:intvector { 20928, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } } //Z#293 @@ -1966,7 +1930,7 @@ zoneinfo64:table(nofallback) { /* Brazil/DeNoronha */ :int { 175 } //Z#367 /* Brazil/East */ :int { 200 } //Z#368 /* Brazil/West */ :int { 155 } //Z#369 - /* CAT */ :int { 29 } //Z#370 + /* CAT */ :int { 43 } //Z#370 /* CET */ :table { trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 3600, 0, 3600, 3600 } @@ -3617,7 +3581,7 @@ zoneinfo64:table(nofallback) { "BR", //Z#367 Brazil/DeNoronha "BR", //Z#368 Brazil/East "BR", //Z#369 Brazil/West - "ZW", //Z#370 CAT + "MZ", //Z#370 CAT "001",//Z#371 CET "CA", //Z#372 CNT "US", //Z#373 CST diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index 2beca5af7..43df43a21 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From 5b74c74564f39965cc9dfba7c37a704590f504ac Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 30 Sep 2014 16:00:46 -0700 Subject: Update sl zones data to CLDR 26. (The reported bug was Europe/Belgrade not being shown as "Beograd".) Bug: 17422234 (cherry picked from commit 39230118f046f61161d24cf7e70c077c49c22b7b) Change-Id: I6f241e373c21a85e0dce000a2841129c414569c5 --- icu4c/source/data/zone/sl.txt | 854 ++++++++++++++++++++++++++++++++++++- icu4c/source/stubdata/icudt53l.dat | Bin 18715696 -> 18724416 bytes 2 files changed, 851 insertions(+), 3 deletions(-) diff --git a/icu4c/source/data/zone/sl.txt b/icu4c/source/data/zone/sl.txt index ac1fba6d6..8ca6fbf76 100644 --- a/icu4c/source/data/zone/sl.txt +++ b/icu4c/source/data/zone/sl.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/sl.xml */ sl{ - Version{"2.0.99.67"} + Version{"2.1.8.9"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} @@ -27,33 +27,246 @@ sl{ "Africa:Asmera"{ ec{"Asmara"} } + "Africa:Bamako"{ + ec{"Bamako"} + } + "Africa:Bangui"{ + ec{"Bangui"} + } + "Africa:Banjul"{ + ec{"Banjul"} + } + "Africa:Bissau"{ + ec{"Bissau"} + } + "Africa:Blantyre"{ + ec{"Blantyre"} + } + "Africa:Brazzaville"{ + ec{"Brazzaville"} + } + "Africa:Bujumbura"{ + ec{"Bujumbura"} + } "Africa:Cairo"{ ec{"Kairo"} } + "Africa:Casablanca"{ + ec{"Casablanca"} + } + "Africa:Ceuta"{ + ec{"Ceuta"} + } + "Africa:Conakry"{ + ec{"Conakry"} + } + "Africa:Dakar"{ + ec{"Dakar"} + } + "Africa:Dar_es_Salaam"{ + ec{"Dar es Salaam"} + } "Africa:Djibouti"{ ec{"Džibuti"} } + "Africa:Douala"{ + ec{"Douala"} + } + "Africa:El_Aaiun"{ + ec{"El Aaiun"} + } + "Africa:Freetown"{ + ec{"Freetown"} + } + "Africa:Gaborone"{ + ec{"Gaborone"} + } + "Africa:Harare"{ + ec{"Harare"} + } + "Africa:Johannesburg"{ + ec{"Johannesburg"} + } + "Africa:Juba"{ + ec{"Juba"} + } + "Africa:Kampala"{ + ec{"Kampala"} + } "Africa:Khartoum"{ ec{"Kartum"} } + "Africa:Kigali"{ + ec{"Kigali"} + } "Africa:Kinshasa"{ ec{"Kinšasa"} } + "Africa:Lagos"{ + ec{"Lagos"} + } + "Africa:Libreville"{ + ec{"Libreville"} + } + "Africa:Lome"{ + ec{"Lome"} + } + "Africa:Luanda"{ + ec{"Luanda"} + } "Africa:Lubumbashi"{ ec{"Lubumbaši"} } + "Africa:Lusaka"{ + ec{"Lusaka"} + } + "Africa:Malabo"{ + ec{"Malabo"} + } + "Africa:Maputo"{ + ec{"Maputo"} + } + "Africa:Maseru"{ + ec{"Maseru"} + } + "Africa:Mbabane"{ + ec{"Mbabane"} + } "Africa:Mogadishu"{ ec{"Mogadišu"} } + "Africa:Monrovia"{ + ec{"Monrovia"} + } + "Africa:Nairobi"{ + ec{"Nairobi"} + } + "Africa:Ndjamena"{ + ec{"Ndjamena"} + } + "Africa:Niamey"{ + ec{"Niamey"} + } + "Africa:Nouakchott"{ + ec{"Nouakchott"} + } + "Africa:Ouagadougou"{ + ec{"Ouagadougou"} + } + "Africa:Porto-Novo"{ + ec{"Porto-Novo"} + } "Africa:Sao_Tome"{ ec{"São Tomé"} } + "Africa:Tripoli"{ + ec{"Tripoli"} + } + "Africa:Tunis"{ + ec{"Tunis"} + } + "Africa:Windhoek"{ + ec{"Windhoek"} + } + "America:Adak"{ + ec{"Adak"} + } + "America:Anchorage"{ + ec{"Anchorage"} + } + "America:Anguilla"{ + ec{"Anguilla"} + } + "America:Antigua"{ + ec{"Antigua"} + } + "America:Araguaina"{ + ec{"Araguaina"} + } + "America:Argentina:La_Rioja"{ + ec{"La Rioja"} + } + "America:Argentina:Rio_Gallegos"{ + ec{"Rio Gallegos"} + } + "America:Argentina:Salta"{ + ec{"Salta"} + } + "America:Argentina:San_Juan"{ + ec{"San Juan"} + } + "America:Argentina:San_Luis"{ + ec{"San Luis"} + } + "America:Argentina:Tucuman"{ + ec{"Tucuman"} + } + "America:Argentina:Ushuaia"{ + ec{"Ushuaia"} + } + "America:Aruba"{ + ec{"Aruba"} + } "America:Asuncion"{ ec{"Asunción"} } + "America:Bahia"{ + ec{"Bahia"} + } + "America:Bahia_Banderas"{ + ec{"Bahia Banderas"} + } + "America:Barbados"{ + ec{"Barbados"} + } + "America:Belem"{ + ec{"Belem"} + } + "America:Belize"{ + ec{"Belize"} + } + "America:Blanc-Sablon"{ + ec{"Blanc-Sablon"} + } + "America:Boa_Vista"{ + ec{"Boa Vista"} + } + "America:Bogota"{ + ec{"Bogota"} + } + "America:Boise"{ + ec{"Boise"} + } + "America:Buenos_Aires"{ + ec{"Buenos Aires"} + } + "America:Cambridge_Bay"{ + ec{"Cambridge Bay"} + } + "America:Campo_Grande"{ + ec{"Campo Grande"} + } + "America:Cancun"{ + ec{"Cancun"} + } + "America:Caracas"{ + ec{"Caracas"} + } + "America:Catamarca"{ + ec{"Catamarca"} + } + "America:Cayenne"{ + ec{"Cayenne"} + } "America:Cayman"{ ec{"Kajman"} } + "America:Chicago"{ + ec{"Chicago"} + } + "America:Chihuahua"{ + ec{"Chihuahua"} + } "America:Coral_Harbour"{ ec{"Atikokan"} } @@ -63,24 +276,81 @@ sl{ "America:Costa_Rica"{ ec{"Kostarika"} } + "America:Creston"{ + ec{"Creston"} + } + "America:Cuiaba"{ + ec{"Cuiaba"} + } "America:Curacao"{ ec{"Curaçao"} } + "America:Danmarkshavn"{ + ec{"Danmarkshavn"} + } + "America:Dawson"{ + ec{"Dawson"} + } + "America:Dawson_Creek"{ + ec{"Dawson Creek"} + } + "America:Denver"{ + ec{"Denver"} + } + "America:Detroit"{ + ec{"Detroit"} + } "America:Dominica"{ ec{"Dominika"} } + "America:Edmonton"{ + ec{"Edmonton"} + } + "America:Eirunepe"{ + ec{"Eirunepe"} + } "America:El_Salvador"{ ec{"Salvador"} } + "America:Fortaleza"{ + ec{"Fortaleza"} + } + "America:Glace_Bay"{ + ec{"Glace Bay"} + } "America:Godthab"{ ec{"Nuuk"} } + "America:Goose_Bay"{ + ec{"Goose Bay"} + } + "America:Grand_Turk"{ + ec{"Grand Turk"} + } + "America:Grenada"{ + ec{"Grenada"} + } + "America:Guadeloupe"{ + ec{"Gvadelup"} + } "America:Guatemala"{ ec{"Gvatemala"} } + "America:Guayaquil"{ + ec{"Guayaquil"} + } "America:Guyana"{ ec{"Gvajana"} } + "America:Halifax"{ + ec{"Halifax"} + } + "America:Havana"{ + ec{"Havana"} + } + "America:Hermosillo"{ + ec{"Hermosillo"} + } "America:Indiana:Knox"{ ec{"Knox, Indiana"} } @@ -102,21 +372,111 @@ sl{ "America:Indiana:Winamac"{ ec{"Winamac, Indiana"} } + "America:Indianapolis"{ + ec{"Indianapolis"} + } + "America:Inuvik"{ + ec{"Inuvik"} + } + "America:Iqaluit"{ + ec{"Iqaluit"} + } "America:Jamaica"{ ec{"Jamajka"} } + "America:Jujuy"{ + ec{"Jujuy"} + } + "America:Juneau"{ + ec{"Juneau"} + } "America:Kentucky:Monticello"{ ec{"Monticello, Kentucky"} } + "America:Kralendijk"{ + ec{"Kralendijk"} + } + "America:La_Paz"{ + ec{"La Paz"} + } + "America:Lima"{ + ec{"Lima"} + } + "America:Los_Angeles"{ + ec{"Los Angeles"} + } + "America:Louisville"{ + ec{"Louisville"} + } "America:Lower_Princes"{ - ec{"Lower Prince's Quarter"} + ec{"Lower Prince’s Quarter"} + } + "America:Maceio"{ + ec{"Maceio"} + } + "America:Managua"{ + ec{"Managua"} + } + "America:Manaus"{ + ec{"Manaus"} + } + "America:Marigot"{ + ec{"Marigot"} } "America:Martinique"{ ec{"Martinik"} } + "America:Matamoros"{ + ec{"Matamoros"} + } + "America:Mazatlan"{ + ec{"Mazatlan"} + } + "America:Mendoza"{ + ec{"Mendoza"} + } + "America:Menominee"{ + ec{"Menominee"} + } + "America:Merida"{ + ec{"Merida"} + } + "America:Metlakatla"{ + ec{"Metlakatla"} + } "America:Mexico_City"{ ec{"Ciudad Mexico"} } + "America:Miquelon"{ + ec{"Miquelon"} + } + "America:Moncton"{ + ec{"Moncton"} + } + "America:Monterrey"{ + ec{"Monterrey"} + } + "America:Montevideo"{ + ec{"Montevideo"} + } + "America:Montserrat"{ + ec{"Montserrat"} + } + "America:Nassau"{ + ec{"Nassau"} + } + "America:New_York"{ + ec{"New York"} + } + "America:Nipigon"{ + ec{"Nipigon"} + } + "America:Nome"{ + ec{"Nome"} + } + "America:Noronha"{ + ec{"Noronha"} + } "America:North_Dakota:Beulah"{ ec{"Beulah, North Dakota"} } @@ -126,12 +486,72 @@ sl{ "America:North_Dakota:New_Salem"{ ec{"New Salem, Severna Dakota"} } + "America:Ojinaga"{ + ec{"Ojinaga"} + } + "America:Panama"{ + ec{"Panama"} + } + "America:Pangnirtung"{ + ec{"Pangnirtung"} + } + "America:Paramaribo"{ + ec{"Paramaribo"} + } + "America:Phoenix"{ + ec{"Phoenix"} + } + "America:Port-au-Prince"{ + ec{"Port-au-Prince"} + } + "America:Port_of_Spain"{ + ec{"Port of Spain"} + } + "America:Porto_Velho"{ + ec{"Porto Velho"} + } "America:Puerto_Rico"{ ec{"Portoriko"} } + "America:Rainy_River"{ + ec{"Rainy River"} + } + "America:Rankin_Inlet"{ + ec{"Rankin Inlet"} + } + "America:Recife"{ + ec{"Recife"} + } + "America:Regina"{ + ec{"Regina"} + } + "America:Resolute"{ + ec{"Resolute"} + } + "America:Rio_Branco"{ + ec{"Rio Branco"} + } + "America:Santa_Isabel"{ + ec{"Santa Isabel"} + } + "America:Santarem"{ + ec{"Santarem"} + } + "America:Santiago"{ + ec{"Santiago"} + } + "America:Santo_Domingo"{ + ec{"Santo Domingo"} + } + "America:Sao_Paulo"{ + ec{"Sao Paulo"} + } "America:Scoresbysund"{ ec{"Ittoqqortoormiit"} } + "America:Sitka"{ + ec{"Sitka"} + } "America:St_Barthelemy"{ ec{"Saint Barthélemy"} } @@ -150,9 +570,81 @@ sl{ "America:St_Vincent"{ ec{"St. Vincent"} } + "America:Swift_Current"{ + ec{"Swift Current"} + } + "America:Tegucigalpa"{ + ec{"Tegucigalpa"} + } + "America:Thule"{ + ec{"Thule"} + } + "America:Thunder_Bay"{ + ec{"Thunder Bay"} + } + "America:Tijuana"{ + ec{"Tijuana"} + } + "America:Toronto"{ + ec{"Toronto"} + } + "America:Tortola"{ + ec{"Tortola"} + } + "America:Vancouver"{ + ec{"Vancouver"} + } + "America:Whitehorse"{ + ec{"Whitehorse"} + } + "America:Winnipeg"{ + ec{"Winnipeg"} + } + "America:Yakutat"{ + ec{"Yakutat"} + } + "America:Yellowknife"{ + ec{"Yellowknife"} + } + "Antarctica:Casey"{ + ec{"Casey"} + } + "Antarctica:Davis"{ + ec{"Davis"} + } "Antarctica:DumontDUrville"{ ec{"Dumont d’Urville"} } + "Antarctica:Macquarie"{ + ec{"Macquarie"} + } + "Antarctica:Mawson"{ + ec{"Mawson"} + } + "Antarctica:McMurdo"{ + ec{"McMurdo"} + } + "Antarctica:Palmer"{ + ec{"Palmer"} + } + "Antarctica:Rothera"{ + ec{"Rothera"} + } + "Antarctica:Syowa"{ + ec{"Syowa"} + } + "Antarctica:Troll"{ + ec{"Troll"} + } + "Antarctica:Vostok"{ + ec{"Vostok"} + } + "Arctic:Longyearbyen"{ + ec{"Longyearbyen"} + } + "Asia:Aden"{ + ec{"Aden"} + } "Asia:Almaty"{ ec{"Almati"} } @@ -177,6 +669,12 @@ sl{ "Asia:Bahrain"{ ec{"Bahrajn"} } + "Asia:Baku"{ + ec{"Baku"} + } + "Asia:Bangkok"{ + ec{"Bangkok"} + } "Asia:Beirut"{ ec{"Bejrut"} } @@ -195,27 +693,54 @@ sl{ "Asia:Chongqing"{ ec{"Čongčing"} } + "Asia:Colombo"{ + ec{"Colombo"} + } "Asia:Damascus"{ ec{"Damask"} } "Asia:Dhaka"{ ec{"Daka"} } + "Asia:Dili"{ + ec{"Dili"} + } "Asia:Dubai"{ ec{"Dubaj"} } "Asia:Dushanbe"{ ec{"Dušanbe"} } + "Asia:Gaza"{ + ec{"Gaza"} + } + "Asia:Harbin"{ + ec{"Harbin"} + } + "Asia:Hebron"{ + ec{"Hebron"} + } "Asia:Hong_Kong"{ ec{"Hongkong"} } + "Asia:Hovd"{ + ec{"Hovd"} + } + "Asia:Irkutsk"{ + ec{"Irkutsk"} + } "Asia:Jakarta"{ ec{"Džakarta"} } + "Asia:Jayapura"{ + ec{"Jayapura"} + } "Asia:Jerusalem"{ ec{"Jeruzalem"} } + "Asia:Kabul"{ + ec{"Kabul"} + } "Asia:Kamchatka"{ ec{"Kamčatka"} } @@ -234,24 +759,51 @@ sl{ "Asia:Krasnoyarsk"{ ec{"Krasnojarsk"} } + "Asia:Kuala_Lumpur"{ + ec{"Kuala Lumpur"} + } + "Asia:Kuching"{ + ec{"Kuching"} + } "Asia:Kuwait"{ ec{"Kuvajt"} } "Asia:Macau"{ ec{"Macao"} } + "Asia:Magadan"{ + ec{"Magadan"} + } "Asia:Makassar"{ ec{"Makasar"} } + "Asia:Manila"{ + ec{"Manila"} + } "Asia:Muscat"{ ec{"Muškat"} } "Asia:Nicosia"{ ec{"Nikozija"} } + "Asia:Novokuznetsk"{ + ec{"Novokuznetsk"} + } + "Asia:Novosibirsk"{ + ec{"Novosibirsk"} + } + "Asia:Omsk"{ + ec{"Omsk"} + } "Asia:Oral"{ ec{"Uralsk"} } + "Asia:Phnom_Penh"{ + ec{"Phnom Penh"} + } + "Asia:Pontianak"{ + ec{"Pontianak"} + } "Asia:Pyongyang"{ ec{"Pjongjang"} } @@ -273,6 +825,9 @@ sl{ "Asia:Sakhalin"{ ec{"Sahalin"} } + "Asia:Samarkand"{ + ec{"Samarkand"} + } "Asia:Seoul"{ ec{"Seul"} } @@ -288,9 +843,15 @@ sl{ "Asia:Tashkent"{ ec{"Taškent"} } + "Asia:Tbilisi"{ + ec{"Tbilisi"} + } "Asia:Tehran"{ ec{"Teheran"} } + "Asia:Thimphu"{ + ec{"Thimphu"} + } "Asia:Tokyo"{ ec{"Tokio"} } @@ -300,6 +861,15 @@ sl{ "Asia:Urumqi"{ ec{"Urumči"} } + "Asia:Ust-Nera"{ + ec{"Ust-Nera"} + } + "Asia:Vientiane"{ + ec{"Vientiane"} + } + "Asia:Vladivostok"{ + ec{"Vladivostok"} + } "Asia:Yakutsk"{ ec{"Jakutsk"} } @@ -324,21 +894,78 @@ sl{ "Atlantic:Faeroe"{ ec{"Faroe"} } + "Atlantic:Madeira"{ + ec{"Madeira"} + } + "Atlantic:Reykjavik"{ + ec{"Reykjavik"} + } "Atlantic:South_Georgia"{ ec{"Južna Georgia"} } "Atlantic:St_Helena"{ ec{"St. Helena"} } + "Atlantic:Stanley"{ + ec{"Stanley"} + } + "Australia:Adelaide"{ + ec{"Adelaide"} + } + "Australia:Brisbane"{ + ec{"Brisbane"} + } + "Australia:Broken_Hill"{ + ec{"Broken Hill"} + } + "Australia:Currie"{ + ec{"Currie"} + } + "Australia:Darwin"{ + ec{"Darwin"} + } + "Australia:Eucla"{ + ec{"Eucla"} + } + "Australia:Hobart"{ + ec{"Hobart"} + } + "Australia:Lindeman"{ + ec{"Lindeman"} + } + "Australia:Lord_Howe"{ + ec{"Lord Howe"} + } + "Australia:Melbourne"{ + ec{"Melbourne"} + } + "Australia:Perth"{ + ec{"Perth"} + } + "Australia:Sydney"{ + ec{"Sydney"} + } "Etc:Unknown"{ ec{"neznano"} } + "Europe:Amsterdam"{ + ec{"Amsterdam"} + } "Europe:Andorra"{ ec{"Andora"} } "Europe:Athens"{ ec{"Atene"} } + "Europe:Belgrade"{ + ec{"Beograd"} + } + "Europe:Berlin"{ + ec{"Berlin"} + } + "Europe:Bratislava"{ + ec{"Bratislava"} + } "Europe:Brussels"{ ec{"Bruselj"} } @@ -348,45 +975,113 @@ sl{ "Europe:Budapest"{ ec{"Budimpešta"} } + "Europe:Busingen"{ + ec{"Busingen"} + } + "Europe:Chisinau"{ + ec{"Kišinjev"} + } "Europe:Copenhagen"{ ec{"Köbenhavn"} } "Europe:Dublin"{ + ec{"Dublin"} ld{"irski poletni čas"} } + "Europe:Gibraltar"{ + ec{"Gibraltar"} + } + "Europe:Guernsey"{ + ec{"Guernsey"} + } + "Europe:Helsinki"{ + ec{"Helsinki"} + } "Europe:Isle_of_Man"{ ec{"Otok Man"} } + "Europe:Istanbul"{ + ec{"Istanbul"} + } + "Europe:Jersey"{ + ec{"Jersey"} + } + "Europe:Kaliningrad"{ + ec{"Kaliningrad"} + } "Europe:Kiev"{ ec{"Kijev"} } "Europe:Lisbon"{ ec{"Lizbona"} } + "Europe:Ljubljana"{ + ec{"Ljubljana"} + } "Europe:London"{ + ec{"London"} ld{"britanski poletni čas"} } "Europe:Luxembourg"{ ec{"Luksemburg"} } + "Europe:Madrid"{ + ec{"Madrid"} + } + "Europe:Malta"{ + ec{"Malta"} + } + "Europe:Mariehamn"{ + ec{"Mariehamn"} + } + "Europe:Minsk"{ + ec{"Minsk"} + } "Europe:Monaco"{ ec{"Monako"} } "Europe:Moscow"{ ec{"Moskva"} } + "Europe:Oslo"{ + ec{"Oslo"} + } "Europe:Paris"{ ec{"Pariz"} } + "Europe:Podgorica"{ + ec{"Podgorica"} + } "Europe:Prague"{ ec{"Praga"} } + "Europe:Riga"{ + ec{"Riga"} + } "Europe:Rome"{ ec{"Rim"} } + "Europe:Samara"{ + ec{"Samara"} + } + "Europe:San_Marino"{ + ec{"San Marino"} + } + "Europe:Sarajevo"{ + ec{"Sarajevo"} + } + "Europe:Simferopol"{ + ec{"Simferopol"} + } + "Europe:Skopje"{ + ec{"Skopje"} + } "Europe:Sofia"{ ec{"Sofija"} } + "Europe:Stockholm"{ + ec{"Stockholm"} + } "Europe:Tallinn"{ ec{"Talin"} } @@ -396,6 +1091,9 @@ sl{ "Europe:Uzhgorod"{ ec{"Užgorod"} } + "Europe:Vaduz"{ + ec{"Vaduz"} + } "Europe:Vatican"{ ec{"Vatikan"} } @@ -405,12 +1103,27 @@ sl{ "Europe:Vilnius"{ ec{"Vilna"} } + "Europe:Volgograd"{ + ec{"Volgograd"} + } "Europe:Warsaw"{ ec{"Varšava"} } + "Europe:Zagreb"{ + ec{"Zagreb"} + } "Europe:Zaporozhye"{ ec{"Zaporožje"} } + "Europe:Zurich"{ + ec{"Zürich"} + } + "Indian:Antananarivo"{ + ec{"Antananarivo"} + } + "Indian:Chagos"{ + ec{"Chagos"} + } "Indian:Christmas"{ ec{"Božični otok"} } @@ -420,21 +1133,138 @@ sl{ "Indian:Comoro"{ ec{"Komori"} } + "Indian:Kerguelen"{ + ec{"Kerguelen"} + } + "Indian:Mahe"{ + ec{"Mahe"} + } "Indian:Maldives"{ ec{"Maldivi"} } + "Indian:Mauritius"{ + ec{"Mauritius"} + } + "Indian:Mayotte"{ + ec{"Mayotte"} + } + "Indian:Reunion"{ + ec{"Reunion"} + } + "Pacific:Apia"{ + ec{"Apia"} + } + "Pacific:Auckland"{ + ec{"Auckland"} + } + "Pacific:Chatham"{ + ec{"Chatham"} + } "Pacific:Easter"{ ec{"Velikonočni otok"} } + "Pacific:Efate"{ + ec{"Efate"} + } + "Pacific:Enderbury"{ + ec{"Enderbury"} + } + "Pacific:Fakaofo"{ + ec{"Fakaofo"} + } "Pacific:Fiji"{ ec{"Fidži"} } + "Pacific:Funafuti"{ + ec{"Funafuti"} + } + "Pacific:Galapagos"{ + ec{"Galapagos"} + } + "Pacific:Gambier"{ + ec{"Gambier"} + } + "Pacific:Guadalcanal"{ + ec{"Guadalcanal"} + } + "Pacific:Guam"{ + ec{"Guam"} + } + "Pacific:Honolulu"{ + ec{"Honolulu"} + } + "Pacific:Johnston"{ + ec{"Johnston"} + } + "Pacific:Kiritimati"{ + ec{"Kiritimati"} + } + "Pacific:Kosrae"{ + ec{"Kosrae"} + } + "Pacific:Kwajalein"{ + ec{"Kwajalein"} + } + "Pacific:Majuro"{ + ec{"Majuro"} + } + "Pacific:Marquesas"{ + ec{"Marquesas"} + } + "Pacific:Midway"{ + ec{"Midway"} + } + "Pacific:Nauru"{ + ec{"Nauru"} + } + "Pacific:Niue"{ + ec{"Niue"} + } + "Pacific:Norfolk"{ + ec{"Norfolk"} + } + "Pacific:Noumea"{ + ec{"Noumea"} + } + "Pacific:Pago_Pago"{ + ec{"Pago Pago"} + } + "Pacific:Palau"{ + ec{"Palau"} + } + "Pacific:Pitcairn"{ + ec{"Pitcairn"} + } "Pacific:Ponape"{ ec{"Pohnpei"} } + "Pacific:Port_Moresby"{ + ec{"Port Moresby"} + } + "Pacific:Rarotonga"{ + ec{"Rarotonga"} + } + "Pacific:Saipan"{ + ec{"Saipan"} + } + "Pacific:Tahiti"{ + ec{"Tahiti"} + } + "Pacific:Tarawa"{ + ec{"Tarawa"} + } + "Pacific:Tongatapu"{ + ec{"Tongatapu"} + } "Pacific:Truk"{ ec{"Chuuk"} } + "Pacific:Wake"{ + ec{"Wake"} + } + "Pacific:Wallis"{ + ec{"Wallis"} + } "meta:Afghanistan"{ ls{"Afganistanski čas"} } @@ -487,6 +1317,11 @@ sl{ lg{"Anadirski čas"} ls{"Anadirski standardni čas"} } + "meta:Apia"{ + ld{"Poletni čas: Apia"} + lg{"Čas: Apia"} + ls{"Standardni čas: Apia"} + } "meta:Arabian"{ ld{"Arabski poletni čas"} lg{"Arabski čas"} @@ -614,7 +1449,7 @@ sl{ ls{"Čas: Davis"} } "meta:DumontDUrville"{ - ls{"Čas: Dumont-d'Urville"} + ls{"Čas: Dumont-d’Urville"} } "meta:East_Timor"{ ls{"Vzhodnotimorski čas"} @@ -637,6 +1472,9 @@ sl{ lg{"Vzhodnoevropski čas"} ls{"Vzhodnoevropski standardni čas"} } + "meta:Europe_Further_Eastern"{ + ls{"Dodatni vzhodnoevropski čas"} + } "meta:Europe_Western"{ ld{"Zahodnoevropski poletni čas"} lg{"Zahodnoevropski čas"} @@ -807,6 +1645,16 @@ sl{ "meta:Mawson"{ ls{"Mawsonski čas"} } + "meta:Mexico_Northwest"{ + ld{"Poletni čas: severozahod Mehike"} + lg{"Čas: severozahod Mehike"} + ls{"Standardni čas: severozahod Mehike"} + } + "meta:Mexico_Pacific"{ + ld{"Poletni čas: pacifiška obala Mehike"} + lg{"Čas: pacifiška obala Mehike"} + ls{"Standardni čas: pacifiška obala Mehike"} + } "meta:Mongolia"{ ld{"Ulanbatorski poletni čas"} lg{"Ulanbatorski čas"} diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index 43df43a21..f79b45dc2 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From 08abb6e8e91df00c02af487c2a15fb52805c0dd5 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 8 Oct 2014 17:14:06 -0700 Subject: Add implicit RLMs to ar and fa percent symbols. Bug: 15476051 (cherry picked from commit 56b2b8b0d3a14be2dddc9671570a17c99999c9f1) Change-Id: I75902ff331d06a4ca0fbede131e7d06646ad5733 --- icu4c/source/data/locales/ar.txt | 2 +- icu4c/source/data/locales/fa.txt | 2 +- icu4c/source/stubdata/icudt53l.dat | Bin 18724416 -> 18724416 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 347910af9..66b8e562e 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -43,7 +43,7 @@ ar{ minusSign{"‏-"} nan{"ليس رقم"} perMille{"؉"} - percentSign{"٪"} + percentSign{"‏٪"} // Android-changed: http://b/15476051. plusSign{"‏+"} superscriptingExponent{"×"} } diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index 21bc5da1a..b48e28179 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -45,7 +45,7 @@ fa{ minusSign{"‎−"} nan{"ناعدد"} perMille{"؉"} - percentSign{"٪"} + percentSign{"‏٪"} // Android-changed: http://b/15476051. plusSign{"‎+‎"} superscriptingExponent{"×"} } diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index f79b45dc2..1ac26b1e7 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From 767914fe79c094ace3c145fd3745f57a55b35497 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 22 Oct 2014 12:19:43 -0700 Subject: Update icu to tzdata2014i. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release notes: Changes affecting future time stamps Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. (Thanks to Ken Rylander for the heads-up.) Guess that future years will use a similar pattern. A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. (Thanks to Kiley Walbom for the heads-up.) Changes affecting time zone abbreviations Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET to its more-traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT+8 in Indochina, to distinguish it better from ICT (UT+7). Changes affecting past time stamps Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976 (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's authoritative book). Asia/Ho_Chi_Minh has been added to zone1970.tab, to give tzselect users in Vietnam two choices, since north and south Vietnam disagreed after our 1970 cutoff. Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as they differed from existing zones only for older time stamps. As usual, these changes affect pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. Bug: 18085936 (cherry picked from commit 6c6993c9ef811e486c4468172004539002cad6c2) Change-Id: I088b9593714c140c4bacfbc138e5f165aa37b75d --- icu4c/source/data/misc/zoneinfo64.txt | 467 +++++++++++++++++----------------- icu4c/source/stubdata/icudt53l.dat | Bin 18724416 -> 18724448 bytes 2 files changed, 234 insertions(+), 233 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 82a85323c..d0ec6f9ed 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,9 +3,9 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Sep 30 17:28:41 2014 +// Build date: Wed Oct 22 12:13:57 2014 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2014h +// Olson version: 2014i // ICU version: 53.1.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2014h" } + TZVersion { "2014i" } Zones:array { /* ACT */ :int { 347 } //Z#0 /* AET */ :int { 359 } //Z#1 @@ -213,7 +213,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -36000 } finalYear:int { 2008 } - links:intvector { 59, 80, 603 } + links:intvector { 59, 80, 604 } } //Z#59 /* America/Anchorage */ :table { transPre32:intvector { -1, 1069604872, -1, 2106016072 } @@ -223,7 +223,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - links:intvector { 4, 60, 602 } + links:intvector { 4, 60, 603 } } //Z#60 /* America/Anguilla */ :int { 185 } //Z#61 /* America/Antigua */ :table { @@ -435,7 +435,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 98, 373, 605 } + links:intvector { 98, 373, 606 } } //Z#98 /* America/Chihuahua */ :table { trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600 } @@ -501,7 +501,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 109, 202, 532, 611 } + links:intvector { 109, 202, 532, 612 } } //Z#109 /* America/Detroit */ :table { trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80499600, -68666400, 104914800, 120636000, 126687600, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -510,7 +510,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 110, 610 } + links:intvector { 110, 611 } } //Z#110 /* America/Dominica */ :int { 185 } //Z#111 /* America/Edmonton */ :table { @@ -620,7 +620,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 116, 130, 138, 500, 606 } + links:intvector { 116, 130, 138, 500, 607 } } //Z#130 /* America/Indiana/Knox */ :table { transPre32:intvector { -1, 1577320096 } @@ -630,7 +630,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 131, 146, 609 } + links:intvector { 131, 146, 610 } } //Z#131 /* America/Indiana/Marengo */ :table { transPre32:intvector { -1, 1577320096 } @@ -759,7 +759,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 150, 537, 612, 613 } + links:intvector { 150, 537, 613, 614 } } //Z#150 /* America/Louisville */ :int { 144 } //Z#151 /* America/Lower_Princes */ :int { 105 } //Z#152 @@ -895,7 +895,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 172, 607 } + links:intvector { 172, 608 } } //Z#172 /* America/Nipigon */ :table { transPre32:intvector { -1, 1928233280 } @@ -980,7 +980,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -820519140, -812653140, -796845540, -84380400, -68659200 } typeOffsets:intvector { -26898, 0, -25200, 0, -25200, 3600 } typeMap:bin { "0102010201020102010201" } - links:intvector { 183, 534, 604 } + links:intvector { 183, 534, 605 } } //Z#183 /* America/Port-au-Prince */ :table { transPre32:intvector { -1, 1770463056 } @@ -1341,6 +1341,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1570084924 } typeOffsets:intvector { 24124, 0, 25200, 0 } typeMap:bin { "01" } + links:intvector { 247, 297, 324 } } //Z#247 /* Asia/Beirut */ :table { transPre32:intvector { -1, 1454817976 } @@ -1431,10 +1432,10 @@ zoneinfo64:table(nofallback) { finalYear:int { 2014 } } //Z#265 /* Asia/Ho_Chi_Minh */ :table { - trans:intvector { -2005974400, -1855983920, -1819954800, -1220428800 } - typeOffsets:intvector { 25600, 0, 25200, 0, 25580, 0, 28800, 0 } - typeMap:bin { "02010301" } - links:intvector { 266, 304, 617 } + trans:intvector { -2004073600, -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 } + typeOffsets:intvector { 25600, 0, 25200, 0, 25590, 0, 28800, 0, 32400, 0 } + typeMap:bin { "020103040103010301" } + links:intvector { 266, 304, 618 } } //Z#266 /* Asia/Hong_Kong */ :table { trans:intvector { -2056693002, -907389000, -891667800, -884246400, -766746000, -747981000, -728544600, -717049800, -694503000, -683785800, -668064600, -654755400, -636615000, -623305800, -605165400, -591856200, -573715800, -559801800, -542352600, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 } @@ -1589,11 +1590,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 12324, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "01030405040304030403040304030403040302010201020102010201020102010201020102010201020102010201020103" } } //Z#296 - /* Asia/Phnom_Penh */ :table { - trans:intvector { -2005973980, -1855983920, -1819954800, -1220428800 } - typeOffsets:intvector { 25180, 0, 25200, 0, 25580, 0, 28800, 0 } - typeMap:bin { "02010301" } - } //Z#297 + /* Asia/Phnom_Penh */ :int { 247 } //Z#297 /* Asia/Pontianak */ :table { trans:intvector { -1172906240, -881220600, -766054800, -683883000, -620812800, -189415800, 567964800 } typeOffsets:intvector { 26240, 0, 25200, 0, 27000, 0, 28800, 0, 32400, 0 } @@ -1641,7 +1638,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -303984000, -293533200, -264931200, -39515400, 547570800, 560872800, 579020400, 592322400 } typeOffsets:intvector { 30472, 0, 28800, 0, 28800, 3600, 30600, 0, 32400, 0, 32400, 3600 } typeMap:bin { "03040304010201030405040504" } - links:intvector { 307, 584 } + links:intvector { 307, 585 } } //Z#307 /* Asia/Shanghai */ :table { transPre32:intvector { -1, 2117485353 } @@ -1654,7 +1651,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378664200 } typeOffsets:intvector { 24925, 0, 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } typeMap:bin { "01020304060405" } - links:intvector { 309, 586 } + links:intvector { 309, 587 } } //Z#309 /* Asia/Srednekolymsk */ :table { trans:intvector { -1441188892, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701784000, 717505200, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1414245600 } @@ -1666,7 +1663,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1017820800, -766224000, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -639133200, -620812800, -607597200, -589276800, -576061200, -562924800, -541760400, -528710400, -510224400, -497174400, -478688400, -465638400, -449830800, -434016000, -418208400, -402480000, -386672400, -370944000, -355136400, -339408000, -323600400, -302515200, -291978000, -270979200, -260442000, 133977600, 149785200, 165513600, 181321200, 299606400, 307551600 } typeOffsets:intvector { 29160, 0, 28800, 0, 28800, 3600, 32400, 0 } typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 311, 583 } + links:intvector { 311, 584 } } //Z#311 /* Asia/Tashkent */ :table { trans:intvector { -1441168631, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600 } @@ -1718,11 +1715,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 34374, 0, 28800, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "010206050605060506050605060506050605060506050403050605060506050605060506050605060506050605060506050605060506050605060506050605070503" } } //Z#323 - /* Asia/Vientiane */ :table { - trans:intvector { -2005973424, -1855983920, -1819954800, -1220428800 } - typeOffsets:intvector { 24624, 0, 25200, 0, 25580, 0, 28800, 0 } - typeMap:bin { "02010301" } - } //Z#324 + /* Asia/Vientiane */ :int { 247 } //Z#324 /* Asia/Vladivostok */ :table { trans:intvector { -1487321251, -1247562000, 354895200, 370702800, 386431200, 402238800, 417967200, 433774800, 449589600, 465321600, 481046400, 496771200, 512496000, 528220800, 543945600, 559670400, 575395200, 591120000, 606844800, 622569600, 638294400, 654624000, 670348800, 686077200, 695754000, 701787600, 717508800, 733248000, 748972800, 764697600, 780422400, 796147200, 811872000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1414249200 } typeOffsets:intvector { 31651, 0, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 } @@ -1960,7 +1953,7 @@ zoneinfo64:table(nofallback) { /* Canada/Saskatchewan */ :int { 192 } //Z#383 /* Canada/Yukon */ :int { 219 } //Z#384 /* Chile/Continental */ :int { 198 } //Z#385 - /* Chile/EasterIsland */ :int { 543 } //Z#386 + /* Chile/EasterIsland */ :int { 544 } //Z#386 /* Cuba */ :int { 128 } //Z#387 /* EAT */ :int { 7 } //Z#388 /* ECT */ :int { 465 } //Z#389 @@ -2073,11 +2066,11 @@ zoneinfo64:table(nofallback) { /* Etc/Greenwich */ :int { 395 } //Z#425 /* Etc/UCT */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 426, 601 } + links:intvector { 426, 602 } } //Z#426 /* Etc/UTC */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 427, 428, 430, 615, 616, 620 } + links:intvector { 427, 428, 430, 616, 617, 621 } } //Z#427 /* Etc/Universal */ :int { 427 } //Z#428 /* Etc/Unknown */ :table { @@ -2214,7 +2207,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2016 } - links:intvector { 270, 449, 600 } + links:intvector { 270, 449, 601 } } //Z#449 /* Europe/Jersey */ :int { 455 } //Z#450 /* Europe/Kaliningrad */ :table { @@ -2238,7 +2231,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 453, 582 } + links:intvector { 453, 583 } } //Z#453 /* Europe/Ljubljana */ :int { 435 } //Z#454 /* Europe/London */ :table { @@ -2297,7 +2290,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1688265017, -1656819079, -1641353479, -1627965079, -1618716679, -1596429079, -1593829879, -1589860800, -1542427200, -1539493200, -1525323600, -1522728000, -1491188400, -1247536800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701812800, 717534000, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 9017, 0, 7200, 0, 7200, 3600, 9079, 0, 9079, 3600, 9079, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 } typeMap:bin { "0304030504050706070807060106070607060706070607060706070607060706070602010607060706070607060706070607060706070607060706070607060706070607060706070607060906" } - links:intvector { 462, 618 } + links:intvector { 462, 619 } } //Z#462 /* Europe/Nicosia */ :int { 292 } //Z#463 /* Europe/Oslo */ :table { @@ -2438,7 +2431,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 486, 581 } + links:intvector { 486, 582 } } //Z#486 /* Europe/Zagreb */ :int { 435 } //Z#487 /* Europe/Zaporozhye */ :table { @@ -2537,7 +2530,7 @@ zoneinfo64:table(nofallback) { /* JST */ :int { 318 } //Z#516 /* Jamaica */ :int { 141 } //Z#517 /* Japan */ :int { 318 } //Z#518 - /* Kwajalein */ :int { 557 } //Z#519 + /* Kwajalein */ :int { 558 } //Z#519 /* Libya */ :int { 56 } //Z#520 /* MET */ :table { trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2565,7 +2558,7 @@ zoneinfo64:table(nofallback) { /* NET */ :int { 328 } //Z#528 /* NST */ :int { 540 } //Z#529 /* NZ */ :int { 540 } //Z#530 - /* NZ-CHAT */ :int { 541 } //Z#531 + /* NZ-CHAT */ :int { 542 } //Z#531 /* Navajo */ :int { 109 } //Z#532 /* PLT */ :int { 276 } //Z#533 /* PNT */ :int { 183 } //Z#534 @@ -2600,6 +2593,12 @@ zoneinfo64:table(nofallback) { finalYear:int { 2009 } links:intvector { 228, 231, 529, 530, 540 } } //Z#540 + /* Pacific/Bougainville */ :table { + transPre32:intvector { -1, 1454789160, -1, 1928176784 } + trans:intvector { -868010400, -768906000, 1419696000 } + typeOffsets:intvector { 37336, 0, 32400, 0, 35312, 0, 36000, 0, 39600, 0 } + typeMap:bin { "0203010304" } + } //Z#541 /* Pacific/Chatham */ :table { transPre32:intvector { -1, 1102529668 } trans:intvector { -757426500, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 } @@ -2608,14 +2607,14 @@ zoneinfo64:table(nofallback) { finalRule { "Chatham" } finalRaw:int { 45900 } finalYear:int { 2009 } - links:intvector { 531, 541 } - } //Z#541 + links:intvector { 531, 542 } + } //Z#542 /* Pacific/Chuuk */ :table { transPre32:intvector { -1, 2117478068 } typeOffsets:intvector { 36428, 0, 36000, 0 } typeMap:bin { "01" } - links:intvector { 542, 577, 580 } - } //Z#542 + links:intvector { 543, 578, 581 } + } //Z#543 /* Pacific/Easter */ :table { transPre32:intvector { -1, 1770471960 } trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 } @@ -2624,205 +2623,205 @@ zoneinfo64:table(nofallback) { finalRule { "Chile" } finalRaw:int { -21600 } finalYear:int { 2013 } - links:intvector { 386, 543 } - } //Z#543 + links:intvector { 386, 544 } + } //Z#544 /* Pacific/Efate */ :table { trans:intvector { -1829387596, 433256400, 448977600, 467298000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 } typeOffsets:intvector { 40396, 0, 39600, 0, 39600, 3600 } typeMap:bin { "010201020102010201020102010201020102010201" } - } //Z#544 + } //Z#545 /* Pacific/Enderbury */ :table { transPre32:intvector { -1, 2117555556 } trans:intvector { 307627200, 788958000 } typeOffsets:intvector { -41060, 0, -43200, 0, -39600, 0, 46800, 0 } typeMap:bin { "010203" } - } //Z#545 + } //Z#546 /* Pacific/Fakaofo */ :table { transPre32:intvector { -1, 2117555592 } trans:intvector { 1325242800 } typeOffsets:intvector { -41096, 0, -39600, 0, 46800, 0 } typeMap:bin { "0102" } - } //Z#546 + } //Z#547 /* Pacific/Fiji */ :table { - trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414245600 } + trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414850400, 1421503200, 1446300000 } typeOffsets:intvector { 42944, 0, 43200, 0, 43200, 3600 } - typeMap:bin { "01020102010201020102010201020102" } + typeMap:bin { "010201020102010201020102010201020102" } finalRule { "Fiji" } finalRaw:int { 43200 } - finalYear:int { 2015 } - } //Z#547 + finalYear:int { 2016 } + } //Z#548 /* Pacific/Funafuti */ :table { transPre32:intvector { -1, 2117471484 } typeOffsets:intvector { 43012, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#548 + } //Z#549 /* Pacific/Galapagos */ :table { trans:intvector { -1230746496, 504939600 } typeOffsets:intvector { -21504, 0, -21600, 0, -18000, 0 } typeMap:bin { "0201" } - } //Z#549 + } //Z#550 /* Pacific/Gambier */ :table { trans:intvector { -1806678012 } typeOffsets:intvector { -32388, 0, -32400, 0 } typeMap:bin { "01" } - } //Z#550 + } //Z#551 /* Pacific/Guadalcanal */ :table { trans:intvector { -1806748788 } typeOffsets:intvector { 38388, 0, 39600, 0 } typeMap:bin { "01" } - links:intvector { 551, 585 } - } //Z#551 + links:intvector { 552, 586 } + } //Z#552 /* Pacific/Guam */ :table { transPre32:intvector { -1, 350340556, -1, 2117479756 } typeOffsets:intvector { -51660, 0, 34740, 0, 36000, 0 } typeMap:bin { "0102" } - } //Z#552 + } //Z#553 /* Pacific/Honolulu */ :table { transPre32:intvector { -1, 1960865982 } trans:intvector { -1157283000, -1155436200, -880198200, -765376200, -712150200 } typeOffsets:intvector { -37886, 0, -37800, 0, -37800, 3600, -36000, 0 } typeMap:bin { "010201020103" } - links:intvector { 553, 554, 608 } - } //Z#553 - /* Pacific/Johnston */ :int { 553 } //Z#554 + links:intvector { 554, 555, 609 } + } //Z#554 + /* Pacific/Johnston */ :int { 554 } //Z#555 /* Pacific/Kiritimati */ :table { transPre32:intvector { -1, 2117552256 } trans:intvector { 307622400, 788954400 } typeOffsets:intvector { -37760, 0, -38400, 0, -36000, 0, 50400, 0 } typeMap:bin { "010203" } - } //Z#555 + } //Z#556 /* Pacific/Kosrae */ :table { transPre32:intvector { -1, 2117475380 } trans:intvector { -7988400, 915105600 } typeOffsets:intvector { 39116, 0, 39600, 0, 43200, 0 } typeMap:bin { "010201" } - } //Z#556 + } //Z#557 /* Pacific/Kwajalein */ :table { transPre32:intvector { -1, 2117474336 } trans:intvector { -7988400, 745848000 } typeOffsets:intvector { 40160, 0, -43200, 0, 39600, 0, 43200, 0 } typeMap:bin { "020103" } - links:intvector { 519, 557 } - } //Z#557 + links:intvector { 519, 558 } + } //Z#558 /* Pacific/Majuro */ :table { transPre32:intvector { -1, 2117473408 } trans:intvector { -7988400 } typeOffsets:intvector { 41088, 0, 39600, 0, 43200, 0 } typeMap:bin { "0102" } - } //Z#558 + } //Z#559 /* Pacific/Marquesas */ :table { trans:intvector { -1806676920 } typeOffsets:intvector { -33480, 0, -34200, 0 } typeMap:bin { "01" } - } //Z#559 + } //Z#560 /* Pacific/Midway */ :table { transPre32:intvector { -1, 2117557064 } trans:intvector { -428504400, -420645600 } typeOffsets:intvector { -42568, 0, -39600, 0, -39600, 3600 } typeMap:bin { "010201" } - } //Z#560 + } //Z#561 /* Pacific/Nauru */ :table { trans:intvector { -1545131260, -877347000, -800960400, 294323400 } typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 } typeMap:bin { "02010203" } - } //Z#561 + } //Z#562 /* Pacific/Niue */ :table { transPre32:intvector { -1, 2117555276 } trans:intvector { -599575200, 276089400 } typeOffsets:intvector { -40780, 0, -41400, 0, -40800, 0, -39600, 0 } typeMap:bin { "020103" } - } //Z#562 + } //Z#563 /* Pacific/Norfolk */ :table { transPre32:intvector { -1, 2117474184 } trans:intvector { -599656320 } typeOffsets:intvector { 40312, 0, 40320, 0, 41400, 0 } typeMap:bin { "0102" } - } //Z#563 + } //Z#564 /* Pacific/Noumea */ :table { trans:intvector { -1829387148, 250002000, 257342400, 281451600, 288878400, 849366000, 857228400 } typeOffsets:intvector { 39948, 0, 39600, 0, 39600, 3600 } typeMap:bin { "01020102010201" } - } //Z#564 + } //Z#565 /* Pacific/Pago_Pago */ :table { transPre32:intvector { -1, 1439229064 } trans:intvector { -1861879032 } typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 } typeMap:bin { "0102" } - links:intvector { 565, 573, 614 } - } //Z#565 + links:intvector { 566, 574, 615 } + } //Z#566 /* Pacific/Palau */ :table { transPre32:intvector { -1, 2117482220 } typeOffsets:intvector { 32276, 0, 32400, 0 } typeMap:bin { "01" } - } //Z#566 + } //Z#567 /* Pacific/Pitcairn */ :table { transPre32:intvector { -1, 2117545716 } trans:intvector { 893665800 } typeOffsets:intvector { -31220, 0, -30600, 0, -28800, 0 } typeMap:bin { "0102" } - } //Z#567 + } //Z#568 /* Pacific/Pohnpei */ :table { transPre32:intvector { -1, 2117476524 } typeOffsets:intvector { 37972, 0, 39600, 0 } typeMap:bin { "01" } - links:intvector { 568, 569 } - } //Z#568 - /* Pacific/Ponape */ :int { 568 } //Z#569 + links:intvector { 569, 570 } + } //Z#569 + /* Pacific/Ponape */ :int { 569 } //Z#570 /* Pacific/Port_Moresby */ :table { transPre32:intvector { -1, 1454791176, -1, 1928176784 } typeOffsets:intvector { 35320, 0, 35312, 0, 36000, 0 } typeMap:bin { "0102" } - } //Z#570 + } //Z#571 /* Pacific/Rarotonga */ :table { transPre32:intvector { -1, 2117552840 } trans:intvector { 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 } typeOffsets:intvector { -38344, 0, -37800, 0, -36000, 0, -36000, 1800 } typeMap:bin { "010302030203020302030203020302030203020302030203020302" } - } //Z#571 + } //Z#572 /* Pacific/Saipan */ :table { transPre32:intvector { -1, 350340316, -1, 2117479516 } trans:intvector { -7981200 } typeOffsets:intvector { -51420, 0, 32400, 0, 34980, 0, 36000, 0 } typeMap:bin { "020103" } - } //Z#572 - /* Pacific/Samoa */ :int { 565 } //Z#573 + } //Z#573 + /* Pacific/Samoa */ :int { 566 } //Z#574 /* Pacific/Tahiti */ :table { trans:intvector { -1806674504 } typeOffsets:intvector { -35896, 0, -36000, 0 } typeMap:bin { "01" } - } //Z#574 + } //Z#575 /* Pacific/Tarawa */ :table { transPre32:intvector { -1, 2117472972 } typeOffsets:intvector { 41524, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#575 + } //Z#576 /* Pacific/Tongatapu */ :table { transPre32:intvector { -1, 2117470136 } trans:intvector { -915193200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400 } typeOffsets:intvector { 44360, 0, 44400, 0, 46800, 0, 46800, 3600 } typeMap:bin { "0102030203020302" } - } //Z#576 - /* Pacific/Truk */ :int { 542 } //Z#577 + } //Z#577 + /* Pacific/Truk */ :int { 543 } //Z#578 /* Pacific/Wake */ :table { transPre32:intvector { -1, 2117474508 } typeOffsets:intvector { 39988, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#578 + } //Z#579 /* Pacific/Wallis */ :table { transPre32:intvector { -1, 2117470376 } typeOffsets:intvector { 44120, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#579 - /* Pacific/Yap */ :int { 542 } //Z#580 - /* Poland */ :int { 486 } //Z#581 - /* Portugal */ :int { 453 } //Z#582 - /* ROC */ :int { 311 } //Z#583 - /* ROK */ :int { 307 } //Z#584 - /* SST */ :int { 551 } //Z#585 - /* Singapore */ :int { 309 } //Z#586 + } //Z#580 + /* Pacific/Yap */ :int { 543 } //Z#581 + /* Poland */ :int { 486 } //Z#582 + /* Portugal */ :int { 453 } //Z#583 + /* ROC */ :int { 311 } //Z#584 + /* ROK */ :int { 307 } //Z#585 + /* SST */ :int { 552 } //Z#586 + /* Singapore */ :int { 309 } //Z#587 /* SystemV/AST4 */ :table { typeOffsets:intvector { -14400, 0 } - } //Z#587 + } //Z#588 /* SystemV/AST4ADT */ :table { transPre32:intvector { -1, 2096195296, -1, 2111916496, -1, 2127644896, -1, 2143366096 } trans:intvector { -2135872800, -2120151600, -2104423200, -2088702000, -2072973600, -2056647600, -2040919200, -2025198000, -2009469600, -1993748400, -1978020000, -1962298800, -1946570400, -1930849200, -1915120800, -1898794800, -1883671200, -1867345200, -1851616800, -1835895600, -1820167200, -1804446000, -1788717600, -1772996400, -1757268000, -1741546800, -1725818400, -1709492400, -1693764000, -1678042800, -1662314400, -1646593200, -1630864800, -1615143600, -1599415200, -1583694000, -1567965600, -1551639600, -1536516000, -1520190000, -1504461600, -1488740400, -1473012000, -1457290800, -1441562400, -1425841200, -1410112800, -1394391600, -1378663200, -1362337200, -1347213600, -1330887600, -1315159200, -1299438000, -1283709600, -1267988400, -1252260000, -1236538800, -1220810400, -1205089200, -1189360800, -1173034800, -1157306400, -1141585200, -1125856800, -1110135600, -1094407200, -1078686000, -1062957600, -1047236400, -1031508000, -1015182000, -1000058400, -983732400, -968004000, -952282800, -936554400, -920833200, -905104800, -889383600, -873655200, -857934000, -842205600, -825879600, -810151200, -794430000, -778701600, -762980400, -747252000, -731530800, -715802400, -700081200, -684352800, -668026800, -652903200, -636577200, -620848800, -605127600, -589399200, -573678000, -557949600, -542228400, -526500000, -510778800, -495050400, -478724400, -463600800, -447274800, -431546400, -415825200, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 126684000, 154501200, 162367200, 183531600, 199260000, 215586000 } @@ -2831,10 +2830,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -14400 } finalYear:int { 1977 } - } //Z#588 + } //Z#589 /* SystemV/CST6 */ :table { typeOffsets:intvector { -21600, 0 } - } //Z#589 + } //Z#590 /* SystemV/CST6CDT */ :table { transPre32:intvector { -1, 2096202496, -1, 2111923696, -1, 2127652096, -1, 2143373296 } trans:intvector { -2135865600, -2120144400, -2104416000, -2088694800, -2072966400, -2056640400, -2040912000, -2025190800, -2009462400, -1993741200, -1978012800, -1962291600, -1946563200, -1930842000, -1915113600, -1898787600, -1883664000, -1867338000, -1851609600, -1835888400, -1820160000, -1804438800, -1788710400, -1772989200, -1757260800, -1741539600, -1725811200, -1709485200, -1693756800, -1678035600, -1662307200, -1646586000, -1630857600, -1615136400, -1599408000, -1583686800, -1567958400, -1551632400, -1536508800, -1520182800, -1504454400, -1488733200, -1473004800, -1457283600, -1441555200, -1425834000, -1410105600, -1394384400, -1378656000, -1362330000, -1347206400, -1330880400, -1315152000, -1299430800, -1283702400, -1267981200, -1252252800, -1236531600, -1220803200, -1205082000, -1189353600, -1173027600, -1157299200, -1141578000, -1125849600, -1110128400, -1094400000, -1078678800, -1062950400, -1047229200, -1031500800, -1015174800, -1000051200, -983725200, -967996800, -952275600, -936547200, -920826000, -905097600, -889376400, -873648000, -857926800, -842198400, -825872400, -810144000, -794422800, -778694400, -762973200, -747244800, -731523600, -715795200, -700074000, -684345600, -668019600, -652896000, -636570000, -620841600, -605120400, -589392000, -573670800, -557942400, -542221200, -526492800, -510771600, -495043200, -478717200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 154508400, 162374400, 183538800, 199267200, 215593200 } @@ -2843,10 +2842,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -21600 } finalYear:int { 1977 } - } //Z#590 + } //Z#591 /* SystemV/EST5 */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#591 + } //Z#592 /* SystemV/EST5EDT */ :table { transPre32:intvector { -1, 2096198896, -1, 2111920096, -1, 2127648496, -1, 2143369696 } trans:intvector { -2135869200, -2120148000, -2104419600, -2088698400, -2072970000, -2056644000, -2040915600, -2025194400, -2009466000, -1993744800, -1978016400, -1962295200, -1946566800, -1930845600, -1915117200, -1898791200, -1883667600, -1867341600, -1851613200, -1835892000, -1820163600, -1804442400, -1788714000, -1772992800, -1757264400, -1741543200, -1725814800, -1709488800, -1693760400, -1678039200, -1662310800, -1646589600, -1630861200, -1615140000, -1599411600, -1583690400, -1567962000, -1551636000, -1536512400, -1520186400, -1504458000, -1488736800, -1473008400, -1457287200, -1441558800, -1425837600, -1410109200, -1394388000, -1378659600, -1362333600, -1347210000, -1330884000, -1315155600, -1299434400, -1283706000, -1267984800, -1252256400, -1236535200, -1220806800, -1205085600, -1189357200, -1173031200, -1157302800, -1141581600, -1125853200, -1110132000, -1094403600, -1078682400, -1062954000, -1047232800, -1031504400, -1015178400, -1000054800, -983728800, -968000400, -952279200, -936550800, -920829600, -905101200, -889380000, -873651600, -857930400, -842202000, -825876000, -810147600, -794426400, -778698000, -762976800, -747248400, -731527200, -715798800, -700077600, -684349200, -668023200, -652899600, -636573600, -620845200, -605124000, -589395600, -573674400, -557946000, -542224800, -526496400, -510775200, -495046800, -478720800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 154504800, 162370800, 183535200, 199263600, 215589600 } @@ -2855,13 +2854,13 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -18000 } finalYear:int { 1977 } - } //Z#592 + } //Z#593 /* SystemV/HST10 */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#593 + } //Z#594 /* SystemV/MST7 */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#594 + } //Z#595 /* SystemV/MST7MDT */ :table { transPre32:intvector { -1, 2096206096, -1, 2111927296, -1, 2127655696, -1, 2143376896 } trans:intvector { -2135862000, -2120140800, -2104412400, -2088691200, -2072962800, -2056636800, -2040908400, -2025187200, -2009458800, -1993737600, -1978009200, -1962288000, -1946559600, -1930838400, -1915110000, -1898784000, -1883660400, -1867334400, -1851606000, -1835884800, -1820156400, -1804435200, -1788706800, -1772985600, -1757257200, -1741536000, -1725807600, -1709481600, -1693753200, -1678032000, -1662303600, -1646582400, -1630854000, -1615132800, -1599404400, -1583683200, -1567954800, -1551628800, -1536505200, -1520179200, -1504450800, -1488729600, -1473001200, -1457280000, -1441551600, -1425830400, -1410102000, -1394380800, -1378652400, -1362326400, -1347202800, -1330876800, -1315148400, -1299427200, -1283698800, -1267977600, -1252249200, -1236528000, -1220799600, -1205078400, -1189350000, -1173024000, -1157295600, -1141574400, -1125846000, -1110124800, -1094396400, -1078675200, -1062946800, -1047225600, -1031497200, -1015171200, -1000047600, -983721600, -967993200, -952272000, -936543600, -920822400, -905094000, -889372800, -873644400, -857923200, -842194800, -825868800, -810140400, -794419200, -778690800, -762969600, -747241200, -731520000, -715791600, -700070400, -684342000, -668016000, -652892400, -636566400, -620838000, -605116800, -589388400, -573667200, -557938800, -542217600, -526489200, -510768000, -495039600, -478713600, -463590000, -447264000, -431535600, -415814400, -400086000, -384364800, -368636400, -352915200, -337186800, -321465600, -305737200, -289411200, -273682800, -257961600, -242233200, -226512000, -210783600, -195062400, -179334000, -163612800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 154512000, 162378000, 183542400, 199270800, 215596800 } @@ -2870,10 +2869,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -25200 } finalYear:int { 1977 } - } //Z#595 + } //Z#596 /* SystemV/PST8 */ :table { typeOffsets:intvector { -28800, 0 } - } //Z#596 + } //Z#597 /* SystemV/PST8PDT */ :table { transPre32:intvector { -1, 2096209696, -1, 2111930896, -1, 2127659296, -1, 2143380496 } trans:intvector { -2135858400, -2120137200, -2104408800, -2088687600, -2072959200, -2056633200, -2040904800, -2025183600, -2009455200, -1993734000, -1978005600, -1962284400, -1946556000, -1930834800, -1915106400, -1898780400, -1883656800, -1867330800, -1851602400, -1835881200, -1820152800, -1804431600, -1788703200, -1772982000, -1757253600, -1741532400, -1725804000, -1709478000, -1693749600, -1678028400, -1662300000, -1646578800, -1630850400, -1615129200, -1599400800, -1583679600, -1567951200, -1551625200, -1536501600, -1520175600, -1504447200, -1488726000, -1472997600, -1457276400, -1441548000, -1425826800, -1410098400, -1394377200, -1378648800, -1362322800, -1347199200, -1330873200, -1315144800, -1299423600, -1283695200, -1267974000, -1252245600, -1236524400, -1220796000, -1205074800, -1189346400, -1173020400, -1157292000, -1141570800, -1125842400, -1110121200, -1094392800, -1078671600, -1062943200, -1047222000, -1031493600, -1015167600, -1000044000, -983718000, -967989600, -952268400, -936540000, -920818800, -905090400, -889369200, -873640800, -857919600, -842191200, -825865200, -810136800, -794415600, -778687200, -762966000, -747237600, -731516400, -715788000, -700066800, -684338400, -668012400, -652888800, -636562800, -620834400, -605113200, -589384800, -573663600, -557935200, -542214000, -526485600, -510764400, -495036000, -478710000, -463586400, -447260400, -431532000, -415810800, -400082400, -384361200, -368632800, -352911600, -337183200, -321462000, -305733600, -289407600, -273679200, -257958000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 154515600, 162381600, 183546000, 199274400, 215600400 } @@ -2882,10 +2881,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -28800 } finalYear:int { 1977 } - } //Z#597 + } //Z#598 /* SystemV/YST9 */ :table { typeOffsets:intvector { -32400, 0 } - } //Z#598 + } //Z#599 /* SystemV/YST9YDT */ :table { transPre32:intvector { -1, 2096213296, -1, 2111934496, -1, 2127662896, -1, 2143384096 } trans:intvector { -2135854800, -2120133600, -2104405200, -2088684000, -2072955600, -2056629600, -2040901200, -2025180000, -2009451600, -1993730400, -1978002000, -1962280800, -1946552400, -1930831200, -1915102800, -1898776800, -1883653200, -1867327200, -1851598800, -1835877600, -1820149200, -1804428000, -1788699600, -1772978400, -1757250000, -1741528800, -1725800400, -1709474400, -1693746000, -1678024800, -1662296400, -1646575200, -1630846800, -1615125600, -1599397200, -1583676000, -1567947600, -1551621600, -1536498000, -1520172000, -1504443600, -1488722400, -1472994000, -1457272800, -1441544400, -1425823200, -1410094800, -1394373600, -1378645200, -1362319200, -1347195600, -1330869600, -1315141200, -1299420000, -1283691600, -1267970400, -1252242000, -1236520800, -1220792400, -1205071200, -1189342800, -1173016800, -1157288400, -1141567200, -1125838800, -1110117600, -1094389200, -1078668000, -1062939600, -1047218400, -1031490000, -1015164000, -1000040400, -983714400, -967986000, -952264800, -936536400, -920815200, -905086800, -889365600, -873637200, -857916000, -842187600, -825861600, -810133200, -794412000, -778683600, -762962400, -747234000, -731512800, -715784400, -700063200, -684334800, -668008800, -652885200, -636559200, -620830800, -605109600, -589381200, -573660000, -557931600, -542210400, -526482000, -510760800, -495032400, -478706400, -463582800, -447256800, -431528400, -415807200, -400078800, -384357600, -368629200, -352908000, -337179600, -321458400, -305730000, -289404000, -273675600, -257954400, -242226000, -226504800, -210776400, -195055200, -179326800, -163605600, -147877200, -131551200, -116427600, -100101600, -84373200, -68652000, -52923600, -37202400, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 154519200, 162385200, 183549600, 199278000, 215604000 } @@ -2894,26 +2893,26 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -32400 } finalYear:int { 1977 } - } //Z#599 - /* Turkey */ :int { 449 } //Z#600 - /* UCT */ :int { 426 } //Z#601 - /* US/Alaska */ :int { 60 } //Z#602 - /* US/Aleutian */ :int { 59 } //Z#603 - /* US/Arizona */ :int { 183 } //Z#604 - /* US/Central */ :int { 98 } //Z#605 - /* US/East-Indiana */ :int { 130 } //Z#606 - /* US/Eastern */ :int { 172 } //Z#607 - /* US/Hawaii */ :int { 553 } //Z#608 - /* US/Indiana-Starke */ :int { 131 } //Z#609 - /* US/Michigan */ :int { 110 } //Z#610 - /* US/Mountain */ :int { 109 } //Z#611 - /* US/Pacific */ :int { 150 } //Z#612 - /* US/Pacific-New */ :int { 150 } //Z#613 - /* US/Samoa */ :int { 565 } //Z#614 - /* UTC */ :int { 427 } //Z#615 - /* Universal */ :int { 427 } //Z#616 - /* VST */ :int { 266 } //Z#617 - /* W-SU */ :int { 462 } //Z#618 + } //Z#600 + /* Turkey */ :int { 449 } //Z#601 + /* UCT */ :int { 426 } //Z#602 + /* US/Alaska */ :int { 60 } //Z#603 + /* US/Aleutian */ :int { 59 } //Z#604 + /* US/Arizona */ :int { 183 } //Z#605 + /* US/Central */ :int { 98 } //Z#606 + /* US/East-Indiana */ :int { 130 } //Z#607 + /* US/Eastern */ :int { 172 } //Z#608 + /* US/Hawaii */ :int { 554 } //Z#609 + /* US/Indiana-Starke */ :int { 131 } //Z#610 + /* US/Michigan */ :int { 110 } //Z#611 + /* US/Mountain */ :int { 109 } //Z#612 + /* US/Pacific */ :int { 150 } //Z#613 + /* US/Pacific-New */ :int { 150 } //Z#614 + /* US/Samoa */ :int { 566 } //Z#615 + /* UTC */ :int { 427 } //Z#616 + /* Universal */ :int { 427 } //Z#617 + /* VST */ :int { 266 } //Z#618 + /* W-SU */ :int { 462 } //Z#619 /* WET */ :table { trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 0, 0, 0, 3600 } @@ -2921,8 +2920,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#619 - /* Zulu */ :int { 427 } //Z#620 + } //Z#620 + /* Zulu */ :int { 427 } //Z#621 } Names { "ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6 @@ -3083,28 +3082,29 @@ zoneinfo64:table(nofallback) { ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 525 ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 530 ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 538 - ,"Pacific/Apia","Pacific/Auckland","Pacific/Chatham" // 541 - ,"Pacific/Chuuk","Pacific/Easter","Pacific/Efate","Pacific/Enderbury" // 545 - ,"Pacific/Fakaofo","Pacific/Fiji","Pacific/Funafuti" // 548 - ,"Pacific/Galapagos","Pacific/Gambier","Pacific/Guadalcanal" // 551 - ,"Pacific/Guam","Pacific/Honolulu","Pacific/Johnston" // 554 - ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 557 - ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 560 - ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 564 - ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 567 - ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 570 - ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 573 - ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 576 - ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 580 - ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 586 - ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 590 - ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 594 - ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 597 - ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 602 - ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 606 - ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 610 - ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 614 - ,"UTC","Universal","VST","W-SU","WET","Zulu" // 620 + ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 541 + ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 544 + ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 547 + ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 550 + ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 553 + ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kiritimati" // 556 + ,"Pacific/Kosrae","Pacific/Kwajalein","Pacific/Majuro" // 559 + ,"Pacific/Marquesas","Pacific/Midway","Pacific/Nauru" // 562 + ,"Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 565 + ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 568 + ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 571 + ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 574 + ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 577 + ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 581 + ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 587 + ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 591 + ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 595 + ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 598 + ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 603 + ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 607 + ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 611 + ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 615 + ,"UTC","Universal","VST","W-SU","WET","Zulu" // 621 } Rules { AN:intvector { @@ -3153,7 +3153,7 @@ zoneinfo64:table(nofallback) { 3, -30, -6, 0, 1, 8, -30, -5, 86400, 0, 3600 } //_#14 Fiji:intvector { - 9, 21, -1, 7200, 0, 0, 18, -1, 7200, 0, 3600 + 10, 1, -1, 7200, 0, 0, 18, -1, 10800, 0, 3600 } //_#15 Haiti:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 @@ -3752,85 +3752,86 @@ zoneinfo64:table(nofallback) { "001",//Z#538 PST8PDT "WS", //Z#539 Pacific/Apia "NZ", //Z#540 Pacific/Auckland - "NZ", //Z#541 Pacific/Chatham - "FM", //Z#542 Pacific/Chuuk - "CL", //Z#543 Pacific/Easter - "VU", //Z#544 Pacific/Efate - "KI", //Z#545 Pacific/Enderbury - "TK", //Z#546 Pacific/Fakaofo - "FJ", //Z#547 Pacific/Fiji - "TV", //Z#548 Pacific/Funafuti - "EC", //Z#549 Pacific/Galapagos - "PF", //Z#550 Pacific/Gambier - "SB", //Z#551 Pacific/Guadalcanal - "GU", //Z#552 Pacific/Guam - "US", //Z#553 Pacific/Honolulu - "UM", //Z#554 Pacific/Johnston - "KI", //Z#555 Pacific/Kiritimati - "FM", //Z#556 Pacific/Kosrae - "MH", //Z#557 Pacific/Kwajalein - "MH", //Z#558 Pacific/Majuro - "PF", //Z#559 Pacific/Marquesas - "UM", //Z#560 Pacific/Midway - "NR", //Z#561 Pacific/Nauru - "NU", //Z#562 Pacific/Niue - "NF", //Z#563 Pacific/Norfolk - "NC", //Z#564 Pacific/Noumea - "AS", //Z#565 Pacific/Pago_Pago - "PW", //Z#566 Pacific/Palau - "PN", //Z#567 Pacific/Pitcairn - "FM", //Z#568 Pacific/Pohnpei - "FM", //Z#569 Pacific/Ponape - "PG", //Z#570 Pacific/Port_Moresby - "CK", //Z#571 Pacific/Rarotonga - "MP", //Z#572 Pacific/Saipan - "AS", //Z#573 Pacific/Samoa - "PF", //Z#574 Pacific/Tahiti - "KI", //Z#575 Pacific/Tarawa - "TO", //Z#576 Pacific/Tongatapu - "FM", //Z#577 Pacific/Truk - "UM", //Z#578 Pacific/Wake - "WF", //Z#579 Pacific/Wallis - "FM", //Z#580 Pacific/Yap - "PL", //Z#581 Poland - "PT", //Z#582 Portugal - "TW", //Z#583 ROC - "KR", //Z#584 ROK - "SB", //Z#585 SST - "SG", //Z#586 Singapore - "001",//Z#587 SystemV/AST4 - "001",//Z#588 SystemV/AST4ADT - "001",//Z#589 SystemV/CST6 - "001",//Z#590 SystemV/CST6CDT - "001",//Z#591 SystemV/EST5 - "001",//Z#592 SystemV/EST5EDT - "001",//Z#593 SystemV/HST10 - "001",//Z#594 SystemV/MST7 - "001",//Z#595 SystemV/MST7MDT - "001",//Z#596 SystemV/PST8 - "001",//Z#597 SystemV/PST8PDT - "001",//Z#598 SystemV/YST9 - "001",//Z#599 SystemV/YST9YDT - "TR", //Z#600 Turkey - "001",//Z#601 UCT - "US", //Z#602 US/Alaska - "US", //Z#603 US/Aleutian - "US", //Z#604 US/Arizona - "US", //Z#605 US/Central - "US", //Z#606 US/East-Indiana - "US", //Z#607 US/Eastern - "US", //Z#608 US/Hawaii - "US", //Z#609 US/Indiana-Starke - "US", //Z#610 US/Michigan - "US", //Z#611 US/Mountain - "US", //Z#612 US/Pacific - "US", //Z#613 US/Pacific-New - "AS", //Z#614 US/Samoa - "001",//Z#615 UTC - "001",//Z#616 Universal - "VN", //Z#617 VST - "RU", //Z#618 W-SU - "001",//Z#619 WET - "001",//Z#620 Zulu + "PG", //Z#541 Pacific/Bougainville + "NZ", //Z#542 Pacific/Chatham + "FM", //Z#543 Pacific/Chuuk + "CL", //Z#544 Pacific/Easter + "VU", //Z#545 Pacific/Efate + "KI", //Z#546 Pacific/Enderbury + "TK", //Z#547 Pacific/Fakaofo + "FJ", //Z#548 Pacific/Fiji + "TV", //Z#549 Pacific/Funafuti + "EC", //Z#550 Pacific/Galapagos + "PF", //Z#551 Pacific/Gambier + "SB", //Z#552 Pacific/Guadalcanal + "GU", //Z#553 Pacific/Guam + "US", //Z#554 Pacific/Honolulu + "UM", //Z#555 Pacific/Johnston + "KI", //Z#556 Pacific/Kiritimati + "FM", //Z#557 Pacific/Kosrae + "MH", //Z#558 Pacific/Kwajalein + "MH", //Z#559 Pacific/Majuro + "PF", //Z#560 Pacific/Marquesas + "UM", //Z#561 Pacific/Midway + "NR", //Z#562 Pacific/Nauru + "NU", //Z#563 Pacific/Niue + "NF", //Z#564 Pacific/Norfolk + "NC", //Z#565 Pacific/Noumea + "AS", //Z#566 Pacific/Pago_Pago + "PW", //Z#567 Pacific/Palau + "PN", //Z#568 Pacific/Pitcairn + "FM", //Z#569 Pacific/Pohnpei + "FM", //Z#570 Pacific/Ponape + "PG", //Z#571 Pacific/Port_Moresby + "CK", //Z#572 Pacific/Rarotonga + "MP", //Z#573 Pacific/Saipan + "AS", //Z#574 Pacific/Samoa + "PF", //Z#575 Pacific/Tahiti + "KI", //Z#576 Pacific/Tarawa + "TO", //Z#577 Pacific/Tongatapu + "FM", //Z#578 Pacific/Truk + "UM", //Z#579 Pacific/Wake + "WF", //Z#580 Pacific/Wallis + "FM", //Z#581 Pacific/Yap + "PL", //Z#582 Poland + "PT", //Z#583 Portugal + "TW", //Z#584 ROC + "KR", //Z#585 ROK + "SB", //Z#586 SST + "SG", //Z#587 Singapore + "001",//Z#588 SystemV/AST4 + "001",//Z#589 SystemV/AST4ADT + "001",//Z#590 SystemV/CST6 + "001",//Z#591 SystemV/CST6CDT + "001",//Z#592 SystemV/EST5 + "001",//Z#593 SystemV/EST5EDT + "001",//Z#594 SystemV/HST10 + "001",//Z#595 SystemV/MST7 + "001",//Z#596 SystemV/MST7MDT + "001",//Z#597 SystemV/PST8 + "001",//Z#598 SystemV/PST8PDT + "001",//Z#599 SystemV/YST9 + "001",//Z#600 SystemV/YST9YDT + "TR", //Z#601 Turkey + "001",//Z#602 UCT + "US", //Z#603 US/Alaska + "US", //Z#604 US/Aleutian + "US", //Z#605 US/Arizona + "US", //Z#606 US/Central + "US", //Z#607 US/East-Indiana + "US", //Z#608 US/Eastern + "US", //Z#609 US/Hawaii + "US", //Z#610 US/Indiana-Starke + "US", //Z#611 US/Michigan + "US", //Z#612 US/Mountain + "US", //Z#613 US/Pacific + "US", //Z#614 US/Pacific-New + "AS", //Z#615 US/Samoa + "001",//Z#616 UTC + "001",//Z#617 Universal + "VN", //Z#618 VST + "RU", //Z#619 W-SU + "001",//Z#620 WET + "001",//Z#621 Zulu } } diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index 1ac26b1e7..dabbfdcf6 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From de0bc8d2be370bea700cd501190a17f044c67ab2 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 23 Oct 2014 13:08:54 -0700 Subject: Make sl short date formats more consistent. Bug: 17431155 (cherry picked from commit 458069c9b66bef036b1a338d9112bcfac921bd4b) Change-Id: I3230486da7f23d61f90f7b30dccb4b8bd359a8d5 --- icu4c/source/data/locales/sl.txt | 8 ++++---- icu4c/source/stubdata/icudt53l.dat | Bin 18724448 -> 18724432 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index eb7b57e5c..c0d9e97bd 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -211,7 +211,7 @@ sl{ "EEEE, dd. MMMM y G", "dd. MMMM y G", "d. MMM y G", - "d. MM. yy GGGGG", + "d. M. yy GGGGG", // android-changed: http://b/17431155 "{1} {0}", "{1} {0}", "{1} {0}", @@ -229,7 +229,7 @@ sl{ Hm{"HH.mm"} Hms{"HH.mm.ss"} M{"L"} - MEd{"E, d. MM."} + MEd{"E, d. M."} // android-changed: http://b/17431155 MMM{"LLL"} MMMEd{"E, d. MMM"} MMMd{"d. MMM"} @@ -360,7 +360,7 @@ sl{ "EEEE, dd. MMMM y", "dd. MMMM y", "d. MMM y", - "d. MM. yy", + "d. M. yy", // android-changed: http://b/17431155 "{1} {0}", "{1} {0}", "{1} {0}", @@ -385,7 +385,7 @@ sl{ Hm{"HH.mm"} Hms{"HH.mm.ss"} M{"L"} - MEd{"E, d. MM."} + MEd{"E, d. M."} // android-changed: http://b/17431155 MMM{"LLL"} MMMEd{"E, d. MMM"} MMMd{"d. MMM"} diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index dabbfdcf6..5a80a2b51 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From cef75a02f66186f8777d83238b541dec3e3c4a0b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 11 Nov 2014 16:46:28 -0800 Subject: Upgrade icu to tzdata2014j. From the release notes: Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Bug: 18330681 (cherry picked from commit 56953208e098091f794dc1efb00e50c169f83fc1) Change-Id: I686be1dc2747554ae4731a93d676e38595e0d8e2 --- icu4c/source/data/misc/zoneinfo64.txt | 92 +++++++++------------------------- icu4c/source/stubdata/icudt53l.dat | Bin 18724432 -> 18723744 bytes 2 files changed, 25 insertions(+), 67 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index d0ec6f9ed..dfdc306ff 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,9 +3,9 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Oct 22 12:13:57 2014 +// Build date: Tue Nov 11 16:31:19 2014 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2014i +// Olson version: 2014j // ICU version: 53.1.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2014i" } + TZVersion { "2014j" } Zones:array { /* ACT */ :int { 347 } //Z#0 /* AET */ :int { 359 } //Z#1 @@ -31,27 +31,15 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -52, 0, 0, 0, 0, 1200 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } } //Z#6 - /* Africa/Addis_Ababa */ :table { - transPre32:intvector { -1, 1139284408 } - trans:intvector { -1062210920 } - typeOffsets:intvector { 9288, 0, 9320, 0, 10800, 0 } - typeMap:bin { "0102" } - links:intvector { 7, 388 } - } //Z#7 + /* Africa/Addis_Ababa */ :int { 48 } //Z#7 /* Africa/Algiers */ :table { transPre32:intvector { -1, 1808288224 } trans:intvector { -1855958961, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1531443600, -956365200, -950486400, -942012000, -812502000, -796262400, -781052400, -766630800, -733280400, -439430400, -212029200, 41468400, 54774000, 231724800, 246236400, 259545600, 275274000, 309740400, 325468800, 341802000, 357523200 } typeOffsets:intvector { 732, 0, 0, 0, 0, 3600, 561, 0, 3600, 0, 3600, 3600 } typeMap:bin { "03010201020102010201020102010201040504050401040102010204050401020104" } } //Z#8 - /* Africa/Asmara */ :table { - transPre32:intvector { -1, 1770436364 } - trans:intvector { -1062210920 } - typeOffsets:intvector { 9332, 0, 9320, 0, 10800, 0 } - typeMap:bin { "0102" } - links:intvector { 9, 10 } - } //Z#9 - /* Africa/Asmera */ :int { 9 } //Z#10 + /* Africa/Asmara */ :int { 48 } //Z#9 + /* Africa/Asmera */ :int { 48 } //Z#10 /* Africa/Bamako */ :int { 5 } //Z#11 /* Africa/Bangui */ :int { 36 } //Z#12 /* Africa/Banjul */ :int { 5 } //Z#13 @@ -93,16 +81,8 @@ zoneinfo64:table(nofallback) { } //Z#20 /* Africa/Conakry */ :int { 5 } //Z#21 /* Africa/Dakar */ :int { 5 } //Z#22 - /* Africa/Dar_es_Salaam */ :table { - trans:intvector { -1230777428, -694321200, -284006700 } - typeOffsets:intvector { 9428, 0, 9900, 0, 10800, 0 } - typeMap:bin { "020102" } - } //Z#23 - /* Africa/Djibouti */ :table { - trans:intvector { -1846291956 } - typeOffsets:intvector { 10356, 0, 10800, 0 } - typeMap:bin { "01" } - } //Z#24 + /* Africa/Dar_es_Salaam */ :int { 48 } //Z#23 + /* Africa/Djibouti */ :int { 48 } //Z#24 /* Africa/Douala */ :int { 36 } //Z#25 /* Africa/El_Aaiun */ :table { trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434160800, 1437184800, 1445738400, 1459044000, 1465005600, 1468029600, 1477792800, 1490493600, 1495245600, 1498874400, 1509242400, 1521943200, 1526090400, 1529114400, 1540692000, 1553997600, 1556935200, 1559959200, 1572141600, 1585447200, 1587175200, 1590804000, 1603591200, 1616896800, 1618020000, 1621044000, 1635645600, 1648346400, 1648864800, 1651888800, 1667095200, 1682128800, 1698544800, 1712973600, 1729994400, 1743818400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077063200, 2090455200, 2107908000, 2121904800, 2138752800 } @@ -124,11 +104,7 @@ zoneinfo64:table(nofallback) { links:intvector { 30, 44, 45 } } //Z#30 /* Africa/Juba */ :int { 33 } //Z#31 - /* Africa/Kampala */ :table { - trans:intvector { -1309745380, -1262314800, -694319400, -410237100 } - typeOffsets:intvector { 7780, 0, 9000, 0, 9900, 0, 10800, 0 } - typeMap:bin { "03010203" } - } //Z#32 + /* Africa/Kampala */ :int { 48 } //Z#32 /* Africa/Khartoum */ :table { trans:intvector { -1230775808, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400 } typeOffsets:intvector { 7808, 0, 7200, 0, 7200, 3600, 10800, 0 } @@ -157,12 +133,7 @@ zoneinfo64:table(nofallback) { } //Z#43 /* Africa/Maseru */ :int { 30 } //Z#44 /* Africa/Mbabane */ :int { 30 } //Z#45 - /* Africa/Mogadishu */ :table { - transPre32:intvector { -1, 1891394808 } - trans:intvector { -1230778800, -410236200 } - typeOffsets:intvector { 10888, 0, 9000, 0, 10800, 0 } - typeMap:bin { "020102" } - } //Z#46 + /* Africa/Mogadishu */ :int { 48 } //Z#46 /* Africa/Monrovia */ :table { trans:intvector { -1604359012, 73529070 } typeOffsets:intvector { -2588, 0, -2670, 0, 0, 0 } @@ -172,6 +143,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1309746436, -1262314800, -946780200, -315629100 } typeOffsets:intvector { 8836, 0, 9000, 0, 9900, 0, 10800, 0 } typeMap:bin { "03010203" } + links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 388, 503, 507, 512 } } //Z#48 /* Africa/Ndjamena */ :table { trans:intvector { -1830387612, 308703600, 321314400 } @@ -566,9 +538,9 @@ zoneinfo64:table(nofallback) { } //Z#120 /* America/Grand_Turk */ :table { transPre32:intvector { -1, 1770462768 } - trans:intvector { -1827687169, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000 } + trans:intvector { -1827687169, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600 } typeOffsets:intvector { -17072, 0, -18431, 0, -18000, 0, -18000, 3600, -14400, 0 } - typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" } + typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" } } //Z#121 /* America/Grenada */ :int { 185 } //Z#122 /* America/Guadeloupe */ :int { 185 } //Z#123 @@ -1597,10 +1569,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "02040203020301" } } //Z#298 /* Asia/Pyongyang */ :table { - transPre32:intvector { -1, 1770415516 } - trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -264931200 } - typeOffsets:intvector { 30180, 0, 28800, 0, 30600, 0, 32400, 0 } - typeMap:bin { "020302030103" } + trans:intvector { -1948782180, -1830414600 } + typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 } + typeMap:bin { "0102" } } //Z#299 /* Asia/Qatar */ :table { trans:intvector { -1577935568, 76190400 } @@ -1634,10 +1605,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "010203040302030203020302030203020302030203020302" } } //Z#306 /* Asia/Seoul */ :table { - transPre32:intvector { -1, 1770415224 } - trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -303984000, -293533200, -264931200, -39515400, 547570800, 560872800, 579020400, 592322400 } - typeOffsets:intvector { 30472, 0, 28800, 0, 28800, 3600, 30600, 0, 32400, 0, 32400, 3600 } - typeMap:bin { "03040304010201030405040504" } + trans:intvector { -1948782472, -1830414600, -498128400, -462702600, -451733400, -429784200, -418296600, -399544200, -387451800, -368094600, -356002200, -336645000, -324552600, -305195400, -293103000, -264933000, 547578000, 560883600, 579027600, 592333200 } + typeOffsets:intvector { 30472, 0, 30600, 0, 30600, 3600, 32400, 0, 32400, 3600 } + typeMap:bin { "0103010201020102010201020102010304030403" } links:intvector { 307, 585 } } //Z#307 /* Asia/Shanghai */ :table { @@ -1955,7 +1925,7 @@ zoneinfo64:table(nofallback) { /* Chile/Continental */ :int { 198 } //Z#385 /* Chile/EasterIsland */ :int { 544 } //Z#386 /* Cuba */ :int { 128 } //Z#387 - /* EAT */ :int { 7 } //Z#388 + /* EAT */ :int { 48 } //Z#388 /* ECT */ :int { 465 } //Z#389 /* EET */ :table { trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2470,11 +2440,7 @@ zoneinfo64:table(nofallback) { /* IET */ :int { 130 } //Z#500 /* IST */ :int { 281 } //Z#501 /* Iceland */ :int { 337 } //Z#502 - /* Indian/Antananarivo */ :table { - trans:intvector { -1846293004, -499924800, -492062400 } - typeOffsets:intvector { 11404, 0, 10800, 0, 10800, 3600 } - typeMap:bin { "010201" } - } //Z#503 + /* Indian/Antananarivo */ :int { 48 } //Z#503 /* Indian/Chagos */ :table { trans:intvector { -1988167780, 820436400 } typeOffsets:intvector { 17380, 0, 18000, 0, 21600, 0 } @@ -2490,11 +2456,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 23260, 0, 23400, 0 } typeMap:bin { "01" } } //Z#506 - /* Indian/Comoro */ :table { - trans:intvector { -1846291984 } - typeOffsets:intvector { 10384, 0, 10800, 0 } - typeMap:bin { "01" } - } //Z#507 + /* Indian/Comoro */ :int { 48 } //Z#507 /* Indian/Kerguelen */ :table { trans:intvector { -631152000 } typeOffsets:intvector { 0, 0, 18000, 0 } @@ -2515,11 +2477,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 13800, 0, 14400, 0, 14400, 3600 } typeMap:bin { "0102010201" } } //Z#511 - /* Indian/Mayotte */ :table { - trans:intvector { -1846292456 } - typeOffsets:intvector { 10856, 0, 10800, 0 } - typeMap:bin { "01" } - } //Z#512 + /* Indian/Mayotte */ :int { 48 } //Z#512 /* Indian/Reunion */ :table { trans:intvector { -1848886912 } typeOffsets:intvector { 13312, 0, 14400, 0 } @@ -3221,7 +3179,7 @@ zoneinfo64:table(nofallback) { "ET", //Z#7 Africa/Addis_Ababa "DZ", //Z#8 Africa/Algiers "ER", //Z#9 Africa/Asmara - "ER", //Z#10 Africa/Asmera + "KE", //Z#10 Africa/Asmera "ML", //Z#11 Africa/Bamako "CF", //Z#12 Africa/Bangui "GM", //Z#13 Africa/Banjul @@ -3599,7 +3557,7 @@ zoneinfo64:table(nofallback) { "CL", //Z#385 Chile/Continental "CL", //Z#386 Chile/EasterIsland "CU", //Z#387 Cuba - "ET", //Z#388 EAT + "KE", //Z#388 EAT "FR", //Z#389 ECT "001",//Z#390 EET "001",//Z#391 EST diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index 5a80a2b51..1b7fa94de 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From ff2bd8fda4d2cf0eec380a28cca0640aa8c9f0f8 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 2 Feb 2015 11:32:28 +0000 Subject: Update tzdata to tzdata2015a Time Zone Data v. 2015a (Released 2015-01-29) http://www.iana.org/time-zones/repository/releases/tzdata2015a.tar.gz Information from NEWS: Release 2015a - 2015-01-29 22:35:20 -0800 Changes affecting future time stamps The Mexican state of Quintana Roo, represented by America/Cancun, will shift from Central Time with DST to Eastern Time without DST on 2015-02-01 at 02:00. (Thanks to Steffen Thorsen and Gwillim Law.) Chile will not change clocks in April or thereafter; its new standard time will be its old daylight saving time. This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer. (Thanks to Juan Correa.) New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. (Thanks to Tim Parenti.) Changes affecting past time stamps Iceland observed DST in 1919 and 1921, and its 1939 fallback transition was Oct. 29, not Nov. 29. Remove incorrect data from Shanks about time in Iceland between 1837 and 1908. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait, and Asia/Muscat. Changes affecting code tzalloc now scrubs time zone abbreviations compatibly with the way that tzset always has, by replacing invalid bytes with '_' and by shortening too-long abbreviations. tzselect ports to POSIX awk implementations, no longer mishandles POSIX TZ settings when GNU awk is used, and reports POSIX TZ settings to the user. (Thanks to Stefan Kuhn.) Changes affecting build procedure 'make check' now checks for links to links in the data. One such link (for Africa/Asmera) has been fixed. (Thanks to Stephen Colebourne for pointing out the problem.) Changes affecting commentary The leapseconds file commentary now mentions the expiration date. (Problem reported by Martin Burnicki.) Update Mexican Library of Congress URL. Bug: 19212588 Change-Id: I7aa647c347d05dcd778339477486fddeea8656af --- icu4c/source/data/misc/zoneinfo64.txt | 126 +++++++++++++--------------------- icu4c/source/stubdata/icudt53l.dat | Bin 18723744 -> 18723520 bytes 2 files changed, 47 insertions(+), 79 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index dfdc306ff..46e592b56 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -1,11 +1,11 @@ //--------------------------------------------------------- -// Copyright (C) 2003-2014, International Business Machines +// Copyright (C) 2003-2015, International Business Machines // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Nov 11 16:31:19 2014 +// Build date: Mon Feb 2 11:23:12 2015 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2014j +// Olson version: 2015a // ICU version: 53.1.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2014j" } + TZVersion { "2015a" } Zones:array { /* ACT */ :int { 347 } //Z#0 /* AET */ :int { 359 } //Z#1 @@ -374,12 +374,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2039 } } //Z#92 /* America/Cancun */ :table { - trans:intvector { -1514743200, 377935200, 828860400, 846396000, 860310000, 877845600, 891759600, 902037600, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000 } + trans:intvector { -1514743200, 377935200, 828860400, 846396000, 860310000, 877845600, 891759600, 902037600, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1270368000, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1422777600 } typeOffsets:intvector { -20824, 0, -21600, 0, -21600, 3600, -18000, 0, -18000, 3600 } - typeMap:bin { "0103040304030402010201020102010201" } - finalRule { "Mexico" } - finalRaw:int { -21600 } - finalYear:int { 2003 } + typeMap:bin { "010304030403040201020102010201020102010201020102010201020102010201020102010201020103" } } //Z#93 /* America/Caracas */ :table { transPre32:intvector { -1, 1770461760 } @@ -1039,12 +1036,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" } } //Z#197 /* America/Santiago */ :table { - trans:intvector { -1893439034, -1688410800, -1619983034, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736376400, -713646000, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 } - typeOffsets:intvector { -16966, 0, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600 } - typeMap:bin { "010003000201020102010201020102010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304" } - finalRule { "Chile" } - finalRaw:int { -14400 } - finalYear:int { 2013 } + trans:intvector { -1893439034, -1688410800, -1619983034, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736376400, -713646000, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1430017200 } + typeOffsets:intvector { -16966, 0, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600, -10800, 0 } + typeMap:bin { "0100030002010201020102010201020102010304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030405" } links:intvector { 198, 385 } } //Z#198 /* America/Santo_Domingo */ :table { @@ -1218,12 +1212,9 @@ zoneinfo64:table(nofallback) { } //Z#227 /* Antarctica/McMurdo */ :int { 540 } //Z#228 /* Antarctica/Palmer */ :table { - trans:intvector { -157766400, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 389070000, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 } + trans:intvector { -157766400, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 389070000, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1430017200 } typeOffsets:intvector { 0, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } - typeMap:bin { "020102010201020102010304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" } - finalRule { "ChileAQ" } - finalRaw:int { -14400 } - finalYear:int { 2013 } + typeMap:bin { "0201020102010201020103040301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } } //Z#229 /* Antarctica/Rothera */ :table { trans:intvector { 218246400 } @@ -1250,11 +1241,7 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01" } } //Z#234 /* Arctic/Longyearbyen */ :int { 464 } //Z#235 - /* Asia/Aden */ :table { - trans:intvector { -631162794 } - typeOffsets:intvector { 10794, 0, 10800, 0 } - typeMap:bin { "01" } - } //Z#236 + /* Asia/Aden */ :int { 303 } //Z#236 /* Asia/Almaty */ :table { trans:intvector { -1441170468, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400 } typeOffsets:intvector { 18468, 0, 18000, 0, 21600, 0, 21600, 3600 } @@ -1296,11 +1283,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 10660, 0, 10656, 0, 10800, 0, 10800, 3600 } typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } } //Z#244 - /* Asia/Bahrain */ :table { - trans:intvector { -1577935340, 76190400 } - typeOffsets:intvector { 12140, 0, 10800, 0, 14400, 0 } - typeMap:bin { "0201" } - } //Z#245 + /* Asia/Bahrain */ :int { 300 } //Z#245 /* Asia/Baku */ :table { trans:intvector { -1441163964, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701812800, 717534000, 828234000, 846378000, 859680000, 877824000 } typeOffsets:intvector { 11964, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } @@ -1378,6 +1361,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1577936472 } typeOffsets:intvector { 13272, 0, 14400, 0 } typeMap:bin { "01" } + links:intvector { 261, 291 } } //Z#261 /* Asia/Dushanbe */ :table { trans:intvector { -1441168512, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 684363600 } @@ -1499,11 +1483,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 26480, 0, 27000, 0, 28800, 0, 28800, 1200, 32400, 0 } typeMap:bin { "010203020302030203020302030203020402" } } //Z#284 - /* Asia/Kuwait */ :table { - trans:intvector { -631163516 } - typeOffsets:intvector { 11516, 0, 10800, 0 } - typeMap:bin { "01" } - } //Z#285 + /* Asia/Kuwait */ :int { 303 } //Z#285 /* Asia/Macao */ :int { 287 } //Z#286 /* Asia/Macau */ :table { trans:intvector { -1830411260, -277360200, -257405400, -245910600, -225955800, -214473600, -194506200, -182406600, -163056600, -150969600, -131619600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72201600, 87922800, 103651200, 119977200, 135705600, 151439400, 167167800, 182889000, 198617400, 214338600, 230067000, 245788200, 261504000, 277225200, 292953600, 309279600, 325008000, 340729200 } @@ -1528,11 +1508,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -57360, 0, 28800, 0, 28800, 3600, 29040, 0, 32400, 0 } typeMap:bin { "03010201040102010201" } } //Z#290 - /* Asia/Muscat */ :table { - trans:intvector { -1577937264 } - typeOffsets:intvector { 14064, 0, 14400, 0 } - typeMap:bin { "01" } - } //Z#291 + /* Asia/Muscat */ :int { 261 } //Z#291 /* Asia/Nicosia */ :table { trans:intvector { -1518920008, 166572000, 182293200, 200959200, 213829200, 228866400, 243982800, 260316000, 276123600, 291765600, 307486800, 323820000, 338936400, 354664800, 370386000, 386114400, 401835600, 417564000, 433285200, 449013600, 465339600, 481068000, 496789200, 512517600, 528238800, 543967200, 559688400, 575416800, 591138000, 606866400, 622587600, 638316000, 654642000, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 909277200, 922582800, 941331600 } typeOffsets:intvector { 8008, 0, 7200, 0, 7200, 3600 } @@ -1577,6 +1553,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1577935568, 76190400 } typeOffsets:intvector { 12368, 0, 10800, 0, 14400, 0 } typeMap:bin { "0201" } + links:intvector { 245, 300 } } //Z#300 /* Asia/Qyzylorda */ :table { trans:intvector { -1441167712, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 695768400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400 } @@ -1592,6 +1569,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -719636812 } typeOffsets:intvector { 11212, 0, 10800, 0 } typeMap:bin { "01" } + links:intvector { 236, 285, 303 } } //Z#303 /* Asia/Saigon */ :int { 266 } //Z#304 /* Asia/Sakhalin */ :table { @@ -1757,10 +1735,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 1997 } } //Z#336 /* Atlantic/Reykjavik */ :table { - transPre32:intvector { -1, 97919740 } - trans:intvector { -1956609132, -1668211200, -1647212400, -1636675200, -1613430000, -968025600, -949615200, -942008400, -920239200, -909957600, -888789600, -877903200, -857944800, -846453600, -826495200, -815004000, -795045600, -783554400, -762991200, -752104800, -731541600, -717631200, -700092000, -686181600, -668642400, -654732000, -636588000, -623282400, -605743200, -591832800, -573688800, -559778400, -542239200, -528328800, -510789600, -496879200, -479340000, -465429600, -447890400, -433980000, -415836000, -401925600, -384386400, -370476000, -352936800, -339026400, -321487200, -307576800, -290037600, -276127200, -258588000, -244677600, -226533600, -212623200, -195084000, -181173600, -163634400, -149724000, -132184800, -118274400, -100735200, -86824800, -68680800, -54770400 } - typeOffsets:intvector { -5244, 0, -5268, 0, -3600, 0, -3600, 3600, 0, 0 } - typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030204" } + trans:intvector { -1956609120, -1668211200, -1647212400, -1636675200, -1613430000, -1605139200, -1581894000, -1539561600, -1531350000, -968025600, -952293600, -942008400, -920239200, -909957600, -888789600, -877903200, -857944800, -846453600, -826495200, -815004000, -795045600, -783554400, -762991200, -752104800, -731541600, -717631200, -700092000, -686181600, -668642400, -654732000, -636588000, -623282400, -605743200, -591832800, -573688800, -559778400, -542239200, -528328800, -510789600, -496879200, -479340000, -465429600, -447890400, -433980000, -415836000, -401925600, -384386400, -370476000, -352936800, -339026400, -321487200, -307576800, -290037600, -276127200, -258588000, -244677600, -226533600, -212623200, -195084000, -181173600, -163634400, -149724000, -132184800, -118274400, -100735200, -86824800, -68680800, -54770400 } + typeOffsets:intvector { -5280, 0, -3600, 0, -3600, 3600, 0, 0 } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" } links:intvector { 337, 502 } } //Z#337 /* Atlantic/South_Georgia */ :table { @@ -2575,12 +2552,9 @@ zoneinfo64:table(nofallback) { } //Z#543 /* Pacific/Easter */ :table { transPre32:intvector { -1, 1770471960 } - trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 } - typeOffsets:intvector { -26264, 0, -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } - typeMap:bin { "01030203020302030203020302030203020302030203020302030203020302030405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405" } - finalRule { "Chile" } - finalRaw:int { -21600 } - finalYear:int { 2013 } + trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384836400, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1430017200 } + typeOffsets:intvector { -26264, 0, -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600, -18000, 0 } + typeMap:bin { "01030203020302030203020302030203020302030203020302030203020302030504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } links:intvector { 386, 544 } } //Z#544 /* Pacific/Efate */ :table { @@ -3092,81 +3066,75 @@ zoneinfo64:table(nofallback) { Chatham:intvector { 8, -30, -1, 9900, 1, 3, 1, -1, 9900, 1, 3600 } //_#8 - Chile:intvector { - 8, 2, -1, 14400, 2, 3, 23, -1, 10800, 2, 3600 - } //_#9 - ChileAQ:intvector { - 8, 2, -1, 14400, 2, 3, 23, -1, 10800, 2, 3600 - } //_#10 Cuba:intvector { 2, 8, -1, 0, 1, 10, 1, -1, 0, 1, 3600 - } //_#11 + } //_#9 EU:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600 - } //_#12 + } //_#10 EUAsia:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600 - } //_#13 + } //_#11 Egypt:intvector { 3, -30, -6, 0, 1, 8, -30, -5, 86400, 0, 3600 - } //_#14 + } //_#12 Fiji:intvector { 10, 1, -1, 7200, 0, 0, 18, -1, 10800, 0, 3600 - } //_#15 + } //_#13 Haiti:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#16 + } //_#14 Jordan:intvector { 2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600 - } //_#17 + } //_#15 LH:intvector { 9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800 - } //_#18 + } //_#16 Lebanon:intvector { 2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600 - } //_#19 + } //_#17 Mexico:intvector { 3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#20 + } //_#18 Morocco:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 - } //_#21 + } //_#19 NZ:intvector { 8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 - } //_#22 + } //_#20 Namibia:intvector { 8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600 - } //_#23 + } //_#21 Palestine:intvector { 2, -31, -5, 86400, 0, 8, 21, -6, 0, 0, 3600 - } //_#24 + } //_#22 Para:intvector { 9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600 - } //_#25 + } //_#23 Syria:intvector { 2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600 - } //_#26 + } //_#24 SystemV:intvector { 3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#27 + } //_#25 Thule:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#28 + } //_#26 Troll:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200 - } //_#29 + } //_#27 US:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#30 + } //_#28 Uruguay:intvector { 9, 1, -1, 7200, 0, 2, 8, -1, 7200, 0, 3600 - } //_#31 + } //_#29 WS:intvector { 8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600 - } //_#32 + } //_#30 Zion:intvector { 2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#33 + } //_#31 } Regions:array { "AU", //Z#0 ACT diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index 1b7fa94de..ee5914094 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From bbd5f1788053783759fbdd030605b7b78fd6ca17 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 2 Feb 2015 16:48:28 +0000 Subject: Fix for the America/Montreal region mapping Associated with a fix to bionic/.../update-tzdata.py. Previously the tool was not picking up icuregions and icuzones leading to an incorrect mapping for America/Montreal ("001" instead of "CA"). Bug: 19230091 Bug: 19212588 Change-Id: I7d1dc2ae1faeaead28d654f07449ed37a6ebcb0e --- icu4c/source/data/misc/zoneinfo64.txt | 4 ++-- icu4c/source/stubdata/icudt53l.dat | Bin 18723520 -> 18723520 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 46e592b56..a1e34e0e0 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 11:23:12 2015 +// Build date: Mon Feb 2 16:44:09 2015 // Olson source: ftp://elsie.nci.nih.gov/pub/ // Olson version: 2015a // ICU version: 53.1.0.1 @@ -3306,7 +3306,7 @@ zoneinfo64:table(nofallback) { "CA", //Z#166 America/Moncton "MX", //Z#167 America/Monterrey "UY", //Z#168 America/Montevideo - "001",//Z#169 America/Montreal + "CA", //Z#169 America/Montreal "MS", //Z#170 America/Montserrat "BS", //Z#171 America/Nassau "US", //Z#172 America/New_York diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index ee5914094..66e566866 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3 From 9a74b1c87c877728998408ce7b41fc4eaacc265c Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 3 Feb 2015 14:07:56 +0000 Subject: 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 --- icu4c/source/data/misc/metaZones.txt | 159 +++++++++++++++++-------------- icu4c/source/data/misc/timezoneTypes.txt | 21 +++- icu4c/source/data/misc/windowsZones.txt | 39 ++++++-- icu4c/source/data/misc/zoneinfo64.txt | 4 +- icu4c/source/stubdata/icudt53l.dat | Bin 18723520 -> 18724224 bytes icu4c/source/tools/tzcode/icuregions | 3 +- icu4c/source/tools/tzcode/icuzones | 4 +- 7 files changed, 138 insertions(+), 92 deletions(-) diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 23c7f26c2..47ee0276c 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -90,7 +90,6 @@ metaZones:table(nofallback){ JM{"America/Jamaica"} KY{"America/Cayman"} PA{"America/Panama"} - TC{"America/Grand_Turk"} } America_Mountain{ 001{"America/Denver"} @@ -105,6 +104,9 @@ metaZones:table(nofallback){ Anadyr{ 001{"Asia/Anadyr"} } + Apia{ + 001{"Pacific/Apia"} + } Aqtau{ 001{"Asia/Aqtau"} } @@ -211,9 +213,6 @@ metaZones:table(nofallback){ 001{"Pacific/Saipan"} GU{"Pacific/Guam"} } - Changbai{ - 001{"Asia/Harbin"} - } Chatham{ 001{"Pacific/Chatham"} } @@ -315,6 +314,10 @@ metaZones:table(nofallback){ 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 @@ metaZones:table(nofallback){ 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 @@ metaZones:table(nofallback){ Karachi{ 001{"Asia/Karachi"} } - Kashgar{ - 001{"Asia/Kashgar"} - } Kazakhstan_Eastern{ 001{"Asia/Almaty"} } @@ -477,9 +476,6 @@ metaZones:table(nofallback){ Line_Islands{ 001{"Pacific/Kiritimati"} } - Long_Shu{ - 001{"Asia/Chongqing"} - } Lord_Howe{ 001{"Australia/Lord_Howe"} } @@ -614,7 +610,7 @@ metaZones:table(nofallback){ 001{"Asia/Samarkand"} } Samoa{ - 001{"Pacific/Apia"} + 001{"Pacific/Pago_Pago"} } Seychelles{ 001{"Indian/Mahe"} @@ -1623,6 +1619,13 @@ metaZones:table(nofallback){ "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,27 +2720,27 @@ metaZones:table(nofallback){ "India", } } - "Asia:Choibalsan"{ + "Asia:Chita"{ { - "Mongolia", + "Yakutsk", "1970-01-01 00:00", - "1983-03-31 16:00", + "2014-10-25 16:00", } { - "Choibalsan", - "1983-03-31 16:00", + "Irkutsk", + "2014-10-25 16:00", "9999-12-31 23:59", } } - "Asia:Chongqing"{ + "Asia:Choibalsan"{ { - "Long_Shu", + "Mongolia", "1970-01-01 00:00", - "1980-04-30 17:00", + "1983-03-31 16:00", } { - "China", - "1980-04-30 17:00", + "Choibalsan", + "1983-03-31 16:00", "9999-12-31 23:59", } } @@ -2821,18 +2824,6 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ { "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 @@ metaZones:table(nofallback){ "Asia:Saigon"{ { "Indochina", + "1975-06-12 16:00", + "9999-12-31 23:59", } } "Asia:Sakhalin"{ @@ -3156,6 +3135,13 @@ metaZones:table(nofallback){ "Singapore", } } + "Asia:Srednekolymsk"{ + { + "Magadan", + "1970-01-01 00:00", + "2014-10-25 14:00", + } + } "Asia:Taipei"{ { "Taipei", @@ -3215,13 +3201,6 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ { "Kuybyshev", "1970-01-01 00:00", - "1991-10-20 00:00", + "1989-03-25 22:00", } { - "Samara", + "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", - "2010-03-27 22:00", } { - "Moscow", - "2010-03-27 22:00", + "Samara", + "1991-10-20 00:00", "9999-12-31 23:59", } } @@ -3858,6 +3862,13 @@ metaZones:table(nofallback){ "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 @@ metaZones:table(nofallback){ } "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 @@ metaZones:table(nofallback){ "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 7f60b3d4c..366b101fa 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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 @@ timezoneTypes:table(nofallback){ "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 2a98decaf..4a9b9f211 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -78,6 +78,10 @@ windowsZones:table(nofallback){ 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 @@ windowsZones:table(nofallback){ "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 @@ windowsZones:table(nofallback){ } "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 @@ windowsZones:table(nofallback){ } 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 @@ windowsZones:table(nofallback){ } "Kaliningrad Standard Time"{ 001{"Europe/Kaliningrad"} - BY{"Europe/Minsk"} RU{"Europe/Kaliningrad"} } "Korea Standard Time"{ @@ -321,9 +324,14 @@ windowsZones:table(nofallback){ 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 @@ windowsZones:table(nofallback){ } "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 @@ windowsZones:table(nofallback){ } "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 @@ windowsZones:table(nofallback){ 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 @@ windowsZones:table(nofallback){ 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 @@ windowsZones:table(nofallback){ 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 a1e34e0e0..ba6c1f823 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 @@ zoneinfo64:table(nofallback) { "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 66e566866..bbd196542 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ diff --git a/icu4c/source/tools/tzcode/icuregions b/icu4c/source/tools/tzcode/icuregions index 1ea894b08..b09f35b1d 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 - # # +Africa/Asmera ER America/Montreal CA diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones index 21b0fa246..f8cbc7c1b 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 Africa/Cairo ART 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 -- cgit v1.2.3 From dcd27b053b7d59af28bdabdc991e8e98e4d55e68 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Wed, 4 Feb 2015 16:55:10 +0000 Subject: Update ICU metadata from 2014j to 2015a Files taken from: http://bugs.icu-project.org/trac/changeset/37006 The tzdata rules used are 2015a. No effort has been made to maintain the icu tests: this is just a data update. 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: I498842f3681dc5ae7bf968b814dadfd7d6b22dae --- icu4c/source/data/misc/metaZones.txt | 7 ++++++- icu4c/source/data/misc/windowsZones.txt | 10 ++++++---- icu4c/source/data/misc/zoneinfo64.txt | 2 +- icu4c/source/stubdata/icudt53l.dat | Bin 18724224 -> 18724224 bytes 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 47ee0276c..a65629f99 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2014 International Business Machines +// * Copyright (C) 2015 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /metaZones.xml @@ -1412,6 +1412,11 @@ metaZones:table(nofallback){ { "America_Central", "1998-08-02 06:00", + "2015-02-01 08:00", + } + { + "America_Eastern", + "2015-02-01 08:00", "9999-12-31 23:59", } } diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 4a9b9f211..8706eac83 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2014 International Business Machines +// * Copyright (C) 2015 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /windowsZones.xml @@ -145,6 +145,7 @@ windowsZones:table(nofallback){ AU{"Antarctica/Macquarie"} FM{"Pacific/Ponape Pacific/Kosrae"} NC{"Pacific/Noumea"} + PG{"Pacific/Bougainville"} SB{"Pacific/Guadalcanal"} VU{"Pacific/Efate"} ZZ{"Etc/GMT-11"} @@ -152,8 +153,8 @@ windowsZones:table(nofallback){ "Central Standard Time (Mexico)"{ 001{"America/Mexico_City"} MX{ - "America/Mexico_City America/Bahia_Banderas America/Cancun America/Me" - "rida America/Monterrey" + "America/Mexico_City America/Bahia_Banderas America/Merida America/Mo" + "nterrey" } } "Central Standard Time"{ @@ -467,6 +468,7 @@ windowsZones:table(nofallback){ EC{"America/Guayaquil"} JM{"America/Jamaica"} KY{"America/Cayman"} + MX{"America/Cancun"} PA{"America/Panama"} PE{"America/Lima"} ZZ{"Etc/GMT+5"} @@ -686,7 +688,7 @@ windowsZones:table(nofallback){ FM{"Pacific/Truk"} GU{"Pacific/Guam"} MP{"Pacific/Saipan"} - PG{"Pacific/Port_Moresby Pacific/Bougainville"} + PG{"Pacific/Port_Moresby"} ZZ{"Etc/GMT-10"} } "Yakutsk Standard Time"{ diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index ba6c1f823..cd5176416 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: Tue Feb 3 15:48:08 2015 +// Build date: Wed Feb 4 16:59:51 2015 // Olson source: ftp://elsie.nci.nih.gov/pub/ // Olson version: 2015a // ICU version: 53.1.0.1 diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat index bbd196542..ee8010ea1 100644 Binary files a/icu4c/source/stubdata/icudt53l.dat and b/icu4c/source/stubdata/icudt53l.dat differ -- cgit v1.2.3