From 1c2a1c50b70be5bf34ece49b43165653c4aecb0a Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Thu, 19 Sep 2024 10:24:26 -0700 Subject: [PATCH] ICU-22896 updating tzdata to 2024b --- icu4c/source/data/misc/metaZones.txt | 72 ++---- icu4c/source/data/misc/timezoneTypes.txt | 3 +- icu4c/source/data/misc/windowsZones.txt | 2 +- icu4c/source/data/misc/zoneinfo64.txt | 244 +++++++----------- icu4c/source/test/intltest/tztest.cpp | 2 +- .../ibm/icu/impl/data/icudata/metaZones.res | Bin 43008 -> 42848 bytes .../icu/impl/data/icudata/timezoneTypes.res | Bin 21184 -> 21168 bytes .../icu/impl/data/icudata/windowsZones.res | Bin 22048 -> 21984 bytes .../ibm/icu/impl/data/icudata/zoneinfo64.res | Bin 151504 -> 147744 bytes .../icu/dev/test/timezone/TimeZoneTest.java | 2 +- 10 files changed, 114 insertions(+), 211 deletions(-) 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 e40276a061ca7edc02bdffdd39b0e77a9b30fdba..80ae1508b95942ec72b42850ac86044b0f4183d9 100644 GIT binary patch delta 13307 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 G|NB3?!?bz; delta 13507 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 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 cc0cf27e5cd28fd45ca25461283db2c14f6e21ba..fa8cac23ed0965ad961552333ff5bc528acf5124 100644 GIT binary patch delta 2765 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 N&g3eSYqtJh`w!`#@azBp 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 4885a7fc20c681fcbd3bd5d83cf2649fffaacb16..422ae4861f4d9ad2c1409fe0fc010fd8ef3c4882 100644 GIT binary patch delta 992 zcmXZbUrZEN6vy#<8J1l(GvLCq3v6I!Xpu-Cc+ik){6pYjbr*Jrg~mT=qBViGMry$b zDWF6}BZ5f07^8r;O-%|239g}yRq>(5wBf-vgrpC()bP-zrY$~L6VkL_z)3!nGm}it zIlr6v^p;#0mjiDU92P>jh0yK`k@L|S(aSq2gnwwNV!TAfON&&)j;!RrCHqp6pOnUY z$@Hy@hTWleh!hbPQDZ51d9^wvLo&2l4P`dxm#K_MU8sEZ`MZqlzypyg!t#i0k;lA? z#)G_s>Wu7_Q8gd2Wtw^w*(Ehq8I8&hRev;?IUHyYU0C^68_$}_zo_m+<94riQ|i~g z)U?^O!R$=^MfO4Wgy)tRUF{IfvV(Wko7EfK<(@!bbN*kdzPiKRmlJV4)%(Cql4meIqa6#R6_WLq~ zi;Y{faWN#l>D{?=s;IU^?p2Z6#v=WYerRQIqdC1ky?!kuV0=w}p-a{jfq7x@^7QGn6Rb0nSjA07X_y!O07_;~Ri&(-- zM-;k|1skO(b3|9+CW>vSL>LG0J`ST9t>{8GdeDy>_yS*nhJ}ytJ^sMoSayUd;DQ&K z@FNd}C#3T`O9zWx`BP?0LZ3{R8D}mjhu|;ExBe0HP0GDwMY;Li+HHt|j)xbN!hM%aO w;&=Rs{~Td^;6pA1h;S}`rwIcgyWgV>gMF*clrpd^ttE!s*e8c-~XQyJiygZb)CM?g=PhutM`q!2O^@Esg z+48nDO0BGt$ud{g%0}wdjMg)|N;aei-@I=+>x^}hB^44kA4PgH)h-oP(M;8vS6|}l z^Yh+|F3pV3y;2aqDcMq?HmU~oQQ)rGKdMpBtgKP%b+Xb?G2K%+PmS9jkH?l3_4}`e z4&)qGhcX{Dcv8|DI8odeZjE-m{Fx^e8YuZeH^i%*ZGoxTy}|69^Et_aJmYr3YTq$` zr*veNjE9`aHGL;O(O2dVhi63db!dK*uc@fg`=`;Qlk@9*1Nn9SXU2f`SMBk%8EraQ zRjxkMXRGFVyMn_;m(EX=dGo}TFNd{rX)Zo*OT>YVC?Z9MjFH$8<3UnKZ(v0Jbu zFlZJQP7e$PUBAzK!>rJot0$>i-Cn&zUC^bjn^mmzCU<3UvUrIgvm+JA{j~V0zU9W$ zHtk=qW~_NIT=TMVvp#oG?xK;@%wt8*M=GPmXwmx?bgN!HXJLivOSdeHs^(f(#%w?% zwqgf%VK$r_!{Ef%1lzI_D1QSq>If%n`rMYx5#ryaG zYw-y_#~0X-18B#$IEv#qgP(B)ELeIEf4O2A2x2rGjK?Irj%k>QS$GFDV7YFySTtZQ z2Mt&>VAWwWNWvlsYY)DJ#y2>GBj`XE(&$AWe#ANaj!U3H>js8FA{L2Q&+xA+wu!OL zyjFlCup6-zENru|%@NpNqZ>Uq4R&s`bNg5PfgzB9O#(Iv*bng(|KNoyP5^nZF%eTR o1G7N_&Rd*;Ljn#7I4kiXI0EN8q|lF_a1oce^|sBuKl=akAKXP2r2qf` 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 5260bf76ea75ed22c27cd2d82f348615cd5c402d..91801d47c09aab2135d9997d683fcce7f660fed1 100644 GIT binary patch delta 13449 zcma)id3;P)`2KtDOqQ8sCU++LezTKUV&91*6_SwHVo6BEzE8v!iA)Gd2o_h{!de`m)fE}8y*E@NG0xXgDEjjOyHxwkj&a8GvG;NK|lzJF);!S3UX z2b{CqXE~4cPxtQRzR*9{8u@! z%g5mpye%$Y8c&8s`%g7~>vB1?OW3T?e#YDGtNhE{Ym86a5BaYQs|wrdemd}#`xQ5h z``ys7ZsyQpw-EO~z2|r@^WG%9>%C8SFUag)WJ&_KjPi zN3z>OkHJCn0<_*IJjMlhxxE`C2^YP;^_UgVAgIQ>F6d*o?cUEk7CKjXtct9TJRH@+ zd96o{n=Jesbk5^Ycxl+3pqs*9)(}(Z#~~4+-?)A5cF{){^oPgk&^jMKpO~<}1KNka z^y%pGd$@;BPoJSalLJzNb>Yz=?ew39^z^vmao6L|fT3=;f&+X?JoO>Ne3trbjQBjv z6krK%8Zb9FK0MCH=B*D{9x_dv>$uv%;<(MB(9!0qar@2jh;xmztexO|-1)qt^-JgL zj^DYO9LhZXc#bzY-*Z^%8tkw}JKbTMYhzx}mN?#YeCTtWZ>nAB{LHn3&cU?@-`Qa= z-&1GS1@l?116)Vy8u?rd*s5#i_`>01hc9&9T=SiroZNMN0}lB7q+PCE=NZk9=Vv)w zaGk?1(B(Jp3`Nf#*1WfAHJB(ZL(SR|W6$?Vvv!d@}e-ct-F8-&Efr zp0j)>xn2|~WNpX?t~WgwdaeqK^sMo<3hqKAeg#oPLreY(D-NqG=h1f#;Uoi`A*wQyWQcHqu$X| zyH|Ty`?>a<_KNnF_809l?LY_4QE-fLZ0*?9G1bA=Uv}po_~7jz5D`xF&KPny`sI^3#neo27e*j zX_M}Kr`?8zzPAl+0?F`}?jzqnbYB?y8itvIoj%fC^m8&yb~@>F!7w|}>^0cbBrx1i zsr%8-$JEL2uGcufhF-ID4^63tZKh1W_J$7)#{yd$&TF1h6HT4QdR5y;o2B*F@6d#6 z8)_P88fjjIJTTnwOVPbFJn+kMy5Y6ZZ=z|OsX#MQvr`jmo}yXmcV8oET5^h}t$D9s zv8lo&X*z1+C{%M+vzNQ2Nz`=Lq-xU5pXqgeOTyC4vkWgxTaCKF?p~{~y6V8eUNxai zALjRg-)E)|t-=)3alc!p3xN|%KN`LDv0jHvzXlc?Bm6FSoiVWYT7EQ&kNeaX${-s7^l46<-xYznuG zeueintD@bkj$6RZV7Ex(7IA@`Gjn8S?q}LWYq<@aH!)}2@E+YEUfk2)w}(4D<&sDX zjVCXrA)Yk`<5@fuchw^=?jX6dLUtC47d~3Bx9Z!ZP%~JyFJps6KEu;=i%nyTxyw|< z)8=1#xXvk1Hjfi^T1oa}MI94Bsdh77pD$9ee9$xaEhW zM!GEC&j_)8#hsvF zc8K&8jL$iIg4qYmmHy)1Aw9duK4$*r(YP8%0TjS~paiZASVuo{EAg~D4)r*Vph{fV z(@<)OPanDs|07)4i;up(_b%GS&d?5g^wg5;z_mhOz52<)?T%7Qc8W``pTJgb5Qfv! zx3mfaoQ8LSzGX9MDTbYhPk$&aaWi!~diD*Np0)y`sSWc%L3F3N_K2;!q42AZ#m@}}eIC-G6wISWWXcg3i>q`aPch?d?GO5K#0S*rd)GQ;QXiom&kR69zh3KM~r6QFe@BKiCPLyfLKrDckXE4KrMX`xMd( zg?t>u+MFbvFHb(fU?H~fVRf9Z)k02pKpO+ifW5dZ!(O(9kJ#&A^m(9=Zz@lIn2KLd z+pVz)%rFG*0!T|>SKC^SFLW?`ppd@{qw1%$yyim7>Zx;9{$ zU?atjQ|fg2U=r8{u~B}Z0Rag(1my_qr{cc+MgfcCFHWy{{g3ee%HYFliGmi2FZ2Bk z=h5^kx*&D|KZxN|yXgZSfc^&hyEt{KWMB#f8hHxDOalExpJ@rYXt1VW&BPJYh8sG; z>k1_awue|d?V({1yeueI*b4F7^rwcE@G!4H%q#Get#-y}X1J_S5QYuHB7;J0-3!7v zQ){^GflA0C><(K|VK8Sp1{diF_Tecw7`Byd*X*WDmj+r2y3}^7cs(<%g}VW`4*4eR z6Wj6<$U21t1CY#aDf_o3rLxsZ0 zcC-qT2i)E~g%5xoW6N1~lj({;&w}2vr7j=GqQg+Oq$SW%sW!mi?nL za^$X^EC*a$=N$N}?9rEZ^KwMtaznAx_MYO<6{DQh#!SOF>4(NFSX_VE&&6IX`d6>k z_7erEsjeT!MQS28ivy)Zty)*&N-0UV4>D2|aYno&oz-0dd!bOI)^>Dd7^mZTip&RH zEZ$#rL$?|XWe|BvtX-X?y9kCjM1F4zUlYn1BY##XDuJh{B-m_QzjYUoSnRG#pwl3u z6r#SfwXMcE8}$oM4X~LT49Bcvw(P%>J$rA5*}YT4(mMI5-X z%2jQoE{$;-t=M~bDAS1ko7(CoW02JtWSf|^DcgV?H8>0f^K0;#_{F9K-*3Ra1G|j= zS|Ar&$O@F$gw1C-UJbxM|8RA;$aX}C9WHo_v4``;_1n5f+(zHK3N?I}r-tic&!APu z|K>w1*-;?&ygypJzkNpFk32=ABBGn3Wtac9w3X~AWV$YBVnvfGQM)r+w*_oBn9Vj} z=ToLT!c&aDLNP7G3GdaZO=E_GO_VIHSh%g^eJ9RT2>u;(#69LW+@-B}?cn#~v=0^r zVzV@g=c!Q=>;PPG044!n6LJ1FpS{&gjlnSK*T$@;$nWqF7r&zuqxZEljYfxwz}M(} z0rr7y>b{3eJvtg|d1{P8Z9Ktd+3&^$zRqUj5=irK=?3gm3>vbcrlLfO^jZ79H%XLq#+}s+;t(T{`HZF${)_z1QTPLQQ$`(cxD*fv2Wu&@{vL?Bg&0 zEt#gdkZq8^u+<*P*LbS;{vH%NJ$4FDu`^)T+p><`V1|zrYUYfWCKp&i?0#art~FQ! zSdw`7M5duHya7-$VTXv}pQq_2f}yILO|un!zQjH@s`9*hwNZV+))y@b7j*{B`PD1wnJ9b}r8Du=0)^5dTulG! zuy{^!R&x_6{#xWO#(bS+YK}{7fuU$N9Cngz<=0&}QyJWaKpkYnuccPpbuqxEJ@3v; zexQjwwM>HTi?P~@doKFe;=UQpOk*K!#HDSpGA@PJUpjXIPsgtyJ;tS{3bo=yrS^!y z2VNtdS|J3ja8_UJz)Z+ZE9~D^g|Ox5-xU1?o6mPGm;vW@tFLegWz$Nr4ZL*n-}JTm zgQwO=LF)mw*ehpQefkjM)`(|o?AzAJS?jZ+$FkZo)6UnGwNbL`=n4uRW?4`ClVLuauK6 z%@OzAz1M0n*lw_cxFZK_fC+^Cznt}Z9sWJ!+ewCRnUnU_t2G@({y~iCG=@YnI=Cp* zAppbmuFuni2eHigpJPs3^ULahMz~&#cBQcIqFuXx&)@JXqIGMuZT7<;rh5-9>d@k; zZS$iP*4ROzj;EtPMKeX-oE#}|i=y(z` zYOa&UcIQcyrkT38Q5>DTfbBeWLKZun$H1M{nf-4MKe5p>MLfE~O;-=Baa(LY>>%ik@dN@!Fp|J-b6%4{1LJ)&TG0NwCbe^2NFO%!E%WCLm{Qjgp1NYVuB#?!;*A`CX|RDsn3|y{Qk&2YqjZ7oDpeU+rf)jv0MJ3`qz*a; zIE4OwD~znWlxk!h)YBzlGJq0KK#3=m$}5fduJ2iioc;*D3^Fm0(Uwj3AS3| z{n=UF9?-L(m*hMC>>=k_fTi34{|We+rz9*lX{mHSi0w3NgL?qdN3fsDn}eAymaW?ix*K$_)IEkhw4SnWpX5&fJ75D&#sLIb+ltNlIfj zblGf2DXs~NHzxnBP>P19l<~0h<*Fv^QvIIW`9FIu=ei&+IpQRRHfPOzUmpi4IP+7g z6-rIvDK!nYP@d47-QfPYo{EU1qP%*#^VHKDww*kp6>Gtndcsc!c0os&dY+WGw_#`h z?bq`w_@$iI81;r~|YCM@IS- zNLk73s-Y6@+mLp`+T_F(Hh}3)fWJ_vuTI{a3T_C5-@iq%(JBz~cLLP^e!|T#S=kZ!;hHXm2)y zc{*X;IB)w60oI|>CfE<<)V|ozIy^A?y;7*ZLEhYtt!KJGp86wo{ijK52C#BNIou_X za0c{WA;%76t2ljsq(37{p^PM{b}%dV?GJYlkOLWAGe+V5+GRflku)`vCFu$wBib4B zrQ?~buVE?N6_60|jI~mD7CWTRK*TeSfuEM|WU&{_b2BD<6Z{HK16n9FAQ>Yrm+y~e zBbhuThfQ(vO|+1616;w920T`1Pz#<0wSg^@?~G=3&i`B=v`V4DID#{$@RT_N_H*fu zg-tPLUV(odS{>|Nc}yOwVaCiqL6GaL1ckCPWFa4?t!@lBrkb@w&YH?rFnyK`;e|p& z4ARSKY&`zJKtm9VA<>d$I%=sSD7p`MOFllG<#VRq@DZOOhoGZmhFp=l7qD)|A(-=! zC(xe4K9|=Nuu7(L;%O*~cW9OrTZqu(g>EQb=!O=;TBYNKEJcmoP*m$s3HDt%ponc_ zx^3Y1!2goY%tkWY70UJokjLyW*hqw~>xSos$7-eQlLRZfpu_o?jZw1~OE0a=W>^mw zud&%O?8oxq61JZiv(JKj!&8pGLOD(3lDTR@;(?h{3jU51Fb|pB2Db*%ZrBf`qIqng zF$ZhR`2rfc=Uk9I=Ci)`Y@+;fZUc9C8Wyb3u*PyxnY!jK;23h)a+$AStC@NL55sDP z{Uz^Pz?Lwbfv4Owg>r| zv6v+rbDzV13GJ0a!?ygn zimhY%;TL%tfmn=aEEO$d$JBX`$OO%mx{K_F`m7s)N683mlM$<>mdn{6<`M6~-v^wB z{vE6$b$o}F8Am*X{~NRyuz$* zL_ZRt9eEQRCHpRmXZn$U@-(WcLZdp#`&QuqG~k3Dg?Ecl5^RlRS;Kl6M;(TL1llp! z6VjPAY?gTxVm1ns8l^zTfTQZQDPy>QFXTcpHlJeNj)2p>=H(I3HnEHAId?`ZX-k*hIo3XKVoQ#Y!| zD2~Z7Sm>C=^8HOJUk{GCjQL$!v<2nmq|jIwp2nifSd)Bzi+VZ*gAWIvCNJNHzj~xD zfWHXZm$26`es;OR`vY=}9-#4q*to5#5dun~vy5baJea!{FI=i@f!y?D3jq#f5 zO_M6CHixwlwxk{5YaCswYU+xl(L3Heb7xT!pin*qB@w(MffIsG`qY`nih<6FwR-e)dMmjpf;yg)j- zoAuRUspC;%L&PGp<(&sFJfAy%YIr@wK}D+WcA+{tJbX5Rjoa>v}9dz zCw_g+398PvRBfnyRg{c$(A#Hdz|@5tB^0a7O_+EhizIlL}WHX6p@$ z;Gv`@AxM*U$h!`+4xF$0T5%a%20l_~GG5ar2g9~qaRdipDm+y3~ZG8`Hr)9v*69hvJQBR>rWNRGf1^(SiCh4VaaP`kLj=o?~hd&7f!-q14a+Ro}X zv`o9Uw(1Qn$F40Yc|#j%*XCH>(8j46k&(y!@y|ZP$#!v3wJN>VrouzRRc}tFz^-jS z3j0sHVt8n`|J)l|sa?aDP4%Ds9u@G=E^+E%+}DS1QNNn}=UQe5?hxJL><%i8OU(u zA96HXCk?G-ZOv1@z~!?5USOs?RVbg6x7Xr? zkIwf32?Pf7l%EZ2L2n1#Y&LKZ_!Pi7#reoHzh#^M=eH+Pz$JFboL`16ivVnfe2hEQ zEZ@1r1~dKCXr87HhcHD>y~4IKSoSiIx@fTjj%(HRa&mIXN6SFby>;v-5S8OiR&&KcBi=7lI_L8-XGjrzR zW+1HqJU5G%z;2ZrXt*+_FFphTbzpUs4`?}L$Qs0x6%}i>$Z?L`Pt0sB0r?W*S=gJ% zNF%B00`ru6I&-a<(fXG{CCG9K=2g;BuF~OuS?EjpK|n-G-j$tQxNZ>kLa2lAyFAd9 z+sKS_9C@0PqR^Zn7_e=9?Z|?W%fOX9sCbv2vm5q^JkO0=2=Tl^a~*h^>jLX52bj3G znSO2?2!#+9%lpjSpUgOSEl4#)6n&{qKJ39YXU$8IgwimeJ5Qx)u!C_&oGGvW)t`E$ z>h9zg6hB=P`_uP(q`1bMpOoyy3Hnkzk4tfj(%I5fFD~9#inpv%gs^l8>{98t7niIr zT?>x7DBUW}3*hESu7TV*bLn0PIH5|<;^GC^t8zskH-$5oJ_dQF&^&B}c?k2o0?Ae2 zrW@xW+4Cf5>tQ#_RRVXC`OdXJ8t38Nd7cdX&C`61Li4?3ODI?R?=Ow!H-gp_*U)$V zVaYjy+p3?BZ!Gigfj^cGL~z}V^Z!<;jCd+T|1t;3HIh56FLMWP0p3wkBDp^LGK8oM zAu8)Fb&TR#>&vpihl7ulilVq=W7%Z*Q=!d(Es$!XxYK@R^Wj$jtDz$bWjhc`EuzV! zeGRyl()|WpXLA`gdD*AHNi_Nr_G_tQLvFCK><0WFq1D0uENyPc^)Z$`hyN1VD}~CL zq>bhl8p}=a@oSRuVAwEeO*B_*E^h1|}@CA}bBW{VO`uc%WuKXPUnJmW|%C|}f8mV1B0Y3?TTJmYkjWU;i z3;!zcJ@lKfx23AasDSb(;Mhaue@VB%jTJhDDqMJ~aDz2T9h-2u#tKZmA_7_rY-4Fx z6Yh$!q67Q^&@y3%OUs*bP4pG0xC+F#qCh&+6d|f8g}(qADz0Lw)H0Tv9#nyOR_p}d zjadKZ?WE#k`HNUCMiX%o>pF-wpYgN+<1d(NZ~NvO%7Ue`Ps=yjF2FA%7B*FAVTQf! z!9B1zj@8$#g(KxLZP2#e>v0#3_6f00S{>HNmL7J2csXgAt^ixy}*$MQzo+wz#MXls2vuSIux zT8x-2u0hjc3$c+v9y-JUW}u@$-e1Ey0I>r3s9Nl6s9HGS0KEZh%xfM4t_b9p0c=&T zzs5iP!Uc*BaD6SRozNkmDKH5>ZW2(VY5*DroR(6%asJkyK!aXGZSqo}z%Zb#+6?&T z9_SL-N9C|ffo}u~!q7qc1qzObenbWQl>!M2mvX)_!1g!+CYJo z1!{=C(d~iNDhCqaAA&t3P)vK+BZ8G;rVG@F19E^T0yTa;nZ|z$)TA@e9}TYv)YKPt z9_$d{Ec_1zirphnGc};ESKq7`_$Z)QpytB_YM})h0|f%L#6nvR1wIp~75rA1e5++v z{J3WyxOJ{Tt#P9^2Jl4Kw*_j8)wKNze7<@U_*iW_bZ&PHe3@NqZxpC~8$f-zL!0&$ zz)^uZM1XgL-6&8;0@4BKom>Ijr!%6_S*=&XH>&y-TotH`8Yb8{tUPXkKwSfXtpde2 z2R;!fAqwb@Hke$(2w)*_`E~!#1xj=Wu(HHop(z5rl>;EpZ~ZAyw=uvD=m`KO(Cr80 zKWU9XNnZ=p9Yx*!Ixb8Ss7Ed=R+6mdxIVQ1SZM2kgTNDLm}m+nk~-JkzNfmm(68sW z0`;mCD9s3-2a5ts>un(}1s2!R9>K@nNS}cGr_WLeb|*rZj@6`ZhL4-p^JfC}o&nqt zs1G90rwsT6gZ?2ea1pFdUzk$GEf%^ME4+8}Fm>lZ?bW{Pp1r|FY1L?@f zx8lbl06EG)wGQYj(4fWkhM8Xpl=+)LStz6|RQC`+=x1Ot(IKh8Z2|w05f}|D#5JsL zXf*$Q!Xihx z*cHQ}4@ZFxKZN#}`EZr!0!T$>JEH}wrWJ)f{z7^ zLZn6y1aE-+kA5Fc4+x(LG^V-zrejtKG?oJp;<57p3_R{VfyQGcko1pz{v@MPTkYcNvx*zSjwGjLdyI-R2AoMBO4!neaLZCSlEHT885cUlC5yIyJ z&Bcu8t`w-$0~)rfI>Az`x-?&^?#TscvDw>6M|*N!L8bGMFmx&nAl zdeV~%f1PwL8ZA)xG)ZdEi))FblX{1{0?k8m=3(0NgV7)RZ$6Sg|2cdlz04KBQO9As zlnn;P0mZ;R;5+Ephh>iiD%S(C0OF~(EguEj4Hj+7k@RvKa2~iXP=ywVz+U3or~qjR zOoHFm-l+neDzJcx11r+F=;jsJh6~DpOso8bBYu=Y5~QKKFNV-S>6MoN}MCvq|LwRn0n; zHOQa8LkMvIdJw|@Ru7_wPYLl{xGa9IvRSvOQvSHw6pBi+bUGKG(D45lM(DUMfq zm~S$*%#X}-=9M8tpj8>3GN#uW3%-Y0n2m`_9r{ce)wWE!Yw?So_GW(zo2LTKkvVQQx(}D}#5s z)%e@FNiHh4+Mr1;`k(@raChQW&vBXJSi+t3 zpC0_9%Y64V7puF`zto`iI_qvS7+lu*ui>tFU3a$_n)_FKJ@!BDvfJy8yVY@}du7;` zu&=^9IBs;WcKMQf;{Uz-(U6kh-~E3LRG0(3f{q792L0%A&gGik#s9T?P0(XKr*9de zG{grp`mRoYhxq6-^f~&ehV%fJkm$fT^~t~tcgelhgBWsL9tH&I7kRLOxq3mrE%aQl zmtk5!TSIX`&yeo=1757*lfc=^vG(ijrrGbZn{R)>S>^Jl{nw7wj$bOLIG%C*!QT9x z;~o1O&R%xq9vth)dO1F|6P!csHYn%V?Q(9-hA9`>|7!n2e}-+Vv^u_VPEa{Hr?N?Q z``HYYUKPrYavtV9Ue!u}&9GAy=Roa_+kLA_ah~a*aqw0RG91?bru;;?$s?Mb%v$Vz zaxP+*s>V2kI<$2Dh+S)U$9bc+zd2xtLucntRe27*oR2v4S6S?y*!>kSQU8xeyu(Q6 z^Xx8ft!lBuhXM0dpLnEs2Y46*mwK4kLjfziqXV{vR0bUMPEcP7I3FN|3=MeZo$j6O zVe!s)zQ)-HZVVKifAz3>R0cYN+Aj6h?)+La#6=IM;28LPf3OhB8yR+uqKewf9x- zSAL~Dr~FUL^f{Q7!UstrC{{EVK}K@RFB zKBCVl-4|wVhVG2dL)}k)Q*;lse(H9fM|Cg#3bc_vKY7-;+6RyKTj}bd?cf^X+S+fM zI#HeG+STEy;)pUvk*OG{7^)qt9_A^j$GKY7(_JgIJ=6uR)#_!gN7ZXRYZc!p{|fcKF@A~-$6%}qlf)G*M7(<`Kg*$1nlu2pC!a|kun@Yk~f%_o?z zNdOgzngrl;5}yFNo7$7-%tu5`FVch5!}UX?b|wa5pg)sDW)ZNK{KTvx-N_eFzaS$? zA=1@k2x)^)D!C5(GovVgfPe-LNIeA>VSe#AgWa~Sy^^)4pOnG7@>0%AUsDA$iVh=p$tQLGHO8j6%G`zhIbDbJ)@C%PIUZiuu!iOp5{fZ2 z(Ld=9+LJb=N13I}P)5r*F{hY5bpw-*7)mGo5yqFvrMfQ3(ddam399>0%m&4P?U%bx zEzpALB(Lm?S0vdMMdL z+tIfq0;wIDP4I^^U*YfPBp$Q1f*dBtFrGe2GK9G-hq<>?L|vmWuNZy(;B)%7Z{OYm z-V$Qqa9zUPil}7Gc5d)`g;`ImgeNP>$E1R6Alu2OL?nmE5%LW=M=p{p-C z`j*;JC#tQgl5jZ#mIAARt$+!#RrL0Ga2R@NE^X> zY}C$y=+70wxFtPxB}eGwiWZ%QQfC7KL`GR{8A#Eqb?2nJ||_!lMGW z*^VyasqPR=#9-iS$ZsVQ#PTNVUA|XIl_nJ4D3%1}f@geIYNncUSSO+2K|$AeuJBi0 zwZxg9U%o-}L?Xcmq+oO@ILQ{h7|$9Ab0wtJ;GMRbC6JE7e9Mv$g+xN!Z6+(E2$-WG zjR()MvCD5$l@;!7xUX!l`Ej&WD8e-~St6lB2_bQt_dPJ}`D3EAZ%md^OuT5^@7&I~ z|DQ#*XCF>B{cgZ~f@HTcbFMW0Z^n5T5R*{z5-D>Z6mx#`*2rHJM=Y_U%%O zU};JX%eT9#L&xHAJMg$eeC^64K2}InVX{MSLb<~i3l~(FlQ1`lgc)qcRl$rZ0&W@H z&3ySMH&r%xKft@i=dbRedJOLwycf0;tAiMAIMz=15SE0G08h6)Uvr7-He$K`2p97g zj<^VaV*7F3Uo1K9Q-lqb9N}MY7@@fU>oOFyFXAdcc4MN)LwK0Eh^Hv8 z07hX=nQbRFo@12o_VAx>3+1m}^x~y2^7z!PJwyMINE7s-Ni|EFpx!1Da>f4VjPTLh zXYy^g{p|NImNacGk*0~r^}puL7QKBoRb?Oxk1U(`y;UPr2jCrtchY9q@sg@8u_O|) z8`*<5?7A;!jhqf|zF=%iLu}Ez9T?qG_>Z8Y4^i?L;uyaCzzsh1(^7A&l&CD0L=6Ft zM~d8^iNLqEbDvgH;gy1p5t@rs&HrfYq??UQ7T^{N+?Pl*Y75!>gvxtGGd)Y1AvBv= zY}`H<#;;+vnyrAe3Q5l-(%cEv2Cl3swygA_CjQX=T$LY7n#Uof7aw&XLp1;%CcOD5 zTk!!Wg=Qj5thMHECDI~%O|;dVUdVL7xU^abU{`I0-nMo@Z(aU#%KytE z)JHX1gf0z>kYXvyA30{#Z{G^9!0%UJn7VZ+OIo+bgJSsy=MKr!7RIli#EK(z4(;gB64;G`Ht=Pe@xFqp9l7}LPBFHc-!ds5_4{f+9O<1ZAg=>|j$$3&?aTU<(H z)}}U@HVcHA0x1JL0>$LsYytU$lm2rl*>*m~i9Q`!XQ2p!Gxj@M?6b)C;S+nCC7m(G zodaw$o`);m?MR&w>77p?=_L3uDz0lA22+yfvjd;-dk4PrM=EChbKZEsU)=?_qAr~z z(k0mz|L0K3ulj3`4*OJ>J&?XZ0lA60ZA1UAc^?3K>H&Sgm zB5_Mt632s&+M?egNH0qy9;-MW^Bu z@sN`GGMe_VasDTux`Z79wBLok3OZ0|>PT;Bj!C4e4@hPKuv zph$P1CyFP7`v^u29pZuBBxb{vOUt#51r7?AHMFOo*U~uMRHV%U3X!i2yi^>krLC#Q zGVJ4suSD!xiRX}Z0eoGkcA+Qbm6_xsktDrfVd)-S2u#dT5^ktTiQsNxypGx!`4X3e z5KBVIq~G_sQ}KOpbW^gVTdG95WecY~=t~ujkZuUpZdKwbPnt?K`(R_w>-Gfvj~Jq- zw)aK5Ygp2KfJC~F7an-iN1Ays7eLww-YG~v^n&UT+-q>}i2Hr%6UM__|4pI$AJAT~ zq{nQD^jISt@~1mAHkgRU9w)))#ry#3#%ONA#-i$puJjxtt_Z~JsXl;@JUwrUM}sLs z=eb0Bbz?~{jB~G%;^k24qH(^Cr|LA7i~&!`&cMH>D#~)o{On zdsxs%(kJ~c)L*T7pMi`X_x=+zB+pbna0nR+oES22`W?Wu!-eMrM7 zr(O~^#nB!*Olj&Pxbmix{;yTL2%lCIEk?!DJyi84OVUy$k~UhnlR#UjrozR}mNru` zbft+pUsU=%+=Y;fz$JpID@|76UX_NROa9na|DCWRm1cM#oHOo0LfCUiY7T^-3x6gmX}##u{RkJQ>sI}*r!3xAf0umD#hH8$1sM%H z15JJvN~3?d!W1z3o{<}W*AzJ9lrbpzq$#*ll`$l8yD8MS+!*FmW(rqslfs{Gt&O-- zDmA%WQrq;z1SxXw_}ZvVeWhkA`qVZrh?ZL9x2TQIag|yQGp3kY^=V;j-MP7`O*5Ub ztsiS@=lsmr@z>4PPJ7o{VmGa^c3xqzbSW@fPvLh9^>R~? zX#7sq4g*kzfxzJRKQF{)(IU-FnD-%J@caKR)@0F77{6ye}>a34&J>@#1Y?U2jKcQu(w18q1l5F zZ-agoi^tIWj_=Y3Vaps`B9S53nuc7E$WVWwcoLnW9g0(YXgih+Mc@qWDmt2I71a(+ zhl6(#Lsx@$i$^Ep6j2?8kERZz;_E4NB~=f@-ZLx%!f2r)pN>~ehl{Zowm@K~Voj}p zi{iu9h&fYf9;4e18{;$Fl_kTyz^#M_(`k3@aI|?it}4S*!TrS88MKV5M!??)f3Hw8 z6GMLjCf)%IzXbk4$eBfx<*^(78>A=Tr{bYmbSqWiGCm?vA|v_>6Xswt#>1QhU<(*A z8$1s~m$3d%%^z4XdxfKO=_S=NB%#s~cZG_1)TVg}^DmYdT_j@k5Qm!SKB_f_!)XdJ z54=d^=F966`-Slu{Kvwf1(?XU5*f*`WTXRFB^VacQte1|aU=%~#YaYpdl%A-`pLvH z9N8I&N7{67p=cs~6GLRP~xAqtKaA{l&~;x|FI$!`}-3fcRTU!?GQP z=Voh!q%t~AosDIi9SOg=u)mCURcGS_&qn#|Zi2F$_SR-&;%J7l*vIKattiV2>=I*`Ag|qs?KQ!0b`LWN}<8r%mY;X?> z50=rJnlmuZL&7S_c_v(5PXFaP+D;;)oq;AS8QlULBV6a{BJJoNu#=%>fU`u?3VCEF zz~2M^nCQHc22BeS5m@2-;ivX&^5*>R1{w=X$gX}+J$p`Hv@S<_#*t%V$v2`L{o0SmRK?lQ!_3a?J8e>uc~r&a*1{Io7>&q`0Xhm~H6Yn5Kl&QHf<-(l9 zxNy6EmEkYCRz}=yUD@PHNM+NnJ!qv+bCx!7>g;Q6c+0eSWfjd4ER{4sXYYVtHS0e0 zFQ8bVyox3Wg)UU*^R(88|3m@X<#`NASKtDM2jMgB)xI6H6{8;S&XV!dB{JSB#_q!F zan(lnXW?HF(st7f`HSRu1k3oR;?CVvK~u1}CSXxd2nV;UAK?n?>g3s$)o-p?D=PlB ztU0~Rves;|tgHH(RE`*BSzq?bvLWHVW#h!TmQBIFWOM4Lq{{9eOV#r=!ry!35$-Hx zSJTIBG^>4yw#=Eh6tuUn`4JXfj<>}%Q*U)k{M+K*`Y)?T@FT0I+jXm#;=I-C*#0{@cZ(e~!L;HzFMRjE1Q{)UxD5H;H`cA^!Fm-9XhJ20+M#FiTvu7k4mSDeT3- zE$H{bZ-k@!=vvo_SV$ASfC!dM!~&YwQZ$J)jB%Y94<`}8t}qch%fx-cwgXhqeGBs< za1HWp@O>feAYG?Zj-% zZxv#m(@oCrMz=2A8p^b@um7oFrIHErRLn$m2+hfhQO!y4_sBM|?xjiW=AQK3OOJs9 z3Jz2vP06#5B6VokWL$Tr#7SgI7Sss&QCn$*oGqd*oACTQ8X1e4r{IW~vK0IY@?pvk zRDkd9LRxTo@^`D$Ko-M95T{Qk}yYxDR;tQ|*WZ_g4)6|tv zG!~DZvYRD&4id@p7dD-sUCnvTV8@^;RR6RV+)#a9T)mcOl%@Jd<|V;GzR_uov|jbv zfcQpQ-+Jw~)JV&y*RIqw(gxxeOu537M;nR5>N7U(Yu>1OZAWFJe7W`78fznMLcO-s z(nymRHJBgJyw+jGt7?QiE1luWdUjOAT5nEacnQ zxOYqIHC%P%fA!B;0SoyIoGd{zVyVIv@AP{0xcY=LqLcQ>kuq6ZV|JTXMUL)JKDe&d*1VJ>bJa{8@VF z-5Lp%eNU;;9-sn5w7Y@;wd3r_BtiD3KD74cjz?sC78ED}Qd{6w5 zRx#QcSl2Ub5Jm76aql&%rrH^g;b638dP!tvpm^>&a(d2e4W~U&g#?Vr%=73=YW+4; zeUAEx$8ORCR6Fw*iOfQKXCdpX6tVagew#FwER*uLttuK3M+K}**Y2(C6 zrcJ@lwVP8n)K=L&F;zWZBJ8;%A9O7Que>c15vGP7$t8kr-BVcx|MCMpoGKU8r64M^x3%qvDWr@tixiB{z z94n?hrVOK#?hO9GnjUOp_V)nvaSDU(y9sZT_Am78i+F{KY%3s4L@Y z=>P}c1T6TXWD&r-MaRGCBC580#gh35lKJl9s@L-L%@2c+3t@)Hy`lH0c78FOOAvnm zKl>?E=P6TbkhS&$@}DE_-2^@5=gFb)gWiw_v4JA{J}o9l%T2&9w^ne&&bG+o{hQ)xa*#Hho)OVZ zQ_pv&=OQ1LEXqUqQaJ-(en-#89*nU~xXb>>aWBkh-RRI=^f8J(lSq+Tc%Wqpgt0En zMAss32nGOO)r&fT6U7HE%oN78XfPZjfT$@t3BDyvaAl@xi!k^_*bs{yBvPyvYh9U> z)VsL;N>hxAiV@$%*cXeju@%n~YuuTI?_aMLuYiUtTnWmSga~83m@Vp(j_?sEC4&XM zp6RYF83TJPG?Xv-P?(@+&ZtXf!^a$yY!c$VnRInYHGC2N0inVh^Hy>a{#p3vh3np! zqmmzBUx#)Rd`oEK!<_Lf!RA+jC0wdtNvRW9hrv?_dS9lE(9@Uc>RK8CF#>3g46VWK zgbH6~u(q@Z?B38)!TkiKfl1ev;)Pdf4zyhG2SSd4Db{8qw@0A`G9Sr^!eKsV^g;66fa0MlDth9z5; z4S%$d#9@reCd1ByHXS@usNk4U+A=h~4EM+~9{iEu9LQYNmTiQ61ln=%S>bsg(_CG4 z13t#K?3NG}gdr+>1p6tpm*78z6+z52|8lgm+)X0oUZgI_PaXv~1bKO=7!k}wDnier zUk8u}??K8@fB8e?z=GIODQB&}td##L&IoIq_YI4kTOx}OBM0&xsQ!1}#plISO^~-k zL%oYHvSi74i7Z)OpEu9=@4QRa*K3Uz-;yn2R5K?0eY=)m6JMGrk)`A6^ESTGEuAUO zh;G!brSn)~^^%CSOMTw?rhh-n+DAOq8hJe$+GR~gUX0l?SLFFWZr=Lcw7Gd%AWN2E z0+-=>&df6rIvSXaTH^s%AeJLuzkuz4XpZQ^WNv`0g#dQYW5JOPekAc^Iwqs8-Of+EYKcEfmYWBa9w+# zjgf8eX5b!2{86?48IA;GK|dk`_D+s)9)LW831H+4OaVUUNRS^;2t43Oa6jMxN6aCC z90@6@FC0q2BG8E=q1nJ`;4w$Sf`Q%jdBRXQ>@`QiS_zS?LeT)%#n5q zRDg=xpKM`8v6ci|TT7~UB4wgU=xxCVcDz1A^|BOOzLvIf5r_KzIt zlnB2&_%KIe4ZsB8I!8K30RQ4h7j&+R`3Gc@E0cS0jU#a<>p3377XL9v5~6^89O>E> z_?9Dyh>gTd${XAsq#Xb42}i*n+TH(Mq27~*jO8BCd_{tRwsi+LD91`^eSx|Y&^8i$8h(X4cz8P zdOHBIlKvGc#qecdNHg+~uQeFMnt`dy910xeNPh$LV1R?Y2)GIxE1AZ^#>h|=N3ziI ztg~kPxdZ&gkpayB^llJ_Q_eUP^E?zS9*Si$Obtwdeh!SD4co+#;hg~l(Qx#9_%BF9 z-rAb37NB#*;>FdjoT9sxQ2X8@ZPMb9V1fYJL8 zl_+Ni_Gw_O7CM7{R=L z06LX71VFuccuw9pU=o0pkvFrU%ski&fns1WfDz6UfC^weumwPvgyfE-)M zKQp3%31-Yakd7yfdp(ebFhcV51fl>ohvuw3`gd51!L;weGQgZ8_JmF zhakWCG)F8g05o`hAT;@b(C1?m=D(@87xV+8%mVa!A*P#t4bC@35{e0-a@79<0fAS5 z78fAs3gsn;^GhqT3gkrkGm-AvS%6tLjEz1P3BFaK7$biMnV8<#$ zRFr)W8%sehRE9!jZ#YuU32E_6(^lnJW93hP*Bn`V9H`;Q5=7GyY#>Xvb7bixU=ByD wi2xe9%uCoA&!nK#GE6W1oY;{9>PAWlPEIQcpJ^pc&?K*oMxrRQkY%I)2aXNYQ~&?~ 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