tzinfo-data 1.2021.1 → 1.2021.5

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

@@ -45,106 +45,6 @@ module TZInfo
             tz.transition 2020, 4, :o6, 1586008800
             tz.transition 2020, 9, :o5, 1601128800
             tz.transition 2021, 4, :o6, 1617458400
-            tz.transition 2021, 9, :o5, 1632578400
-            tz.transition 2022, 4, :o6, 1648908000
-            tz.transition 2022, 9, :o5, 1664028000
-            tz.transition 2023, 4, :o6, 1680357600
-            tz.transition 2023, 9, :o5, 1695477600
-            tz.transition 2024, 4, :o6, 1712412000
-            tz.transition 2024, 9, :o5, 1727532000
-            tz.transition 2025, 4, :o6, 1743861600
-            tz.transition 2025, 9, :o5, 1758981600
-            tz.transition 2026, 4, :o6, 1775311200
-            tz.transition 2026, 9, :o5, 1790431200
-            tz.transition 2027, 4, :o6, 1806760800
-            tz.transition 2027, 9, :o5, 1821880800
-            tz.transition 2028, 4, :o6, 1838210400
-            tz.transition 2028, 9, :o5, 1853330400
-            tz.transition 2029, 3, :o6, 1869660000
-            tz.transition 2029, 9, :o5, 1885384800
-            tz.transition 2030, 4, :o6, 1901714400
-            tz.transition 2030, 9, :o5, 1916834400
-            tz.transition 2031, 4, :o6, 1933164000
-            tz.transition 2031, 9, :o5, 1948284000
-            tz.transition 2032, 4, :o6, 1964613600
-            tz.transition 2032, 9, :o5, 1979733600
-            tz.transition 2033, 4, :o6, 1996063200
-            tz.transition 2033, 9, :o5, 2011183200
-            tz.transition 2034, 4, :o6, 2027512800
-            tz.transition 2034, 9, :o5, 2042632800
-            tz.transition 2035, 3, :o6, 2058962400
-            tz.transition 2035, 9, :o5, 2074687200
-            tz.transition 2036, 4, :o6, 2091016800
-            tz.transition 2036, 9, :o5, 2106136800
-            tz.transition 2037, 4, :o6, 2122466400
-            tz.transition 2037, 9, :o5, 2137586400
-            tz.transition 2038, 4, :o6, 2153916000, 29586205, 12
-            tz.transition 2038, 9, :o5, 2169036000, 29588305, 12
-            tz.transition 2039, 4, :o6, 2185365600, 29590573, 12
-            tz.transition 2039, 9, :o5, 2200485600, 29592673, 12
-            tz.transition 2040, 3, :o6, 2216815200, 29594941, 12
-            tz.transition 2040, 9, :o5, 2232540000, 29597125, 12
-            tz.transition 2041, 4, :o6, 2248869600, 29599393, 12
-            tz.transition 2041, 9, :o5, 2263989600, 29601493, 12
-            tz.transition 2042, 4, :o6, 2280319200, 29603761, 12
-            tz.transition 2042, 9, :o5, 2295439200, 29605861, 12
-            tz.transition 2043, 4, :o6, 2311768800, 29608129, 12
-            tz.transition 2043, 9, :o5, 2326888800, 29610229, 12
-            tz.transition 2044, 4, :o6, 2343218400, 29612497, 12
-            tz.transition 2044, 9, :o5, 2358338400, 29614597, 12
-            tz.transition 2045, 4, :o6, 2374668000, 29616865, 12
-            tz.transition 2045, 9, :o5, 2389788000, 29618965, 12
-            tz.transition 2046, 3, :o6, 2406117600, 29621233, 12
-            tz.transition 2046, 9, :o5, 2421842400, 29623417, 12
-            tz.transition 2047, 4, :o6, 2438172000, 29625685, 12
-            tz.transition 2047, 9, :o5, 2453292000, 29627785, 12
-            tz.transition 2048, 4, :o6, 2469621600, 29630053, 12
-            tz.transition 2048, 9, :o5, 2484741600, 29632153, 12
-            tz.transition 2049, 4, :o6, 2501071200, 29634421, 12
-            tz.transition 2049, 9, :o5, 2516191200, 29636521, 12
-            tz.transition 2050, 4, :o6, 2532520800, 29638789, 12
-            tz.transition 2050, 9, :o5, 2547640800, 29640889, 12
-            tz.transition 2051, 4, :o6, 2563970400, 29643157, 12
-            tz.transition 2051, 9, :o5, 2579090400, 29645257, 12
-            tz.transition 2052, 4, :o6, 2596024800, 29647609, 12
-            tz.transition 2052, 9, :o5, 2611144800, 29649709, 12
-            tz.transition 2053, 4, :o6, 2627474400, 29651977, 12
-            tz.transition 2053, 9, :o5, 2642594400, 29654077, 12
-            tz.transition 2054, 4, :o6, 2658924000, 29656345, 12
-            tz.transition 2054, 9, :o5, 2674044000, 29658445, 12
-            tz.transition 2055, 4, :o6, 2690373600, 29660713, 12
-            tz.transition 2055, 9, :o5, 2705493600, 29662813, 12
-            tz.transition 2056, 4, :o6, 2721823200, 29665081, 12
-            tz.transition 2056, 9, :o5, 2736943200, 29667181, 12
-            tz.transition 2057, 3, :o6, 2753272800, 29669449, 12
-            tz.transition 2057, 9, :o5, 2768997600, 29671633, 12
-            tz.transition 2058, 4, :o6, 2785327200, 29673901, 12
-            tz.transition 2058, 9, :o5, 2800447200, 29676001, 12
-            tz.transition 2059, 4, :o6, 2816776800, 29678269, 12
-            tz.transition 2059, 9, :o5, 2831896800, 29680369, 12
-            tz.transition 2060, 4, :o6, 2848226400, 29682637, 12
-            tz.transition 2060, 9, :o5, 2863346400, 29684737, 12
-            tz.transition 2061, 4, :o6, 2879676000, 29687005, 12
-            tz.transition 2061, 9, :o5, 2894796000, 29689105, 12
-            tz.transition 2062, 4, :o6, 2911125600, 29691373, 12
-            tz.transition 2062, 9, :o5, 2926245600, 29693473, 12
-            tz.transition 2063, 3, :o6, 2942575200, 29695741, 12
-            tz.transition 2063, 9, :o5, 2958300000, 29697925, 12
-            tz.transition 2064, 4, :o6, 2974629600, 29700193, 12
-            tz.transition 2064, 9, :o5, 2989749600, 29702293, 12
-            tz.transition 2065, 4, :o6, 3006079200, 29704561, 12
-            tz.transition 2065, 9, :o5, 3021199200, 29706661, 12
-            tz.transition 2066, 4, :o6, 3037528800, 29708929, 12
-            tz.transition 2066, 9, :o5, 3052648800, 29711029, 12
-            tz.transition 2067, 4, :o6, 3068978400, 29713297, 12
-            tz.transition 2067, 9, :o5, 3084098400, 29715397, 12
-            tz.transition 2068, 3, :o6, 3100428000, 29717665, 12
-            tz.transition 2068, 9, :o5, 3116152800, 29719849, 12
-            tz.transition 2069, 4, :o6, 3132482400, 29722117, 12
-            tz.transition 2069, 9, :o5, 3147602400, 29724217, 12
-            tz.transition 2070, 4, :o6, 3163932000, 29726485, 12
-            tz.transition 2070, 9, :o5, 3179052000, 29728585, 12
-            tz.transition 2071, 4, :o6, 3195381600, 29730853, 12
           end
         end
       end

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

@@ -10,16 +10,7 @@ module TZInfo
         module Enderbury
           include TimezoneDefinition
           
-          timezone 'Pacific/Enderbury' do |tz|
-            tz.offset :o0, -41060, 0, :LMT
-            tz.offset :o1, -43200, 0, :'-12'
-            tz.offset :o2, -39600, 0, :'-11'
-            tz.offset :o3, 46800, 0, :'+13'
-            
-            tz.transition 1901, 1, :o1, -2177411740, 10434467413, 4320
-            tz.transition 1979, 10, :o2, 307627200
-            tz.transition 1994, 12, :o3, 788871600
-          end
+          linked_timezone 'Pacific/Enderbury', 'Pacific/Kanton'
         end
       end
     end

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

@@ -44,8 +44,6 @@ module TZInfo
             tz.transition 2020, 1, :o1, 1578751200
             tz.transition 2020, 12, :o2, 1608386400
             tz.transition 2021, 1, :o1, 1610805600
-            tz.transition 2021, 11, :o2, 1636812000
-            tz.transition 2022, 1, :o1, 1642255200
             tz.transition 2022, 11, :o2, 1668261600
             tz.transition 2023, 1, :o1, 1673704800
             tz.transition 2023, 11, :o2, 1699711200

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

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+
+# This file contains data derived from the IANA Time Zone Database
+# (https://www.iana.org/time-zones).
+
+module TZInfo
+  module Data
+    module Definitions
+      module Pacific
+        module Kanton
+          include TimezoneDefinition
+          
+          timezone 'Pacific/Kanton' do |tz|
+            tz.offset :o0, 0, 0, :'-00'
+            tz.offset :o1, -43200, 0, :'-12'
+            tz.offset :o2, -39600, 0, :'-11'
+            tz.offset :o3, 46800, 0, :'+13'
+            
+            tz.transition 1937, 8, :o1, -1020470400, 4857553, 2
+            tz.transition 1979, 10, :o2, 307627200
+            tz.transition 1994, 12, :o3, 788871600
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,12 +13,10 @@ module TZInfo
           timezone 'Pacific/Niue' do |tz|
             tz.offset :o0, -40780, 0, :LMT
             tz.offset :o1, -40800, 0, :'-1120'
-            tz.offset :o2, -41400, 0, :'-1130'
-            tz.offset :o3, -39600, 0, :'-11'
+            tz.offset :o2, -39600, 0, :'-11'
             
-            tz.transition 1901, 1, :o1, -2177412020, 10434467399, 4320
-            tz.transition 1951, 1, :o2, -599575200, 87611327, 36
-            tz.transition 1978, 10, :o3, 276089400
+            tz.transition 1952, 10, :o1, -543069620, 10516184519, 4320
+            tz.transition 1964, 7, :o2, -173623200, 87788807, 36
           end
         end
       end

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

@@ -11,38 +11,40 @@ module TZInfo
           include TimezoneDefinition
           
           timezone 'Pacific/Rarotonga' do |tz|
-            tz.offset :o0, -38344, 0, :LMT
-            tz.offset :o1, -37800, 0, :'-1030'
-            tz.offset :o2, -36000, 1800, :'-0930'
-            tz.offset :o3, -36000, 0, :'-10'
+            tz.offset :o0, 48056, 0, :LMT
+            tz.offset :o1, -38344, 0, :LMT
+            tz.offset :o2, -37800, 0, :'-1030'
+            tz.offset :o3, -36000, 1800, :'-0930'
+            tz.offset :o4, -36000, 0, :'-10'
             
-            tz.transition 1901, 1, :o1, -2177414456, 26086168193, 10800
-            tz.transition 1978, 11, :o2, 279714600
-            tz.transition 1979, 3, :o3, 289387800
-            tz.transition 1979, 10, :o2, 309952800
-            tz.transition 1980, 3, :o3, 320837400
-            tz.transition 1980, 10, :o2, 341402400
-            tz.transition 1981, 3, :o3, 352287000
-            tz.transition 1981, 10, :o2, 372852000
-            tz.transition 1982, 3, :o3, 384341400
-            tz.transition 1982, 10, :o2, 404906400
-            tz.transition 1983, 3, :o3, 415791000
-            tz.transition 1983, 10, :o2, 436356000
-            tz.transition 1984, 3, :o3, 447240600
-            tz.transition 1984, 10, :o2, 467805600
-            tz.transition 1985, 3, :o3, 478690200
-            tz.transition 1985, 10, :o2, 499255200
-            tz.transition 1986, 3, :o3, 510139800
-            tz.transition 1986, 10, :o2, 530704800
-            tz.transition 1987, 3, :o3, 541589400
-            tz.transition 1987, 10, :o2, 562154400
-            tz.transition 1988, 3, :o3, 573643800
-            tz.transition 1988, 10, :o2, 594208800
-            tz.transition 1989, 3, :o3, 605093400
-            tz.transition 1989, 10, :o2, 625658400
-            tz.transition 1990, 3, :o3, 636543000
-            tz.transition 1990, 10, :o2, 657108000
-            tz.transition 1991, 3, :o3, 667992600
+            tz.transition 1899, 12, :o1, -2209555256, 26082150593, 10800
+            tz.transition 1952, 10, :o2, -543072056, 26290460993, 10800
+            tz.transition 1978, 11, :o3, 279714600
+            tz.transition 1979, 3, :o4, 289387800
+            tz.transition 1979, 10, :o3, 309952800
+            tz.transition 1980, 3, :o4, 320837400
+            tz.transition 1980, 10, :o3, 341402400
+            tz.transition 1981, 3, :o4, 352287000
+            tz.transition 1981, 10, :o3, 372852000
+            tz.transition 1982, 3, :o4, 384341400
+            tz.transition 1982, 10, :o3, 404906400
+            tz.transition 1983, 3, :o4, 415791000
+            tz.transition 1983, 10, :o3, 436356000
+            tz.transition 1984, 3, :o4, 447240600
+            tz.transition 1984, 10, :o3, 467805600
+            tz.transition 1985, 3, :o4, 478690200
+            tz.transition 1985, 10, :o3, 499255200
+            tz.transition 1986, 3, :o4, 510139800
+            tz.transition 1986, 10, :o3, 530704800
+            tz.transition 1987, 3, :o4, 541589400
+            tz.transition 1987, 10, :o3, 562154400
+            tz.transition 1988, 3, :o4, 573643800
+            tz.transition 1988, 10, :o3, 594208800
+            tz.transition 1989, 3, :o4, 605093400
+            tz.transition 1989, 10, :o3, 625658400
+            tz.transition 1990, 3, :o4, 636543000
+            tz.transition 1990, 10, :o3, 657108000
+            tz.transition 1991, 3, :o4, 667992600
           end
         end
       end

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

@@ -11,13 +11,13 @@ module TZInfo
           include TimezoneDefinition
           
           timezone 'Pacific/Tongatapu' do |tz|
-            tz.offset :o0, 44360, 0, :LMT
+            tz.offset :o0, 44352, 0, :LMT
             tz.offset :o1, 44400, 0, :'+1220'
             tz.offset :o2, 46800, 0, :'+13'
             tz.offset :o3, 46800, 3600, :'+14'
             
-            tz.transition 1900, 12, :o1, -2177497160, 5217231571, 2160
-            tz.transition 1940, 12, :o2, -915193200, 174959639, 72
+            tz.transition 1945, 9, :o1, -767189952, 182378099, 75
+            tz.transition 1960, 12, :o2, -284041200, 175485599, 72
             tz.transition 1999, 10, :o3, 939214800
             tz.transition 2000, 3, :o2, 953384400
             tz.transition 2000, 11, :o3, 973342800

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

@@ -19,10 +19,10 @@ module TZInfo
           c.timezone 'Asia/Kabul', 2071, 60, 346, 5
         end
         country 'AG', 'Antigua & Barbuda' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'AI', 'Anguilla' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'AL', 'Albania' do |c|
           c.timezone 'Europe/Tirane', 124, 3, 119, 6
@@ -36,14 +36,14 @@ module TZInfo
         country 'AQ', 'Antarctica' do |c|
           c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey'
           c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis'
-          c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville'
           c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson'
           c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer'
           c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera'
-          c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa'
           c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll'
           c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, '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 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
         end
         country 'AR', 'Argentina' do |c|
           c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
@@ -80,7 +80,7 @@ module TZInfo
           c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia (Eucla)'
         end
         country 'AW', 'Aruba' do |c|
-          c.timezone 'America/Curacao', 731, 60, -69, 1
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'AX', 'Åland Islands' do |c|
           c.timezone 'Europe/Helsinki', 361, 6, 749, 30
@@ -116,7 +116,7 @@ module TZInfo
           c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'BL', 'St Barthelemy' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'BM', 'Bermuda' do |c|
           c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30
@@ -128,7 +128,7 @@ module TZInfo
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
         end
         country 'BQ', 'Caribbean NL' do |c|
-          c.timezone 'America/Curacao', 731, 60, -69, 1
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'BR', 'Brazil' do |c|
           c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands'
@@ -149,7 +149,7 @@ module TZInfo
           c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre'
         end
         country 'BS', 'Bahamas' do |c|
-          c.timezone 'America/Nassau', 301, 12, -1547, 20
+          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas), Bahamas'
         end
         country 'BT', 'Bhutan' do |c|
           c.timezone 'Asia/Thimphu', 412, 15, 1793, 20
@@ -170,13 +170,11 @@ module TZInfo
           c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic - NS (Cape Breton)'
           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/Blanc-Sablon', 617, 12, -3427, 60, 'AST - QC (Lower North Shore)'
-          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (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/Atikokan', 175531, 3600, -54973, 600, 'EST - ON (Atikokan); NU (Coral H)'
           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)'
@@ -187,12 +185,14 @@ 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/Creston', 491, 10, -6991, 60, 'MST - BC (Creston)'
           c.timezone 'America/Dawson_Creek', 1793, 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)'
           c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)'
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
+          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
@@ -241,7 +241,7 @@ module TZInfo
           c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60
         end
         country 'CW', 'Curaçao' do |c|
-          c.timezone 'America/Curacao', 731, 60, -69, 1
+          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
@@ -264,7 +264,7 @@ module TZInfo
           c.timezone 'Europe/Copenhagen', 167, 3, 151, 12
         end
         country 'DM', 'Dominica' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'DO', 'Dominican Republic' do |c|
           c.timezone 'America/Santo_Domingo', 277, 15, -699, 10
@@ -323,7 +323,7 @@ module TZInfo
           c.timezone 'Europe/London', 6181, 120, -451, 3600
         end
         country 'GD', 'Grenada' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'GE', 'Georgia' do |c|
           c.timezone 'Asia/Tbilisi', 2503, 60, 2689, 60
@@ -335,7 +335,7 @@ module TZInfo
           c.timezone 'Europe/London', 6181, 120, -451, 3600
         end
         country 'GH', 'Ghana' do |c|
-          c.timezone 'Africa/Accra', 111, 20, -13, 60
+          c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'GI', 'Gibraltar' do |c|
           c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
@@ -353,7 +353,7 @@ module TZInfo
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'GP', 'Guadeloupe' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'GQ', 'Equatorial Guinea' do |c|
           c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
@@ -448,14 +448,14 @@ module TZInfo
         end
         country 'KI', 'Kiribati' do |c|
           c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands'
-          c.timezone 'Pacific/Enderbury', -47, 15, -2053, 12, 'Phoenix Islands'
+          c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands'
           c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands'
         end
         country 'KM', 'Comoros' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'KN', 'St Kitts & Nevis' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'KP', 'Korea (North)' do |c|
           c.timezone 'Asia/Pyongyang', 2341, 60, 503, 4
@@ -464,10 +464,10 @@ module TZInfo
           c.timezone 'Asia/Seoul', 751, 20, 3809, 30
         end
         country 'KW', 'Kuwait' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
         end
         country 'KY', 'Cayman Islands' do |c|
-          c.timezone 'America/Panama', 269, 30, -1193, 15
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
         end
         country 'KZ', 'Kazakhstan' do |c|
           c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)'
@@ -485,7 +485,7 @@ module TZInfo
           c.timezone 'Asia/Beirut', 2033, 60, 71, 2
         end
         country 'LC', 'St Lucia' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'LI', 'Liechtenstein' do |c|
           c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
@@ -524,7 +524,7 @@ module TZInfo
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
         country 'MF', 'St Martin (French)' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'MG', 'Madagascar' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
@@ -560,7 +560,7 @@ module TZInfo
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'MS', 'Montserrat' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'MT', 'Malta' do |c|
           c.timezone 'Europe/Malta', 359, 10, 871, 60
@@ -590,6 +590,7 @@ module TZInfo
         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/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
         end
         country 'MZ', 'Mozambique' do |c|
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
@@ -635,7 +636,7 @@ module TZInfo
           c.timezone 'Asia/Dubai', 253, 10, 553, 10
         end
         country 'PA', 'Panama' do |c|
-          c.timezone 'America/Panama', 269, 30, -1193, 15
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
         end
         country 'PE', 'Peru' do |c|
           c.timezone 'America/Lima', -241, 20, -1541, 20
@@ -646,7 +647,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)'
+          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Dumont d\'Urville'
           c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville'
         end
         country 'PH', 'Philippines' do |c|
@@ -665,7 +666,7 @@ module TZInfo
           c.timezone 'Pacific/Pitcairn', -376, 15, -1561, 12
         end
         country 'PR', 'Puerto Rico' do |c|
-          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'PS', 'Palestine' do |c|
           c.timezone 'Asia/Gaza', 63, 2, 517, 15, 'Gaza Strip'
@@ -727,7 +728,7 @@ module TZInfo
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'SA', 'Saudi Arabia' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60
+          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
@@ -742,7 +743,7 @@ module TZInfo
           c.timezone 'Europe/Stockholm', 178, 3, 361, 20
         end
         country 'SG', 'Singapore' do |c|
-          c.timezone 'Asia/Singapore', 77, 60, 2077, 20
+          c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
         end
         country 'SH', 'St Helena' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -781,7 +782,7 @@ module TZInfo
           c.timezone 'America/El_Salvador', 137, 10, -446, 5
         end
         country 'SX', 'St Maarten (Dutch)' do |c|
-          c.timezone 'America/Curacao', 731, 60, -69, 1
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'SY', 'Syria' do |c|
           c.timezone 'Asia/Damascus', 67, 2, 363, 10
@@ -821,13 +822,13 @@ module TZInfo
           c.timezone 'Africa/Tunis', 184, 5, 611, 60
         end
         country 'TO', 'Tonga' do |c|
-          c.timezone 'Pacific/Tongatapu', -127, 6, -1051, 6
+          c.timezone 'Pacific/Tongatapu', -317, 15, -876, 5
         end
         country 'TR', 'Turkey' do |c|
           c.timezone 'Europe/Istanbul', 2461, 60, 869, 30
         end
         country 'TT', 'Trinidad & Tobago' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'TV', 'Tuvalu' do |c|
           c.timezone 'Pacific/Funafuti', -511, 60, 10753, 60
@@ -872,7 +873,7 @@ module TZInfo
           c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central - ND (Mercer)'
           c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain (most areas)'
           c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain - ID (south); OR (east)'
-          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo)'
+          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo), Creston BC'
           c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific'
           c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska (most areas)'
           c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska - Juneau area'
@@ -894,16 +895,16 @@ module TZInfo
           c.timezone 'Europe/Rome', 419, 10, 749, 60
         end
         country 'VC', 'St Vincent' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'VE', 'Venezuela' do |c|
           c.timezone 'America/Caracas', 21, 2, -1004, 15
         end
         country 'VG', 'Virgin Islands (UK)' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'VI', 'Virgin Islands (US)' do |c|
-          c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
+          c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'VN', 'Vietnam' do |c|
           c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)'
@@ -919,7 +920,7 @@ module TZInfo
           c.timezone 'Pacific/Apia', -83, 6, -2576, 15
         end
         country 'YE', 'Yemen' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
         end
         country 'YT', 'Mayotte' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60