diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 274a8d5dcf70..53876c895a08 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -216,9 +216,6 @@ metaZones:table(nofallback){ China{ 001{"Asia/Shanghai"} } - Choibalsan{ - 001{"Asia/Choibalsan"} - } Christmas{ 001{"Indian/Christmas"} } @@ -748,7 +745,6 @@ metaZones:table(nofallback){ chat{"Chatham"} chil{"Chile"} chin{"China"} - choi{"Choibalsan"} chri{"Christmas"} coco{"Cocos"} colo{"Colombia"} @@ -1491,14 +1487,9 @@ metaZones:table(nofallback){ } } "America:Bahia_Banderas"{ - { - "America_Pacific", - "1970-01-01 00:00", - "1970-01-01 08:00", - } { "America_Mountain", - "1970-01-01 08:00", + "1970-01-01 00:00", "2010-04-04 09:00", } { @@ -1583,11 +1574,21 @@ metaZones:table(nofallback){ { "America_Central", "1970-01-01 00:00", - "1981-12-23 06:00", + "1981-12-26 08:00", } { "America_Eastern", - "1981-12-23 06:00", + "1981-12-26 08:00", + "1983-01-04 05:00", + } + { + "America_Central", + "1983-01-04 05:00", + "1997-10-26 07:00", + } + { + "America_Eastern", + "1997-10-26 07:00", "1998-08-02 06:00", } { @@ -1901,15 +1902,8 @@ metaZones:table(nofallback){ } } "America:Hermosillo"{ - { - "America_Pacific", - "1970-01-01 00:00", - "1970-01-01 08:00", - } { "Mexico_Pacific", - "1970-01-01 08:00", - "9999-12-31 23:59", } } "America:Indiana:Knox"{ @@ -2204,15 +2198,8 @@ metaZones:table(nofallback){ } } "America:Mazatlan"{ - { - "America_Pacific", - "1970-01-01 00:00", - "1970-01-01 08:00", - } { "Mexico_Pacific", - "1970-01-01 08:00", - "9999-12-31 23:59", } } "America:Mendoza"{ @@ -2248,16 +2235,16 @@ metaZones:table(nofallback){ { "America_Central", "1970-01-01 00:00", - "1981-12-23 06:00", + "1981-12-26 08:00", } { "America_Eastern", - "1981-12-23 06:00", - "1982-12-02 05:00", + "1981-12-26 08:00", + "1982-11-02 07:00", } { "America_Central", - "1982-12-02 05:00", + "1982-11-02 07:00", "9999-12-31 23:59", } } @@ -3030,23 +3017,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "Asia:Choibalsan"{ - { - "Mongolia", - "1970-01-01 00:00", - "1983-03-31 16:00", - } - { - "Choibalsan", - "1983-03-31 16:00", - "2008-03-30 15:00", - } - { - "Mongolia", - "2008-03-30 15:00", - "9999-12-31 23:59", - } - } "Asia:Colombo"{ { "India", @@ -3614,16 +3584,16 @@ metaZones:table(nofallback){ { "Azores", "1970-01-01 00:00", - "1992-09-27 02:00", + "1992-12-27 02:00", } { "Europe_Western", - "1992-09-27 02:00", - "1993-03-28 01:00", + "1992-12-27 02:00", + "1993-06-17 01:00", } { "Azores", - "1993-03-28 01:00", + "1993-06-17 01:00", "9999-12-31 23:59", } } diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt index 18b79ff93f99..83b57fb9e82d 100644 --- a/icu4c/source/data/misc/timezoneTypes.txt +++ b/icu4c/source/data/misc/timezoneTypes.txt @@ -18,6 +18,7 @@ timezoneTypes:table(nofallback){ cst6cdt{"uschi"} est5edt{"usnyc"} gaza{"gazastrp"} + mncoq{"mnuln"} mst7mdt{"usden"} mxstis{"mxtij"} pst8pdt{"uslax"} @@ -81,6 +82,7 @@ timezoneTypes:table(nofallback){ "America:Yellowknife"{"America/Edmonton"} "Antarctica:South_Pole"{"Pacific/Auckland"} "Asia:Ashkhabad"{"Asia/Ashgabat"} + "Asia:Choibalsan"{"Asia/Ulaanbaatar"} "Asia:Chongqing"{"Asia/Shanghai"} "Asia:Chungking"{"Asia/Shanghai"} "Asia:Dacca"{"Asia/Dhaka"} @@ -434,7 +436,6 @@ timezoneTypes:table(nofallback){ "Asia:Brunei"{"bnbwn"} "Asia:Calcutta"{"inccu"} "Asia:Chita"{"ruchita"} - "Asia:Choibalsan"{"mncoq"} "Asia:Colombo"{"lkcmb"} "Asia:Damascus"{"sydam"} "Asia:Dhaka"{"bddac"} diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 3dd0ba744daa..2c2e5bca7efc 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -713,7 +713,7 @@ windowsZones:table(nofallback){ } "Ulaanbaatar Standard Time"{ 001{"Asia/Ulaanbaatar"} - MN{"Asia/Ulaanbaatar Asia/Choibalsan"} + MN{"Asia/Ulaanbaatar"} } "Venezuela Standard Time"{ 001{"America/Caracas"} diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 9838ef48e222..c9a13dd6e0a0 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,17 +3,17 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Feb 7 16:30:19 2024 +// Build date: Thu Sep 19 09:34:01 2024 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2024a -// ICU version: 75.1 +// tz version: 2024b +// ICU version: 76.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2024a" } + TZVersion { "2024b" } Zones:array { /* ACT */ :int { 357 } //Z#0 /* AET */ :int { 369 } //Z#1 @@ -119,8 +119,8 @@ zoneinfo64:table(nofallback) { /* Africa/Lusaka */ :int { 43 } //Z#41 /* Africa/Malabo */ :int { 36 } //Z#42 /* Africa/Maputo */ :table { - trans:intvector { -2109291020 } - typeOffsets:intvector { 7820, 0, 7200, 0 } + trans:intvector { -1924999818 } + typeOffsets:intvector { 7818, 0, 7200, 0 } typeMap:bin { "01" } links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 380 } } //Z#43 @@ -293,9 +293,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } } //Z#81 /* America/Bahia_Banderas */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } - typeOffsets:intvector { -25260, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } - typeMap:bin { "020402030204020102030203020302030203020302030203020302030203020302030203020504050405040504050405040504050405040504050405040504" } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -873828000, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } + typeOffsets:intvector { -25260, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } + typeMap:bin { "01030102010301020102010201020102010201020102010201020102010201020102010403040304030403040304030403040304030403040304030403" } } //Z#82 /* America/Barbados */ :table { trans:intvector { -1841256091, -874263600, -862682400, -841604400, -830714400, -811882800, -798660000, 234943200, 244616400, 261554400, 276066000, 293004000, 307515600, 325058400, 338706000 } @@ -347,9 +347,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } } //Z#92 /* America/Cancun */ :table { - 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 } + trans:intvector { -1514743200, 378201600, 410504400, 828864000, 846399600, 860313600, 877849200, 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 { "010304030403040201020102010201020102010201020102010201020102010201020102010201020103" } + typeMap:bin { "01030102010203040201020102010201020102010201020102010201020102010201020102010201020103" } } //Z#93 /* America/Caracas */ :table { transPre32:intvector { -1, 1770461760 } @@ -372,15 +372,15 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 98, 383, 622 } + links:intvector { 98, 383, 384, 622 } } //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, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } typeOffsets:intvector { -25460, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "010301020103040304030201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } } //Z#99 /* America/Ciudad_Juarez */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800, 1300006800, 1320566400, 1331456400, 1352016000, 1362906000, 1383465600, 1394355600, 1414915200, 1425805200, 1446364800, 1457859600, 1478419200, 1489309200, 1509868800, 1520758800, 1541318400, 1552208400, 1572768000, 1583658000, 1604217600, 1615712400, 1636272000, 1647162000, 1667116800, 1669788000, 1678611600, 1699171200 } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800, 1300006800, 1320566400, 1331456400, 1352016000, 1362906000, 1383465600, 1394355600, 1414915200, 1425805200, 1446364800, 1457859600, 1478419200, 1489309200, 1509868800, 1520758800, 1541318400, 1552208400, 1572768000, 1583658000, 1604217600, 1615712400, 1636272000, 1647162000, 1667116800, 1669788000, 1678611600, 1699171200 } typeOffsets:intvector { -25556, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "010301020103040304030201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203010201" } finalRule { "US" } @@ -426,7 +426,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 110, 206, 547, 628 } + links:intvector { 110, 206, 539, 547, 628 } } //Z#110 /* America/Detroit */ :table { trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80506740, -68666400, -52938000, -37216800, 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 } @@ -535,9 +535,9 @@ zoneinfo64:table(nofallback) { links:intvector { 130, 397 } } //Z#130 /* America/Hermosillo */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 } - typeOffsets:intvector { -26632, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0 } - typeMap:bin { "020402030204020102030203020302" } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -873828000, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 } + typeOffsets:intvector { -26632, 0, -25200, 0, -25200, 3600, -21600, 0 } + typeMap:bin { "01030102010301020102010201" } } //Z#131 /* America/Indiana/Indianapolis */ :table { transPre32:intvector { -1, 1577320096 } @@ -687,7 +687,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 152, 552, 629, 630 } + links:intvector { 152, 552, 553, 629, 630 } } //Z#152 /* America/Louisville */ :int { 146 } //Z#153 /* America/Lower_Princes */ :int { 191 } //Z#154 @@ -723,9 +723,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2011 } } //Z#160 /* America/Mazatlan */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } - typeOffsets:intvector { -25540, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0 } - typeMap:bin { "020402030204020102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -873828000, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } + typeOffsets:intvector { -25540, 0, -25200, 0, -25200, 3600, -21600, 0 } + typeMap:bin { "01030102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } links:intvector { 161, 541 } } //Z#161 /* America/Mendoza */ :int { 70 } //Z#162 @@ -739,7 +739,7 @@ zoneinfo64:table(nofallback) { finalYear:int { 2008 } } //Z#163 /* America/Merida */ :table { - trans:intvector { -1514743200, 377935200, 407653200, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } + trans:intvector { -1514743200, 378201600, 405068400, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } typeOffsets:intvector { -21508, 0, -21600, 0, -21600, 3600, -18000, 0 } typeMap:bin { "010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } } //Z#164 @@ -753,7 +753,7 @@ zoneinfo64:table(nofallback) { finalYear:int { 2020 } } //Z#165 /* America/Mexico_City */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -975261600, -963169200, -917114400, -907354800, -821901600, -810068400, -627501600, -612990000, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -975261600, -963169200, -917114400, -907354800, -821901600, -810068400, -627501600, -612990000, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } typeOffsets:intvector { -23796, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "0103010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" } links:intvector { 166, 542 } @@ -776,9 +776,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2008 } } //Z#168 /* America/Monterrey */ :table { - trans:intvector { -1514743200, 576057600, 594198000, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } - typeOffsets:intvector { -24076, 0, -21600, 0, -21600, 3600 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + trans:intvector { -1514743200, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 576057600, 594198000, 828864000, 846399600, 860313600, 877849200, 891763200, 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, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } + typeOffsets:intvector { -24076, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } + typeMap:bin { "0103010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" } } //Z#169 /* America/Montevideo */ :table { trans:intvector { -1567455309, -1459627200, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1047241800, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -954707400, -938984400, -920838600, -907534800, -896819400, -853621200, -845847000, -334789200, -319671000, -314226000, -309996000, -149720400, -134604000, -50446800, -34205400, 9860400, 14176800, 72846000, 80100000, 127278000, 132111000, 147234600, 156913200, 165376800, 219812400, 226461600, 250052400, 257911200, 282711600, 289360800, 294202800, 322020000, 566449200, 573012000, 597812400, 605066400, 625633200, 635911200, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1111896000, 1128834000, 1142136000, 1159678800, 1173585600, 1191733200, 1205035200, 1223182800, 1236484800, 1254632400, 1268539200, 1286082000, 1299988800, 1317531600, 1331438400, 1349586000, 1362888000, 1381035600, 1394337600, 1412485200, 1425787200 } @@ -796,7 +796,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 174, 624 } + links:intvector { 174, 402, 624 } } //Z#174 /* America/Nipigon */ :int { 219 } //Z#175 /* America/Nome */ :table { @@ -851,7 +851,7 @@ zoneinfo64:table(nofallback) { links:intvector { 121, 181 } } //Z#181 /* America/Ojinaga */ :table { - trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800, 1300006800, 1320566400, 1331456400, 1352016000, 1362906000, 1383465600, 1394355600, 1414915200, 1425805200, 1446364800, 1457859600, 1478419200, 1489309200, 1509868800, 1520758800, 1541318400, 1552208400, 1572768000, 1583658000, 1604217600, 1615712400, 1636272000, 1647162000, 1667116800, 1678608000, 1699167600 } + trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800, 1300006800, 1320566400, 1331456400, 1352016000, 1362906000, 1383465600, 1394355600, 1414915200, 1425805200, 1446364800, 1457859600, 1478419200, 1489309200, 1509868800, 1520758800, 1541318400, 1552208400, 1572768000, 1583658000, 1604217600, 1615712400, 1636272000, 1647162000, 1667116800, 1678608000, 1699167600 } typeOffsets:intvector { -25060, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "0103010201030403040302010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030403" } finalRule { "US" } @@ -863,7 +863,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1946918424 } typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 } typeMap:bin { "0102" } - links:intvector { 79, 97, 101, 183 } + links:intvector { 79, 97, 101, 183, 401 } } //Z#183 /* America/Pangnirtung */ :int { 142 } //Z#184 /* America/Paramaribo */ :table { @@ -876,7 +876,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 { 104, 186, 549, 621 } + links:intvector { 104, 186, 538, 549, 621 } } //Z#186 /* America/Port-au-Prince */ :table { transPre32:intvector { -1, 1770463056 } @@ -1021,9 +1021,9 @@ zoneinfo64:table(nofallback) { } //Z#216 /* America/Thunder_Bay */ :int { 219 } //Z#217 /* America/Tijuana */ :table { - trans:intvector { -1514739600, -1451667600, -1343062800, -1234803600, -1222963200, -1207242000, -873820800, -761677200, -686073600, -661539600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 } + trans:intvector { -1514739600, -1451667600, -1343145600, -1234803600, -1222963200, -1207242000, -873820800, -761418000, -686073600, -661539600, -620755200, -608144400, -589384800, -576082800, -557935200, -544633200, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 } typeOffsets:intvector { -28084, 0, -28800, 0, -28800, 3600, -25200, 0 } - typeMap:bin { "03010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "03010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2011 } @@ -1212,11 +1212,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { 27232, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } } //Z#258 - /* Asia/Choibalsan */ :table { - trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200, 1427479200, 1443193200, 1458928800, 1474642800 } - typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 } - typeMap:bin { "010205040504050405040504050405040504050405040504050405040504050405040504050405040504050405040203020302" } - } //Z#259 + /* Asia/Choibalsan */ :int { 329 } //Z#259 /* Asia/Chongqing */ :int { 316 } //Z#260 /* Asia/Chungking */ :int { 316 } //Z#261 /* Asia/Colombo */ :table { @@ -1239,7 +1235,7 @@ zoneinfo64:table(nofallback) { links:intvector { 263, 265, 375 } } //Z#265 /* Asia/Dili */ :table { - trans:intvector { -1830414140, -879152400, 199897200, 969120000 } + trans:intvector { -1830412800, -879152400, 199897200, 969120000 } typeOffsets:intvector { 30140, 0, 28800, 0, 32400, 0 } typeMap:bin { "01020102" } } //Z#266 @@ -1547,7 +1543,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - links:intvector { 329, 330 } + links:intvector { 259, 329, 330 } } //Z#329 /* Asia/Ulan_Bator */ :int { 329 } //Z#330 /* Asia/Urumqi */ :table { @@ -1591,9 +1587,9 @@ zoneinfo64:table(nofallback) { } //Z#338 /* Atlantic/Azores */ :table { transPre32:intvector { -1, 1581063056 } - trans:intvector { -1830376800, -1689548400, -1677794400, -1667430000, -1647730800, -1635807600, -1616194800, -1604358000, -1584658800, -1572735600, -1553036400, -1541199600, -1521500400, -1442444400, -1426806000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922662000, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -623275200, -607550400, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, 228272400, 243997200, 260326800, 276051600, 291776400, 307504800, 323226000, 338954400, 354679200, 370404000, 386128800, 401853600, 417582000, 433303200, 449028000, 465357600, 481082400, 496807200, 512532000, 528256800, 543981600, 559706400, 575431200, 591156000, 606880800, 622605600, 638330400, 654660000, 670384800, 686109600, 701834400, 717559200, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } - typeOffsets:intvector { -6160, 0, -7200, 0, -7200, 3600, -7200, 7200, -6872, 0, -3600, 0, -3600, 3600, 0, 0 } - typeMap:bin { "040102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030201020302010203020102030201020102010201020102010201020102010201020102010201020102010201020102010201020102010506050605060506050605060506050605060506050605060506050605060506070605060506050605" } + trans:intvector { -1830376800, -1689548400, -1677794400, -1667426400, -1647730800, -1635890400, -1616194800, -1604354400, -1584658800, -1572732000, -1553036400, -1541196000, -1521500400, -1442444400, -1427670000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922489200, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -623275200, -607550400, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, -102542400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 725421600, 733280400, 740278800, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } + typeOffsets:intvector { -6160, 0, -7200, 0, -7200, 3600, -7200, 7200, -6872, 0, -3600, 0, -3600, 3600, 0, 0, 0, 3600 } + typeMap:bin { "0401020102010201020102010201020102010201020102010201020102010201020102010201020102010201020302010203020102030201020302010201020102010201020102010201020102010201020102010201020102010201020102010201020102050605060506050605060506050605060506050605060507080605060506050605" } finalRule { "EU" } finalRaw:int { -3600 } finalYear:int { 1997 } @@ -1631,9 +1627,9 @@ zoneinfo64:table(nofallback) { } //Z#344 /* Atlantic/Jan_Mayen */ :int { 447 } //Z#345 /* Atlantic/Madeira */ :table { - trans:intvector { -1830380400, -1689552000, -1677798000, -1667433600, -1647734400, -1635811200, -1616198400, -1604361600, -1584662400, -1572739200, -1553040000, -1541203200, -1521504000, -1442448000, -1426809600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922665600, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -623278800, -607554000, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 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 } + trans:intvector { -1830380400, -1689552000, -1677798000, -1667430000, -1647734400, -1635894000, -1616198400, -1604358000, -1584662400, -1572735600, -1553040000, -1541199600, -1521504000, -1442448000, -1427673600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922492800, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -623278800, -607554000, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, -102546000, 386726400, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -4056, 0, -3600, 0, -3600, 3600, -3600, 7200, 0, 0, 0, 3600 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030201020302010203020102030201020102010201020102010201020102010201020102010201020102010201020102010201020102010405040504050405040504050405040504050405040504050405040504050405040504050405040504" } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030201020302010203020102030201020102010201020102010201020102010201020102010201020102010201020102010201020102010204050405040504050405040504050405040504050405040504050405040504" } finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } @@ -1762,24 +1758,10 @@ zoneinfo64:table(nofallback) { /* Brazil/East */ :int { 204 } //Z#378 /* Brazil/West */ :int { 157 } //Z#379 /* CAT */ :int { 43 } //Z#380 - /* 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 } - typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "C-Eur" } - finalRaw:int { 3600 } - finalYear:int { 1997 } - } //Z#381 + /* CET */ :int { 449 } //Z#381 /* CNT */ :int { 209 } //Z#382 /* CST */ :int { 98 } //Z#383 - /* CST6CDT */ :table { - trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } - typeOffsets:intvector { -21600, 0, -21600, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "US" } - finalRaw:int { -21600 } - finalYear:int { 2008 } - } //Z#384 + /* CST6CDT */ :int { 98 } //Z#384 /* CTT */ :int { 316 } //Z#385 /* Canada/Atlantic */ :int { 129 } //Z#386 /* Canada/Central */ :int { 224 } //Z#387 @@ -1795,25 +1777,9 @@ zoneinfo64:table(nofallback) { /* Cuba */ :int { 130 } //Z#397 /* EAT */ :int { 48 } //Z#398 /* ECT */ :int { 478 } //Z#399 - /* 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 } - typeOffsets:intvector { 7200, 0, 7200, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "EU" } - finalRaw:int { 7200 } - finalYear:int { 1997 } - } //Z#400 - /* EST */ :table { - typeOffsets:intvector { -18000, 0 } - } //Z#401 - /* EST5EDT */ :table { - trans:intvector { -1633280400, -1615140000, -1601830800, -1583690400, -880218000, -765396000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 152085600, 162370800, 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 } - typeOffsets:intvector { -18000, 0, -18000, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "US" } - finalRaw:int { -18000 } - finalYear:int { 2008 } - } //Z#402 + /* EET */ :int { 444 } //Z#400 + /* EST */ :int { 183 } //Z#401 + /* EST5EDT */ :int { 174 } //Z#402 /* Egypt */ :int { 18 } //Z#403 /* Eire */ :int { 455 } //Z#404 /* Etc/GMT */ :table { @@ -1934,6 +1900,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } + links:intvector { 400, 444 } } //Z#444 /* Europe/Belfast */ :int { 468 } //Z#445 /* Europe/Belgrade */ :table { @@ -1965,7 +1932,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 441, 449, 469 } + links:intvector { 381, 441, 449, 469, 536 } } //Z#449 /* Europe/Bucharest */ :table { trans:intvector { -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, 296604000, 307486800, 323816400, 338940000, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670370400, 686095200, 701820000, 717544800, 733269600, 748994400, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 } @@ -2055,13 +2022,13 @@ zoneinfo64:table(nofallback) { links:intvector { 463, 465, 495, 503 } } //Z#465 /* Europe/Lisbon */ :table { - trans:intvector { -1830384000, -1689555600, -1677801600, -1667437200, -1647738000, -1635814800, -1616202000, -1604365200, -1584666000, -1572742800, -1553043600, -1541206800, -1521507600, -1442451600, -1426813200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922669200, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -623282400, -607557600, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, 212544000, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 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 } + trans:intvector { -1830384000, -1689555600, -1677801600, -1667433600, -1647738000, -1635897600, -1616202000, -1604361600, -1584666000, -1572739200, -1553043600, -1541203200, -1521507600, -1442451600, -1427677200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922496400, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -623282400, -607557600, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, -102549600, 212544000, 228268800, 243993600, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -2205, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203020102030201020302010203020102010201020102010201020102010201020102010201020102010201020102010201020102010201040102010201020102010201020102010201020102010201020102010201020102040504050405040201" } + typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020302010203020102030201020302010201020102010201020102010201020102010201020102010201020102010201020102010201020102040102010201020102010201020102010201020102010201020102010201020102040504050405040201" } finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 466, 599 } + links:intvector { 466, 599, 636 } } //Z#466 /* Europe/Ljubljana */ :int { 446 } //Z#467 /* Europe/London */ :table { @@ -2255,9 +2222,7 @@ zoneinfo64:table(nofallback) { /* GMT-0 */ :int { 405 } //Z#510 /* GMT0 */ :int { 405 } //Z#511 /* Greenwich */ :int { 405 } //Z#512 - /* HST */ :table { - typeOffsets:intvector { -36000, 0 } - } //Z#513 + /* HST */ :int { 569 } //Z#513 /* Hongkong */ :int { 274 } //Z#514 /* IET */ :int { 132 } //Z#515 /* IST */ :int { 288 } //Z#516 @@ -2293,26 +2258,10 @@ zoneinfo64:table(nofallback) { /* Japan */ :int { 326 } //Z#533 /* Kwajalein */ :int { 574 } //Z#534 /* Libya */ :int { 56 } //Z#535 - /* 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 } - typeOffsets:intvector { 3600, 0, 3600, 3600 } - typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "C-Eur" } - finalRaw:int { 3600 } - finalYear:int { 1997 } - } //Z#536 + /* MET */ :int { 449 } //Z#536 /* MIT */ :int { 554 } //Z#537 - /* MST */ :table { - typeOffsets:intvector { -25200, 0 } - } //Z#538 - /* MST7MDT */ :table { - trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -765388800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200 } - typeOffsets:intvector { -25200, 0, -25200, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "US" } - finalRaw:int { -25200 } - finalYear:int { 2008 } - } //Z#539 + /* MST */ :int { 186 } //Z#538 + /* MST7MDT */ :int { 110 } //Z#539 /* Mexico/BajaNorte */ :int { 218 } //Z#540 /* Mexico/BajaSur */ :int { 161 } //Z#541 /* Mexico/General */ :int { 166 } //Z#542 @@ -2326,14 +2275,7 @@ zoneinfo64:table(nofallback) { /* PRC */ :int { 316 } //Z#550 /* PRT */ :int { 191 } //Z#551 /* PST */ :int { 152 } //Z#552 - /* PST8PDT */ :table { - trans:intvector { -1633269600, -1615129200, -1601820000, -1583679600, -880207200, -765385200, -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, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800 } - typeOffsets:intvector { -28800, 0, -28800, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "US" } - finalRaw:int { -28800 } - finalYear:int { 2008 } - } //Z#553 + /* PST8PDT */ :int { 152 } //Z#553 /* Pacific/Apia */ :table { transPre32:intvector { -1, 1849542912 } trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200, 1365256800, 1380376800, 1396706400, 1411826400, 1428156000, 1443276000, 1459605600, 1474725600, 1491055200, 1506175200, 1522504800, 1538229600, 1554559200, 1569679200, 1586008800, 1601128800, 1617458400 } @@ -2423,7 +2365,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1157283000, -1155436200, -880198200, -765376200, -712150200 } typeOffsets:intvector { -37886, 0, -37800, 0, -37800, 3600, -36000, 0 } typeMap:bin { "010201020103" } - links:intvector { 569, 570, 625 } + links:intvector { 513, 569, 570, 625 } } //Z#569 /* Pacific/Johnston */ :int { 569 } //Z#570 /* Pacific/Kanton */ :table { @@ -2630,14 +2572,7 @@ zoneinfo64:table(nofallback) { /* Universal */ :int { 437 } //Z#633 /* VST */ :int { 273 } //Z#634 /* W-SU */ :int { 475 } //Z#635 - /* 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 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100" } - finalRule { "EU" } - finalRaw:int { 0 } - finalYear:int { 1997 } - } //Z#636 + /* WET */ :int { 466 } //Z#636 /* Zulu */ :int { 437 } //Z#637 } Names { @@ -2841,66 +2776,63 @@ zoneinfo64:table(nofallback) { AV:intvector { 9, 1, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 } //_#3 - C-Eur:intvector { - 2, -31, -1, 7200, 1, 9, -31, -1, 7200, 1, 3600 - } //_#4 Canada:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#5 + } //_#4 Chatham:intvector { 8, -30, -1, 9900, 1, 3, 1, -1, 9900, 1, 3600 - } //_#6 + } //_#5 Chile:intvector { 8, 2, -1, 14400, 2, 3, 2, -1, 10800, 2, 3600 - } //_#7 + } //_#6 Cuba:intvector { 2, 8, -1, 0, 1, 10, 1, -1, 0, 1, 3600 - } //_#8 + } //_#7 EU:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600 - } //_#9 + } //_#8 EUAsia:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600 - } //_#10 + } //_#9 Egypt:intvector { 3, -30, -6, 0, 0, 9, -31, -5, 86400, 0, 3600 - } //_#11 + } //_#10 Haiti:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#12 + } //_#11 LH:intvector { 9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800 - } //_#13 + } //_#12 Lebanon:intvector { 2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600 - } //_#14 + } //_#13 Moldova:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 - } //_#15 + } //_#14 NZ:intvector { 8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 - } //_#16 + } //_#15 Palestine:intvector { 2, -30, -7, 7200, 0, 9, -30, -7, 7200, 0, 3600 - } //_#17 + } //_#16 Para:intvector { 9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600 - } //_#18 + } //_#17 SystemV:intvector { 3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#19 + } //_#18 Thule:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#20 + } //_#19 Troll:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200 - } //_#21 + } //_#20 US:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#22 + } //_#21 Zion:intvector { 2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#23 + } //_#22 } Regions:array { "AU", //Z#0 ACT @@ -3284,10 +3216,10 @@ zoneinfo64:table(nofallback) { "BR", //Z#378 Brazil/East "BR", //Z#379 Brazil/West "MZ", //Z#380 CAT - "001",//Z#381 CET + "BE", //Z#381 CET "CA", //Z#382 CNT "US", //Z#383 CST - "001",//Z#384 CST6CDT + "US", //Z#384 CST6CDT "CN", //Z#385 CTT "CA", //Z#386 Canada/Atlantic "CA", //Z#387 Canada/Central @@ -3303,9 +3235,9 @@ zoneinfo64:table(nofallback) { "CU", //Z#397 Cuba "KE", //Z#398 EAT "FR", //Z#399 ECT - "001",//Z#400 EET - "001",//Z#401 EST - "001",//Z#402 EST5EDT + "GR", //Z#400 EET + "PA", //Z#401 EST + "US", //Z#402 EST5EDT "EG", //Z#403 Egypt "IE", //Z#404 Eire "001",//Z#405 Etc/GMT @@ -3416,7 +3348,7 @@ zoneinfo64:table(nofallback) { "001",//Z#510 GMT-0 "001",//Z#511 GMT0 "001",//Z#512 Greenwich - "001",//Z#513 HST + "US", //Z#513 HST "HK", //Z#514 Hongkong "US", //Z#515 IET "IN", //Z#516 IST @@ -3439,10 +3371,10 @@ zoneinfo64:table(nofallback) { "JP", //Z#533 Japan "MH", //Z#534 Kwajalein "LY", //Z#535 Libya - "001",//Z#536 MET + "BE", //Z#536 MET "WS", //Z#537 MIT - "001",//Z#538 MST - "001",//Z#539 MST7MDT + "US", //Z#538 MST + "US", //Z#539 MST7MDT "MX", //Z#540 Mexico/BajaNorte "MX", //Z#541 Mexico/BajaSur "MX", //Z#542 Mexico/General @@ -3456,7 +3388,7 @@ zoneinfo64:table(nofallback) { "CN", //Z#550 PRC "PR", //Z#551 PRT "US", //Z#552 PST - "001",//Z#553 PST8PDT + "US", //Z#553 PST8PDT "WS", //Z#554 Pacific/Apia "NZ", //Z#555 Pacific/Auckland "PG", //Z#556 Pacific/Bougainville @@ -3539,7 +3471,7 @@ zoneinfo64:table(nofallback) { "001",//Z#633 Universal "VN", //Z#634 VST "RU", //Z#635 W-SU - "001",//Z#636 WET + "PT", //Z#636 WET "001",//Z#637 Zulu } } diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 9b8dc7701c23..db88a2e4ba2d 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2460,7 +2460,7 @@ void TimeZoneTest::TestGetRegion() {"America/Indiana/Indianapolis", "US"}, // CLDR alias {"Mexico/General", "MX"}, // Link America/Mexico_City, Olson backward {"Etc/UTC", "001"}, - {"EST5EDT", "001"}, + {"EST5EDT", "US"}, {"PST", "US"}, // Link America/Los_Angeles {"Europe/Helsinki", "FI"}, {"Europe/Mariehamn", "AX"}, // Link Europe/Helsinki, but in zone.tab diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res index e40276a061ca..80ae1508b959 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res index cc0cf27e5cd2..fa8cac23ed09 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res index 4885a7fc20c6..422ae4861f4d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res index 5260bf76ea75..91801d47c09a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res differ diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 8e36c8de2a1b..7febdd27e3d5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1926,7 +1926,7 @@ public void TestGetRegion() { {"America/Indiana/Indianapolis", "US"}, // CLDR alias {"Mexico/General", "MX"}, // Link America/Mexico_City, Olson backward {"Etc/UTC", "001"}, - {"EST5EDT", "001"}, + {"EST5EDT", "US"}, {"PST", "US"}, // Link America/Los_Angeles {"Europe/Helsinki", "FI"}, {"Europe/Mariehamn", "AX"}, // Link Europe/Helsinki, but in zone.tab