tzinfo-data 1.2021.5 → 1.2022.7

data/lib/tzinfo/data/definitions/Pacific/Fiji.rb

@@ -44,104 +44,6 @@ module TZInfo
             tz.transition 2020, 1, :o1, 1578751200
             tz.transition 2020, 12, :o2, 1608386400
             tz.transition 2021, 1, :o1, 1610805600
-            tz.transition 2022, 11, :o2, 1668261600
-            tz.transition 2023, 1, :o1, 1673704800
-            tz.transition 2023, 11, :o2, 1699711200
-            tz.transition 2024, 1, :o1, 1705154400
-            tz.transition 2024, 11, :o2, 1731160800
-            tz.transition 2025, 1, :o1, 1736604000
-            tz.transition 2025, 11, :o2, 1762610400
-            tz.transition 2026, 1, :o1, 1768658400
-            tz.transition 2026, 11, :o2, 1794060000
-            tz.transition 2027, 1, :o1, 1800108000
-            tz.transition 2027, 11, :o2, 1826114400
-            tz.transition 2028, 1, :o1, 1831557600
-            tz.transition 2028, 11, :o2, 1857564000
-            tz.transition 2029, 1, :o1, 1863007200
-            tz.transition 2029, 11, :o2, 1889013600
-            tz.transition 2030, 1, :o1, 1894456800
-            tz.transition 2030, 11, :o2, 1920463200
-            tz.transition 2031, 1, :o1, 1925906400
-            tz.transition 2031, 11, :o2, 1951912800
-            tz.transition 2032, 1, :o1, 1957960800
-            tz.transition 2032, 11, :o2, 1983967200
-            tz.transition 2033, 1, :o1, 1989410400
-            tz.transition 2033, 11, :o2, 2015416800
-            tz.transition 2034, 1, :o1, 2020860000
-            tz.transition 2034, 11, :o2, 2046866400
-            tz.transition 2035, 1, :o1, 2052309600
-            tz.transition 2035, 11, :o2, 2078316000
-            tz.transition 2036, 1, :o1, 2083759200
-            tz.transition 2036, 11, :o2, 2109765600
-            tz.transition 2037, 1, :o1, 2115813600
-            tz.transition 2037, 11, :o2, 2141215200
-            tz.transition 2038, 1, :o1, 2147263200
-            tz.transition 2038, 11, :o2, 2173269600, 29588893, 12
-            tz.transition 2039, 1, :o1, 2178712800, 29589649, 12
-            tz.transition 2039, 11, :o2, 2204719200, 29593261, 12
-            tz.transition 2040, 1, :o1, 2210162400, 29594017, 12
-            tz.transition 2040, 11, :o2, 2236168800, 29597629, 12
-            tz.transition 2041, 1, :o1, 2241612000, 29598385, 12
-            tz.transition 2041, 11, :o2, 2267618400, 29601997, 12
-            tz.transition 2042, 1, :o1, 2273061600, 29602753, 12
-            tz.transition 2042, 11, :o2, 2299068000, 29606365, 12
-            tz.transition 2043, 1, :o1, 2305116000, 29607205, 12
-            tz.transition 2043, 11, :o2, 2330517600, 29610733, 12
-            tz.transition 2044, 1, :o1, 2336565600, 29611573, 12
-            tz.transition 2044, 11, :o2, 2362572000, 29615185, 12
-            tz.transition 2045, 1, :o1, 2368015200, 29615941, 12
-            tz.transition 2045, 11, :o2, 2394021600, 29619553, 12
-            tz.transition 2046, 1, :o1, 2399464800, 29620309, 12
-            tz.transition 2046, 11, :o2, 2425471200, 29623921, 12
-            tz.transition 2047, 1, :o1, 2430914400, 29624677, 12
-            tz.transition 2047, 11, :o2, 2456920800, 29628289, 12
-            tz.transition 2048, 1, :o1, 2462364000, 29629045, 12
-            tz.transition 2048, 11, :o2, 2488370400, 29632657, 12
-            tz.transition 2049, 1, :o1, 2494418400, 29633497, 12
-            tz.transition 2049, 11, :o2, 2520424800, 29637109, 12
-            tz.transition 2050, 1, :o1, 2525868000, 29637865, 12
-            tz.transition 2050, 11, :o2, 2551874400, 29641477, 12
-            tz.transition 2051, 1, :o1, 2557317600, 29642233, 12
-            tz.transition 2051, 11, :o2, 2583324000, 29645845, 12
-            tz.transition 2052, 1, :o1, 2588767200, 29646601, 12
-            tz.transition 2052, 11, :o2, 2614773600, 29650213, 12
-            tz.transition 2053, 1, :o1, 2620216800, 29650969, 12
-            tz.transition 2053, 11, :o2, 2646223200, 29654581, 12
-            tz.transition 2054, 1, :o1, 2652271200, 29655421, 12
-            tz.transition 2054, 11, :o2, 2677672800, 29658949, 12
-            tz.transition 2055, 1, :o1, 2683720800, 29659789, 12
-            tz.transition 2055, 11, :o2, 2709727200, 29663401, 12
-            tz.transition 2056, 1, :o1, 2715170400, 29664157, 12
-            tz.transition 2056, 11, :o2, 2741176800, 29667769, 12
-            tz.transition 2057, 1, :o1, 2746620000, 29668525, 12
-            tz.transition 2057, 11, :o2, 2772626400, 29672137, 12
-            tz.transition 2058, 1, :o1, 2778069600, 29672893, 12
-            tz.transition 2058, 11, :o2, 2804076000, 29676505, 12
-            tz.transition 2059, 1, :o1, 2809519200, 29677261, 12
-            tz.transition 2059, 11, :o2, 2835525600, 29680873, 12
-            tz.transition 2060, 1, :o1, 2841573600, 29681713, 12
-            tz.transition 2060, 11, :o2, 2867580000, 29685325, 12
-            tz.transition 2061, 1, :o1, 2873023200, 29686081, 12
-            tz.transition 2061, 11, :o2, 2899029600, 29689693, 12
-            tz.transition 2062, 1, :o1, 2904472800, 29690449, 12
-            tz.transition 2062, 11, :o2, 2930479200, 29694061, 12
-            tz.transition 2063, 1, :o1, 2935922400, 29694817, 12
-            tz.transition 2063, 11, :o2, 2961928800, 29698429, 12
-            tz.transition 2064, 1, :o1, 2967372000, 29699185, 12
-            tz.transition 2064, 11, :o2, 2993378400, 29702797, 12
-            tz.transition 2065, 1, :o1, 2999426400, 29703637, 12
-            tz.transition 2065, 11, :o2, 3024828000, 29707165, 12
-            tz.transition 2066, 1, :o1, 3030876000, 29708005, 12
-            tz.transition 2066, 11, :o2, 3056882400, 29711617, 12
-            tz.transition 2067, 1, :o1, 3062325600, 29712373, 12
-            tz.transition 2067, 11, :o2, 3088332000, 29715985, 12
-            tz.transition 2068, 1, :o1, 3093775200, 29716741, 12
-            tz.transition 2068, 11, :o2, 3119781600, 29720353, 12
-            tz.transition 2069, 1, :o1, 3125224800, 29721109, 12
-            tz.transition 2069, 11, :o2, 3151231200, 29724721, 12
-            tz.transition 2070, 1, :o1, 3156674400, 29725477, 12
-            tz.transition 2070, 11, :o2, 3182680800, 29729089, 12
-            tz.transition 2071, 1, :o1, 3188728800, 29729929, 12
           end
         end
       end

data/lib/tzinfo/data/definitions/Pacific/Funafuti.rb

@@ -10,12 +10,7 @@ module TZInfo
         module Funafuti
           include TimezoneDefinition
           
-          timezone 'Pacific/Funafuti' do |tz|
-            tz.offset :o0, 43012, 0, :LMT
-            tz.offset :o1, 43200, 0, :'+12'
-            
-            tz.transition 1900, 12, :o1, -2177495812, 52172316047, 21600
-          end
+          linked_timezone 'Pacific/Funafuti', 'Pacific/Tarawa'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Majuro.rb

@@ -10,21 +10,7 @@ module TZInfo
         module Majuro
           include TimezoneDefinition
           
-          timezone 'Pacific/Majuro' do |tz|
-            tz.offset :o0, 41088, 0, :LMT
-            tz.offset :o1, 39600, 0, :'+11'
-            tz.offset :o2, 32400, 0, :'+09'
-            tz.offset :o3, 36000, 0, :'+10'
-            tz.offset :o4, 43200, 0, :'+12'
-            
-            tz.transition 1900, 12, :o1, -2177493888, 1086923261, 450
-            tz.transition 1914, 9, :o2, -1743678000, 58089745, 24
-            tz.transition 1919, 1, :o1, -1606813200, 19375921, 8
-            tz.transition 1936, 12, :o3, -1041418800, 58284817, 24
-            tz.transition 1941, 3, :o2, -907408800, 29161021, 12
-            tz.transition 1944, 1, :o1, -818067600, 19448953, 8
-            tz.transition 1969, 9, :o4, -7988400, 58571881, 24
-          end
+          linked_timezone 'Pacific/Majuro', 'Pacific/Tarawa'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Norfolk.rb

@@ -127,6 +127,8 @@ module TZInfo
             tz.transition 2070, 4, :o4, 3163935600, 19817657, 8
             tz.transition 2070, 10, :o5, 3179660400, 19819113, 8
             tz.transition 2071, 4, :o4, 3195385200, 19820569, 8
+            tz.transition 2071, 10, :o5, 3211110000, 19822025, 8
+            tz.transition 2072, 4, :o4, 3226834800, 19823481, 8
           end
         end
       end

data/lib/tzinfo/data/definitions/Pacific/Pohnpei.rb

@@ -10,21 +10,7 @@ module TZInfo
         module Pohnpei
           include TimezoneDefinition
           
-          timezone 'Pacific/Pohnpei' do |tz|
-            tz.offset :o0, -48428, 0, :LMT
-            tz.offset :o1, 37972, 0, :LMT
-            tz.offset :o2, 39600, 0, :'+11'
-            tz.offset :o3, 32400, 0, :'+09'
-            tz.offset :o4, 36000, 0, :'+10'
-            
-            tz.transition 1844, 12, :o1, -3944629972, 51730532507, 21600
-            tz.transition 1900, 12, :o2, -2177490772, 52172317307, 21600
-            tz.transition 1914, 9, :o3, -1743678000, 58089745, 24
-            tz.transition 1919, 1, :o2, -1606813200, 19375921, 8
-            tz.transition 1936, 12, :o4, -1041418800, 58284817, 24
-            tz.transition 1941, 3, :o3, -907408800, 29161021, 12
-            tz.transition 1945, 7, :o2, -770634000, 19453345, 8
-          end
+          linked_timezone 'Pacific/Pohnpei', 'Pacific/Guadalcanal'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Ponape.rb

@@ -10,7 +10,7 @@ module TZInfo
         module Ponape
           include TimezoneDefinition
           
-          linked_timezone 'Pacific/Ponape', 'Pacific/Pohnpei'
+          linked_timezone 'Pacific/Ponape', 'Pacific/Guadalcanal'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Truk.rb

@@ -10,7 +10,7 @@ module TZInfo
         module Truk
           include TimezoneDefinition
           
-          linked_timezone 'Pacific/Truk', 'Pacific/Chuuk'
+          linked_timezone 'Pacific/Truk', 'Pacific/Port_Moresby'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Wake.rb

@@ -10,12 +10,7 @@ module TZInfo
         module Wake
           include TimezoneDefinition
           
-          timezone 'Pacific/Wake' do |tz|
-            tz.offset :o0, 39988, 0, :LMT
-            tz.offset :o1, 43200, 0, :'+12'
-            
-            tz.transition 1900, 12, :o1, -2177492788, 52172316803, 21600
-          end
+          linked_timezone 'Pacific/Wake', 'Pacific/Tarawa'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Wallis.rb

@@ -10,12 +10,7 @@ module TZInfo
         module Wallis
           include TimezoneDefinition
           
-          timezone 'Pacific/Wallis' do |tz|
-            tz.offset :o0, 44120, 0, :LMT
-            tz.offset :o1, 43200, 0, :'+12'
-            
-            tz.transition 1900, 12, :o1, -2177496920, 5217231577, 2160
-          end
+          linked_timezone 'Pacific/Wallis', 'Pacific/Tarawa'
         end
       end
     end

data/lib/tzinfo/data/definitions/Pacific/Yap.rb

@@ -10,7 +10,7 @@ module TZInfo
         module Yap
           include TimezoneDefinition
           
-          linked_timezone 'Pacific/Yap', 'Pacific/Chuuk'
+          linked_timezone 'Pacific/Yap', 'Pacific/Port_Moresby'
         end
       end
     end

data/lib/tzinfo/data/definitions/WET.rb

@@ -203,6 +203,8 @@ module TZInfo
           tz.transition 2070, 10, :o0, 3181510800, 59457853, 24
           tz.transition 2071, 3, :o1, 3194816400, 59461549, 24
           tz.transition 2071, 10, :o0, 3212960400, 59466589, 24
+          tz.transition 2072, 3, :o1, 3226266000, 59470285, 24
+          tz.transition 2072, 10, :o0, 3245014800, 59475493, 24
         end
       end
     end

data/lib/tzinfo/data/indexes/countries.rb

@@ -13,7 +13,7 @@ module TZInfo
           c.timezone 'Europe/Andorra', 85, 2, 91, 60
         end
         country 'AE', 'United Arab Emirates' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
         end
         country 'AF', 'Afghanistan' do |c|
           c.timezone 'Asia/Kabul', 2071, 60, 346, 5
@@ -40,9 +40,9 @@ module TZInfo
           c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer'
           c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera'
           c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll'
-          c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok'
+          c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok'
           c.timezone 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time'
-          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Dumont d\'Urville'
+          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville'
           c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
         end
         country 'AR', 'Argentina' do |c|
@@ -122,7 +122,7 @@ module TZInfo
           c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30
         end
         country 'BN', 'Brunei' do |c|
-          c.timezone 'Asia/Brunei', 74, 15, 1379, 12
+          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei'
         end
         country 'BO', 'Bolivia' do |c|
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
@@ -171,12 +171,8 @@ module TZInfo
           c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic - New Brunswick'
           c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic - Labrador (most areas)'
           c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas), Bahamas'
-          c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern - ON, QC (no DST 1967-73)'
-          c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern - ON (Thunder Bay)'
-          c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most east areas)'
-          c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern - NU (Pangnirtung)'
+          c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most areas)'
           c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central - ON (west); Manitoba'
-          c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central - ON (Rainy R, Ft Frances)'
           c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central - NU (Resolute)'
           c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)'
           c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)'
@@ -185,7 +181,7 @@ module TZInfo
           c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain - NU (west)'
           c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain - NT (central)'
           c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain - NT (west)'
-          c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)'
+          c.timezone 'America/Dawson_Creek', 1673, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)'
           c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'MST - BC (Ft Nelson)'
           c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'MST - Yukon (east)'
           c.timezone 'America/Dawson', 961, 15, -1673, 12, 'MST - Yukon (west)'
@@ -195,7 +191,7 @@ module TZInfo
           c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo), Creston BC'
         end
         country 'CC', 'Cocos (Keeling) Islands' do |c|
-          c.timezone 'Indian/Cocos', -73, 6, 1163, 12
+          c.timezone 'Asia/Yangon', 1007, 60, 577, 6
         end
         country 'CD', 'Congo (Dem. Rep.)' do |c|
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
@@ -226,7 +222,7 @@ module TZInfo
         end
         country 'CN', 'China' do |c|
           c.timezone 'Asia/Shanghai', 937, 30, 1822, 15, 'Beijing Time'
-          c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time'
+          c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok'
         end
         country 'CO', 'Colombia' do |c|
           c.timezone 'America/Bogota', 23, 5, -889, 12
@@ -244,7 +240,7 @@ module TZInfo
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'CX', 'Christmas Island' do |c|
-          c.timezone 'Indian/Christmas', -125, 12, 6343, 60
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
         end
         country 'CY', 'Cyprus' do |c|
           c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)'
@@ -254,14 +250,14 @@ module TZInfo
           c.timezone 'Europe/Prague', 601, 12, 433, 30
         end
         country 'DE', 'Germany' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas)'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
           c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
         end
         country 'DJ', 'Djibouti' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'DK', 'Denmark' do |c|
-          c.timezone 'Europe/Copenhagen', 167, 3, 151, 12
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
         end
         country 'DM', 'Dominica' do |c|
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
@@ -306,9 +302,9 @@ module TZInfo
           c.timezone 'Atlantic/Stanley', -517, 10, -1157, 20
         end
         country 'FM', 'Micronesia' do |c|
-          c.timezone 'Pacific/Chuuk', 89, 12, 9107, 60, 'Chuuk/Truk, Yap'
-          c.timezone 'Pacific/Pohnpei', 209, 30, 9493, 60, 'Pohnpei/Ponape'
           c.timezone 'Pacific/Kosrae', 319, 60, 9779, 60, 'Kosrae'
+          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville'
+          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei'
         end
         country 'FO', 'Faroe Islands' do |c|
           c.timezone 'Atlantic/Faroe', 3721, 60, -203, 30
@@ -420,7 +416,7 @@ module TZInfo
           c.timezone 'Asia/Tehran', 107, 3, 1543, 30
         end
         country 'IS', 'Iceland' do |c|
-          c.timezone 'Atlantic/Reykjavik', 1283, 20, -437, 20
+          c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'IT', 'Italy' do |c|
           c.timezone 'Europe/Rome', 419, 10, 749, 60
@@ -447,7 +443,7 @@ module TZInfo
           c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
         end
         country 'KI', 'Kiribati' do |c|
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
           c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands'
           c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands'
         end
@@ -503,7 +499,7 @@ module TZInfo
           c.timezone 'Europe/Vilnius', 3281, 60, 1519, 60
         end
         country 'LU', 'Luxembourg' do |c|
-          c.timezone 'Europe/Luxembourg', 248, 5, 123, 20
+          c.timezone 'Europe/Brussels', 305, 6, 13, 3
         end
         country 'LV', 'Latvia' do |c|
           c.timezone 'Europe/Riga', 1139, 20, 241, 10
@@ -515,7 +511,7 @@ module TZInfo
           c.timezone 'Africa/Casablanca', 673, 20, -91, 12
         end
         country 'MC', 'Monaco' do |c|
-          c.timezone 'Europe/Monaco', 437, 10, 443, 60
+          c.timezone 'Europe/Paris', 733, 15, 7, 3
         end
         country 'MD', 'Moldova' do |c|
           c.timezone 'Europe/Chisinau', 47, 1, 173, 6
@@ -530,8 +526,8 @@ module TZInfo
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'MH', 'Marshall Islands' do |c|
-          c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'Marshall Islands (most areas)'
           c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
         end
         country 'MK', 'North Macedonia' do |c|
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
@@ -569,27 +565,27 @@ module TZInfo
           c.timezone 'Indian/Mauritius', -121, 6, 115, 2
         end
         country 'MV', 'Maldives' do |c|
-          c.timezone 'Indian/Maldives', 25, 6, 147, 2
+          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I'
         end
         country 'MW', 'Malawi' do |c|
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'MX', 'Mexico' do |c|
-          c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time'
-          c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Eastern Standard Time - Quintana Roo'
-          c.timezone 'America/Merida', 629, 30, -5377, 60, 'Central Time - Campeche, Yucatán'
-          c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)'
-          c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)'
-          c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - Baja California Sur, Nayarit, Sinaloa'
-          c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mountain Time - Chihuahua (most areas)'
-          c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Mountain Time US - Chihuahua (US border)'
-          c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora'
-          c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Pacific Time US - Baja California'
-          c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Central Time - Bahía de Banderas'
+          c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Mexico'
+          c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Quintana Roo'
+          c.timezone 'America/Merida', 629, 30, -5377, 60, 'Campeche, Yucatán'
+          c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Durango; Coahuila, Nuevo León, Tamaulipas (most areas)'
+          c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Coahuila, Nuevo León, Tamaulipas (US border)'
+          c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Chihuahua (most areas)'
+          c.timezone 'America/Ciudad_Juarez', 476, 15, -6389, 60, 'Chihuahua (US border - west)'
+          c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Chihuahua (US border - east)'
+          c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Baja California Sur, Nayarit (most areas), Sinaloa'
+          c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Bahía de Banderas'
+          c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Sonora'
+          c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Baja California'
         end
         country 'MY', 'Malaysia' do |c|
-          c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'Malaysia (peninsula)'
-          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak'
+          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei'
           c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
         end
         country 'MZ', 'Mozambique' do |c|
@@ -614,10 +610,10 @@ module TZInfo
           c.timezone 'America/Managua', 243, 20, -5177, 60
         end
         country 'NL', 'Netherlands' do |c|
-          c.timezone 'Europe/Amsterdam', 1571, 30, 49, 10
+          c.timezone 'Europe/Brussels', 305, 6, 13, 3
         end
         country 'NO', 'Norway' do |c|
-          c.timezone 'Europe/Oslo', 719, 12, 43, 4
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
         end
         country 'NP', 'Nepal' do |c|
           c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60
@@ -633,7 +629,7 @@ module TZInfo
           c.timezone 'Pacific/Chatham', -879, 20, -3531, 20, 'Chatham Islands'
         end
         country 'OM', 'Oman' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
         end
         country 'PA', 'Panama' do |c|
           c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
@@ -647,7 +643,7 @@ module TZInfo
           c.timezone 'Pacific/Gambier', -347, 15, -2699, 20, 'Gambier Islands'
         end
         country 'PG', 'Papua New Guinea' do |c|
-          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Dumont d\'Urville'
+          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville'
           c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville'
         end
         country 'PH', 'Philippines' do |c|
@@ -687,7 +683,7 @@ module TZInfo
           c.timezone 'Asia/Qatar', 1517, 60, 773, 15
         end
         country 'RE', 'Réunion' do |c|
-          c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands'
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
         end
         country 'RO', 'Romania' do |c|
           c.timezone 'Europe/Bucharest', 1333, 30, 261, 10
@@ -731,16 +727,16 @@ module TZInfo
           c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
         end
         country 'SB', 'Solomon Islands' do |c|
-          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5
+          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei'
         end
         country 'SC', 'Seychelles' do |c|
-          c.timezone 'Indian/Mahe', -14, 3, 832, 15
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
         end
         country 'SD', 'Sudan' do |c|
           c.timezone 'Africa/Khartoum', 78, 5, 488, 15
         end
         country 'SE', 'Sweden' do |c|
-          c.timezone 'Europe/Stockholm', 178, 3, 361, 20
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
         end
         country 'SG', 'Singapore' do |c|
           c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
@@ -752,7 +748,7 @@ module TZInfo
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
         country 'SJ', 'Svalbard & Jan Mayen' do |c|
-          c.timezone 'Europe/Oslo', 719, 12, 43, 4
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
         end
         country 'SK', 'Slovakia' do |c|
           c.timezone 'Europe/Prague', 601, 12, 433, 30
@@ -796,9 +792,9 @@ module TZInfo
         country 'TD', 'Chad' do |c|
           c.timezone 'Africa/Ndjamena', 727, 60, 301, 20
         end
-        country 'TF', 'French Southern & Antarctic Lands' do |c|
-          c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400, 'Kerguelen, St Paul Island, Amsterdam Island'
-          c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands'
+        country 'TF', 'French Southern Territories' do |c|
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
+          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I'
         end
         country 'TG', 'Togo' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -831,7 +827,7 @@ module TZInfo
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'TV', 'Tuvalu' do |c|
-          c.timezone 'Pacific/Funafuti', -511, 60, 10753, 60
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
         end
         country 'TW', 'Taiwan' do |c|
           c.timezone 'Asia/Taipei', 501, 20, 243, 2
@@ -840,17 +836,15 @@ module TZInfo
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'UA', 'Ukraine' do |c|
-          c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'Ukraine (most areas)'
-          c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Transcarpathia'
-          c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozhye and east Lugansk'
+          c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'Ukraine (most areas)'
           c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
         end
         country 'UG', 'Uganda' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'UM', 'US minor outlying islands' do |c|
-          c.timezone 'Pacific/Wake', 1157, 60, 9997, 60, 'Wake Island'
           c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
           c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
         end
         country 'US', 'United States' do |c|
@@ -914,7 +908,7 @@ module TZInfo
           c.timezone 'Pacific/Efate', -53, 3, 2021, 12
         end
         country 'WF', 'Wallis & Futuna' do |c|
-          c.timezone 'Pacific/Wallis', -133, 10, -1057, 6
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
         end
         country 'WS', 'Samoa (western)' do |c|
           c.timezone 'Pacific/Apia', -83, 6, -2576, 15