X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/ba516feee23ef0c2b810ac6365e88f33807caaa8..a62d09fcbc8ca9da27887e04112ec143e19b1caf:/icuSources/data/misc/metaZones.txt

diff --git a/icuSources/data/misc/metaZones.txt b/icuSources/data/misc/metaZones.txt
index d1906a91..9b99e1e4 100644
--- a/icuSources/data/misc/metaZones.txt
+++ b/icuSources/data/misc/metaZones.txt
@@ -1,11 +1,5 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/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"}
         }
@@ -211,9 +207,6 @@ metaZones:table(nofallback){
             001{"Pacific/Saipan"}
             GU{"Pacific/Guam"}
         }
-        Changbai{
-            001{"Asia/Harbin"}
-        }
         Chatham{
             001{"Pacific/Chatham"}
         }
@@ -223,7 +216,6 @@ metaZones:table(nofallback){
         }
         China{
             001{"Asia/Shanghai"}
-            MO{"Asia/Macau"}
         }
         Choibalsan{
             001{"Asia/Choibalsan"}
@@ -302,6 +294,7 @@ metaZones:table(nofallback){
             SM{"Europe/San_Marino"}
             TN{"Africa/Tunis"}
             VA{"Europe/Vatican"}
+            XK{"Europe/Belgrade"}
         }
         Europe_Eastern{
             001{"Europe/Bucharest"}
@@ -315,6 +308,10 @@ metaZones:table(nofallback){
             LB{"Asia/Beirut"}
             SY{"Asia/Damascus"}
         }
+        Europe_Further_Eastern{
+            001{"Europe/Minsk"}
+            RU{"Europe/Kaliningrad"}
+        }
         Europe_Western{
             001{"Atlantic/Canary"}
             FO{"Atlantic/Faeroe"}
@@ -402,10 +399,9 @@ metaZones:table(nofallback){
             001{"Indian/Chagos"}
         }
         Indochina{
-            001{"Asia/Saigon"}
+            001{"Asia/Bangkok"}
             KH{"Asia/Phnom_Penh"}
             LA{"Asia/Vientiane"}
-            TH{"Asia/Bangkok"}
         }
         Indonesia_Central{
             001{"Asia/Makassar"}
@@ -437,9 +433,6 @@ metaZones:table(nofallback){
         Karachi{
             001{"Asia/Karachi"}
         }
-        Kashgar{
-            001{"Asia/Kashgar"}
-        }
         Kazakhstan_Eastern{
             001{"Asia/Almaty"}
         }
@@ -451,7 +444,6 @@ metaZones:table(nofallback){
         }
         Korea{
             001{"Asia/Seoul"}
-            KP{"Asia/Pyongyang"}
         }
         Kosrae{
             001{"Pacific/Kosrae"}
@@ -477,9 +469,6 @@ metaZones:table(nofallback){
         Line_Islands{
             001{"Pacific/Kiritimati"}
         }
-        Long_Shu{
-            001{"Asia/Chongqing"}
-        }
         Lord_Howe{
             001{"Australia/Lord_Howe"}
         }
@@ -513,6 +502,12 @@ metaZones:table(nofallback){
         Mawson{
             001{"Antarctica/Mawson"}
         }
+        Mexico_Northwest{
+            001{"America/Santa_Isabel"}
+        }
+        Mexico_Pacific{
+            001{"America/Mazatlan"}
+        }
         Mongolia{
             001{"Asia/Ulaanbaatar"}
         }
@@ -589,6 +584,9 @@ metaZones:table(nofallback){
         Ponape{
             001{"Pacific/Ponape"}
         }
+        Pyongyang{
+            001{"Asia/Pyongyang"}
+        }
         Qyzylorda{
             001{"Asia/Qyzylorda"}
         }
@@ -608,7 +606,7 @@ metaZones:table(nofallback){
             001{"Asia/Samarkand"}
         }
         Samoa{
-            001{"Pacific/Apia"}
+            001{"Pacific/Pago_Pago"}
         }
         Seychelles{
             001{"Indian/Mahe"}
@@ -1059,6 +1057,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",
             }
         }
@@ -1405,6 +1408,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",
             }
         }
@@ -1457,7 +1465,7 @@ metaZones:table(nofallback){
                 "1998-04-05 09:00",
             }
             {
-                "America_Mountain",
+                "Mexico_Pacific",
                 "1998-04-05 09:00",
                 "9999-12-31 23:59",
             }
@@ -1564,6 +1572,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",
             }
         }
@@ -1572,6 +1585,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",
@@ -1607,6 +1632,13 @@ metaZones:table(nofallback){
         "America:Grand_Turk"{
             {
                 "America_Eastern",
+                "1970-01-01 00:00",
+                "2015-11-01 06:00",
+            }
+            {
+                "Atlantic",
+                "2015-11-01 06:00",
+                "9999-12-31 23:59",
             }
         }
         "America:Grenada"{
@@ -1651,7 +1683,7 @@ metaZones:table(nofallback){
                 "1970-01-01 08:00",
             }
             {
-                "America_Mountain",
+                "Mexico_Pacific",
                 "1970-01-01 08:00",
                 "9999-12-31 23:59",
             }
@@ -1964,7 +1996,7 @@ metaZones:table(nofallback){
                 "1970-01-01 08:00",
             }
             {
-                "America_Mountain",
+                "Mexico_Pacific",
                 "1970-01-01 08:00",
                 "9999-12-31 23:59",
             }
@@ -2018,6 +2050,13 @@ metaZones:table(nofallback){
         "America:Metlakatla"{
             {
                 "America_Pacific",
+                "1970-01-01 00:00",
+                "2015-11-01 10:00",
+            }
+            {
+                "Alaska",
+                "2015-11-01 10:00",
+                "9999-12-31 23:59",
             }
         }
         "America:Mexico_City"{
@@ -2052,11 +2091,6 @@ metaZones:table(nofallback){
                 "Uruguay",
             }
         }
-        "America:Montreal"{
-            {
-                "America_Eastern",
-            }
-        }
         "America:Montserrat"{
             {
                 "Atlantic",
@@ -2279,12 +2313,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"{
@@ -2343,11 +2382,6 @@ metaZones:table(nofallback){
                 "9999-12-31 23:59",
             }
         }
-        "America:Shiprock"{
-            {
-                "America_Mountain",
-            }
-        }
         "America:Sitka"{
             {
                 "America_Pacific",
@@ -2493,6 +2527,11 @@ metaZones:table(nofallback){
             {
                 "Australia_Western",
                 "2012-02-21 17:00",
+                "2016-10-21 16:00",
+            }
+            {
+                "Casey",
+                "2016-10-21 16:00",
                 "9999-12-31 23:59",
             }
         }
@@ -2550,6 +2589,11 @@ metaZones:table(nofallback){
                 "Syowa",
             }
         }
+        "Antarctica:Troll"{
+            {
+                "GMT",
+            }
+        }
         "Antarctica:Vostok"{
             {
                 "Vostok",
@@ -2569,11 +2613,11 @@ 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",
             }
         }
@@ -2591,6 +2635,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",
             }
         }
@@ -2603,11 +2652,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",
             }
         }
@@ -2620,11 +2669,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",
             }
         }
@@ -2701,27 +2750,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",
             }
         }
@@ -2793,6 +2847,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",
@@ -2805,18 +2866,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",
@@ -2867,13 +2916,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"{
@@ -2888,21 +2930,26 @@ metaZones:table(nofallback){
                 "9999-12-31 23:59",
             }
         }
-        "Asia:Kashgar"{
+        "Asia:Katmandu"{
+            {
+                "Nepal",
+            }
+        }
+        "Asia:Khandyga"{
             {
-                "Kashgar",
+                "Yakutsk",
                 "1970-01-01 00:00",
-                "1980-04-30 19:00",
+                "2003-12-31 15:00",
             }
             {
-                "China",
-                "1980-04-30 19:00",
-                "9999-12-31 23:59",
+                "Vladivostok",
+                "2003-12-31 15:00",
+                "2011-09-12 13:00",
             }
-        }
-        "Asia:Katmandu"{
             {
-                "Nepal",
+                "Yakutsk",
+                "2011-09-12 13:00",
+                "9999-12-31 23:59",
             }
         }
         "Asia:Krasnoyarsk"{
@@ -2985,6 +3032,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",
             }
         }
@@ -3007,11 +3059,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",
             }
         }
@@ -3035,6 +3087,13 @@ metaZones:table(nofallback){
         "Asia:Pyongyang"{
             {
                 "Korea",
+                "1970-01-01 00:00",
+                "2015-08-14 15:00",
+            }
+            {
+                "Pyongyang",
+                "2015-08-14 15:00",
+                "9999-12-31 23:59",
             }
         }
         "Asia:Qatar"{
@@ -3058,11 +3117,11 @@ 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",
                 "9999-12-31 23:59",
             }
         }
@@ -3079,6 +3138,8 @@ metaZones:table(nofallback){
         "Asia:Saigon"{
             {
                 "Indochina",
+                "1975-06-12 16:00",
+                "9999-12-31 23:59",
             }
         }
         "Asia:Sakhalin"{
@@ -3123,6 +3184,13 @@ metaZones:table(nofallback){
                 "Singapore",
             }
         }
+        "Asia:Srednekolymsk"{
+            {
+                "Magadan",
+                "1970-01-01 00:00",
+                "2014-10-25 14:00",
+            }
+        }
         "Asia:Taipei"{
             {
                 "Taipei",
@@ -3182,12 +3250,22 @@ metaZones:table(nofallback){
         "Asia:Urumqi"{
             {
                 "Urumqi",
+            }
+        }
+        "Asia:Ust-Nera"{
+            {
+                "Yakutsk",
                 "1970-01-01 00:00",
-                "1980-04-30 18:00",
+                "1981-03-31 15:00",
             }
             {
-                "China",
-                "1980-04-30 18:00",
+                "Magadan",
+                "1981-03-31 15:00",
+                "2011-09-12 12:00",
+            }
+            {
+                "Vladivostok",
+                "2011-09-12 12:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3379,6 +3457,13 @@ metaZones:table(nofallback){
                 "Europe_Central",
             }
         }
+        "Europe:Astrakhan"{
+            {
+                "Moscow",
+                "1992-03-28 22:00",
+                "2016-03-26 23:00",
+            }
+        }
         "Europe:Athens"{
             {
                 "Europe_Eastern",
@@ -3414,6 +3499,11 @@ metaZones:table(nofallback){
                 "Europe_Central",
             }
         }
+        "Europe:Busingen"{
+            {
+                "Europe_Central",
+            }
+        }
         "Europe:Chisinau"{
             {
                 "Moscow",
@@ -3491,6 +3581,11 @@ metaZones:table(nofallback){
             {
                 "Europe_Eastern",
                 "1985-04-19 21:00",
+                "2016-09-06 21:00",
+            }
+            {
+                "Turkey",
+                "2016-09-06 21:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3510,23 +3605,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",
             }
         }
@@ -3600,6 +3705,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"{
             {
@@ -3664,16 +3779,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",
             }
         }
@@ -3706,6 +3826,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",
             }
         }
@@ -3741,6 +3866,13 @@ metaZones:table(nofallback){
                 "Europe_Central",
             }
         }
+        "Europe:Ulyanovsk"{
+            {
+                "Moscow",
+                "1992-01-19 00:00",
+                "2016-03-26 23:00",
+            }
+        }
         "Europe:Uzhgorod"{
             {
                 "Moscow",
@@ -3777,11 +3909,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",
             }
             {
@@ -3798,6 +3930,13 @@ metaZones:table(nofallback){
         "Europe:Volgograd"{
             {
                 "Volgograd",
+                "1970-01-01 00:00",
+                "1992-03-28 22:00",
+            }
+            {
+                "Moscow",
+                "1992-03-28 22:00",
+                "9999-12-31 23:59",
             }
         }
         "Europe:Warsaw"{
@@ -3894,14 +4033,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"{
@@ -3909,6 +4041,13 @@ metaZones:table(nofallback){
                 "New_Zealand",
             }
         }
+        "Pacific:Bougainville"{
+            {
+                "Papua_New_Guinea",
+                "1970-01-01 00:00",
+                "2014-12-27 16:00",
+            }
+        }
         "Pacific:Chatham"{
             {
                 "Chatham",
@@ -4146,4 +4285,17 @@ metaZones:table(nofallback){
             }
         }
     }
+    primaryZones{
+        CL{"America/Santiago"}
+        CN{"Asia/Shanghai"}
+        DE{"Europe/Berlin"}
+        EC{"America/Guayaquil"}
+        ES{"Europe/Madrid"}
+        MH{"Pacific/Majuro"}
+        MY{"Asia/Kuala_Lumpur"}
+        NZ{"Pacific/Auckland"}
+        PT{"Europe/Lisbon"}
+        UA{"Europe/Kiev"}
+        UZ{"Asia/Tashkent"}
+    }
 }