tzinfo-data 1.2013.4 → 1.2013.5

data/lib/tzinfo/data/definitions/Antarctica/South_Pole.rb

@@ -10,7 +10,7 @@ module TZInfo
         module South_Pole
           include TimezoneDefinition
           
-          linked_timezone 'Antarctica/South_Pole', 'Antarctica/McMurdo'
+          linked_timezone 'Antarctica/South_Pole', 'Pacific/Auckland'
         end
       end
     end

data/lib/tzinfo/data/definitions/Asia/Dili.rb

@@ -15,7 +15,7 @@ module TZInfo
             tz.offset :o1, 28800, 0, :TLT
             tz.offset :o2, 32400, 0, :JST
             tz.offset :o3, 32400, 0, :TLT
-            tz.offset :o4, 28800, 0, :CIT
+            tz.offset :o4, 28800, 0, :WITA
             
             tz.transition 1911, 12, :o1, -1830414140, 10451817293, 4320
             tz.transition 1942, 2, :o2, -879152400, 19443297, 8

data/lib/tzinfo/data/definitions/Asia/Jakarta.rb

@@ -12,12 +12,12 @@ module TZInfo
           
           timezone 'Asia/Jakarta' do |tz|
             tz.offset :o0, 25632, 0, :LMT
-            tz.offset :o1, 25632, 0, :JMT
+            tz.offset :o1, 25632, 0, :BMT
             tz.offset :o2, 26400, 0, :JAVT
-            tz.offset :o3, 27000, 0, :WIT
+            tz.offset :o3, 27000, 0, :WIB
             tz.offset :o4, 32400, 0, :JST
-            tz.offset :o5, 28800, 0, :WIT
-            tz.offset :o6, 25200, 0, :WIT
+            tz.offset :o5, 28800, 0, :WIB
+            tz.offset :o6, 25200, 0, :WIB
             
             tz.transition 1867, 8, :o1, -3231299232, 720956461, 300
             tz.transition 1923, 12, :o2, -1451719200, 87256267, 36

data/lib/tzinfo/data/definitions/Asia/Jayapura.rb

@@ -12,7 +12,7 @@ module TZInfo
           
           timezone 'Asia/Jayapura' do |tz|
             tz.offset :o0, 33768, 0, :LMT
-            tz.offset :o1, 32400, 0, :EIT
+            tz.offset :o1, 32400, 0, :WIT
             tz.offset :o2, 34200, 0, :CST
             
             tz.transition 1932, 10, :o1, -1172913768, 2912414531, 1200

data/lib/tzinfo/data/definitions/Asia/Makassar.rb

@@ -13,7 +13,7 @@ module TZInfo
           timezone 'Asia/Makassar' do |tz|
             tz.offset :o0, 28656, 0, :LMT
             tz.offset :o1, 28656, 0, :MMT
-            tz.offset :o2, 28800, 0, :CIT
+            tz.offset :o2, 28800, 0, :WITA
             tz.offset :o3, 32400, 0, :JST
             
             tz.transition 1919, 12, :o1, -1577951856, 1453394501, 600

data/lib/tzinfo/data/definitions/Asia/Pontianak.rb

@@ -13,11 +13,11 @@ module TZInfo
           timezone 'Asia/Pontianak' do |tz|
             tz.offset :o0, 26240, 0, :LMT
             tz.offset :o1, 26240, 0, :PMT
-            tz.offset :o2, 27000, 0, :WIT
+            tz.offset :o2, 27000, 0, :WIB
             tz.offset :o3, 32400, 0, :JST
-            tz.offset :o4, 28800, 0, :WIT
-            tz.offset :o5, 28800, 0, :CIT
-            tz.offset :o6, 25200, 0, :WIT
+            tz.offset :o4, 28800, 0, :WIB
+            tz.offset :o5, 28800, 0, :WITA
+            tz.offset :o6, 25200, 0, :WIB
             
             tz.transition 1908, 4, :o1, -1946186240, 652876793, 270
             tz.transition 1932, 10, :o2, -1172906240, 655293293, 270

data/lib/tzinfo/data/definitions/Europe/Vaduz.rb

@@ -10,179 +10,7 @@ module TZInfo
         module Vaduz
           include TimezoneDefinition
           
-          timezone 'Europe/Vaduz' do |tz|
-            tz.offset :o0, 2284, 0, :LMT
-            tz.offset :o1, 3600, 0, :CET
-            tz.offset :o2, 3600, 3600, :CEST
-            
-            tz.transition 1894, 5, :o1, -2385247084, 52120378229, 21600
-            tz.transition 1981, 3, :o2, 354675600
-            tz.transition 1981, 9, :o1, 370400400
-            tz.transition 1982, 3, :o2, 386125200
-            tz.transition 1982, 9, :o1, 401850000
-            tz.transition 1983, 3, :o2, 417574800
-            tz.transition 1983, 9, :o1, 433299600
-            tz.transition 1984, 3, :o2, 449024400
-            tz.transition 1984, 9, :o1, 465354000
-            tz.transition 1985, 3, :o2, 481078800
-            tz.transition 1985, 9, :o1, 496803600
-            tz.transition 1986, 3, :o2, 512528400
-            tz.transition 1986, 9, :o1, 528253200
-            tz.transition 1987, 3, :o2, 543978000
-            tz.transition 1987, 9, :o1, 559702800
-            tz.transition 1988, 3, :o2, 575427600
-            tz.transition 1988, 9, :o1, 591152400
-            tz.transition 1989, 3, :o2, 606877200
-            tz.transition 1989, 9, :o1, 622602000
-            tz.transition 1990, 3, :o2, 638326800
-            tz.transition 1990, 9, :o1, 654656400
-            tz.transition 1991, 3, :o2, 670381200
-            tz.transition 1991, 9, :o1, 686106000
-            tz.transition 1992, 3, :o2, 701830800
-            tz.transition 1992, 9, :o1, 717555600
-            tz.transition 1993, 3, :o2, 733280400
-            tz.transition 1993, 9, :o1, 749005200
-            tz.transition 1994, 3, :o2, 764730000
-            tz.transition 1994, 9, :o1, 780454800
-            tz.transition 1995, 3, :o2, 796179600
-            tz.transition 1995, 9, :o1, 811904400
-            tz.transition 1996, 3, :o2, 828234000
-            tz.transition 1996, 10, :o1, 846378000
-            tz.transition 1997, 3, :o2, 859683600
-            tz.transition 1997, 10, :o1, 877827600
-            tz.transition 1998, 3, :o2, 891133200
-            tz.transition 1998, 10, :o1, 909277200
-            tz.transition 1999, 3, :o2, 922582800
-            tz.transition 1999, 10, :o1, 941331600
-            tz.transition 2000, 3, :o2, 954032400
-            tz.transition 2000, 10, :o1, 972781200
-            tz.transition 2001, 3, :o2, 985482000
-            tz.transition 2001, 10, :o1, 1004230800
-            tz.transition 2002, 3, :o2, 1017536400
-            tz.transition 2002, 10, :o1, 1035680400
-            tz.transition 2003, 3, :o2, 1048986000
-            tz.transition 2003, 10, :o1, 1067130000
-            tz.transition 2004, 3, :o2, 1080435600
-            tz.transition 2004, 10, :o1, 1099184400
-            tz.transition 2005, 3, :o2, 1111885200
-            tz.transition 2005, 10, :o1, 1130634000
-            tz.transition 2006, 3, :o2, 1143334800
-            tz.transition 2006, 10, :o1, 1162083600
-            tz.transition 2007, 3, :o2, 1174784400
-            tz.transition 2007, 10, :o1, 1193533200
-            tz.transition 2008, 3, :o2, 1206838800
-            tz.transition 2008, 10, :o1, 1224982800
-            tz.transition 2009, 3, :o2, 1238288400
-            tz.transition 2009, 10, :o1, 1256432400
-            tz.transition 2010, 3, :o2, 1269738000
-            tz.transition 2010, 10, :o1, 1288486800
-            tz.transition 2011, 3, :o2, 1301187600
-            tz.transition 2011, 10, :o1, 1319936400
-            tz.transition 2012, 3, :o2, 1332637200
-            tz.transition 2012, 10, :o1, 1351386000
-            tz.transition 2013, 3, :o2, 1364691600
-            tz.transition 2013, 10, :o1, 1382835600
-            tz.transition 2014, 3, :o2, 1396141200
-            tz.transition 2014, 10, :o1, 1414285200
-            tz.transition 2015, 3, :o2, 1427590800
-            tz.transition 2015, 10, :o1, 1445734800
-            tz.transition 2016, 3, :o2, 1459040400
-            tz.transition 2016, 10, :o1, 1477789200
-            tz.transition 2017, 3, :o2, 1490490000
-            tz.transition 2017, 10, :o1, 1509238800
-            tz.transition 2018, 3, :o2, 1521939600
-            tz.transition 2018, 10, :o1, 1540688400
-            tz.transition 2019, 3, :o2, 1553994000
-            tz.transition 2019, 10, :o1, 1572138000
-            tz.transition 2020, 3, :o2, 1585443600
-            tz.transition 2020, 10, :o1, 1603587600
-            tz.transition 2021, 3, :o2, 1616893200
-            tz.transition 2021, 10, :o1, 1635642000
-            tz.transition 2022, 3, :o2, 1648342800
-            tz.transition 2022, 10, :o1, 1667091600
-            tz.transition 2023, 3, :o2, 1679792400
-            tz.transition 2023, 10, :o1, 1698541200
-            tz.transition 2024, 3, :o2, 1711846800
-            tz.transition 2024, 10, :o1, 1729990800
-            tz.transition 2025, 3, :o2, 1743296400
-            tz.transition 2025, 10, :o1, 1761440400
-            tz.transition 2026, 3, :o2, 1774746000
-            tz.transition 2026, 10, :o1, 1792890000
-            tz.transition 2027, 3, :o2, 1806195600
-            tz.transition 2027, 10, :o1, 1824944400
-            tz.transition 2028, 3, :o2, 1837645200
-            tz.transition 2028, 10, :o1, 1856394000
-            tz.transition 2029, 3, :o2, 1869094800
-            tz.transition 2029, 10, :o1, 1887843600
-            tz.transition 2030, 3, :o2, 1901149200
-            tz.transition 2030, 10, :o1, 1919293200
-            tz.transition 2031, 3, :o2, 1932598800
-            tz.transition 2031, 10, :o1, 1950742800
-            tz.transition 2032, 3, :o2, 1964048400
-            tz.transition 2032, 10, :o1, 1982797200
-            tz.transition 2033, 3, :o2, 1995498000
-            tz.transition 2033, 10, :o1, 2014246800
-            tz.transition 2034, 3, :o2, 2026947600
-            tz.transition 2034, 10, :o1, 2045696400
-            tz.transition 2035, 3, :o2, 2058397200
-            tz.transition 2035, 10, :o1, 2077146000
-            tz.transition 2036, 3, :o2, 2090451600
-            tz.transition 2036, 10, :o1, 2108595600
-            tz.transition 2037, 3, :o2, 2121901200
-            tz.transition 2037, 10, :o1, 2140045200
-            tz.transition 2038, 3, :o2, 2153350800, 59172253, 24
-            tz.transition 2038, 10, :o1, 2172099600, 59177461, 24
-            tz.transition 2039, 3, :o2, 2184800400, 59180989, 24
-            tz.transition 2039, 10, :o1, 2203549200, 59186197, 24
-            tz.transition 2040, 3, :o2, 2216250000, 59189725, 24
-            tz.transition 2040, 10, :o1, 2234998800, 59194933, 24
-            tz.transition 2041, 3, :o2, 2248304400, 59198629, 24
-            tz.transition 2041, 10, :o1, 2266448400, 59203669, 24
-            tz.transition 2042, 3, :o2, 2279754000, 59207365, 24
-            tz.transition 2042, 10, :o1, 2297898000, 59212405, 24
-            tz.transition 2043, 3, :o2, 2311203600, 59216101, 24
-            tz.transition 2043, 10, :o1, 2329347600, 59221141, 24
-            tz.transition 2044, 3, :o2, 2342653200, 59224837, 24
-            tz.transition 2044, 10, :o1, 2361402000, 59230045, 24
-            tz.transition 2045, 3, :o2, 2374102800, 59233573, 24
-            tz.transition 2045, 10, :o1, 2392851600, 59238781, 24
-            tz.transition 2046, 3, :o2, 2405552400, 59242309, 24
-            tz.transition 2046, 10, :o1, 2424301200, 59247517, 24
-            tz.transition 2047, 3, :o2, 2437606800, 59251213, 24
-            tz.transition 2047, 10, :o1, 2455750800, 59256253, 24
-            tz.transition 2048, 3, :o2, 2469056400, 59259949, 24
-            tz.transition 2048, 10, :o1, 2487200400, 59264989, 24
-            tz.transition 2049, 3, :o2, 2500506000, 59268685, 24
-            tz.transition 2049, 10, :o1, 2519254800, 59273893, 24
-            tz.transition 2050, 3, :o2, 2531955600, 59277421, 24
-            tz.transition 2050, 10, :o1, 2550704400, 59282629, 24
-            tz.transition 2051, 3, :o2, 2563405200, 59286157, 24
-            tz.transition 2051, 10, :o1, 2582154000, 59291365, 24
-            tz.transition 2052, 3, :o2, 2595459600, 59295061, 24
-            tz.transition 2052, 10, :o1, 2613603600, 59300101, 24
-            tz.transition 2053, 3, :o2, 2626909200, 59303797, 24
-            tz.transition 2053, 10, :o1, 2645053200, 59308837, 24
-            tz.transition 2054, 3, :o2, 2658358800, 59312533, 24
-            tz.transition 2054, 10, :o1, 2676502800, 59317573, 24
-            tz.transition 2055, 3, :o2, 2689808400, 59321269, 24
-            tz.transition 2055, 10, :o1, 2708557200, 59326477, 24
-            tz.transition 2056, 3, :o2, 2721258000, 59330005, 24
-            tz.transition 2056, 10, :o1, 2740006800, 59335213, 24
-            tz.transition 2057, 3, :o2, 2752707600, 59338741, 24
-            tz.transition 2057, 10, :o1, 2771456400, 59343949, 24
-            tz.transition 2058, 3, :o2, 2784762000, 59347645, 24
-            tz.transition 2058, 10, :o1, 2802906000, 59352685, 24
-            tz.transition 2059, 3, :o2, 2816211600, 59356381, 24
-            tz.transition 2059, 10, :o1, 2834355600, 59361421, 24
-            tz.transition 2060, 3, :o2, 2847661200, 59365117, 24
-            tz.transition 2060, 10, :o1, 2866410000, 59370325, 24
-            tz.transition 2061, 3, :o2, 2879110800, 59373853, 24
-            tz.transition 2061, 10, :o1, 2897859600, 59379061, 24
-            tz.transition 2062, 3, :o2, 2910560400, 59382589, 24
-            tz.transition 2062, 10, :o1, 2929309200, 59387797, 24
-            tz.transition 2063, 3, :o2, 2942010000, 59391325, 24
-            tz.transition 2063, 10, :o1, 2960758800, 59396533, 24
-          end
+          linked_timezone 'Europe/Vaduz', 'Europe/Zurich'
         end
       end
     end

data/lib/tzinfo/data/definitions/Europe/Zurich.rb

@@ -12,12 +12,12 @@ module TZInfo
           
           timezone 'Europe/Zurich' do |tz|
             tz.offset :o0, 2048, 0, :LMT
-            tz.offset :o1, 1784, 0, :BMT
+            tz.offset :o1, 1786, 0, :BMT
             tz.offset :o2, 3600, 0, :CET
             tz.offset :o3, 3600, 3600, :CEST
             
-            tz.transition 1848, 9, :o1, -3827954048, 3234981343, 1350
-            tz.transition 1894, 5, :o2, -2385246584, 26060189177, 10800
+            tz.transition 1853, 7, :o1, -3675198848, 3237368143, 1350
+            tz.transition 1894, 5, :o2, -2385246586, 104240756707, 43200
             tz.transition 1941, 5, :o3, -904435200, 4860239, 2
             tz.transition 1941, 10, :o2, -891129600, 4860547, 2
             tz.transition 1942, 5, :o3, -872985600, 4860967, 2

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

@@ -28,11 +28,11 @@ module TZInfo
             tz.transition 2012, 1, :o1, 1327154400
             tz.transition 2012, 10, :o2, 1350741600
             tz.transition 2013, 1, :o1, 1358604000
-            tz.transition 2013, 10, :o2, 1382191200
+            tz.transition 2013, 10, :o2, 1382796000
             tz.transition 2014, 1, :o1, 1390053600
-            tz.transition 2014, 10, :o2, 1413640800
+            tz.transition 2014, 10, :o2, 1414245600
             tz.transition 2015, 1, :o1, 1421503200
-            tz.transition 2015, 10, :o2, 1445090400
+            tz.transition 2015, 10, :o2, 1445695200
             tz.transition 2016, 1, :o1, 1453557600
             tz.transition 2016, 10, :o2, 1477144800
             tz.transition 2017, 1, :o1, 1485007200
@@ -40,9 +40,9 @@ module TZInfo
             tz.transition 2018, 1, :o1, 1516456800
             tz.transition 2018, 10, :o2, 1540044000
             tz.transition 2019, 1, :o1, 1547906400
-            tz.transition 2019, 10, :o2, 1571493600
+            tz.transition 2019, 10, :o2, 1572098400
             tz.transition 2020, 1, :o1, 1579356000
-            tz.transition 2020, 10, :o2, 1602943200
+            tz.transition 2020, 10, :o2, 1603548000
             tz.transition 2021, 1, :o1, 1611410400
             tz.transition 2021, 10, :o2, 1634997600
             tz.transition 2022, 1, :o1, 1642860000
@@ -50,11 +50,11 @@ module TZInfo
             tz.transition 2023, 1, :o1, 1674309600
             tz.transition 2023, 10, :o2, 1697896800
             tz.transition 2024, 1, :o1, 1705759200
-            tz.transition 2024, 10, :o2, 1729346400
+            tz.transition 2024, 10, :o2, 1729951200
             tz.transition 2025, 1, :o1, 1737208800
-            tz.transition 2025, 10, :o2, 1760796000
+            tz.transition 2025, 10, :o2, 1761400800
             tz.transition 2026, 1, :o1, 1768658400
-            tz.transition 2026, 10, :o2, 1792245600
+            tz.transition 2026, 10, :o2, 1792850400
             tz.transition 2027, 1, :o1, 1800712800
             tz.transition 2027, 10, :o2, 1824300000
             tz.transition 2028, 1, :o1, 1832162400
@@ -62,9 +62,9 @@ module TZInfo
             tz.transition 2029, 1, :o1, 1863612000
             tz.transition 2029, 10, :o2, 1887199200
             tz.transition 2030, 1, :o1, 1895061600
-            tz.transition 2030, 10, :o2, 1918648800
+            tz.transition 2030, 10, :o2, 1919253600
             tz.transition 2031, 1, :o1, 1926511200
-            tz.transition 2031, 10, :o2, 1950098400
+            tz.transition 2031, 10, :o2, 1950703200
             tz.transition 2032, 1, :o1, 1957960800
             tz.transition 2032, 10, :o2, 1982152800
             tz.transition 2033, 1, :o1, 1990015200
@@ -74,9 +74,9 @@ module TZInfo
             tz.transition 2035, 1, :o1, 2052914400
             tz.transition 2035, 10, :o2, 2076501600
             tz.transition 2036, 1, :o1, 2084364000
-            tz.transition 2036, 10, :o2, 2107951200
+            tz.transition 2036, 10, :o2, 2108556000
             tz.transition 2037, 1, :o1, 2115813600
-            tz.transition 2037, 10, :o2, 2139400800
+            tz.transition 2037, 10, :o2, 2140005600
             tz.transition 2038, 1, :o1, 2147868000, 29585365, 12
             tz.transition 2038, 10, :o2, 2171455200, 29588641, 12
             tz.transition 2039, 1, :o1, 2179317600, 29589733, 12
@@ -84,11 +84,11 @@ module TZInfo
             tz.transition 2040, 1, :o1, 2210767200, 29594101, 12
             tz.transition 2040, 10, :o2, 2234354400, 29597377, 12
             tz.transition 2041, 1, :o1, 2242216800, 29598469, 12
-            tz.transition 2041, 10, :o2, 2265804000, 29601745, 12
+            tz.transition 2041, 10, :o2, 2266408800, 29601829, 12
             tz.transition 2042, 1, :o1, 2273666400, 29602837, 12
-            tz.transition 2042, 10, :o2, 2297253600, 29606113, 12
+            tz.transition 2042, 10, :o2, 2297858400, 29606197, 12
             tz.transition 2043, 1, :o1, 2305116000, 29607205, 12
-            tz.transition 2043, 10, :o2, 2328703200, 29610481, 12
+            tz.transition 2043, 10, :o2, 2329308000, 29610565, 12
             tz.transition 2044, 1, :o1, 2337170400, 29611657, 12
             tz.transition 2044, 10, :o2, 2360757600, 29614933, 12
             tz.transition 2045, 1, :o1, 2368620000, 29616025, 12
@@ -96,9 +96,9 @@ module TZInfo
             tz.transition 2046, 1, :o1, 2400069600, 29620393, 12
             tz.transition 2046, 10, :o2, 2423656800, 29623669, 12
             tz.transition 2047, 1, :o1, 2431519200, 29624761, 12
-            tz.transition 2047, 10, :o2, 2455106400, 29628037, 12
+            tz.transition 2047, 10, :o2, 2455711200, 29628121, 12
             tz.transition 2048, 1, :o1, 2462968800, 29629129, 12
-            tz.transition 2048, 10, :o2, 2486556000, 29632405, 12
+            tz.transition 2048, 10, :o2, 2487160800, 29632489, 12
             tz.transition 2049, 1, :o1, 2495023200, 29633581, 12
             tz.transition 2049, 10, :o2, 2518610400, 29636857, 12
             tz.transition 2050, 1, :o1, 2526472800, 29637949, 12
@@ -106,11 +106,11 @@ module TZInfo
             tz.transition 2051, 1, :o1, 2557922400, 29642317, 12
             tz.transition 2051, 10, :o2, 2581509600, 29645593, 12
             tz.transition 2052, 1, :o1, 2589372000, 29646685, 12
-            tz.transition 2052, 10, :o2, 2612959200, 29649961, 12
+            tz.transition 2052, 10, :o2, 2613564000, 29650045, 12
             tz.transition 2053, 1, :o1, 2620821600, 29651053, 12
-            tz.transition 2053, 10, :o2, 2644408800, 29654329, 12
+            tz.transition 2053, 10, :o2, 2645013600, 29654413, 12
             tz.transition 2054, 1, :o1, 2652271200, 29655421, 12
-            tz.transition 2054, 10, :o2, 2675858400, 29658697, 12
+            tz.transition 2054, 10, :o2, 2676463200, 29658781, 12
             tz.transition 2055, 1, :o1, 2684325600, 29659873, 12
             tz.transition 2055, 10, :o2, 2707912800, 29663149, 12
             tz.transition 2056, 1, :o1, 2715775200, 29664241, 12
@@ -118,9 +118,9 @@ module TZInfo
             tz.transition 2057, 1, :o1, 2747224800, 29668609, 12
             tz.transition 2057, 10, :o2, 2770812000, 29671885, 12
             tz.transition 2058, 1, :o1, 2778674400, 29672977, 12
-            tz.transition 2058, 10, :o2, 2802261600, 29676253, 12
+            tz.transition 2058, 10, :o2, 2802866400, 29676337, 12
             tz.transition 2059, 1, :o1, 2810124000, 29677345, 12
-            tz.transition 2059, 10, :o2, 2833711200, 29680621, 12
+            tz.transition 2059, 10, :o2, 2834316000, 29680705, 12
             tz.transition 2060, 1, :o1, 2841573600, 29681713, 12
             tz.transition 2060, 10, :o2, 2865765600, 29685073, 12
             tz.transition 2061, 1, :o1, 2873628000, 29686165, 12

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

@@ -10,10 +10,7 @@ module TZInfo
         module Johnston
           include TimezoneDefinition
           
-          timezone 'Pacific/Johnston' do |tz|
-            tz.offset :o0, -36000, 0, :HST
-            
-          end
+          linked_timezone 'Pacific/Johnston', 'Pacific/Honolulu'
         end
       end
     end

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

@@ -34,8 +34,7 @@ module TZInfo
           c.timezone 'Africa/Luanda', -44, 5, 397, 30
         end
         country 'AQ', 'Antarctica' do |c|
-          c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo Station, Ross Island'
-          c.timezone 'Antarctica/South_Pole', -90, 1, 0, 1, 'Amundsen-Scott Station, South Pole'
+          c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo, South Pole, Scott (New Zealand time)'
           c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera Station, Adelaide Island'
           c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer Station, Anvers Island'
           c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson Station, Holme Bay'
@@ -128,7 +127,7 @@ module TZInfo
         country 'BO', 'Bolivia' do |c|
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
         end
-        country 'BQ', 'Bonaire, St Eustatius & Saba' do |c|
+        country 'BQ', 'Caribbean Netherlands' do |c|
           c.timezone 'America/Kralendijk', 14581, 1200, -20483, 300
         end
         country 'BR', 'Brazil' do |c|
@@ -172,8 +171,7 @@ module TZInfo
           c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
           c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
           c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
-          c.timezone 'America/Montreal', 2731, 60, -2207, 30, 'Eastern Time - Quebec - most locations'
-          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario - most locations'
+          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario & Quebec - most locations'
           c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973'
           c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
           c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut - most locations'
@@ -431,7 +429,7 @@ module TZInfo
           c.timezone 'Europe/Jersey', 246, 5, -127, 60
         end
         country 'JM', 'Jamaica' do |c|
-          c.timezone 'America/Jamaica', 18, 1, -384, 5
+          c.timezone 'America/Jamaica', 12937, 720, -11519, 150
         end
         country 'JO', 'Jordan' do |c|
           c.timezone 'Asia/Amman', 639, 20, 539, 15
@@ -862,8 +860,7 @@ module TZInfo
           c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central Time - North Dakota - Mercer County'
           c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain Time'
           c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain Time - south Idaho & east Oregon'
-          c.timezone 'America/Shiprock', 33107, 900, -391271, 3600, 'Mountain Time - Navajo'
-          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona'
+          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona (except Navajo)'
           c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific Time'
           c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
           c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'