X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/2be6500137966bba13903b24204a44804f9e133a..HEAD:/icuSources/data/misc/metaZones.txt?ds=sidebyside diff --git a/icuSources/data/misc/metaZones.txt b/icuSources/data/misc/metaZones.txt index 0de028a6..62439a51 100644 --- a/icuSources/data/misc/metaZones.txt +++ b/icuSources/data/misc/metaZones.txt @@ -1,11 +1,5 @@ -// *************************************************************************** -// * -// * Copyright (C) 2013 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter -// * Source File: /metaZones.xml -// * -// *************************************************************************** +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License metaZones:table(nofallback){ mapTimezones{ Acre{ @@ -90,7 +84,6 @@ metaZones:table(nofallback){ JM{"America/Jamaica"} KY{"America/Cayman"} PA{"America/Panama"} - TC{"America/Grand_Turk"} } America_Mountain{ 001{"America/Denver"} @@ -105,6 +98,9 @@ metaZones:table(nofallback){ Anadyr{ 001{"Asia/Anadyr"} } + Apia{ + 001{"Pacific/Apia"} + } Aqtau{ 001{"Asia/Aqtau"} } @@ -135,11 +131,11 @@ metaZones:table(nofallback){ 001{"America/Halifax"} AG{"America/Antigua"} AI{"America/Anguilla"} - AN{"America/Curacao"} AW{"America/Aruba"} BB{"America/Barbados"} BM{"Atlantic/Bermuda"} BQ{"America/Kralendijk"} + CW{"America/Curacao"} DM{"America/Dominica"} GD{"America/Grenada"} GL{"America/Thule"} @@ -211,15 +207,11 @@ metaZones:table(nofallback){ 001{"Pacific/Saipan"} GU{"Pacific/Guam"} } - Changbai{ - 001{"Asia/Harbin"} - } Chatham{ 001{"Pacific/Chatham"} } Chile{ 001{"America/Santiago"} - AQ{"Antarctica/Palmer"} } China{ 001{"Asia/Shanghai"} @@ -311,9 +303,14 @@ metaZones:table(nofallback){ EG{"Africa/Cairo"} FI{"Europe/Helsinki"} GR{"Europe/Athens"} + JO{"Asia/Amman"} LB{"Asia/Beirut"} SY{"Asia/Damascus"} } + Europe_Further_Eastern{ + 001{"Europe/Minsk"} + RU{"Europe/Kaliningrad"} + } Europe_Western{ 001{"Atlantic/Canary"} FO{"Atlantic/Faeroe"} @@ -347,7 +344,6 @@ metaZones:table(nofallback){ SH{"Atlantic/St_Helena"} SL{"Africa/Freetown"} SN{"Africa/Dakar"} - ST{"Africa/Sao_Tome"} TG{"Africa/Lome"} } Galapagos{ @@ -401,10 +397,9 @@ metaZones:table(nofallback){ 001{"Indian/Chagos"} } Indochina{ - 001{"Asia/Saigon"} + 001{"Asia/Bangkok"} KH{"Asia/Phnom_Penh"} LA{"Asia/Vientiane"} - TH{"Asia/Bangkok"} } Indonesia_Central{ 001{"Asia/Makassar"} @@ -436,9 +431,6 @@ metaZones:table(nofallback){ Karachi{ 001{"Asia/Karachi"} } - Kashgar{ - 001{"Asia/Kashgar"} - } Kazakhstan_Eastern{ 001{"Asia/Almaty"} } @@ -450,7 +442,6 @@ metaZones:table(nofallback){ } Korea{ 001{"Asia/Seoul"} - KP{"Asia/Pyongyang"} } Kosrae{ 001{"Pacific/Kosrae"} @@ -476,9 +467,6 @@ metaZones:table(nofallback){ Line_Islands{ 001{"Pacific/Kiritimati"} } - Long_Shu{ - 001{"Asia/Chongqing"} - } Lord_Howe{ 001{"Australia/Lord_Howe"} } @@ -512,6 +500,12 @@ metaZones:table(nofallback){ Mawson{ 001{"Antarctica/Mawson"} } + Mexico_Northwest{ + 001{"America/Santa_Isabel"} + } + Mexico_Pacific{ + 001{"America/Mazatlan"} + } Mongolia{ 001{"Asia/Ulaanbaatar"} } @@ -588,6 +582,9 @@ metaZones:table(nofallback){ Ponape{ 001{"Pacific/Ponape"} } + Pyongyang{ + 001{"Asia/Pyongyang"} + } Qyzylorda{ 001{"Asia/Qyzylorda"} } @@ -607,7 +604,7 @@ metaZones:table(nofallback){ 001{"Asia/Samarkand"} } Samoa{ - 001{"Pacific/Apia"} + 001{"Pacific/Pago_Pago"} } Seychelles{ 001{"Indian/Mahe"} @@ -816,7 +813,7 @@ metaZones:table(nofallback){ { "Europe_Western", "1985-12-31 23:00", - "9999-12-31 23:59", + "2018-10-28 02:00", } } "Africa:Ceuta"{ @@ -865,7 +862,7 @@ metaZones:table(nofallback){ { "Europe_Western", "1976-04-14 01:00", - "9999-12-31 23:59", + "2018-10-28 02:00", } } "Africa:Freetown"{ @@ -914,6 +911,11 @@ metaZones:table(nofallback){ { "Africa_Eastern", "2000-01-15 10:00", + "2017-10-31 21:00", + } + { + "Africa_Central", + "2017-10-31 21:00", "9999-12-31 23:59", } } @@ -1027,6 +1029,18 @@ metaZones:table(nofallback){ "Africa:Sao_Tome"{ { "GMT", + "1970-01-01 00:00", + "2018-01-01 01:00", + } + { + "Africa_Western", + "2018-01-01 01:00", + "2019-01-01 01:00", + } + { + "GMT", + "2019-01-01 01:00", + "9999-12-31 23:59", } } "Africa:Tripoli"{ @@ -1058,6 +1072,11 @@ metaZones:table(nofallback){ { "Europe_Central", "2012-11-10 00:00", + "2013-10-25 00:00", + } + { + "Europe_Eastern", + "2013-10-25 00:00", "9999-12-31 23:59", } } @@ -1075,11 +1094,16 @@ metaZones:table(nofallback){ { "Africa_Central", "1990-03-20 22:00", - "1994-04-02 22:00", + "1994-03-20 22:00", } { "Africa_Western", - "1994-04-02 22:00", + "1994-03-20 22:00", + "2017-10-23 22:00", + } + { + "Africa_Central", + "2017-10-23 22:00", "9999-12-31 23:59", } } @@ -1404,6 +1428,11 @@ metaZones:table(nofallback){ { "America_Central", "1998-08-02 06:00", + "2015-02-01 08:00", + } + { + "America_Eastern", + "2015-02-01 08:00", "9999-12-31 23:59", } } @@ -1456,7 +1485,7 @@ metaZones:table(nofallback){ "1998-04-05 09:00", } { - "America_Mountain", + "Mexico_Pacific", "1998-04-05 09:00", "9999-12-31 23:59", } @@ -1563,6 +1592,11 @@ metaZones:table(nofallback){ { "Amazon", "2008-06-24 05:00", + "2013-11-10 04:00", + } + { + "Acre", + "2013-11-10 04:00", "9999-12-31 23:59", } } @@ -1571,6 +1605,18 @@ metaZones:table(nofallback){ "America_Central", } } + "America:Fort_Nelson"{ + { + "America_Pacific", + "1970-01-01 00:00", + "2015-03-08 10:00", + } + { + "America_Mountain", + "2015-03-08 10:00", + "9999-12-31 23:59", + } + } "America:Fortaleza"{ { "Brasilia", @@ -1606,6 +1652,18 @@ metaZones:table(nofallback){ "America:Grand_Turk"{ { "America_Eastern", + "1970-01-01 00:00", + "2015-11-01 06:00", + } + { + "Atlantic", + "2015-11-01 06:00", + "2018-03-11 07:00", + } + { + "America_Eastern", + "2018-03-11 07:00", + "9999-12-31 23:59", } } "America:Grenada"{ @@ -1650,7 +1708,7 @@ metaZones:table(nofallback){ "1970-01-01 08:00", } { - "America_Mountain", + "Mexico_Pacific", "1970-01-01 08:00", "9999-12-31 23:59", } @@ -1963,7 +2021,7 @@ metaZones:table(nofallback){ "1970-01-01 08:00", } { - "America_Mountain", + "Mexico_Pacific", "1970-01-01 08:00", "9999-12-31 23:59", } @@ -2017,6 +2075,23 @@ metaZones:table(nofallback){ "America:Metlakatla"{ { "America_Pacific", + "1970-01-01 00:00", + "2015-11-01 10:00", + } + { + "Alaska", + "2015-11-01 10:00", + "2018-11-04 10:00", + } + { + "America_Pacific", + "2018-11-04 10:00", + "2019-01-20 10:00", + } + { + "Alaska", + "2019-01-20 10:00", + "9999-12-31 23:59", } } "America:Mexico_City"{ @@ -2051,11 +2126,6 @@ metaZones:table(nofallback){ "Uruguay", } } - "America:Montreal"{ - { - "America_Eastern", - } - } "America:Montserrat"{ { "Atlantic", @@ -2210,6 +2280,13 @@ metaZones:table(nofallback){ "Atlantic", } } + "America:Punta_Arenas"{ + { + "Chile", + "1970-01-01 00:00", + "2016-12-03 23:00", + } + } "America:Rainy_River"{ { "America_Central", @@ -2278,12 +2355,17 @@ metaZones:table(nofallback){ { "Amazon", "2008-06-24 05:00", + "2013-11-10 04:00", + } + { + "Acre", + "2013-11-10 04:00", "9999-12-31 23:59", } } "America:Santa_Isabel"{ { - "America_Pacific", + "Mexico_Northwest", } } "America:Santarem"{ @@ -2342,11 +2424,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "America:Shiprock"{ - { - "America_Mountain", - } - } "America:Sitka"{ { "America_Pacific", @@ -2492,6 +2569,16 @@ metaZones:table(nofallback){ { "Australia_Western", "2012-02-21 17:00", + "2016-10-21 16:00", + } + { + "Casey", + "2016-10-21 16:00", + "2018-03-10 17:00", + } + { + "Australia_Western", + "2018-03-10 17:00", "9999-12-31 23:59", } } @@ -2536,7 +2623,7 @@ metaZones:table(nofallback){ { "Chile", "1982-05-01 03:00", - "9999-12-31 23:59", + "2016-12-03 23:00", } } "Antarctica:Rothera"{ @@ -2549,6 +2636,11 @@ metaZones:table(nofallback){ "Syowa", } } + "Antarctica:Troll"{ + { + "GMT", + } + } "Antarctica:Vostok"{ { "Vostok", @@ -2568,24 +2660,17 @@ metaZones:table(nofallback){ { "Almaty", "1970-01-01 00:00", - "2005-03-14 18:00", + "2004-10-30 20:00", } { "Kazakhstan_Eastern", - "2005-03-14 18:00", + "2004-10-30 20:00", "9999-12-31 23:59", } } "Asia:Amman"{ { "Europe_Eastern", - "1970-01-01 00:00", - "2012-10-25 22:00", - } - { - "Arabian", - "2012-10-25 22:00", - "9999-12-31 23:59", } } "Asia:Anadyr"{ @@ -2597,6 +2682,11 @@ metaZones:table(nofallback){ { "Magadan", "2010-03-27 14:00", + "2014-10-25 14:00", + } + { + "Anadyr", + "2014-10-25 14:00", "9999-12-31 23:59", } } @@ -2609,11 +2699,11 @@ metaZones:table(nofallback){ { "Aqtau", "1991-12-15 19:00", - "2005-03-14 20:00", + "2004-10-30 22:00", } { "Kazakhstan_Western", - "2005-03-14 20:00", + "2004-10-30 22:00", "9999-12-31 23:59", } } @@ -2626,11 +2716,11 @@ metaZones:table(nofallback){ { "Aqtobe", "1991-12-15 19:00", - "2005-03-14 19:00", + "2004-10-30 21:00", } { "Kazakhstan_Western", - "2005-03-14 19:00", + "2005-10-30 21:00", "9999-12-31 23:59", } } @@ -2646,6 +2736,13 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } + "Asia:Atyrau"{ + { + "Kazakhstan_Western", + "2004-10-30 22:00", + "9999-12-31 23:59", + } + } "Asia:Baghdad"{ { "Arabian", @@ -2707,27 +2804,32 @@ metaZones:table(nofallback){ "India", } } - "Asia:Choibalsan"{ + "Asia:Chita"{ { - "Mongolia", + "Yakutsk", "1970-01-01 00:00", - "1983-03-31 16:00", + "2014-10-25 16:00", } { - "Choibalsan", - "1983-03-31 16:00", + "Irkutsk", + "2014-10-25 16:00", + "2016-03-26 18:00", + } + { + "Yakutsk", + "2016-03-26 18:00", "9999-12-31 23:59", } } - "Asia:Chongqing"{ + "Asia:Choibalsan"{ { - "Long_Shu", + "Mongolia", "1970-01-01 00:00", - "1980-04-30 17:00", + "1983-03-31 16:00", } { - "China", - "1980-04-30 17:00", + "Choibalsan", + "1983-03-31 16:00", "9999-12-31 23:59", } } @@ -2799,6 +2901,13 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } + "Asia:Famagusta"{ + { + "Europe_Eastern", + "1970-01-01 00:00", + "2016-09-07 21:00", + } + } "Asia:Gaza"{ { "Israel", @@ -2811,18 +2920,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "Asia:Harbin"{ - { - "Changbai", - "1970-01-01 00:00", - "1980-04-30 15:30", - } - { - "China", - "1980-04-30 15:30", - "9999-12-31 23:59", - } - } "Asia:Hebron"{ { "Israel", @@ -2873,13 +2970,6 @@ metaZones:table(nofallback){ "Asia:Kamchatka"{ { "Kamchatka", - "1970-01-01 00:00", - "2010-03-27 14:00", - } - { - "Magadan", - "2010-03-27 14:00", - "9999-12-31 23:59", } } "Asia:Karachi"{ @@ -2894,18 +2984,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "Asia:Kashgar"{ - { - "Kashgar", - "1970-01-01 00:00", - "1980-04-30 19:00", - } - { - "China", - "1980-04-30 19:00", - "9999-12-31 23:59", - } - } "Asia:Katmandu"{ { "Nepal", @@ -3008,6 +3086,11 @@ metaZones:table(nofallback){ { "Novosibirsk", "2010-03-27 19:00", + "2014-10-25 19:00", + } + { + "Krasnoyarsk", + "2014-10-25 19:00", "9999-12-31 23:59", } } @@ -3030,11 +3113,11 @@ metaZones:table(nofallback){ { "Oral", "1991-12-15 20:00", - "2005-03-14 20:00", + "2004-10-30 22:00", } { "Kazakhstan_Western", - "2005-03-14 20:00", + "2004-10-30 22:00", "9999-12-31 23:59", } } @@ -3058,6 +3141,18 @@ metaZones:table(nofallback){ "Asia:Pyongyang"{ { "Korea", + "1970-01-01 00:00", + "2015-08-14 15:00", + } + { + "Pyongyang", + "2015-08-14 15:00", + "2018-05-04 15:00", + } + { + "Korea", + "2018-05-04 15:00", + "9999-12-31 23:59", } } "Asia:Qatar"{ @@ -3072,6 +3167,13 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } + "Asia:Qostanay"{ + { + "Kazakhstan_Eastern", + "2004-10-30 21:00", + "9999-12-31 23:59", + } + } "Asia:Qyzylorda"{ { "Kizilorda", @@ -3081,11 +3183,16 @@ metaZones:table(nofallback){ { "Qyzylorda", "1991-12-15 19:00", - "2005-03-14 18:00", + "2004-10-30 21:00", } { "Kazakhstan_Eastern", - "2005-03-14 18:00", + "2004-10-30 21:00", + "2018-12-20 18:00", + } + { + "Kazakhstan_Western", + "2018-12-20 18:00", "9999-12-31 23:59", } } @@ -3102,6 +3209,8 @@ metaZones:table(nofallback){ "Asia:Saigon"{ { "Indochina", + "1975-06-12 16:00", + "9999-12-31 23:59", } } "Asia:Sakhalin"{ @@ -3146,6 +3255,13 @@ metaZones:table(nofallback){ "Singapore", } } + "Asia:Srednekolymsk"{ + { + "Magadan", + "1970-01-01 00:00", + "2014-10-25 14:00", + } + } "Asia:Taipei"{ { "Taipei", @@ -3205,13 +3321,6 @@ metaZones:table(nofallback){ "Asia:Urumqi"{ { "Urumqi", - "1970-01-01 00:00", - "1980-04-30 18:00", - } - { - "China", - "1980-04-30 18:00", - "9999-12-31 23:59", } } "Asia:Ust-Nera"{ @@ -3409,6 +3518,11 @@ metaZones:table(nofallback){ "America_Eastern", } } + "Etc:GMT"{ + { + "GMT", + } + } "Europe:Amsterdam"{ { "Europe_Central", @@ -3419,6 +3533,13 @@ metaZones:table(nofallback){ "Europe_Central", } } + "Europe:Astrakhan"{ + { + "Moscow", + "1992-03-28 22:00", + "2016-03-26 23:00", + } + } "Europe:Athens"{ { "Europe_Eastern", @@ -3526,16 +3647,21 @@ metaZones:table(nofallback){ { "Europe_Eastern", "1970-01-01 00:00", - "1978-10-14 21:00", + "1978-06-28 21:00", } { "Turkey", - "1978-10-14 21:00", + "1978-06-28 21:00", "1985-04-19 21:00", } { "Europe_Eastern", "1985-04-19 21:00", + "2016-09-06 21:00", + } + { + "Turkey", + "2016-09-06 21:00", "9999-12-31 23:59", } } @@ -3555,23 +3681,33 @@ metaZones:table(nofallback){ { "Moscow", "1970-01-01 00:00", - "1991-03-30 23:00", + "1989-03-25 23:00", } { "Europe_Eastern", - "1991-03-30 23:00", + "1989-03-25 23:00", + "2011-03-27 00:00", + } + { + "Europe_Further_Eastern", "2011-03-27 00:00", + "2014-10-25 23:00", + } + { + "Europe_Eastern", + "2014-10-25 23:00", + "9999-12-31 23:59", } } "Europe:Kiev"{ { "Moscow", "1970-01-01 00:00", - "1990-06-30 23:00", + "1990-06-30 22:00", } { "Europe_Eastern", - "1990-06-30 23:00", + "1990-06-30 22:00", "9999-12-31 23:59", } } @@ -3645,6 +3781,16 @@ metaZones:table(nofallback){ "1991-03-30 23:00", "2011-03-27 00:00", } + { + "Europe_Further_Eastern", + "2011-03-27 00:00", + "2014-10-26 22:00", + } + { + "Moscow", + "2014-10-26 22:00", + "9999-12-31 23:59", + } } "Europe:Monaco"{ { @@ -3709,16 +3855,21 @@ metaZones:table(nofallback){ { "Kuybyshev", "1970-01-01 00:00", - "1991-10-20 00:00", + "1989-03-25 22:00", } { - "Samara", - "1991-10-20 00:00", - "2010-03-27 22:00", + "Moscow", + "1989-03-25 22:00", + "1991-03-30 23:00", } { - "Moscow", - "2010-03-27 22:00", + "Europe_Eastern", + "1991-03-30 23:00", + "1991-09-29 00:00", + } + { + "Samara", + "1991-09-29 00:00", "9999-12-31 23:59", } } @@ -3732,6 +3883,13 @@ metaZones:table(nofallback){ "Europe_Central", } } + "Europe:Saratov"{ + { + "Moscow", + "1992-03-28 22:00", + "2016-12-03 23:00", + } + } "Europe:Simferopol"{ { "Moscow", @@ -3751,6 +3909,11 @@ metaZones:table(nofallback){ { "Europe_Eastern", "1997-03-30 01:00", + "2014-03-30 00:00", + } + { + "Moscow", + "2014-03-30 00:00", "9999-12-31 23:59", } } @@ -3786,6 +3949,13 @@ metaZones:table(nofallback){ "Europe_Central", } } + "Europe:Ulyanovsk"{ + { + "Moscow", + "1992-01-19 00:00", + "2016-03-26 23:00", + } + } "Europe:Uzhgorod"{ { "Moscow", @@ -3822,11 +3992,11 @@ metaZones:table(nofallback){ { "Moscow", "1970-01-01 00:00", - "1991-03-30 23:00", + "1989-03-25 23:00", } { "Europe_Eastern", - "1991-03-30 23:00", + "1989-03-25 23:00", "1998-03-29 01:00", } { @@ -3843,6 +4013,18 @@ metaZones:table(nofallback){ "Europe:Volgograd"{ { "Volgograd", + "1970-01-01 00:00", + "1992-03-28 22:00", + } + { + "Moscow", + "1992-03-28 22:00", + "2018-10-27 23:00", + } + { + "Volgograd", + "2018-10-27 23:00", + "9999-12-31 23:59", } } "Europe:Warsaw"{ @@ -3939,14 +4121,7 @@ metaZones:table(nofallback){ } "Pacific:Apia"{ { - "Bering", - "1970-01-01 00:00", - "1983-10-30 12:00", - } - { - "Samoa", - "1983-10-30 12:00", - "9999-12-31 23:59", + "Apia", } } "Pacific:Auckland"{ @@ -3954,6 +4129,13 @@ metaZones:table(nofallback){ "New_Zealand", } } + "Pacific:Bougainville"{ + { + "Papua_New_Guinea", + "1970-01-01 00:00", + "2014-12-27 16:00", + } + } "Pacific:Chatham"{ { "Chatham", @@ -4061,11 +4243,11 @@ metaZones:table(nofallback){ { "Kwajalein", "1970-01-01 00:00", - "1993-08-20 12:00", + "1993-08-21 12:00", } { "Marshall_Islands", - "1993-08-20 12:00", + "1993-08-21 12:00", "9999-12-31 23:59", } }