diff --git a/icu4c/source/data/misc/zoneinfo.txt b/icu4c/source/data/misc/zoneinfo.txt index a319007b17b..68b903deeb4 100644 --- a/icu4c/source/data/misc/zoneinfo.txt +++ b/icu4c/source/data/misc/zoneinfo.txt @@ -1,10 +1,11 @@ //--------------------------------------------------------- -// Copyright (C) 2003, International Business Machines +// Copyright (C) 2003-2004, International Business Machines // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Nov 11 17:41:35 2003 +// Build date: Mon May 24 14:57:11 2004 // Olson source: ftp://elsie.nci.nih.gov/pub/ +// Olson version: 2003e //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << @@ -442,9 +443,9 @@ zoneinfo { :bin { "000100010001000100" } } //Z#83 , /* America/Cuiaba */ :array { - :intvector { -1767212140, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 592977600, 602046000, 624427200, 634705200, 656481600, 666759600, 687931200, 697604400, 719985600, 728449200, 750830400, 761713200, 782280000, 793162800, 813729600, 824007600, 844574400, 856062000, 876110400, 888721200, 908078400, 919566000, 938923200, 951620400, 970977600, 982465200, 1003032000, 1013914800, 1036296000, 1045364400 } + :intvector { -1767212140, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 592977600, 602046000, 624427200, 634705200, 656481600, 666759600, 687931200, 697604400, 719985600, 728449200, 750830400, 761713200, 813729600, 824007600, 844574400, 856062000, 876110400, 888721200, 908078400, 919566000, 938923200, 951620400, 970977600, 982465200, 1003032000, 1013914800, 1036296000, 1045364400 } :intvector { -14400, 0, -14400, 3600 } - :bin { "0001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + :bin { "000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } } //Z#84 , /* America/Curacao */ :array { :intvector { -1826738656, -157750200 } @@ -658,9 +659,9 @@ zoneinfo { :bin { "0001" } } //Z#123 , /* America/Lima */ :array { - :intvector { -1938538284, -1009825200, -1002052800, -986756400, -971035200, -955306800, -939585600, 536475600, 544248000, 631170000, 638942400, 757400400, 765172800 } + :intvector { -1938538284, -1009825200, -1002052800, -986756400, -971035200, -955306800, -939585600, 504939600, 512712000, 536475600, 544248000, 631170000, 638942400, 757400400, 765172800 } :intvector { -18000, 0, -18000, 3600 } - :bin { "00010001000100010001000100" } + :bin { "000100010001000100010001000100" } } //Z#124 , /* America/Los_Angeles */ :array { :intvector { -1633269600, -1615129200, -1601820000, -1583679600, -880207200, -769395600, -765385200, -687967200, -662655600, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -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, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200 } @@ -795,9 +796,9 @@ zoneinfo { :intvector { -32400, 1987 } } //Z#144 , /* America/Noronha */ :array { - :intvector { -1767217820, -1206961200, -1191366000, -1175378400, -1159830000, -633823200, -622072800, -602287200, -591836400, -570751200, -560214000, -539128800, -531356400, -191368800, -184201200, -155167200, -150073200, -128901600, -121129200, -99957600, -89593200, -68421600, -57970800, 499744800, 511232400, 530589600, 540262800, 562125600, 571194000, 592970400, 602038800, 624420000, 634698000 } + :intvector { -1767217820, -1206961200, -1191366000, -1175378400, -1159830000, -633823200, -622072800, -602287200, -591836400, -570751200, -560214000, -539128800, -531356400, -191368800, -184201200, -155167200, -150073200, -128901600, -121129200, -99957600, -89593200, -68421600, -57970800, 499744800, 511232400, 530589600, 540262800, 562125600, 571194000, 592970400, 602038800, 624420000, 634698000, 938916000, 951613200, 970970400, 971571600, 1003024800, 1013907600 } :intvector { -7200, 0, -7200, 3600 } - :bin { "000100010001000100010001000100010001000100010001000100010001000100" } + :bin { "000100010001000100010001000100010001000100010001000100010001000100010001000100" } :intvector { 145, 318 } } //Z#145 , /* America/North_Dakota/Center */ :array { @@ -960,9 +961,9 @@ zoneinfo { :intvector { -14400, 1993 } } //Z#174 , /* America/Thunder_Bay */ :array { - :intvector { -1884272400, -1870966800, -1852822800, -1839517200, -1820768400, -1808067600, -1789318800, -1776013200, -1757869200, -1744563600, -1726419600, -1713114000, -1694970000, -1681664400, -1663520400, -1650214800, -1640977200, -1632070800, -1614794400, -923252400, -880218000, -769395600, -765396000, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 136364400, 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 } + :intvector { -1893434400, -880218000, -769395600, -765396000, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 136364400, 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 } :intvector { -18000, 0, -18000, 3600 } - :bin { "01000100010001000100010001000100000100010101000100010001000100010001000100010001000100010001000100010001000100" } + :bin { "000101000100010001000100010001000100010001000100010001000100010001000100" } "Canada" :intvector { -18000, 1987 } } //Z#175 @@ -975,7 +976,7 @@ zoneinfo { :intvector { 95, 176, 468 } } //Z#176 , /* America/Toronto */ :array { - :intvector { -1632070800, -1614794400, -1601753400, -1583697600, -1567357200, -1554667200, -1534698000, -1524074400, -1503248400, -1492365600, -1471798800, -1460916000, -1440954000, -1428861600, -1409504400, -1397412000, -1378054800, -1365962400, -1346605200, -1333908000, -1315155600, -1301853600, -1283713200, -1270411200, -1252263600, -1238961600, -1220814000, -1207512000, -1188759600, -1176062400, -1157310000, -1144008000, -1125860400, -1112558400, -1094410800, -1081108800, -1062961200, -1049659200, -1031511600, -1018209600, -1000062000, -986760000, -968007600, -955310400, -936558000, -880218000, -769395600, -765396000, -747248400, -733946400, -715806000, -702504000, -684356400, -671054400, -652906800, -634161600, -620845200, -602704800, -589395600, -576093600, -557946000, -544644000, -526496400, -513194400, -495046800, -481744800, -463597200, -450295200, -431542800, -418240800, -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, 136364400, 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 } + :intvector { -1632070800, -1614794400, -1601753400, -1583697600, -1567357200, -1554667200, -1534698000, -1524074400, -1503248400, -1492365600, -1471798800, -1460916000, -1440954000, -1428861600, -1409504400, -1397412000, -1378054800, -1365962400, -1346605200, -1333908000, -1315155600, -1301853600, -1283706000, -1270404000, -1252256400, -1238954400, -1220806800, -1207504800, -1188752400, -1176055200, -1157302800, -1144000800, -1125853200, -1112551200, -1094403600, -1081101600, -1062954000, -1049652000, -1031504400, -1018202400, -1000054800, -986752800, -968000400, -955303200, -936550800, -880218000, -769395600, -765396000, -747248400, -733946400, -715806000, -702504000, -684356400, -671054400, -652906800, -634161600, -620845200, -602704800, -589395600, -576093600, -557946000, -544644000, -526496400, -513194400, -495046800, -481744800, -463597200, -450295200, -431542800, -418240800, -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, 136364400, 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 } :intvector { -18000, 0, -18000, 3600 } :bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000101010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } "Canada" @@ -1305,12 +1306,12 @@ zoneinfo { :intvector { 25200, 1996 } } //Z#236 , /* Asia/Kuala_Lumpur */ :array { - :intvector { -2038200924, -1167634800, -879751200, -767869200, -631178400, 389032200 } - :intvector { 25200, 0, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } - :bin { "000104010203" } + :intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378664200 } + :intvector { 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } + :bin { "00010203050304" } } //Z#237 , /* Asia/Kuching */ :array { - :intvector { -1383463280, -1167636600, -1082448000, -1074586800, -1050825600, -1042964400, -1019289600, -1011428400, -987753600, -979892400, -956217600, -948356400, -924595200, -916734000, -893059200, -885198000, -883641600, -767869200, 389030400 } + :intvector { -1383463280, -1167636600, -1082448000, -1074586800, -1050825600, -1042964400, -1019289600, -1011428400, -987753600, -979892400, -956217600, -948356400, -924595200, -916734000, -893059200, -885198000, -879667200, -767005200, 378662400 } :intvector { 27000, 0, 28800, 0, 28800, 1200, 32400, 0 } :bin { "00010201020102010201020102010201030101" } } //Z#238 @@ -1464,9 +1465,9 @@ zoneinfo { :intvector { 264, 326, 481 } } //Z#264 , /* Asia/Singapore */ :array { - :intvector { -2038200924, -1167634800, -879751200, -767869200, -631178400, -138785400, 389032200 } - :intvector { 25200, 0, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } - :bin { "00010401020203" } + :intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, -138785400, 378664200 } + :intvector { 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } + :bin { "0001020305030304" } :intvector { 265, 530 } } //Z#265 , /* Asia/Taipei */ :array { @@ -2919,12 +2920,12 @@ zoneinfo { CN:intvector { 213, 214, 223, 234, 264, 277, 326, 481 } //R#45 CO:intvector { 70 } //R#46 CR:intvector { 83 } //R#47 - CS:intvector { 385, 400, 416, 418, 430 } //R#48 + CS:intvector { 385 } //R#48 CU:intvector { 108, 338 } //R#49 CV:intvector { 286 } //R#50 CX:intvector { 448 } //R#51 CY:intvector { 246, 408 } //R#52 - CZ:intvector { 387, 411 } //R#53 + CZ:intvector { 411 } //R#53 DE:intvector { 386 } //R#54 DJ:intvector { 23 } //R#55 DK:intvector { 392 } //R#56 @@ -2975,7 +2976,7 @@ zoneinfo { IQ:intvector { 204 } //R#101 IR:intvector { 269, 457 } //R#102 IS:intvector { 290, 445 } //R#103 - IT:intvector { 413, 415, 426 } //R#104 + IT:intvector { 413 } //R#104 JM:intvector { 117, 460 } //R#105 JO:intvector { 198 } //R#106 JP:intvector { 273, 459, 461 } //R#107 @@ -3029,7 +3030,7 @@ zoneinfo { NG:intvector { 34 } //R#155 NI:intvector { 128 } //R#156 NL:intvector { 381 } //R#157 - NO:intvector { 195, 288, 409 } //R#158 + NO:intvector { 409 } //R#158 NP:intvector { 235 } //R#159 NR:intvector { 506 } //R#160 NU:intvector { 507 } //R#161 diff --git a/icu4j/src/com/ibm/icu/impl/ZoneMetaData.java b/icu4j/src/com/ibm/icu/impl/ZoneMetaData.java index de73de6db4a..1c69706ca2d 100644 --- a/icu4j/src/com/ibm/icu/impl/ZoneMetaData.java +++ b/icu4j/src/com/ibm/icu/impl/ZoneMetaData.java @@ -1,10 +1,11 @@ //--------------------------------------------------------- -// Copyright (C) 2003, International Business Machines +// Copyright (C) 2003-2004, International Business Machines // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Thu Sep 4 13:58:40 2003 +// Build date: Mon May 24 14:57:11 2004 // Olson source: ftp://elsie.nci.nih.gov/pub/ +// Olson version: 2003e //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << @@ -36,7 +37,6 @@ public final class ZoneMetaData { { "America/Manaus", "Brazil/West" }, { "America/Mazatlan", "Mexico/BajaSur" }, { "America/Mexico_City", "Mexico/General" }, - { "America/Montreal", "Canada/Eastern" }, { "America/New_York", "EST5EDT", "SystemV/EST5EDT", "US/Eastern" }, { "America/Noronha", "Brazil/DeNoronha" }, { "America/Phoenix", "MST", "PNT", "SystemV/MST7", "US/Arizona" }, @@ -48,6 +48,7 @@ public final class ZoneMetaData { { "America/St_Johns", "CNT", "Canada/Newfoundland" }, { "America/St_Thomas", "America/Virgin" }, { "America/Ensenada", "America/Tijuana", "Mexico/BajaNorte" }, + { "America/Toronto", "Canada/Eastern" }, { "America/Vancouver", "Canada/Pacific" }, { "America/Whitehorse", "Canada/Yukon" }, { "America/Winnipeg", "Canada/Central" }, @@ -141,13 +142,13 @@ public final class ZoneMetaData { { "BM", "Atlantic/Bermuda" }, { "BN", "Asia/Brunei" }, { "BO", "America/La_Paz" }, - { "BR", "America/Araguaina", "America/Belem", "America/Boa_Vista", "America/Cuiaba", "America/Eirunepe", "America/Fortaleza", "America/Maceio", "America/Manaus", "America/Noronha", "America/Porto_Acre", "America/Porto_Velho", "America/Recife", "America/Rio_Branco", "America/Sao_Paulo", "BET", "Brazil/Acre", "Brazil/DeNoronha", "Brazil/East", "Brazil/West" }, + { "BR", "America/Araguaina", "America/Bahia", "America/Belem", "America/Boa_Vista", "America/Campo_Grande", "America/Cuiaba", "America/Eirunepe", "America/Fortaleza", "America/Maceio", "America/Manaus", "America/Noronha", "America/Porto_Acre", "America/Porto_Velho", "America/Recife", "America/Rio_Branco", "America/Sao_Paulo", "BET", "Brazil/Acre", "Brazil/DeNoronha", "Brazil/East", "Brazil/West" }, { "BS", "America/Nassau" }, { "BT", "Asia/Thimbu", "Asia/Thimphu" }, { "BW", "Africa/Gaborone" }, { "BY", "Europe/Minsk" }, { "BZ", "America/Belize" }, - { "CA", "America/Cambridge_Bay", "America/Dawson", "America/Dawson_Creek", "America/Edmonton", "America/Glace_Bay", "America/Goose_Bay", "America/Halifax", "America/Inuvik", "America/Iqaluit", "America/Montreal", "America/Nipigon", "America/Pangnirtung", "America/Rainy_River", "America/Rankin_Inlet", "America/Regina", "America/St_Johns", "America/Swift_Current", "America/Thunder_Bay", "America/Vancouver", "America/Whitehorse", "America/Winnipeg", "America/Yellowknife", "CNT", "Canada/Atlantic", "Canada/Central", "Canada/East-Saskatchewan", "Canada/Eastern", "Canada/Mountain", "Canada/Newfoundland", "Canada/Pacific", "Canada/Saskatchewan", "Canada/Yukon", "SystemV/AST4ADT", "SystemV/CST6" }, + { "CA", "America/Cambridge_Bay", "America/Dawson", "America/Dawson_Creek", "America/Edmonton", "America/Glace_Bay", "America/Goose_Bay", "America/Halifax", "America/Inuvik", "America/Iqaluit", "America/Montreal", "America/Nipigon", "America/Pangnirtung", "America/Rainy_River", "America/Rankin_Inlet", "America/Regina", "America/St_Johns", "America/Swift_Current", "America/Thunder_Bay", "America/Toronto", "America/Vancouver", "America/Whitehorse", "America/Winnipeg", "America/Yellowknife", "CNT", "Canada/Atlantic", "Canada/Central", "Canada/East-Saskatchewan", "Canada/Eastern", "Canada/Mountain", "Canada/Newfoundland", "Canada/Pacific", "Canada/Saskatchewan", "Canada/Yukon", "SystemV/AST4ADT", "SystemV/CST6" }, { "CC", "Indian/Cocos" }, { "CD", "Africa/Kinshasa", "Africa/Lubumbashi" }, { "CF", "Africa/Bangui" }, @@ -160,11 +161,12 @@ public final class ZoneMetaData { { "CN", "Asia/Chongqing", "Asia/Chungking", "Asia/Harbin", "Asia/Kashgar", "Asia/Shanghai", "Asia/Urumqi", "CTT", "PRC" }, { "CO", "America/Bogota" }, { "CR", "America/Costa_Rica" }, + { "CS", "Europe/Belgrade" }, { "CU", "America/Havana", "Cuba" }, { "CV", "Atlantic/Cape_Verde" }, { "CX", "Indian/Christmas" }, { "CY", "Asia/Nicosia", "Europe/Nicosia" }, - { "CZ", "Europe/Bratislava", "Europe/Prague" }, + { "CZ", "Europe/Prague" }, { "DE", "Europe/Berlin" }, { "DJ", "Africa/Djibouti" }, { "DK", "Europe/Copenhagen" }, @@ -215,7 +217,7 @@ public final class ZoneMetaData { { "IQ", "Asia/Baghdad" }, { "IR", "Asia/Tehran", "Iran" }, { "IS", "Atlantic/Reykjavik", "Iceland" }, - { "IT", "Europe/Rome", "Europe/San_Marino", "Europe/Vatican" }, + { "IT", "Europe/Rome" }, { "JM", "America/Jamaica", "Jamaica" }, { "JO", "Asia/Amman" }, { "JP", "Asia/Tokyo", "JST", "Japan" }, @@ -269,7 +271,7 @@ public final class ZoneMetaData { { "NG", "Africa/Lagos" }, { "NI", "America/Managua" }, { "NL", "Europe/Amsterdam" }, - { "NO", "Arctic/Longyearbyen", "Atlantic/Jan_Mayen", "Europe/Oslo" }, + { "NO", "Europe/Oslo" }, { "NP", "Asia/Katmandu" }, { "NR", "Pacific/Nauru" }, { "NU", "Pacific/Niue" }, @@ -346,7 +348,6 @@ public final class ZoneMetaData { { "WS", "MIT", "Pacific/Apia" }, { "YE", "Asia/Aden" }, { "YT", "Indian/Mayotte" }, - { "YU", "Europe/Belgrade", "Europe/Ljubljana", "Europe/Sarajevo", "Europe/Skopje", "Europe/Zagreb" }, { "ZA", "Africa/Johannesburg" }, { "ZM", "Africa/Lusaka" }, { "ZW", "Africa/Harare", "CAT" }