tzinfo 1.2.5 → 1.2.9

data/test/test_utils.rb

@@ -1,4 +1,6 @@
-TESTS_DIR = File.expand_path(File.dirname(__FILE__)).untaint
+tests_dir = File.expand_path(File.dirname(__FILE__))
+tests_dir.untaint if RUBY_VERSION < '2.7'
+TESTS_DIR = tests_dir
 TZINFO_LIB_DIR = File.expand_path(File.join(TESTS_DIR, '..', 'lib'))
 TZINFO_TEST_DATA_DIR = File.join(TESTS_DIR, 'tzinfo-data')
 TZINFO_TEST_ZONEINFO_DIR = File.join(TESTS_DIR, 'zoneinfo')
@@ -55,8 +57,8 @@ module Kernel
   end
   
   def safe_test(options = {})
-    # JRuby and Rubinus don't support SAFE levels.
-    available = !(defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE))
+    # Ruby >= 2.7, JRuby and Rubinus don't support SAFE levels.
+    available = RUBY_VERSION < '2.7' && !(defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE))
    
     if available || options[:unavailable] != :skip
       thread = Thread.new do
@@ -96,6 +98,16 @@ module Kernel
       thread.join
     end
   end
+
+  def skip_if_has_bug_14060
+    # On Ruby 2.4.4 in safe mode, require will fail with a SecurityError for
+    # any file that has not previously been loaded, regardless of whether the
+    # file name is tainted.
+    # See https://bugs.ruby-lang.org/issues/14060#note-5.
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.4.4'
+      skip('Skipping test due to Ruby 2.4.4 being affected by Bug 14060 (see https://bugs.ruby-lang.org/issues/14060#note-5)')
+    end
+  end
   
   def assert_array_same_items(expected, actual, msg = nil)
     full_message = message(msg, '') { diff(expected, actual) }
@@ -104,6 +116,10 @@ module Kernel
   end
   
   def assert_sub_process_returns(expected_lines, code, extra_load_path = [], required = ['tzinfo'])
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && JRUBY_VERSION.start_with?('9.0.') && RbConfig::CONFIG['host_os'] =~ /mswin/
+      skip('JRuby 9.0 on Windows cannot handle writing to the IO instance returned by popen')
+    end
+
     ruby = File.join(RbConfig::CONFIG['bindir'], 
       RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT'])
       
@@ -152,6 +168,19 @@ module Kernel
 end
 
 
+# Object#taint is a deprecated no-op in Ruby 2.7 and outputs a warning. It will
+# be removed in 3.2. Silence the warning or supply a replacement.
+if TZInfo::RubyCoreSupport.const_defined?(:UntaintExt)
+  module TaintExt
+    refine Object do
+      def taint
+        self
+      end
+    end
+  end
+end
+
+
 # JRuby 1.7.5 to 1.7.9 consider DateTime instances that differ by less than 
 # 1 millisecond to be equivalent (https://github.com/jruby/jruby/issues/1311).
 #

data/test/ts_all_zoneinfo.rb

@@ -2,6 +2,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils.rb')
 
 # Use a zoneinfo directory containing files needed by the tests.
 # The symlinks in this directory are set up in test_utils.rb.
-TZInfo::DataSource.set(:zoneinfo, File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo').untaint)
+zoneinfo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo')
+zoneinfo_path.untaint if RUBY_VERSION < '2.7'
+TZInfo::DataSource.set(:zoneinfo, zoneinfo_path)
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'ts_all.rb')

data/test/tzinfo-data/tzinfo/data/definitions/America/Argentina/Buenos_Aires.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -14,10 +14,10 @@ module TZInfo
             timezone 'America/Argentina/Buenos_Aires' do |tz|
               tz.offset :o0, -14028, 0, :LMT
               tz.offset :o1, -15408, 0, :CMT
-              tz.offset :o2, -14400, 0, :ART
-              tz.offset :o3, -14400, 3600, :ARST
-              tz.offset :o4, -10800, 0, :ART
-              tz.offset :o5, -10800, 3600, :ARST
+              tz.offset :o2, -14400, 0, :'-04'
+              tz.offset :o3, -14400, 3600, :'-03'
+              tz.offset :o4, -10800, 0, :'-03'
+              tz.offset :o5, -10800, 3600, :'-02'
               
               tz.transition 1894, 10, :o1, -2372097972, 17374555169, 7200
               tz.transition 1920, 5, :o2, -1567453392, 1453467407, 600

data/test/tzinfo-data/tzinfo/data/definitions/America/New_York.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -307,6 +307,18 @@ module TZInfo
             tz.transition 2063, 11, :o1, 2961381600, 9899451, 4
             tz.transition 2064, 3, :o2, 2972271600, 59399731, 24
             tz.transition 2064, 11, :o1, 2992831200, 9900907, 4
+            tz.transition 2065, 3, :o2, 3003721200, 59408467, 24
+            tz.transition 2065, 11, :o1, 3024280800, 9902363, 4
+            tz.transition 2066, 3, :o2, 3035775600, 59417371, 24
+            tz.transition 2066, 11, :o1, 3056335200, 9903847, 4
+            tz.transition 2067, 3, :o2, 3067225200, 59426107, 24
+            tz.transition 2067, 11, :o1, 3087784800, 9905303, 4
+            tz.transition 2068, 3, :o2, 3098674800, 59434843, 24
+            tz.transition 2068, 11, :o1, 3119234400, 9906759, 4
+            tz.transition 2069, 3, :o2, 3130124400, 59443579, 24
+            tz.transition 2069, 11, :o1, 3150684000, 9908215, 4
+            tz.transition 2070, 3, :o2, 3161574000, 59452315, 24
+            tz.transition 2070, 11, :o1, 3182133600, 9909671, 4
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Australia/Melbourne.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -210,6 +210,18 @@ module TZInfo
             tz.transition 2063, 3, :o1, 2942582400, 14847871, 6
             tz.transition 2063, 10, :o2, 2958912000, 14849005, 6
             tz.transition 2064, 4, :o1, 2974636800, 14850097, 6
+            tz.transition 2064, 10, :o2, 2990361600, 14851189, 6
+            tz.transition 2065, 4, :o1, 3006086400, 14852281, 6
+            tz.transition 2065, 10, :o2, 3021811200, 14853373, 6
+            tz.transition 2066, 4, :o1, 3037536000, 14854465, 6
+            tz.transition 2066, 10, :o2, 3053260800, 14855557, 6
+            tz.transition 2067, 4, :o1, 3068985600, 14856649, 6
+            tz.transition 2067, 10, :o2, 3084710400, 14857741, 6
+            tz.transition 2068, 3, :o1, 3100435200, 14858833, 6
+            tz.transition 2068, 10, :o2, 3116764800, 14859967, 6
+            tz.transition 2069, 4, :o1, 3132489600, 14861059, 6
+            tz.transition 2069, 10, :o2, 3148214400, 14862151, 6
+            tz.transition 2070, 4, :o1, 3163939200, 14863243, 6
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/EST.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data

data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__m__1.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -11,7 +11,7 @@ module TZInfo
           include TimezoneDefinition
           
           timezone 'Etc/GMT-1' do |tz|
-            tz.offset :o0, 3600, 0, :'GMT-1'
+            tz.offset :o0, 3600, 0, :'+01'
             
           end
         end

data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__p__1.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -11,7 +11,7 @@ module TZInfo
           include TimezoneDefinition
           
           timezone 'Etc/GMT+1' do |tz|
-            tz.offset :o0, -3600, 0, :'GMT+1'
+            tz.offset :o0, -3600, 0, :'-01'
             
           end
         end

data/test/tzinfo-data/tzinfo/data/definitions/Etc/UTC.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Amsterdam.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -14,8 +14,8 @@ module TZInfo
             tz.offset :o0, 1172, 0, :LMT
             tz.offset :o1, 1172, 0, :AMT
             tz.offset :o2, 1172, 3600, :NST
-            tz.offset :o3, 1200, 3600, :NEST
-            tz.offset :o4, 1200, 0, :NET
+            tz.offset :o3, 1200, 3600, :'+0120'
+            tz.offset :o4, 1200, 0, :'+0020'
             tz.offset :o5, 3600, 3600, :CEST
             tz.offset :o6, 3600, 0, :CET
             
@@ -253,6 +253,18 @@ module TZInfo
             tz.transition 2063, 10, :o6, 2960758800, 59396533, 24
             tz.transition 2064, 3, :o5, 2974064400, 59400229, 24
             tz.transition 2064, 10, :o6, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o5, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o6, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o5, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o6, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o5, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o6, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o5, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o6, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o5, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o6, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o5, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o6, 3181510800, 59457853, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Andorra.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -178,6 +178,18 @@ module TZInfo
             tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
             tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
             tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o3, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o2, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o3, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o2, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o3, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o2, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o3, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o2, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o3, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o2, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o3, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o2, 3181510800, 59457853, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/London.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -313,6 +313,18 @@ module TZInfo
             tz.transition 2063, 10, :o1, 2960758800, 59396533, 24
             tz.transition 2064, 3, :o2, 2974064400, 59400229, 24
             tz.transition 2064, 10, :o1, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o2, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o1, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o2, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o1, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o2, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o1, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o2, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o1, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o2, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o1, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o2, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o1, 3181510800, 59457853, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Paris.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -19,8 +19,8 @@ module TZInfo
             tz.offset :o5, 3600, 0, :CET
             tz.offset :o6, 0, 7200, :WEMT
             
-            tz.transition 1891, 3, :o1, -2486678901, 69460027033, 28800
-            tz.transition 1911, 3, :o2, -1855958901, 69670267033, 28800
+            tz.transition 1891, 3, :o1, -2486592561, 69460055813, 28800
+            tz.transition 1911, 3, :o2, -1855958961, 69670267013, 28800
             tz.transition 1916, 6, :o3, -1689814800, 58104707, 24
             tz.transition 1916, 10, :o2, -1680397200, 58107323, 24
             tz.transition 1917, 3, :o3, -1665363600, 58111499, 24
@@ -257,6 +257,18 @@ module TZInfo
             tz.transition 2063, 10, :o5, 2960758800, 59396533, 24
             tz.transition 2064, 3, :o4, 2974064400, 59400229, 24
             tz.transition 2064, 10, :o5, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o4, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o5, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o4, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o5, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o4, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o5, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o4, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o5, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o4, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o5, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o4, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o5, 3181510800, 59457853, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Prague.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -15,6 +15,7 @@ module TZInfo
             tz.offset :o1, 3464, 0, :PMT
             tz.offset :o2, 3600, 0, :CET
             tz.offset :o3, 3600, 3600, :CEST
+            tz.offset :o4, 3600, -3600, :GMT
             
             tz.transition 1849, 12, :o1, -3786829064, 25884991367, 10800
             tz.transition 1891, 9, :o2, -2469401864, 26049669767, 10800
@@ -29,11 +30,13 @@ module TZInfo
             tz.transition 1943, 3, :o3, -844556400, 58339501, 24
             tz.transition 1943, 10, :o2, -828226800, 58344037, 24
             tz.transition 1944, 4, :o3, -812502000, 58348405, 24
-            tz.transition 1944, 9, :o2, -798073200, 58352413, 24
-            tz.transition 1945, 4, :o3, -780534000, 58357285, 24
-            tz.transition 1945, 11, :o2, -761180400, 58362661, 24
+            tz.transition 1944, 10, :o2, -796777200, 58352773, 24
+            tz.transition 1945, 4, :o3, -781052400, 58357141, 24
+            tz.transition 1945, 10, :o2, -765327600, 58361509, 24
             tz.transition 1946, 5, :o3, -746578800, 58366717, 24
             tz.transition 1946, 10, :o2, -733359600, 58370389, 24
+            tz.transition 1946, 12, :o4, -728517600, 29185867, 12
+            tz.transition 1947, 2, :o2, -721260000, 29186875, 12
             tz.transition 1947, 4, :o3, -716425200, 58375093, 24
             tz.transition 1947, 10, :o2, -701910000, 58379125, 24
             tz.transition 1948, 4, :o3, -684975600, 58383829, 24
@@ -212,6 +215,18 @@ module TZInfo
             tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
             tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
             tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o3, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o2, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o3, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o2, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o3, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o2, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o3, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o2, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o3, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o2, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o3, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o2, 3181510800, 59457853, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/UTC.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data

data/test/tzinfo-data/tzinfo/data/indexes/countries.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # This file contains data derived from the IANA Time Zone Database
-# (http://www.iana.org/time-zones).
+# (https://www.iana.org/time-zones).
 
 module TZInfo
   module Data
@@ -31,27 +31,27 @@ module TZInfo
           c.timezone 'Asia/Yerevan', 2411, 60, 89, 2
         end
         country 'AO', 'Angola' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'AQ', 'Antarctica' do |c|
-          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'
-          c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis Station, Vestfold Hills'
-          c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey Station, Bailey Peninsula'
-          c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, Lake Vostok'
-          c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Station, Terre Adelie'
-          c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I'
-          c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll Station, Queen Maud Land'
+          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'
         end
         country 'AR', 'Argentina' do |c|
           c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
-          c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most locations (CB, CC, CN, ER, FM, MN, SE, SF)'
-          c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, '(SA, LP, NQ, RN)'
+          c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)'
+          c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, 'Salta (SA, LP, NQ, RN)'
           c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)'
           c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucumán (TM)'
-          c.timezone 'America/Argentina/Catamarca', -427, 15, -3947, 60, 'Catamarca (CT), Chubut (CH)'
+          c.timezone 'America/Argentina/Catamarca', -427, 15, -3947, 60, 'Catamarca (CT); Chubut (CH)'
           c.timezone 'America/Argentina/La_Rioja', -883, 30, -1337, 20, 'La Rioja (LR)'
           c.timezone 'America/Argentina/San_Juan', -473, 15, -4111, 60, 'San Juan (SJ)'
           c.timezone 'America/Argentina/Mendoza', -1973, 60, -4129, 60, 'Mendoza (MZ)'
@@ -68,22 +68,22 @@ module TZInfo
         country 'AU', 'Australia' do |c|
           c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island'
           c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island'
-          c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania - most locations'
-          c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania - King Island'
+          c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania (most areas)'
+          c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania (King Island)'
           c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria'
-          c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales - most locations'
-          c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales - Yancowinna'
-          c.timezone 'Australia/Brisbane', -412, 15, 4591, 30, 'Queensland - most locations'
-          c.timezone 'Australia/Lindeman', -304, 15, 149, 1, 'Queensland - Holiday Islands'
+          c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales (most areas)'
+          c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales (Yancowinna)'
+          c.timezone 'Australia/Brisbane', -412, 15, 4591, 30, 'Queensland (most areas)'
+          c.timezone 'Australia/Lindeman', -304, 15, 149, 1, 'Queensland (Whitsunday Islands)'
           c.timezone 'Australia/Adelaide', -419, 12, 1663, 12, 'South Australia'
           c.timezone 'Australia/Darwin', -187, 15, 785, 6, 'Northern Territory'
-          c.timezone 'Australia/Perth', -639, 20, 2317, 20, 'Western Australia - most locations'
-          c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia - Eucla area'
+          c.timezone 'Australia/Perth', -639, 20, 2317, 20, 'Western Australia (most areas)'
+          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
         end
-        country 'AX', 'Aaland Islands' do |c|
+        country 'AX', 'Åland Islands' do |c|
           c.timezone 'Europe/Helsinki', 361, 6, 749, 30
         end
         country 'AZ', 'Azerbaijan' do |c|
@@ -111,10 +111,10 @@ module TZInfo
           c.timezone 'Asia/Qatar', 1517, 60, 773, 15
         end
         country 'BI', 'Burundi' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'BJ', 'Benin' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          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
@@ -128,25 +128,25 @@ module TZInfo
         country 'BO', 'Bolivia' do |c|
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
         end
-        country 'BQ', 'Caribbean Netherlands' do |c|
+        country 'BQ', 'Caribbean NL' do |c|
           c.timezone 'America/Curacao', 731, 60, -69, 1
         end
         country 'BR', 'Brazil' do |c|
           c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands'
-          c.timezone 'America/Belem', -29, 20, -2909, 60, 'Amapá, E Pará'
-          c.timezone 'America/Fortaleza', -223, 60, -77, 2, 'NE Brazil (MA, PI, CE, RN, PB)'
+          c.timezone 'America/Belem', -29, 20, -2909, 60, 'Pará (east); Amapá'
+          c.timezone 'America/Fortaleza', -223, 60, -77, 2, 'Brazil (northeast: MA, PI, CE, RN, PB)'
           c.timezone 'America/Recife', -161, 20, -349, 10, 'Pernambuco'
           c.timezone 'America/Araguaina', -36, 5, -241, 5, 'Tocantins'
           c.timezone 'America/Maceio', -29, 3, -2143, 60, 'Alagoas, Sergipe'
           c.timezone 'America/Bahia', -779, 60, -2311, 60, 'Bahia'
-          c.timezone 'America/Sao_Paulo', -353, 15, -2797, 60, 'S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)'
+          c.timezone 'America/Sao_Paulo', -353, 15, -2797, 60, 'Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)'
           c.timezone 'America/Campo_Grande', -409, 20, -3277, 60, 'Mato Grosso do Sul'
           c.timezone 'America/Cuiaba', -187, 12, -673, 12, 'Mato Grosso'
-          c.timezone 'America/Santarem', -73, 30, -823, 15, 'W Pará'
+          c.timezone 'America/Santarem', -73, 30, -823, 15, 'Pará (west)'
           c.timezone 'America/Porto_Velho', -263, 30, -639, 10, 'Rondônia'
           c.timezone 'America/Boa_Vista', 169, 60, -182, 3, 'Roraima'
-          c.timezone 'America/Manaus', -47, 15, -3601, 60, 'E Amazonas'
-          c.timezone 'America/Eirunepe', -20, 3, -1048, 15, 'W Amazonas'
+          c.timezone 'America/Manaus', -47, 15, -3601, 60, 'Amazonas (east)'
+          c.timezone 'America/Eirunepe', -20, 3, -1048, 15, 'Amazonas (west)'
           c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre'
         end
         country 'BS', 'Bahamas' do |c|
@@ -157,7 +157,7 @@ module TZInfo
         end
         country 'BV', 'Bouvet Island'
         country 'BW', 'Botswana' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'BY', 'Belarus' do |c|
           c.timezone 'Europe/Minsk', 539, 10, 827, 30
@@ -166,62 +166,64 @@ module TZInfo
           c.timezone 'America/Belize', 35, 2, -441, 5
         end
         country 'CA', 'Canada' do |c|
-          c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland Time, including SE Labrador'
-          c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic Time - Nova Scotia (most places), PEI'
-          c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971'
-          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/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'
-          c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern Time - Pangnirtung, Nunavut'
-          c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central Time - Resolute, Nunavut'
-          c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut'
-          c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central Time - central Nunavut'
-          c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central Time - Manitoba & west Ontario'
-          c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central Time - Rainy River & Fort Frances, Ontario'
-          c.timezone 'America/Regina', 252, 5, -2093, 20, 'Central Standard Time - Saskatchewan - most locations'
-          c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'Central Standard Time - Saskatchewan - midwest'
-          c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain Time - Alberta, east British Columbia & west Saskatchewan'
-          c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain Time - west Nunavut'
-          c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain Time - central Northwest Territories'
-          c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain Time - west Northwest Territories'
-          c.timezone 'America/Creston', 491, 10, -6991, 60, 'Mountain Standard Time - Creston, British Columbia'
-          c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia'
-          c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific Time - west British Columbia'
-          c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific Time - south Yukon'
-          c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific Time - north Yukon'
+          c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland; Labrador (southeast)'
+          c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic - NS (most areas); PE'
+          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/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)'
+          c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)'
+          c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)'
+          c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'CST - SK (midwest)'
+          c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); SK (W)'
+          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/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)'
+          c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific - Yukon (east)'
+          c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific - Yukon (west)'
         end
         country 'CC', 'Cocos (Keeling) Islands' do |c|
           c.timezone 'Indian/Cocos', -73, 6, 1163, 12
         end
         country 'CD', 'Congo (Dem. Rep.)' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'CF', 'Central African Rep.' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'CG', 'Congo (Rep.)' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'CH', 'Switzerland' do |c|
           c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
         end
-        country 'CI', 'Cote d\'Ivoire' do |c|
+        country 'CI', 'Côte d\'Ivoire' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'CK', 'Cook Islands' do |c|
           c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30
         end
         country 'CL', 'Chile' do |c|
-          c.timezone 'America/Santiago', -669, 20, -212, 3, 'most locations'
+          c.timezone 'America/Santiago', -669, 20, -212, 3, 'Chile (most areas)'
+          c.timezone 'America/Punta_Arenas', -1063, 20, -851, 12, 'Region of Magallanes'
           c.timezone 'Pacific/Easter', -543, 20, -3283, 30, 'Easter Island'
         end
         country 'CM', 'Cameroon' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'CN', 'China' do |c|
           c.timezone 'Asia/Shanghai', 937, 30, 1822, 15, 'Beijing Time'
@@ -239,20 +241,21 @@ module TZInfo
         country 'CV', 'Cape Verde' do |c|
           c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60
         end
-        country 'CW', 'Curacao' do |c|
+        country 'CW', 'Curaçao' do |c|
           c.timezone 'America/Curacao', 731, 60, -69, 1
         end
         country 'CX', 'Christmas Island' do |c|
           c.timezone 'Indian/Christmas', -125, 12, 6343, 60
         end
         country 'CY', 'Cyprus' do |c|
-          c.timezone 'Asia/Nicosia', 211, 6, 1001, 30
+          c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)'
+          c.timezone 'Asia/Famagusta', 2107, 60, 679, 20, 'Northern Cyprus'
         end
         country 'CZ', 'Czech Republic' do |c|
           c.timezone 'Europe/Prague', 601, 12, 433, 30
         end
         country 'DE', 'Germany' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Berlin time'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas)'
           c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
         end
         country 'DJ', 'Djibouti' do |c|
@@ -271,7 +274,7 @@ module TZInfo
           c.timezone 'Africa/Algiers', 2207, 60, 61, 20
         end
         country 'EC', 'Ecuador' do |c|
-          c.timezone 'America/Guayaquil', -13, 6, -479, 6, 'mainland'
+          c.timezone 'America/Guayaquil', -13, 6, -479, 6, 'Ecuador (mainland)'
           c.timezone 'Pacific/Galapagos', -9, 10, -448, 5, 'Galápagos Islands'
         end
         country 'EE', 'Estonia' do |c|
@@ -287,8 +290,8 @@ module TZInfo
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'ES', 'Spain' do |c|
-          c.timezone 'Europe/Madrid', 202, 5, -221, 60, 'mainland'
-          c.timezone 'Africa/Ceuta', 2153, 60, -319, 60, 'Ceuta & Melilla'
+          c.timezone 'Europe/Madrid', 202, 5, -221, 60, 'Spain (mainland)'
+          c.timezone 'Africa/Ceuta', 2153, 60, -319, 60, 'Ceuta, Melilla'
           c.timezone 'Atlantic/Canary', 281, 10, -77, 5, 'Canary Islands'
         end
         country 'ET', 'Ethiopia' do |c|
@@ -304,8 +307,8 @@ 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) and Yap'
-          c.timezone 'Pacific/Pohnpei', 209, 30, 9493, 60, 'Pohnpei (Ponape)'
+          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'
         end
         country 'FO', 'Faroe Islands' do |c|
@@ -315,7 +318,7 @@ module TZInfo
           c.timezone 'Europe/Paris', 733, 15, 7, 3
         end
         country 'GA', 'Gabon' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'GB', 'Britain (UK)' do |c|
           c.timezone 'Europe/London', 6181, 120, -451, 3600
@@ -339,10 +342,10 @@ module TZInfo
           c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
         end
         country 'GL', 'Greenland' do |c|
-          c.timezone 'America/Godthab', 3851, 60, -776, 15, 'most locations'
-          c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'east coast, north of Scoresbysund'
-          c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund / Ittoqqortoormiit'
-          c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule / Pituffik'
+          c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)'
+          c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)'
+          c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit'
+          c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik'
         end
         country 'GM', 'Gambia' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -354,7 +357,7 @@ module TZInfo
           c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
         end
         country 'GQ', 'Equatorial Guinea' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'GR', 'Greece' do |c|
           c.timezone 'Europe/Athens', 1139, 30, 1423, 60
@@ -391,10 +394,10 @@ module TZInfo
           c.timezone 'Europe/Budapest', 95, 2, 229, 12
         end
         country 'ID', 'Indonesia' do |c|
-          c.timezone 'Asia/Jakarta', -37, 6, 534, 5, 'Java & Sumatra'
-          c.timezone 'Asia/Pontianak', -1, 30, 328, 3, 'west & central Borneo'
-          c.timezone 'Asia/Makassar', -307, 60, 597, 5, 'east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor'
-          c.timezone 'Asia/Jayapura', -38, 15, 1407, 10, 'west New Guinea (Irian Jaya) & Malukus (Moluccas)'
+          c.timezone 'Asia/Jakarta', -37, 6, 534, 5, 'Java, Sumatra'
+          c.timezone 'Asia/Pontianak', -1, 30, 328, 3, 'Borneo (west, central)'
+          c.timezone 'Asia/Makassar', -307, 60, 597, 5, 'Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)'
+          c.timezone 'Asia/Jayapura', -38, 15, 1407, 10, 'New Guinea (West Papua / Irian Jaya); Malukus/Moluccas'
         end
         country 'IE', 'Ireland' do |c|
           c.timezone 'Europe/Dublin', 160, 3, -25, 4
@@ -442,7 +445,7 @@ module TZInfo
           c.timezone 'Asia/Bishkek', 429, 10, 373, 5
         end
         country 'KH', 'Cambodia' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
+          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'
@@ -468,14 +471,16 @@ module TZInfo
           c.timezone 'America/Panama', 269, 30, -1193, 15
         end
         country 'KZ', 'Kazakhstan' do |c|
-          c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most locations'
-          c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda (Kyzylorda, Kzyl-Orda)'
-          c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtobe (Aktobe)'
-          c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Atyrau (Atirau, Gur\'yev), Mangghystau (Mankistau)'
+          c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)'
+          c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda'
+          c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay'
+          c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtöbe/Aktobe'
+          c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Mangghystaū/Mankistau'
+          c.timezone 'Asia/Atyrau', 2827, 60, 779, 15, 'Atyraū/Atirau/Gur\'yev'
           c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan'
         end
         country 'LA', 'Laos' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
         end
         country 'LB', 'Lebanon' do |c|
           c.timezone 'Asia/Beirut', 2033, 60, 71, 2
@@ -519,32 +524,32 @@ module TZInfo
         country 'ME', 'Montenegro' do |c|
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
-        country 'MF', 'St Martin (French part)' do |c|
+        country 'MF', 'St Martin (French)' do |c|
           c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
         end
         country 'MG', 'Madagascar' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'MH', 'Marshall Islands' do |c|
-          c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'most locations'
+          c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'Marshall Islands (most areas)'
           c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
         end
-        country 'MK', 'Macedonia' do |c|
+        country 'MK', 'North Macedonia' do |c|
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
         country 'ML', 'Mali' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'MM', 'Myanmar (Burma)' do |c|
-          c.timezone 'Asia/Rangoon', 1007, 60, 577, 6
+          c.timezone 'Asia/Yangon', 1007, 60, 577, 6
         end
         country 'MN', 'Mongolia' do |c|
-          c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most locations'
+          c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'Mongolia (most areas)'
           c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan'
           c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sükhbaatar'
         end
         country 'MO', 'Macau' do |c|
-          c.timezone 'Asia/Macau', 667, 30, 1363, 12
+          c.timezone 'Asia/Macau', 7991, 360, 2725, 24
         end
         country 'MP', 'Northern Mariana Islands' do |c|
           c.timezone 'Pacific/Guam', 202, 15, 579, 4
@@ -568,28 +573,27 @@ module TZInfo
           c.timezone 'Indian/Maldives', 25, 6, 147, 2
         end
         country 'MW', 'Malawi' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          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 - most locations'
-          c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Central Time - Quintana Roo'
+          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, 'Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border'
-          c.timezone 'America/Matamoros', 155, 6, -195, 2, 'US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border'
-          c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - S Baja, Nayarit, Sinaloa'
-          c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mexican Mountain Time - Chihuahua away from US border'
-          c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'US Mountain Time - Chihuahua near US border'
+          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, 'US Pacific Time - Baja California near US border'
-          c.timezone 'America/Santa_Isabel', 303, 10, -1723, 15, 'Mexican Pacific Time - Baja California away from US border'
-          c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Mexican Central Time - Bahía de Banderas'
+          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'
         end
         country 'MY', 'Malaysia' do |c|
-          c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'peninsular Malaysia'
-          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah & Sarawak'
+          c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'Malaysia (peninsula)'
+          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak'
         end
         country 'MZ', 'Mozambique' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'NA', 'Namibia' do |c|
           c.timezone 'Africa/Windhoek', -677, 30, 171, 10
@@ -598,13 +602,13 @@ module TZInfo
           c.timezone 'Pacific/Noumea', -334, 15, 3329, 20
         end
         country 'NE', 'Niger' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'NF', 'Norfolk Island' do |c|
           c.timezone 'Pacific/Norfolk', -581, 20, 5039, 30
         end
         country 'NG', 'Nigeria' do |c|
-          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
+          c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'NI', 'Nicaragua' do |c|
           c.timezone 'America/Managua', 243, 20, -5177, 60
@@ -643,7 +647,8 @@ 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
+          c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas)'
+          c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville'
         end
         country 'PH', 'Philippines' do |c|
           c.timezone 'Asia/Manila', 175, 12, 121, 1
@@ -668,7 +673,7 @@ module TZInfo
           c.timezone 'Asia/Hebron', 473, 15, 7019, 200, 'West Bank'
         end
         country 'PT', 'Portugal' do |c|
-          c.timezone 'Europe/Lisbon', 2323, 60, -137, 15, 'mainland'
+          c.timezone 'Europe/Lisbon', 2323, 60, -137, 15, 'Portugal (mainland)'
           c.timezone 'Atlantic/Madeira', 979, 30, -169, 10, 'Madeira Islands'
           c.timezone 'Atlantic/Azores', 566, 15, -77, 3, 'Azores'
         end
@@ -681,8 +686,8 @@ module TZInfo
         country 'QA', 'Qatar' do |c|
           c.timezone 'Asia/Qatar', 1517, 60, 773, 15
         end
-        country 'RE', 'Reunion' do |c|
-          c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet Is, Scattered Is'
+        country 'RE', 'Réunion' do |c|
+          c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands'
         end
         country 'RO', 'Romania' do |c|
           c.timezone 'Europe/Bucharest', 1333, 30, 261, 10
@@ -691,30 +696,36 @@ module TZInfo
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
         country 'RU', 'Russia' do |c|
-          c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'Moscow-01 - Kaliningrad'
-          c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'Moscow+00 - west Russia'
-          c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Moscow+00 - Crimea'
-          c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'Moscow+00 - Caspian Sea'
-          c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia'
-          c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'Moscow+02 - Urals'
-          c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'Moscow+03 - west Siberia'
-          c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'Moscow+03 - Novosibirsk'
-          c.timezone 'Asia/Novokuznetsk', 215, 4, 5227, 60, 'Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo'
-          c.timezone 'Asia/Krasnoyarsk', 3361, 60, 557, 6, 'Moscow+04 - Yenisei River'
-          c.timezone 'Asia/Irkutsk', 784, 15, 313, 3, 'Moscow+05 - Lake Baikal'
-          c.timezone 'Asia/Chita', 1041, 20, 1702, 15, 'Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky'
-          c.timezone 'Asia/Yakutsk', 62, 1, 389, 3, 'Moscow+06 - Lena River'
-          c.timezone 'Asia/Khandyga', 225563, 3600, 243997, 1800, 'Moscow+06 - Tomponsky, Ust-Maysky'
-          c.timezone 'Asia/Vladivostok', 259, 6, 1979, 15, 'Moscow+07 - Amur River'
-          c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'Moscow+07 - Sakhalin Island'
-          c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'Moscow+07 - Oymyakonsky'
-          c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'Moscow+08 (Moscow+07 after 2014-10-26) - Magadan'
-          c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'Moscow+08 - E Sakha, N Kuril Is'
-          c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka'
-          c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea'
+          c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'MSK-01 - Kaliningrad'
+          c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'MSK+00 - Moscow area'
+          c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
+          c.timezone 'Europe/Kirov', 293, 5, 993, 20, 'MSK+00 - Kirov'
+          c.timezone 'Europe/Astrakhan', 927, 20, 961, 20, 'MSK+01 - Astrakhan'
+          c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+01 - Volgograd'
+          c.timezone 'Europe/Saratov', 1547, 30, 1381, 30, 'MSK+01 - Saratov'
+          c.timezone 'Europe/Ulyanovsk', 163, 3, 242, 5, 'MSK+01 - Ulyanovsk'
+          c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'MSK+01 - Samara, Udmurtia'
+          c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'MSK+02 - Urals'
+          c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'MSK+03 - Omsk'
+          c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'MSK+04 - Novosibirsk'
+          c.timezone 'Asia/Barnaul', 1601, 30, 335, 4, 'MSK+04 - Altai'
+          c.timezone 'Asia/Tomsk', 113, 2, 2549, 30, 'MSK+04 - Tomsk'
+          c.timezone 'Asia/Novokuznetsk', 215, 4, 5227, 60, 'MSK+04 - Kemerovo'
+          c.timezone 'Asia/Krasnoyarsk', 3361, 60, 557, 6, 'MSK+04 - Krasnoyarsk area'
+          c.timezone 'Asia/Irkutsk', 784, 15, 313, 3, 'MSK+05 - Irkutsk, Buryatia'
+          c.timezone 'Asia/Chita', 1041, 20, 1702, 15, 'MSK+06 - Zabaykalsky'
+          c.timezone 'Asia/Yakutsk', 62, 1, 389, 3, 'MSK+06 - Lena River'
+          c.timezone 'Asia/Khandyga', 225563, 3600, 243997, 1800, 'MSK+06 - Tomponsky, Ust-Maysky'
+          c.timezone 'Asia/Vladivostok', 259, 6, 1979, 15, 'MSK+07 - Amur River'
+          c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'MSK+07 - Oymyakonsky'
+          c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'MSK+08 - Magadan'
+          c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'MSK+08 - Sakhalin Island'
+          c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); North Kuril Is'
+          c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'MSK+09 - Kamchatka'
+          c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'MSK+09 - Bering Sea'
         end
         country 'RW', 'Rwanda' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          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
@@ -762,21 +773,21 @@ module TZInfo
           c.timezone 'America/Paramaribo', 35, 6, -331, 6
         end
         country 'SS', 'South Sudan' do |c|
-          c.timezone 'Africa/Khartoum', 78, 5, 488, 15
+          c.timezone 'Africa/Juba', 97, 20, 1897, 60
         end
         country 'ST', 'Sao Tome & Principe' do |c|
-          c.timezone 'Africa/Abidjan', 319, 60, -121, 30
+          c.timezone 'Africa/Sao_Tome', 1, 3, 101, 15
         end
         country 'SV', 'El Salvador' do |c|
           c.timezone 'America/El_Salvador', 137, 10, -446, 5
         end
-        country 'SX', 'St Maarten (Dutch part)' do |c|
+        country 'SX', 'St Maarten (Dutch)' do |c|
           c.timezone 'America/Curacao', 731, 60, -69, 1
         end
         country 'SY', 'Syria' do |c|
           c.timezone 'Asia/Damascus', 67, 2, 363, 10
         end
-        country 'SZ', 'Swaziland' do |c|
+        country 'SZ', 'Eswatini (Swaziland)' do |c|
           c.timezone 'Africa/Johannesburg', -105, 4, 28, 1
         end
         country 'TC', 'Turks & Caicos Is' do |c|
@@ -786,14 +797,14 @@ module TZInfo
           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 I, Amsterdam I'
-          c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet Is, Scattered Is'
+          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'
         end
         country 'TG', 'Togo' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'TH', 'Thailand' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
         end
         country 'TJ', 'Tajikistan' do |c|
           c.timezone 'Asia/Dushanbe', 463, 12, 344, 5
@@ -829,9 +840,10 @@ module TZInfo
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'UA', 'Ukraine' do |c|
-          c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'most locations'
-          c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia'
-          c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye, E Lugansk / Zaporizhia, E Luhansk'
+          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/Simferopol', 899, 20, 341, 10, 'Crimea'
         end
         country 'UG', 'Uganda' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
@@ -839,45 +851,45 @@ module TZInfo
         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/Honolulu', 15341, 720, -18943, 120, 'Hawaii time'
+          c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
         end
         country 'US', 'United States' do |c|
-          c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time'
-          c.timezone 'America/Detroit', 152393, 3600, -19931, 240, 'Eastern Time - Michigan - most locations'
-          c.timezone 'America/Kentucky/Louisville', 9181, 240, -154367, 1800, 'Eastern Time - Kentucky - Louisville area'
-          c.timezone 'America/Kentucky/Monticello', 132587, 3600, -101819, 1200, 'Eastern Time - Kentucky - Wayne County'
-          c.timezone 'America/Indiana/Indianapolis', 23861, 600, -310169, 3600, 'Eastern Time - Indiana - most locations'
-          c.timezone 'America/Indiana/Vincennes', 69619, 1800, -315103, 3600, 'Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties'
-          c.timezone 'America/Indiana/Winamac', 29557, 720, -311771, 3600, 'Eastern Time - Indiana - Pulaski County'
-          c.timezone 'America/Indiana/Marengo', 17269, 450, -310841, 3600, 'Eastern Time - Indiana - Crawford County'
-          c.timezone 'America/Indiana/Petersburg', 138571, 3600, -314203, 3600, 'Eastern Time - Indiana - Pike County'
-          c.timezone 'America/Indiana/Vevay', 34873, 900, -153121, 1800, 'Eastern Time - Indiana - Switzerland County'
-          c.timezone 'America/Chicago', 837, 20, -1753, 20, 'Central Time'
-          c.timezone 'America/Indiana/Tell_City', 136631, 3600, -312341, 3600, 'Central Time - Indiana - Perry County'
-          c.timezone 'America/Indiana/Knox', 9911, 240, -693, 8, 'Central Time - Indiana - Starke County'
-          c.timezone 'America/Menominee', 40597, 900, -105137, 1200, 'Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties'
-          c.timezone 'America/North_Dakota/Center', 169619, 3600, -121559, 1200, 'Central Time - North Dakota - Oliver County'
-          c.timezone 'America/North_Dakota/New_Salem', 9369, 200, -121693, 1200, 'Central Time - North Dakota - Morton County (except Mandan area)'
-          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/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/Metlakatla', 198457, 3600, -18947, 144, 'Pacific Standard Time - Annette Island, Alaska'
-          c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
-          c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'
-          c.timezone 'America/Sitka', 41167, 720, -487087, 3600, 'Alaska Time - southeast Alaska panhandle'
-          c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska Time - Alaska panhandle neck'
-          c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska Time - west Alaska'
+          c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern (most areas)'
+          c.timezone 'America/Detroit', 152393, 3600, -19931, 240, 'Eastern - MI (most areas)'
+          c.timezone 'America/Kentucky/Louisville', 9181, 240, -154367, 1800, 'Eastern - KY (Louisville area)'
+          c.timezone 'America/Kentucky/Monticello', 132587, 3600, -101819, 1200, 'Eastern - KY (Wayne)'
+          c.timezone 'America/Indiana/Indianapolis', 23861, 600, -310169, 3600, 'Eastern - IN (most areas)'
+          c.timezone 'America/Indiana/Vincennes', 69619, 1800, -315103, 3600, 'Eastern - IN (Da, Du, K, Mn)'
+          c.timezone 'America/Indiana/Winamac', 29557, 720, -311771, 3600, 'Eastern - IN (Pulaski)'
+          c.timezone 'America/Indiana/Marengo', 17269, 450, -310841, 3600, 'Eastern - IN (Crawford)'
+          c.timezone 'America/Indiana/Petersburg', 138571, 3600, -314203, 3600, 'Eastern - IN (Pike)'
+          c.timezone 'America/Indiana/Vevay', 34873, 900, -153121, 1800, 'Eastern - IN (Switzerland)'
+          c.timezone 'America/Chicago', 837, 20, -1753, 20, 'Central (most areas)'
+          c.timezone 'America/Indiana/Tell_City', 136631, 3600, -312341, 3600, 'Central - IN (Perry)'
+          c.timezone 'America/Indiana/Knox', 9911, 240, -693, 8, 'Central - IN (Starke)'
+          c.timezone 'America/Menominee', 40597, 900, -105137, 1200, 'Central - MI (Wisconsin border)'
+          c.timezone 'America/North_Dakota/Center', 169619, 3600, -121559, 1200, 'Central - ND (Oliver)'
+          c.timezone 'America/North_Dakota/New_Salem', 9369, 200, -121693, 1200, 'Central - ND (Morton rural)'
+          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/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'
+          c.timezone 'America/Sitka', 41167, 720, -487087, 3600, 'Alaska - Sitka area'
+          c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Alaska - Annette Island'
+          c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska - Yakutat'
+          c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska (west)'
           c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands'
-          c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii time'
+          c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
         end
         country 'UY', 'Uruguay' do |c|
-          c.timezone 'America/Montevideo', -2093, 60, -3371, 60
+          c.timezone 'America/Montevideo', -41891, 1200, -4497, 80
         end
         country 'UZ', 'Uzbekistan' do |c|
-          c.timezone 'Asia/Samarkand', 119, 3, 334, 5, 'west Uzbekistan'
-          c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'east Uzbekistan'
+          c.timezone 'Asia/Samarkand', 119, 3, 334, 5, 'Uzbekistan (west)'
+          c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'Uzbekistan (east)'
         end
         country 'VA', 'Vatican City' do |c|
           c.timezone 'Europe/Rome', 419, 10, 749, 60
@@ -895,7 +907,8 @@ module TZInfo
           c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
         end
         country 'VN', 'Vietnam' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
+          c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
         end
         country 'VU', 'Vanuatu' do |c|
           c.timezone 'Pacific/Efate', -53, 3, 2021, 12
@@ -916,10 +929,10 @@ module TZInfo
           c.timezone 'Africa/Johannesburg', -105, 4, 28, 1
         end
         country 'ZM', 'Zambia' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'ZW', 'Zimbabwe' do |c|
-          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
+          c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
       end
     end