libgweather r145 - in trunk: . data libgweather



Author: vuntz
Date: Mon Apr  7 10:40:38 2008
New Revision: 145
URL: http://svn.gnome.org/viewvc/libgweather?rev=145&view=rev

Log:
2008-04-07  Vincent Untz  <vuntz gnome org>

	Add country codes and timezone hints to Locations.xml. Patch by Dan
	Winship <danw gnome org>. Fix bug #525451.

	* data/Locations.xml.in: Add ISO 3166 codes for all countries (and
	those sub-country regions that have them). Add guesses at the
	timezones for various countries, states, and locations.
	* data/locations.dtd: Update; a country must have an iso-code, and
	a location may have one. A country, state, or location may have a
	tz-hint.
	* libgweather/gweather-xml.c (gweather_xml_parse_node): Handle iso-code
	and tz-hint (and make them be inherited properly).
	* libgweather/weather.[ch] (weather_location_new): add country_code and
	tz_hint fields to WeatherLocation and update its methods


Modified:
   trunk/ChangeLog
   trunk/data/Locations.xml.in
   trunk/data/locations.dtd
   trunk/libgweather/gweather-gconf.c
   trunk/libgweather/gweather-xml.c
   trunk/libgweather/weather.c
   trunk/libgweather/weather.h

Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in	(original)
+++ trunk/data/Locations.xml.in	Mon Apr  7 10:40:38 2008
@@ -9,6 +9,8 @@
   <_name>Middle East</_name>
   <country>
     <_name>United Arab Emirates</_name>
+    <iso-code>AE</iso-code>
+    <tz-hint>Asia/Dubai</tz-hint>
     <location>
       <!-- Translators: This is in United Arab Emirates. -->
       <_name>Abu Dhabi</_name>
@@ -48,6 +50,8 @@
   </country>
   <country>
     <_name>Qatar</_name>
+    <iso-code>QA</iso-code>
+    <tz-hint>Asia/Qatar</tz-hint>
     <location>
       <!-- Translators: This is in Qatar. -->
       <_name>Al Udeid</_name>
@@ -63,6 +67,8 @@
   </country>
   <country>
     <_name>Oman</_name>
+    <iso-code>OM</iso-code>
+    <tz-hint>Asia/Muscat</tz-hint>
     <location>
       <!-- Translators: This is in Oman. -->
       <_name>Salalah</_name>
@@ -78,6 +84,8 @@
   </country>
   <country>
     <_name>Yemen</_name>
+    <iso-code>YE</iso-code>
+    <tz-hint>Asia/Aden</tz-hint>
     <location>
       <!-- Translators: This is in Yemen. -->
       <_name>Aden</_name>
@@ -135,6 +143,8 @@
   </country>
   <country>
     <_name>Saudi Arabia</_name>
+    <iso-code>SA</iso-code>
+    <tz-hint>Asia/Riyadh</tz-hint>
     <location>
       <!-- Translators: This is in Saudi Arabia. -->
       <_name>Abha</_name>
@@ -312,6 +322,8 @@
   </country>
   <country>
     <_name>Bahrain</_name>
+    <iso-code>BH</iso-code>
+    <tz-hint>Asia/Bahrain</tz-hint>
     <location>
       <_name>Bahrain</_name>
       <code>OBBI</code>
@@ -320,6 +332,8 @@
   </country>
   <country>
     <_name>Lebanon</_name>
+    <iso-code>LB</iso-code>
+    <tz-hint>Asia/Beirut</tz-hint>
     <location>
       <!-- Translators: This is in Lebanon. -->
       <_name>Beirut</_name>
@@ -329,6 +343,8 @@
   </country>
   <country>
     <_name>Israel</_name>
+    <iso-code>IL</iso-code>
+    <tz-hint>Asia/Jerusalem</tz-hint>
     <location>
       <!-- Translators: This is in Israel. -->
       <_name>Ben-Gurion</_name>
@@ -362,6 +378,8 @@
   </country>
   <country>
     <_name>Iran, Islamic Republic of</_name>
+    <iso-code>IR</iso-code>
+    <tz-hint>Asia/Tehran</tz-hint>
     <location>
       <!-- Translators: This is in Iran. -->
       <_name>Abadan</_name>
@@ -503,6 +521,8 @@
   </country>
   <country>
     <_name>Jordan</_name>
+    <iso-code>JO</iso-code>
+    <tz-hint>Asia/Amman</tz-hint>
     <location>
       <!-- Translators: This is in Jordan. -->
       <_name>Amman</_name>
@@ -524,6 +544,8 @@
   </country>
   <country>
     <_name>Kuwait</_name>
+    <iso-code>KW</iso-code>
+    <tz-hint>Asia/Kuwait</tz-hint>
     <location>
       <_name>Kuwait</_name>
       <code>OKBK</code>
@@ -532,6 +554,8 @@
   </country>
   <country>
     <_name>Syria</_name>
+    <iso-code>SY</iso-code>
+    <tz-hint>Asia/Damascus</tz-hint>
     <location>
       <!-- Translators: This is in Syria. -->
       <_name>Aleppo</_name>
@@ -568,6 +592,8 @@
   <_name>North America</_name>
   <country>
     <_name>Mexico</_name>
+    <iso-code>MX</iso-code>
+    <tz-hint>America/Mexico_City</tz-hint>
     <location>
       <!-- Translators: This is in Mexico. -->
       <_name>Acapulco</_name>
@@ -935,9 +961,11 @@
   </country>
   <country>
     <_name>United States</_name>
+    <iso-code>US</iso-code>
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Alabama</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Alabama in the United States. -->
         <_name>Alabaster</_name>
@@ -1118,9 +1146,11 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Alaska</_name>
+      <tz-hint>America/Anchorage</tz-hint>
       <location>
         <!-- Translators: This is in Alaska in the United States. -->
         <_name>Adak Island</_name>
+	<tz-hint>America/Adak</tz-hint>
         <code>PADK</code>
         <zone>AKZ020</zone>
         <radar>alaska</radar>
@@ -1212,6 +1242,7 @@
       <location>
         <!-- Translators: This is in Alaska in the United States. -->
         <_name>Atka</_name>
+	<tz-hint>America/Adak</tz-hint>
         <code>PAAK</code>
         <radar>alaska</radar>
         <coordinates>52-13-13N 174-12-23W</coordinates>
@@ -1955,6 +1986,7 @@
       <location>
         <!-- Translators: This is in Alaska in the United States. -->
         <_name>Shemya</_name>
+	<tz-hint>America/Adak</tz-hint>
         <code>PASY</code>
         <radar>alaska</radar>
         <coordinates>52-43-00N 174-07-00E</coordinates>
@@ -2191,6 +2223,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Arizona</_name>
+      <tz-hint>America/Pheonix</tz-hint>
       <city>
         <!-- Translators: This is in Arizona in the United States. -->
        <_name>Bullhead City</_name>
@@ -2437,6 +2470,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Arkansas</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <city>
        <!-- Translators: This is in Arkansas in the United States. -->
        <_name>Auburn</_name>
@@ -2724,6 +2758,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>California</_name>
+      <tz-hint>America/Los_Angeles</tz-hint>
       <location>
         <!-- Translators: This is in California in the United States. -->
         <_name>Alturas</_name>
@@ -3630,6 +3665,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Colorado</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in Colorado in the United States. -->
         <_name>Air Force Academy</_name>
@@ -3952,6 +3988,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Connecticut</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Connecticut in the United States. -->
         <_name>Bridgeport</_name>
@@ -4024,6 +4061,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Delaware</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Delaware in the United States. -->
         <_name>Dover</_name>
@@ -4050,6 +4088,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>District of Columbia</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in District of Columbia in the United States. -->
         <_name>Washington</_name>
@@ -4073,12 +4112,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Florida</_name>
-      <location>
-        <!-- Translators: This is in Florida in the United States. -->
-        <_name>Atoka</_name>
-        <code>KAQR</code>
-        <coordinates>34-23-54N 096-08-53W</coordinates>
-      </location>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Bartow</_name>
@@ -4121,6 +4155,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Crestview</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KCEW</code>
         <zone>FLZ006</zone>
         <radar>bix</radar>
@@ -4145,6 +4180,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Destin</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KDTS</code>
         <radar>bix</radar>
         <coordinates>30-23-36N 086-28-03W</coordinates>
@@ -4155,12 +4191,14 @@
        <location>
          <!-- Translators: This is in Eglin, Florida in the United States. -->
          <_name>Duke Field</_name>
+	 <tz-hint>America/Chicago</tz-hint>
          <code>KEGI</code>
          <coordinates>30-39N 086-31W</coordinates>
        </location>
        <location>
          <!-- Translators: This is in Eglin, Florida in the United States. -->
          <_name>Eglin</_name>
+	 <tz-hint>America/Chicago</tz-hint>
          <code>KEGI</code>
          <zone>FLZ006</zone>
          <radar>tlh</radar>
@@ -4241,6 +4279,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Hurlburt</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KHRT</code>
         <radar>bix</radar>
         <coordinates>30-25N 086-41W</coordinates>
@@ -4331,6 +4370,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Marianna</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KMAI</code>
         <zone>FLZ011</zone>
         <radar>tlh</radar>
@@ -4386,6 +4426,7 @@
        <location>
          <!-- Translators: This is in Milton, Florida in the United States. -->
          <_name>Whiting Field - North</_name>
+	 <tz-hint>America/Chicago</tz-hint>
          <code>KNSE</code>
          <zone>FLZ004</zone>
          <radar>bix</radar>
@@ -4450,6 +4491,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Panama City</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KPFN</code>
         <zone>FLZ012</zone>
         <radar>tlh</radar>
@@ -4461,6 +4503,7 @@
        <location>
          <!-- Translators: This is in Pensacola, Florida in the United States. -->
          <_name>Pensacola</_name>
+	 <tz-hint>America/Chicago</tz-hint>
          <code>KPNS</code>
          <zone>FLZ002</zone>
          <radar>bix</radar>
@@ -4469,6 +4512,7 @@
        <location>
          <!-- Translators: This is in Pensacola, Florida in the United States. -->
          <_name>Naval Air Station</_name>
+	 <tz-hint>America/Chicago</tz-hint>
          <code>KNPA</code>
          <zone>FLZ002</zone>
          <radar>bix</radar>
@@ -4593,6 +4637,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Tyndall AFB</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KPAM</code>
         <radar>tlh</radar>
         <coordinates>30-04N 085-35W</coordinates>
@@ -4600,6 +4645,7 @@
       <location>
         <!-- Translators: This is in Florida in the United States. -->
         <_name>Valparaiso</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KVPS</code>
         <zone>FLZ006</zone>
         <radar>bix</radar>
@@ -4632,6 +4678,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Georgia</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Georgia in the United States. -->
         <_name>Albany</_name>
@@ -4977,6 +5024,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Hawaii</_name>
+      <tz-hint>Pacific/Honolulu</tz-hint>
       <location>
         <!-- Translators: This is in Hawaii in the United States. -->
         <_name>Barbers Point</_name>
@@ -5109,6 +5157,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Idaho</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Boise</_name>
@@ -5134,6 +5183,7 @@
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Coeur d'Alene</_name>
+	<tz-hint>America/Los_Angeles</tz-hint>
         <code>KCOE</code>
         <zone>IDZ002</zone>
         <radar>geg</radar>
@@ -5165,6 +5215,7 @@
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Lewiston</_name>
+	<tz-hint>America/Los_Angeles</tz-hint>
         <code>KLWS</code>
         <zone>IDZ003</zone>
         <radar>geg</radar>
@@ -5173,6 +5224,7 @@
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Lowell</_name>
+	<tz-hint>America/Los_Angeles</tz-hint>
         <code>KP69</code>
         <coordinates>46-08-39N 115-35-47W</coordinates>
       </location>
@@ -5203,6 +5255,7 @@
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Mullan Pass</_name>
+	<tz-hint>America/Los_Angeles</tz-hint>
         <code>KMLP</code>
         <coordinates>47-27-15N 115-40-11W</coordinates>
       </location>
@@ -5231,6 +5284,7 @@
       <location>
         <!-- Translators: This is in Idaho in the United States. -->
         <_name>Sandpoint</_name>
+	<tz-hint>America/Los_Angeles</tz-hint>
         <code>KSZT</code>
         <coordinates>48-17-58N 116-33-36W</coordinates>
       </location>
@@ -5264,6 +5318,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Illinois</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Illinois in the United States. -->
         <_name>Alton</_name>
@@ -5681,6 +5736,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Indiana</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Indiana in the United States. -->
         <_name>Anderson</_name>
@@ -5712,6 +5768,7 @@
       <location>
         <!-- Translators: This is in Indiana in the United States. -->
         <_name>Evansville</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KEVV</code>
         <zone>INZ086</zone>
         <radar>lex</radar>
@@ -5728,6 +5785,7 @@
       <location>
         <!-- Translators: This is in Indiana in the United States. -->
         <_name>Gary</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KGYY</code>
         <zone>INZ001</zone>
         <radar>ord</radar>
@@ -5837,6 +5895,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Iowa</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Iowa in the United States. -->
         <_name>Algona</_name>
@@ -6245,6 +6304,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Kansas</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Kansas in the United States. -->
         <_name>Chanute</_name>
@@ -6304,6 +6364,7 @@
       <location>
         <!-- Translators: This is in Kansas in the United States. -->
         <_name>Goodland</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KGLD</code>
         <zone>KSZ013</zone>
         <radar>ddc</radar>
@@ -6466,9 +6527,11 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Kentucky</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Bowling Green</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KBWG</code>
         <zone>KYZ071</zone>
         <radar>lex</radar>
@@ -6485,6 +6548,7 @@
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Fort Campbell</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KHOP</code>
         <zone>KYZ017</zone>
         <radar>lex</radar>
@@ -6509,12 +6573,14 @@
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Glasgow</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KGLW</code>
         <coordinates>37-01-54N 085-57-13W</coordinates>
       </location>
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Henderson</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KEHR</code>
         <zone>KYZ018</zone>
         <radar>lex</radar>
@@ -6562,6 +6628,7 @@
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Owensboro</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KOWB</code>
         <zone>KYZ019</zone>
         <radar>lex</radar>
@@ -6570,6 +6637,7 @@
       <location>
         <!-- Translators: This is in Kentucky in the United States. -->
         <_name>Paducah</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KPAH</code>
         <zone>KYZ005</zone>
         <radar>stl</radar>
@@ -6587,6 +6655,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Lousiana</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Lousiana in the United States. -->
         <_name>Alexandria</_name>
@@ -6860,6 +6929,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Maine</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Maine in the United States. -->
         <_name>Auburn-Lewiston</_name>
@@ -7031,6 +7101,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Maryland</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Maryland in the United States. -->
         <_name>Aberdeen</_name>
@@ -7149,6 +7220,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Massachusetts</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Massachusetts in the United States. -->
         <_name>Ashburnam</_name>
@@ -7352,6 +7424,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Michigan</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Michigan in the United States. -->
         <_name>Adrian</_name>
@@ -7603,6 +7676,7 @@
       <location>
         <!-- Translators: This is in Michigan in the United States. -->
         <_name>Ironwood</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KIWD</code>
         <zone>MIZ009</zone>
         <radar>htl</radar>
@@ -7687,6 +7761,7 @@
       <location>
         <!-- Translators: This is in Michigan in the United States. -->
         <_name>Menominee</_name>
+	<tz-hint>America/Chicago</tz-hint>
         <code>KMNM</code>
         <zone>MIZ012</zone>
         <radar>htl</radar>
@@ -7841,6 +7916,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Minnesota</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Minnesota in the United States. -->
         <_name>Aitkin</_name>
@@ -8458,6 +8534,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Mississippi</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <city>
        <!-- Translators: This is in Mississippi in the United States. -->
        <_name>Biloxi</_name>
@@ -8618,6 +8695,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Missouri</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Missouri in the United States. -->
         <_name>Cape Girardeau</_name>
@@ -8797,6 +8875,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Montana</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in Montana in the United States. -->
         <_name>Baker</_name>
@@ -8972,6 +9051,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Nebraska</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Ainsworth</_name>
@@ -8989,6 +9069,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Alliance</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KAIA</code>
         <zone>NEZ003</zone>
         <radar>lbf</radar>
@@ -9031,6 +9112,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Chadron</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KCDR</code>
         <zone>NEZ002</zone>
         <radar>cpr</radar>
@@ -9092,12 +9174,14 @@
        <location>
          <!-- Translators: This is in Imperial, Nebraska in the United States. -->
          <_name>Location 1</_name>
+	 <tz-hint>America/Denver</tz-hint>
          <code>KIML</code>
          <coordinates>40-31N 101-37W</coordinates>
        </location>
        <location>
          <!-- Translators: This is in Imperial, Nebraska in the United States. -->
          <_name>Location 2</_name>
+	 <tz-hint>America/Denver</tz-hint>
          <code>K6V1</code>
        </location>
       </city>
@@ -9112,6 +9196,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Kimball</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KIBM</code>
         <coordinates>41-11N 103-40W</coordinates>
       </location>
@@ -9132,6 +9217,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>McCook</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KMCK</code>
         <zone>NEZ081</zone>
         <radar>lbf</radar>
@@ -9170,6 +9256,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Ogallala</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KOGA</code>
         <coordinates>41-07-11N 101-46-08W</coordinates>
       </location>
@@ -9215,6 +9302,7 @@
       <location>
         <!-- Translators: This is in Nebraska in the United States. -->
         <_name>Scottsbluff</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KBFF</code>
         <zone>NEZ019</zone>
         <radar>cpr</radar>
@@ -9258,6 +9346,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Nevada</_name>
+      <tz-hint>America/Los_Angeles</tz-hint>
       <location>
         <!-- Translators: This is in Nevada in the United States. -->
         <_name>Battle Mountain</_name>
@@ -9415,6 +9504,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>New Hampshire</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in New Hampshire in the United States. -->
         <_name>Berlin</_name>
@@ -9532,6 +9622,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>New Jersey</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in New Jersey in the United States. -->
         <_name>Andover</_name>
@@ -9653,6 +9744,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>New Mexico</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in New Mexico in the United States. -->
         <_name>Alamogordo</_name>
@@ -9910,6 +10002,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>New York</_name>
+      <tz-hint>America/New_York</tz-hint>
       <city>
        <!-- Translators: This is in New York in the United States. -->
        <_name>Albany</_name>
@@ -10209,6 +10302,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>North Carolina</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in North Carolina in the United States. -->
         <_name>Ahoskie</_name>
@@ -10664,6 +10758,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>North Dakota</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in North Dakota in the United States. -->
         <_name>Bismarck</_name>
@@ -10683,6 +10778,7 @@
       <location>
         <!-- Translators: This is in North Dakota in the United States. -->
         <_name>Dickinson</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KDIK</code>
         <zone>NDZ033</zone>
         <radar>bis</radar>
@@ -10723,6 +10819,7 @@
       <location>
         <!-- Translators: This is in North Dakota in the United States. -->
         <_name>Hettinger</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KHEI</code>
         <coordinates>46-00-38N 102-38-59W</coordinates>
       </location>
@@ -10762,6 +10859,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Ohio</_name>
+      <tz-hint>America/New_York</tz-hint>
       <city>
        <!-- Translators: This is in Ohio in the United States. -->
        <_name>Akron</_name>
@@ -11006,6 +11104,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Oklahoma</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Oklahoma in the United States. -->
         <_name>Ada</_name>
@@ -11046,6 +11145,12 @@
       </city>
       <location>
         <!-- Translators: This is in Oklahoma in the United States. -->
+        <_name>Atoka</_name>
+        <code>KAQR</code>
+        <coordinates>34-23-54N 096-08-53W</coordinates>
+      </location>
+      <location>
+        <!-- Translators: This is in Oklahoma in the United States. -->
         <_name>Bartlesville</_name>
         <code>KBVO</code>
         <zone>OKZ054</zone>
@@ -11299,6 +11404,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Oregon</_name>
+      <tz-hint>America/Los_Angeles</tz-hint>
       <location>
         <!-- Translators: This is in Oregon in the United States. -->
         <_name>Astoria</_name>
@@ -11449,6 +11555,7 @@
       <location>
         <!-- Translators: This is in Oregon in the United States. -->
         <_name>Ontario</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KONO</code>
         <zone>ORZ021</zone>
         <radar>boi</radar>
@@ -11504,6 +11611,7 @@
        <location>
          <!-- Translators: This is in Rome, Oregon in the United States. -->
          <_name>Rome</_name>
+	 <tz-hint>America/Denver</tz-hint>
          <code>KREO</code>
          <coordinates>42-35-26N 117-51-52W</coordinates>
        </location>
@@ -11567,6 +11675,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Pennsylvania</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Pennsylvania in the United States. -->
         <_name>Allentown</_name>
@@ -11837,6 +11946,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Rhode Island</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Rhode Island in the United States. -->
         <_name>Block Island</_name>
@@ -11885,6 +11995,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>South Carolina</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in South Carolina in the United States. -->
         <_name>Anderson</_name>
@@ -12037,6 +12148,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>South Dakota</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Aberdeen</_name>
@@ -12056,6 +12168,7 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Buffalo</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>K2WX</code>
         <coordinates>45-36-16N 103-32-47W</coordinates>
       </location>
@@ -12075,6 +12188,7 @@
        <location>
          <!-- Translators: This is in Custer, South Dakota in the United States. -->
          <_name>Custer County Airport</_name>
+	 <tz-hint>America/Denver</tz-hint>
          <code>KCUT</code>
          <coordinates>43-43-59N 103-37-03W</coordinates>
        </location>
@@ -12082,12 +12196,14 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Ellsworth Air Force Base</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KRCA</code>
         <coordinates>44-09N 103-06W</coordinates>
       </location>
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Faith</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KD07</code>
         <coordinates>45-01-55N 102-01-09W</coordinates>
       </location>
@@ -12102,6 +12218,7 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Lemmon</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KY22</code>
         <zone>SDZ002</zone>
         <radar>bis</radar>
@@ -12129,6 +12246,7 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Philip</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KPHP</code>
         <zone>SDZ032</zone>
         <radar>fsd</radar>
@@ -12145,12 +12263,14 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Pine Ridge</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KIEN</code>
         <coordinates>43-01-32N 102-31-23W</coordinates>
       </location>
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Rapid City</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KRAP</code>
         <zone>SDZ031</zone>
         <radar>rap</radar>
@@ -12159,6 +12279,7 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Rapid City-Ellsworth AFB</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KRCA</code>
         <zone>SDZ031</zone>
         <radar>rap</radar>
@@ -12166,6 +12287,7 @@
       <location>
         <!-- Translators: This is in South Dakota in the United States. -->
         <_name>Redig</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KREJ</code>
         <zone>SDZ001</zone>
         <radar>rap</radar>
@@ -12210,9 +12332,11 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Tennessee</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Tennessee in the United States. -->
         <_name>Bristol</_name>
+	<tz-hint>America/New_York</tz-hint>
         <code>KTRI</code>
         <zone>TNZ017</zone>
         <radar>avl</radar>
@@ -12221,6 +12345,7 @@
       <location>
         <!-- Translators: This is in Tennessee in the United States. -->
         <_name>Chattanooga</_name>
+	<tz-hint>America/New_York</tz-hint>
         <code>KCHA</code>
         <zone>TNZ099</zone>
         <radar>tup</radar>
@@ -12259,6 +12384,7 @@
       <location>
         <!-- Translators: This is in Tennessee in the United States. -->
         <_name>Knoxville</_name>
+	<tz-hint>America/New_York</tz-hint>
         <code>KTYS</code>
         <zone>TNZ069</zone>
         <radar>avl</radar>
@@ -12295,6 +12421,7 @@
       <location>
         <!-- Translators: This is in Tennessee in the United States. -->
         <_name>Oak Ridge</_name>
+	<tz-hint>America/New_York</tz-hint>
         <code>KOQT</code>
         <coordinates>36-01-22N 84-14W</coordinates>
       </location>
@@ -12310,6 +12437,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Texas</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <city>
        <!-- Translators: This is in Texas in the United States. -->
        <_name>Abilene</_name>
@@ -12605,6 +12733,7 @@
       <location>
         <!-- Translators: This is in Texas in the United States. -->
         <_name>El Paso</_name>
+	<tz-hint>America/Denver</tz-hint>
         <code>KELP</code>
         <zone>TXZ055</zone>
         <radar>maf</radar>
@@ -13262,6 +13391,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Utah</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in Utah in the United States. -->
         <_name>Blanding</_name>
@@ -13412,6 +13542,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Vermont</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Vermont in the United States. -->
         <_name>Ball Mountain</_name>
@@ -13526,6 +13657,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Virginia</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in Virginia in the United States. -->
         <_name>Abingdon</_name>
@@ -13913,6 +14045,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Washington</_name>
+      <tz-hint>America/Los_Angeles</tz-hint>
       <city>
        <!-- Translators: This is in Washington in the United States. -->
        <_name>Arlington</_name>
@@ -14231,6 +14364,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>West Virginia</_name>
+      <tz-hint>America/New_York</tz-hint>
       <location>
         <!-- Translators: This is in West Virginia in the United States. -->
         <_name>Beckley</_name>
@@ -14347,6 +14481,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Wisconsin</_name>
+      <tz-hint>America/Chicago</tz-hint>
       <location>
         <!-- Translators: This is in Wisconsin in the United States. -->
         <_name>Antigo</_name>
@@ -14742,6 +14877,7 @@
     <state>
       <!-- Translators: This is a state in the United States. -->
       <_name>Wyoming</_name>
+      <tz-hint>America/Denver</tz-hint>
       <location>
         <!-- Translators: This is in Wyoming in the United States. -->
         <_name>Arlington</_name>
@@ -14932,9 +15068,11 @@
   </country>
   <country>
     <_name>Canada</_name>
+    <iso-code>CA</iso-code>
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Alberta</_name>
+      <tz-hint>America/Edmonton</tz-hint>
       <city>
         <!-- Translators: This is in Alberta in Canada. -->
 	<_name>Calgary</_name>
@@ -15083,6 +15221,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>British Columbia</_name>
+      <tz-hint>America/Vancouver</tz-hint>
       <location>
         <!-- Translators: This is in British Columbia in Canada. -->
         <_name>Abbotsford</_name>
@@ -15361,6 +15500,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Manitoba</_name>
+      <tz-hint>America/Winnipeg</tz-hint>
       <city>
        <!-- Translators: This is in Manitoba in Canada. -->
        <_name>Berens River</_name>
@@ -15445,6 +15585,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>New Brunswick</_name>
+      <tz-hint>America/Moncton</tz-hint>
       <location>
         <!-- Translators: This is in New Brunswick in Canada. -->
         <_name>Bathurst</_name>
@@ -15489,6 +15630,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Newfoundland</_name>
+      <tz-hint>America/St_Johns</tz-hint>
       <location>
         <!-- Translators: This is in Newfoundland in Canada. -->
         <_name>Cape Kiglapait</_name>
@@ -15591,6 +15733,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Northwest Territories</_name>
+      <tz-hint>America/Yellowknife</tz-hint>
       <location>
         <!-- Translators: This is in Northwest Territories in Canada. -->
         <_name>Aklavik</_name>
@@ -15751,6 +15894,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Nova Scotia</_name>
+      <tz-hint>America/Halifax</tz-hint>
       <location>
         <!-- Translators: This is in Nova Scotia in Canada. -->
         <_name>Greenwood</_name>
@@ -15795,6 +15939,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Nunavut</_name>
+      <tz-hint>America/Iqaluit</tz-hint>
       <location>
         <!-- Translators: This is in Nunavut in Canada. -->
         <_name>Alert</_name>
@@ -16045,6 +16190,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Ontario</_name>
+      <tz-hint>America/Toronto</tz-hint>
       <location>
         <!-- Translators: This is in Ontario in Canada. -->
         <_name>Big Trout Lake</_name>
@@ -16285,6 +16431,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Prince Edward Island</_name>
+      <tz-hint>America/Halifax</tz-hint>
       <city>
         <!-- Translators: This is in Prince Edward Island in Canada. -->
         <_name>Charlottetown</_name>
@@ -16299,6 +16446,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Quebec</_name>
+      <tz-hint>America/Montreal</tz-hint>
       <location>
         <!-- Translators: This is in Quebec in Canada. -->
         <_name>Akulivik</_name>
@@ -16546,6 +16694,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Saskatchewan</_name>
+      <tz-hint>America/Regina</tz-hint>
       <location>
         <!-- Translators: This is in Saskatchewan in Canada. -->
         <_name>Broadview</_name>
@@ -16632,6 +16781,7 @@
     <state>
       <!-- Translators: This is a state in Canada. -->
       <_name>Yukon Territory</_name>
+      <tz-hint>America/Whitehorse</tz-hint>
       <location>
         <!-- Translators: This is in Yukon Territory in Canada. -->
         <_name>Beaver Creek</_name>
@@ -16726,6 +16876,8 @@
   </country>
   <country>
     <_name>Saint Pierre and Miquelon</_name>
+    <iso-code>PM</iso-code>
+    <tz-hint>America/Miquelon</tz-hint>
     <location>
       <!-- Translators: This is in Saint Pierre and Miquelon. -->
       <_name>Saint-Pierre</_name>
@@ -16738,6 +16890,8 @@
   <_name>Europe</_name>
   <country>
     <_name>Albania</_name>
+    <iso-code>AL</iso-code>
+    <tz-hint>Europe/Tirane</tz-hint>
     <location>
       <!-- Translators: This is in Albania. -->
       <_name>Tirana</_name>
@@ -16747,6 +16901,8 @@
   </country>
   <country>
     <_name>Austria</_name>
+    <iso-code>AT</iso-code>
+    <tz-hint>Europe/Vienna</tz-hint>
     <location>
       <!-- Translators: This is in Austria. -->
       <_name>Aigen im Ennstal</_name>
@@ -16850,6 +17006,8 @@
   </country>
   <country>
     <_name>Belarus</_name>
+    <iso-code>BY</iso-code>
+    <tz-hint>Europe/Minsk</tz-hint>
     <location>
       <!-- Translators: This is in Belarus. -->
       <_name>Brest</_name>
@@ -16893,6 +17051,8 @@
 	local name (de): Belgien.
 	-->
     <_name>Belgium</_name>
+    <iso-code>BE</iso-code>
+    <tz-hint>Europe/Brussels</tz-hint>
     <state>
       <!-- Translators: This is a state in Belgium.
 	local name (nl): Antwerpen.
@@ -17033,6 +17193,8 @@
   </country>
   <country>
     <_name>Bosnia-Herzegovina</_name>
+    <iso-code>BA</iso-code>
+    <tz-hint>Europe/Sarajevo</tz-hint>
     <location>
       <!-- Translators: This is in Bosnia-Herzegovina. -->
       <_name>Banja Luka</_name>
@@ -17065,6 +17227,8 @@
   </country>
   <country>
     <_name>Bulgaria</_name>
+    <iso-code>BG</iso-code>
+    <tz-hint>Europe/Sofia</tz-hint>
     <location>
       <!-- Translators: This is in Bulgaria. -->
       <_name>Burgas</_name>
@@ -17098,6 +17262,8 @@
   </country>
   <country>
     <_name>Czech Republic</_name>
+    <iso-code>CZ</iso-code>
+    <tz-hint>Europe/Prague</tz-hint>
     <location>
       <!-- Translators: This is in the Czech Republic.
 	The German name is "BrÃnn".
@@ -17154,6 +17320,8 @@
   </country>
   <country>
     <_name>Croatia</_name>
+    <iso-code>HR</iso-code>
+    <tz-hint>Europe/Zagreb</tz-hint>
     <location>
       <!-- Translators: This is in Croatia. -->
       <_name>BraÄ</_name>
@@ -17223,6 +17391,8 @@
 	kingdom.
 	-->
     <_name>Denmark</_name>
+    <iso-code>DK</iso-code>
+    <tz-hint>Europe/Copenhagen</tz-hint>
     <location>
       <!-- Translators: This is in Denmark. -->
       <_name>Billund</_name>
@@ -17330,6 +17500,8 @@
   </country>
   <country>
     <_name>Estonia</_name>
+    <iso-code>EE</iso-code>
+    <tz-hint>Europe/Tallinn</tz-hint>
     <location>
       <!-- Translators: This is in Estonia. -->
       <_name>KÃrdla</_name>
@@ -17377,6 +17549,8 @@
   </country>
   <country>
     <_name>Faroe Islands</_name>
+    <iso-code>FO</iso-code>
+    <tz-hint>Atlantic/Faroe</tz-hint>
     <location>
       <!-- Translators: This is in Faroe Islands.
 	The Danish name is "Vagar/SÃrvÃg".
@@ -17388,6 +17562,8 @@
   </country>
   <country>
     <_name>Gibraltar</_name>
+    <iso-code>GI</iso-code>
+    <tz-hint>Europe/Gibraltar</tz-hint>
     <location>
       <!-- Translators: This is in Gibraltar. -->
       <_name>Gibraltar</_name>
@@ -17397,6 +17573,8 @@
   </country>
   <country>
     <_name>Iceland</_name>
+    <iso-code>IS</iso-code>
+    <tz-hint>Atlanta/Reykjavik</tz-hint>
     <location>
       <!-- Translators: This is in Iceland. -->
       <_name>Akureyri</_name>
@@ -17424,6 +17602,8 @@
   </country>
   <country>
     <_name>Latvia</_name>
+    <iso-code>LV</iso-code>
+    <tz-hint>Europe/Riga</tz-hint>
     <location>
       <!-- Translators: This is in Latvia. -->
       <_name>LiepÄja</_name>
@@ -17441,6 +17621,8 @@
   </country>
   <country>
     <_name>Lithuania</_name>
+    <iso-code>LT</iso-code>
+    <tz-hint>Europe/Vilnius</tz-hint>
     <location>
       <!-- Translators: This is in Lithuania. -->
       <_name>Kaunas</_name>
@@ -17473,6 +17655,8 @@
   </country>
   <country>
     <_name>Luxembourg</_name>
+    <iso-code>LU</iso-code>
+    <tz-hint>Europe/Luxembourg</tz-hint>
     <location>
       <!-- Translators: This is in Luxembourg.
 	   local name (lb_LU): LÃtzebuerg
@@ -17486,6 +17670,8 @@
   </country>
   <country>
     <_name>Macedonia</_name>
+    <iso-code>MK</iso-code>
+    <tz-hint>Europe/Skopje</tz-hint>
     <location>
       <!-- Translators: This is in Macedonia.
 	The local name is "ÐÑÑÐÐ".
@@ -17505,6 +17691,8 @@
   </country>
   <country>
     <_name>Malta</_name>
+    <iso-code>MT</iso-code>
+    <tz-hint>Europe/Malta</tz-hint>
     <location>
       <!-- Translators: This is in Malta. -->
       <_name>Luqa</_name>
@@ -17514,6 +17702,8 @@
   </country>
   <country>
     <_name>Moldova</_name>
+    <iso-code>MD</iso-code>
+    <tz-hint>Europe/Chisinau</tz-hint>
     <location>
       <!-- Translators: This is in Moldova. -->
       <_name>ChiÅinÄu</_name>
@@ -17523,6 +17713,8 @@
   </country>
   <country>
     <_name>Norway</_name>
+    <iso-code>NO</iso-code>
+    <tz-hint>Europe/Oslo</tz-hint>
     <location>
       <!-- Translators: This is in Norway. -->
       <_name>Ãlesund/Vigra</_name>
@@ -17878,6 +18070,8 @@
   </country>
   <country>
     <_name>Poland</_name>
+    <iso-code>PL</iso-code>
+    <tz-hint>Europe/Warsaw</tz-hint>
     <location>
       <!-- Translators: This is in Poland.
 	The German name for GdaÅsk is "Danzig".
@@ -17941,9 +18135,12 @@
   </country>
   <country>
     <_name>Portugal</_name>
+    <iso-code>PT</iso-code>
+    <tz-hint>Europe/Lisbon</tz-hint>
     <location>
       <!-- Translators: This is in Portugal. -->
       <_name>Aeroporto Da Madeira</_name>
+      <tz-hint>Atlantic/Madeira</tz-hint>
       <code>LPMA</code>
       <coordinates>32-41-52N 016-46-28W</coordinates>
     </location>
@@ -17956,18 +18153,21 @@
     <location>
       <!-- Translators: This is in Portugal. -->
       <_name>Flores</_name>
+      <tz-hint>Atlantic/Azores</tz-hint>
       <code>LPFL</code>
       <coordinates>39-27N 031-08W</coordinates>
     </location>
     <location>
       <!-- Translators: This is in Portugal. -->
       <_name>Horta</_name>
+      <tz-hint>Atlantic/Azores</tz-hint>
       <code>LPHR</code>
       <coordinates>38-31N 028-43W</coordinates>
     </location>
     <location>
       <!-- Translators: This is in Portugal. -->
       <_name>Lajes</_name>
+      <tz-hint>Atlantic/Azores</tz-hint>
       <code>LPLA</code>
       <coordinates>38-46N 027-06W</coordinates>
     </location>
@@ -17989,6 +18189,7 @@
       <location>
         <!-- Translators: This is in Ponta Delgada in Portugal. -->
         <_name>JoÃo Paulo II</_name>
+	<tz-hint>Atlantic/Azores</tz-hint>
         <code>LPPD</code>
         <coordinates>37-44N 025-42W</coordinates>
       </location>
@@ -18014,12 +18215,15 @@
     <location>
       <!-- Translators: This is in Portugal. -->
       <_name>Santa Maria</_name>
+      <tz-hint>Atlantic/Azores</tz-hint>
       <code>LPAZ</code>
       <coordinates>36-58N 025-10W</coordinates>
     </location>
   </country>
   <country>
     <_name>Romania</_name>
+    <iso-code>RO</iso-code>
+    <tz-hint>Europe/Bucharest</tz-hint>
     <location>
       <!-- Translators: This is in Romania. -->
       <_name>Arad</_name>
@@ -18081,6 +18285,8 @@
   </country>
   <country>
     <_name>Russia</_name>
+    <iso-code>RU</iso-code>
+    <tz-hint>Europe/Moscow</tz-hint>
     <location>
       <!-- Translators: This is in Russia. -->
       <_name>Abakan</_name>
@@ -18529,6 +18735,8 @@
   </country>
   <country>
     <_name>Serbia and Montenegro</_name>
+    <iso-code>RS</iso-code>
+    <tz-hint>Europe/Belgrade</tz-hint>
     <city>
       <!-- Translators: This is in Serbia and Montenegro.
 	The native name is "Beograd".
@@ -18576,6 +18784,8 @@
   </country>
   <country>
     <_name>Slovakia</_name>
+    <iso-code>SK</iso-code>
+    <tz-hint>Europe/Bratislava</tz-hint>
     <location>
       <!-- Translators: This is in Slovakia.
 	The German name is "Pressburg".
@@ -18653,6 +18863,8 @@
   </country>
   <country>
     <_name>Slovenia</_name>
+    <iso-code>SI</iso-code>
+    <tz-hint>Europe/Ljubljana</tz-hint>
     <city>
       <!-- Translators: This is in Slovenia.
 	The German name is "Laibach".
@@ -18694,6 +18906,8 @@
   </country>
   <country>
     <_name>Sweden</_name>
+    <iso-code>SE</iso-code>
+    <tz-hint>Europe/Stockholm</tz-hint>
     <location>
       <!-- Translators: This is in Sweden. -->
       <_name>BorlÃnge</_name>
@@ -18951,6 +19165,8 @@
   </country>
   <country>
     <_name>Switzerland</_name>
+    <iso-code>CH</iso-code>
+    <tz-hint>Europe/Zurich</tz-hint>
     <city>
       <!-- Translators: This is in Switzerland.
 	local name (de_CH): Bern
@@ -19040,6 +19256,8 @@
   </country>
   <country>
     <_name>Cyprus</_name>
+    <iso-code>CY</iso-code>
+    <tz-hint>Asia/Nicosia</tz-hint>
     <location>
       <!-- Translators: This is in Cyprus. -->
       <_name>Akrotiri</_name>
@@ -19067,6 +19285,8 @@
   </country>
   <country>
     <_name>Finland</_name>
+    <iso-code>FI</iso-code>
+    <tz-hint>Europe/Helsinki</tz-hint>
     <location>
       <!-- Translators: This is in Finland.
 	   local name (fi_FI): EnontekiÃ
@@ -19287,6 +19507,8 @@
   </country>
   <country>
     <_name>France</_name>
+    <iso-code>FR</iso-code>
+    <tz-hint>Europe/Paris</tz-hint>
     <location>
       <!-- Translators: This is in France. -->
       <_name>Agen</_name>
@@ -19965,6 +20187,8 @@
   </country>
   <country>
     <_name>Germany</_name>
+    <iso-code>DE</iso-code>
+    <tz-hint>Europe/Berlin</tz-hint>
     <state>
       <!-- Translators: This is a state in Germany. -->
       <_name>Baden-WÃrttemberg</_name>
@@ -20706,6 +20930,8 @@
   </country>
   <country>
     <_name>Greece</_name>
+    <iso-code>GR</iso-code>
+    <tz-hint>Europe/Athens</tz-hint>
     <location>
       <_name>Agrinio</_name>
       <code>LGAG</code>
@@ -20886,6 +21112,8 @@
   </country>
   <country>
     <_name>Hungary</_name>
+    <iso-code>HU</iso-code>
+    <tz-hint>Europe/Budapest</tz-hint>
     <city>
      <_name>Budapest</_name>
      <location>
@@ -20922,6 +21150,8 @@
   </country>
   <country>
     <_name>Ireland</_name>
+    <iso-code>IE</iso-code>
+    <tz-hint>Europe/Dublin</tz-hint>
     <location>
       <_name>Connaught</_name>
       <code>EIKN</code>
@@ -20945,6 +21175,8 @@
   </country>
   <country>
     <_name>Italy</_name>
+    <iso-code>IT</iso-code>
+    <tz-hint>Europe/Rome</tz-hint>
     <location>
       <_name>Albenga</_name>
       <code>LIMG</code>
@@ -21445,6 +21677,8 @@
   </country>
   <country>
     <_name>Netherlands</_name>
+    <iso-code>NL</iso-code>
+    <tz-hint>Europe/Amsterdam</tz-hint>
     <location>
       <_name>Amsterdam</_name>
       <code>EHAM</code>
@@ -21523,6 +21757,8 @@
   </country>
   <country>
     <_name>Spain</_name>
+    <iso-code>ES</iso-code>
+    <tz-hint>Europe/Madrid</tz-hint>
     <location>
       <_name>Albacete/Los Llanos</_name>
       <code>LEAB</code>
@@ -21562,36 +21798,43 @@
      <_name>Canary Islands</_name>
      <location>
         <_name>Hierro/Airport</_name>
+	<tz-hint>Atlantic/Canary</tz-hint>
         <code>GCHI</code>
         <coordinates>27-49N 017-53W</coordinates>
      </location>
      <location>
        <_name>Lanzarote</_name>
+       <tz-hint>Atlantic/Canary</tz-hint>
        <code>GCRR</code>
        <coordinates>28-57N 013-36W</coordinates>
      </location>
      <location>
        <_name>Las Palmas de Gran Canaria/Gando</_name>
+       <tz-hint>Atlantic/Canary</tz-hint>
        <code>GCLP</code>
        <coordinates>27-56N 015-23W</coordinates>
      </location>
      <location>
       <_name>Tenerife/Tenerife Norte (Los Rodeos) Airport</_name>
+      <tz-hint>Atlantic/Canary</tz-hint>
       <code>GCXO</code>
       <coordinates>28-28N 016-19W</coordinates>
     </location>
     <location>
       <_name>Tenerife/Tenerife Sur Airport</_name>
+      <tz-hint>Atlantic/Canary</tz-hint>
       <code>GCTS</code>
       <coordinates>28-03N 016-34W</coordinates>
     </location>
     <location>
         <_name>La Palma</_name>
+	<tz-hint>Atlantic/Canary</tz-hint>
         <code>GCLA</code>
         <coordinates>28-37N 017-45W</coordinates>
      </location>
      <location>
         <_name>Fuerteventura</_name>
+	<tz-hint>Atlantic/Canary</tz-hint>
         <code>GCFV</code>
         <coordinates>28-27N 013-52W</coordinates>
       </location>
@@ -21769,6 +22012,8 @@
   </country>
   <country>
     <_name>Turkey</_name>
+    <iso-code>TR</iso-code>
+    <tz-hint>Europe/Istanbul</tz-hint>
     <location>
       <_name>Adana/Incirlik</_name>
       <code>LTAG</code>
@@ -21960,6 +22205,8 @@
   </country>
   <country>
     <_name>Ukraine</_name>
+    <iso-code>UA</iso-code>
+    <tz-hint>Europe/Kieve</tz-hint>
     <location>
       <_name>Chernovsty</_name>
       <code>UKLN</code>
@@ -22057,6 +22304,8 @@
   </country>
   <country>
     <_name>United Kingdom</_name>
+    <iso-code>GB</iso-code>
+    <tz-hint>Europe/London</tz-hint>
      <state>
       <_name>Wales</_name>
       <location>
@@ -22341,6 +22590,8 @@
    </location>
    <location>
     <_name>Isle of Man</_name>
+    <iso-code>IM</iso-code>
+    <tz-hint>Europe/Isle_of_Man</tz-hint>
     <code>EGNS</code>
     <zone>:northwest</zone>
     <coordinates>54-05N 004-38W</coordinates>
@@ -22405,12 +22656,16 @@
    </location>
    <location>
     <_name>Guernsey</_name>
+    <iso-code>GG</iso-code>
+    <tz-hint>Europe/Guernsey</tz-hint>
     <code>EGJB</code>
     <zone>:centralsouthern</zone>
     <coordinates>49-26N 002-36W</coordinates>
    </location>
    <location>
     <_name>Jersey</_name>
+    <iso-code>JE</iso-code>
+    <tz-hint>Europe/Jersey</tz-hint>
     <code>EGJJ</code>
     <zone>:centralsouthern</zone>
     <coordinates>49-13N 002-12W</coordinates>
@@ -22587,6 +22842,8 @@
   <_name>Africa</_name>
   <country>
     <_name>Algeria</_name>
+    <iso-code>DZ</iso-code>
+    <tz-hint>Africa/Algiers</tz-hint>
     <location>
       <_name>Adrar</_name>
       <code>DAUA</code>
@@ -22768,6 +23025,8 @@
   </country>
   <country>
     <_name>Angola</_name>
+    <iso-code>AO</iso-code>
+    <tz-hint>Africa/Luanda</tz-hint>
     <location>
       <_name>Huambo Nova Lisboa</_name>
       <code>FNHU</code>
@@ -22786,6 +23045,8 @@
   </country>
   <country>
     <_name>Benin</_name>
+    <iso-code>BJ</iso-code>
+    <tz-hint>Africa/Porto-Novo</tz-hint>
     <location>
       <_name>Cotonou</_name>
       <code>DBBB</code>
@@ -22794,6 +23055,8 @@
   </country>
   <country>
     <_name>Botswana</_name>
+    <iso-code>BW</iso-code>
+    <tz-hint>Africa/Gaborone</tz-hint>
     <location>
       <_name>Francistown</_name>
       <code>FBFT</code>
@@ -22857,6 +23120,8 @@
   </country>
   <country>
     <_name>Burkina Faso</_name>
+    <iso-code>BF</iso-code>
+    <tz-hint>Africa/Ouagadougou</tz-hint>
     <location>
       <_name>Bobo-Dioulasso</_name>
       <code>DFOO</code>
@@ -22870,6 +23135,8 @@
   </country>
   <country>
     <_name>Burundi</_name>
+    <iso-code>BI</iso-code>
+    <tz-hint>Africa/Bujumbura</tz-hint>
     <location>
       <_name>Bujumbura</_name>
       <code>HBBA</code>
@@ -22878,6 +23145,8 @@
   </country>
   <country>
     <_name>Cameroon</_name>
+    <iso-code>CM</iso-code>
+    <tz-hint>Africa/Douala</tz-hint>
     <location>
       <_name>Douala Obs.</_name>
       <code>FKKD</code>
@@ -22901,6 +23170,8 @@
   </country>
   <country>
     <_name>Cape Verde</_name>
+    <iso-code>CV</iso-code>
+    <tz-hint>Atlanta/Cape_Verde</tz-hint>
     <location>
       <_name>Sal</_name>
       <code>GVAC</code>
@@ -22909,6 +23180,8 @@
   </country>
   <country>
     <_name>Central African Republic</_name>
+    <iso-code>CF</iso-code>
+    <tz-hint>Africa/Bangui</tz-hint>
     <location>
       <_name>Bangassou</_name>
       <code>FEFG</code>
@@ -22927,6 +23200,8 @@
   </country>
   <country>
     <_name>Chad</_name>
+    <iso-code>TD</iso-code>
+    <tz-hint>Africa/Ndjamena</tz-hint>
     <location>
       <_name>Abeche</_name>
       <code>FTTC</code>
@@ -22950,6 +23225,8 @@
   </country>
   <country>
     <_name>Comoros</_name>
+    <iso-code>KM</iso-code>
+    <tz-hint>Indian/Comoro</tz-hint>
     <location>
       <_name>Dzaoudzi / Pamanzi Mayotte</_name>
       <code>FMCZ</code>
@@ -22963,6 +23240,8 @@
   </country>
   <country>
     <_name>Congo, Democratic Republic of the</_name>
+    <iso-code>CD</iso-code>
+    <tz-hint>Africa/Kinshasa</tz-hint>
     <location>
       <_name>Kindu</_name>
       <code>FZOA</code>
@@ -22981,6 +23260,8 @@
   </country>
   <country>
     <_name>Congo, Republic of the</_name>
+    <iso-code>CG</iso-code>
+    <tz-hint>Africa/Brazzaville</tz-hint>
     <location>
       <_name>Brazzaville / Maya-Maya</_name>
       <code>FCBB</code>
@@ -22994,6 +23275,8 @@
   </country>
   <country>
     <_name>Cote d'Ivoire</_name>
+    <iso-code>CI</iso-code>
+    <tz-hint>African/Abidjan</tz-hint>
     <location>
       <_name>Abidjan</_name>
       <code>DIAP</code>
@@ -23002,6 +23285,8 @@
   </country>
   <country>
     <_name>Djibouti</_name>
+    <iso-code>DJ</iso-code>
+    <tz-hint>Africa/Djibouti</tz-hint>
     <location>
       <_name>Ambouli</_name>
       <code>HDAM</code>
@@ -23010,6 +23295,8 @@
   </country>
   <country>
     <_name>Egypt</_name>
+    <iso-code>EG</iso-code>
+    <tz-hint>Europe/Cairo</tz-hint>
     <location>
       <_name>Alexandria/Nouzha</_name>
       <code>HEAX</code>
@@ -23073,6 +23360,8 @@
   </country>
   <country>
     <_name>Equatorial Guinea</_name>
+    <iso-code>GQ</iso-code>
+    <tz-hint>Africa/Malabo</tz-hint>
     <location>
       <_name>Malabo/Fernando Poo</_name>
       <code>FGSL</code>
@@ -23081,6 +23370,8 @@
   </country>
   <country>
     <_name>Eritrea</_name>
+    <iso-code>ER</iso-code>
+    <tz-hint>Africa/Asmara</tz-hint>
     <location>
       <_name>Asmara</_name>
       <code>HHAS</code>
@@ -23089,6 +23380,8 @@
   </country>
   <country>
     <_name>Ethiopia</_name>
+    <iso-code>ET</iso-code>
+    <tz-hint>Africa/Addis_Ababa</tz-hint>
     <location>
       <_name>Addis Ababa</_name>
       <code>HAAB</code>
@@ -23097,6 +23390,8 @@
   </country>
   <country>
     <_name>Gabon</_name>
+    <iso-code>GA</iso-code>
+    <tz-hint>Africa/Libreville</tz-hint>
     <location>
       <_name>Bitam</_name>
       <code>FOOB</code>
@@ -23165,6 +23460,8 @@
   </country>
   <country>
     <_name>Gambia, The</_name>
+    <iso-code>GM</iso-code>
+    <tz-hint>Africa/Banjul</tz-hint>
     <location>
       <_name>Banjul / Yundum</_name>
       <code>GBYD</code>
@@ -23173,6 +23470,8 @@
   </country>
   <country>
     <_name>Ghana</_name>
+    <iso-code>GH</iso-code>
+    <tz-hint>Africa/Accra</tz-hint>
     <location>
       <_name>Accra</_name>
       <code>DGAA</code>
@@ -23186,6 +23485,8 @@
   </country>
   <country>
     <_name>Guinea</_name>
+    <iso-code>GN</iso-code>
+    <tz-hint>Africa/Conakry</tz-hint>
     <location>
       <_name>Conakry / Gbessia</_name>
       <code>GUCY</code>
@@ -23194,6 +23495,8 @@
   </country>
   <country>
     <_name>Kenya</_name>
+    <iso-code>KE</iso-code>
+    <tz-hint>Africa/Nairobi</tz-hint>
     <location>
       <_name>Eldoret</_name>
       <code>HKEL</code>
@@ -23325,6 +23628,8 @@
   </country>
   <country>
     <_name>Liberia</_name>
+    <iso-code>LR</iso-code>
+    <tz-hint>Africa/Monrovia</tz-hint>
     <location>
       <_name>Grand Bassa, Roberts Field</_name>
       <code>GLRB</code>
@@ -23333,6 +23638,8 @@
   </country>
   <country>
     <_name>Libya</_name>
+    <iso-code>LY</iso-code>
+    <tz-hint>Africa/Tripoli</tz-hint>
     <location>
       <_name>Benina</_name>
       <code>HLLB</code>
@@ -23346,6 +23653,8 @@
   </country>
   <country>
     <_name>Madagascar</_name>
+    <iso-code>MG</iso-code>
+    <tz-hint>Indian/Antananarivo</tz-hint>
     <location>
       <_name>Antananarivo / Ivato</_name>
       <code>FMMI</code>
@@ -23389,6 +23698,8 @@
   </country>
   <country>
     <_name>Mali</_name>
+    <iso-code>ML</iso-code>
+    <tz-hint>Africa/Bamako</tz-hint>
     <location>
       <_name>Bamako / Senou</_name>
       <code>GABS</code>
@@ -23397,6 +23708,8 @@
   </country>
   <country>
     <_name>Mauritania</_name>
+    <iso-code>MR</iso-code>
+    <tz-hint>Africa/Nouakchott</tz-hint>
     <location>
       <_name>Nouadhibou</_name>
       <code>GQPP</code>
@@ -23410,6 +23723,8 @@
   </country>
   <country>
     <_name>Mauritius</_name>
+    <iso-code>MU</iso-code>
+    <tz-hint>Indian/Mauritius</tz-hint>
     <location>
       <_name>Plaisance Mauritius</_name>
       <code>FIMP</code>
@@ -23423,6 +23738,8 @@
   </country>
   <country>
     <_name>Morocco</_name>
+    <iso-code>MA</iso-code>
+    <tz-hint>Africa/Casablanca</tz-hint>
     <location>
       <_name>Agadir Al Massira</_name>
       <code>GMAD</code>
@@ -23499,6 +23816,8 @@
   </country>
   <country>
     <_name>Mozambique</_name>
+    <iso-code>MZ</iso-code>
+    <tz-hint>Africa/Maputo</tz-hint>
     <location>
       <_name>Beira</_name>
       <code>FQBR</code>
@@ -23555,6 +23874,8 @@
   </country>
   <country>
     <_name>Namibia</_name>
+    <iso-code>NA</iso-code>
+    <tz-hint>Africa/Windhoek</tz-hint>
     <location>
       <_name>Ondangwa</_name>
       <code>FYOA</code>
@@ -23573,6 +23894,8 @@
   </country>
   <country>
     <_name>Niger</_name>
+    <iso-code>NE</iso-code>
+    <tz-hint>Africa/Niamey</tz-hint>
     <location>
       <_name>Agadez</_name>
       <code>DRZA</code>
@@ -23591,6 +23914,8 @@
   </country>
   <country>
     <_name>Nigeria</_name>
+    <iso-code>NG</iso-code>
+    <tz-hint>Africa/Lagos</tz-hint>
     <location>
       <_name>Calabar</_name>
       <code>DNCA</code>
@@ -23645,6 +23970,8 @@
   <country>
     <!-- local name (fr_RE): RÃunion -->
     <_name>Reunion</_name>
+    <iso-code>RE</iso-code>
+    <tz-hint>Indian/Reunion</tz-hint>
     <location>
       <_name>Saint-Denis / Gillot</_name>
       <code>FMEE</code>
@@ -23658,6 +23985,8 @@
   </country>
   <country>
     <_name>Rwanda</_name>
+    <iso-code>RW</iso-code>
+    <tz-hint>Africa/Kigali</tz-hint>
     <location>
       <_name>Kigali</_name>
       <code>HRYR</code>
@@ -23666,6 +23995,8 @@
   </country>
   <country>
     <_name>Senegal</_name>
+    <iso-code>SN</iso-code>
+    <tz-hint>Africa/Dakar</tz-hint>
     <location>
       <_name>Cap-Skirring</_name>
       <code>GOGS</code>
@@ -23694,6 +24025,8 @@
   </country>
   <country>
     <_name>Seychelles</_name>
+    <iso-code>SC</iso-code>
+    <tz-hint>Indian/Mahe</tz-hint>
     <location>
       <_name>Seychelles International Airport</_name>
       <code>FSIA</code>
@@ -23702,6 +24035,8 @@
   </country>
   <country>
     <_name>Somalia</_name>
+    <iso-code>SO</iso-code>
+    <tz-hint>Africa/Mogadishu</tz-hint>
     <location>
       <_name>Berbera</_name>
       <code>HCMI</code>
@@ -23725,6 +24060,8 @@
   </country>
   <country>
     <_name>South Africa</_name>
+    <iso-code>ZA</iso-code>
+    <tz-hint>Africa/Johannesburt</tz-hint>
     <location>
       <_name>Alexander Bay</_name>
       <code>FAAB</code>
@@ -23836,6 +24173,8 @@
   </country>
   <country>
     <_name>Sierra Leone</_name>
+    <iso-code>SL</iso-code>
+    <tz-hint>Africa/Freetown</tz-hint>
     <location>
       <_name>Lungi</_name>
       <code>GFLL</code>
@@ -23844,6 +24183,8 @@
   </country>
   <country>
     <_name>Sudan</_name>
+    <iso-code>SD</iso-code>
+    <tz-hint>Africa/Khartoum</tz-hint>
     <location>
       <_name>Khartoum</_name>
       <code>HSSS</code>
@@ -23852,6 +24193,8 @@
   </country>
   <country>
     <_name>Swaziland</_name>
+    <iso-code>SZ</iso-code>
+    <tz-hint>Africa/Mbabane</tz-hint>
     <location>
       <_name>Manzini</_name>
       <code>FDMS</code>
@@ -23860,6 +24203,8 @@
   </country>
   <country>
     <_name>Tanzania</_name>
+    <iso-code>TZ</iso-code>
+    <tz-hint>Africa/Dar_es_Salaam</tz-hint>
     <location>
       <_name>Arusha</_name>
       <code>HTAR</code>
@@ -23963,6 +24308,8 @@
   </country>
   <country>
     <_name>Togo</_name>
+    <iso-code>TG</iso-code>
+    <tz-hint>Africa/Lome</tz-hint>
     <location>
       <_name>Lome</_name>
       <code>DXXX</code>
@@ -23976,6 +24323,8 @@
   </country>
   <country>
     <_name>Tunisia</_name>
+    <iso-code>TN</iso-code>
+    <tz-hint>Africa/Tunis</tz-hint>
     <location>
       <_name>Bizerte</_name>
       <code>DTTB</code>
@@ -24059,6 +24408,8 @@
   </country>
   <country>
     <_name>Uganda</_name>
+    <iso-code>UG</iso-code>
+    <tz-hint>Africa/Kampala</tz-hint>
     <location>
       <_name>Arua</_name>
       <code>HUAR</code>
@@ -24117,6 +24468,8 @@
   </country>
   <country>
     <_name>Zambia</_name>
+    <iso-code>ZM</iso-code>
+    <tz-hint>Africa/Lusaka</tz-hint>
     <location>
       <_name>Livingstone</_name>
       <code>FLLI</code>
@@ -24140,6 +24493,8 @@
   </country>
   <country>
     <_name>Zimbabwe</_name>
+    <iso-code>ZW</iso-code>
+    <tz-hint>Africa/Harare</tz-hint>
     <location>
       <_name>Buffalo Range</_name>
       <code>FVCZ</code>
@@ -24186,8 +24541,10 @@
   <_name>Australasia &amp; Oceania</_name>
   <country>
     <_name>Australia</_name>
+    <iso-code>AU</iso-code>
     <state>
      <_name>South Australia</_name>
+     <tz-hint>Australia/Adelaide</tz-hint>
      <location>
        <_name>Adelaide</_name>
        <code>YPAD</code>
@@ -24197,6 +24554,7 @@
     </state><!-- /South Australia -->
     <state>
      <_name>Western Australia</_name>
+     <tz-hint>Australia/Perth</tz-hint>
      <location>
        <_name>Broome</_name>
        <code>YBRM</code>
@@ -24236,6 +24594,7 @@
     </state><!-- /Western Australia -->
     <state>
      <_name>Northern Territory</_name>
+     <tz-hint>Australia/Darwin</tz-hint>
      <location>
        <_name>Alice Springs</_name>
        <code>YBAS</code>
@@ -24260,6 +24619,7 @@
     </state><!-- /NT -->
     <state>
      <_name>New South Wales</_name>
+     <tz-hint>Australia/Sydney</tz-hint>
      <location>
        <_name>Dubbo</_name>
        <code>YSDU</code>
@@ -24284,6 +24644,7 @@
     </state><!-- /New South Wales -->
     <state>
      <_name>Queensland</_name>
+     <tz-hint>Australia/Brisbane</tz-hint>
      <location>
        <_name>Brisbane</_name>
        <code>YBBN</code>
@@ -24318,6 +24679,7 @@
     </state><!-- /Queensland -->
     <state>
      <_name>Victoria</_name>
+     <tz-hint>Australia/Melbourne</tz-hint>
      <location>
        <_name>Avalon</_name>
        <code>YMAV</code>
@@ -24337,6 +24699,7 @@
     </state><!-- /Victoria -->
     <state>
      <_name>Australian Capital Territory</_name>
+     <tz-hint>Australia/Melbourne</tz-hint>
      <location>
        <_name>Canberra</_name>
        <code>YSCB</code>
@@ -24346,6 +24709,7 @@
     </state><!-- /ACT -->
     <state>
      <_name>Tasmania</_name>
+     <tz-hint>Australia/Hobart</tz-hint>
      <location>
        <_name>Hobart</_name>
        <code>YMHB</code>
@@ -24362,16 +24726,22 @@
      <_name>Australian External Territories</_name>
      <location>
        <_name>Norfolk Island</_name>
+       <iso-code>NF</iso-code>
+       <tz-hint>Pacific/Norfolk</tz-hint>
        <code>YSNF</code>
        <zone>@IDN10008</zone>
        <coordinates>29-02S 167-56E</coordinates>
      </location>
      <location>
        <_name>Christmas Island</_name>
+       <iso-code>CX</iso-code>
+       <tz-hint>Indian/Christmas</tz-hint>
        <code>YPXM</code>
      </location>
      <location>
        <_name>Cocos (Keeling) Island</_name>
+       <iso-code>CC</iso-code>
+       <tz-hint>Indian/Cocos</tz-hint>
        <code>YPCC</code>
        <zone>@IDW10600</zone>
        <coordinates>12-30S 96-50E</coordinates>
@@ -24380,6 +24750,8 @@
   </country>
   <country>
    <_name>British Indian Ocean Territory</_name>
+    <iso-code>IO</iso-code>
+    <tz-hint>Indian/Chagos</tz-hint>
     <location>
       <_name>Diego Garcia</_name>
       <code>FJDG</code>
@@ -24388,6 +24760,8 @@
   </country>
   <country>
     <_name>Cook Islands</_name>
+    <iso-code>CK</iso-code>
+    <tz-hint>Pacific/Rarotonga</tz-hint>
     <location>
       <_name>Alofi / Niue</_name>
       <code>NIUE</code>
@@ -24401,6 +24775,8 @@
   </country>
   <country>
     <_name>Fiji</_name>
+    <iso-code>FJ</iso-code>
+    <tz-hint>Pacific/Fiji</tz-hint>
     <location>
       <_name>Nandi</_name>
       <code>NFFN</code>
@@ -24414,6 +24790,8 @@
   </country>
   <country>
     <_name>Guam</_name>
+    <iso-code>GU</iso-code>
+    <tz-hint>Pacific/Guam</tz-hint>
     <location>
       <_name>Agana</_name>
       <code>PGUM</code>
@@ -24442,6 +24820,8 @@
   </country>
   <country>
     <_name>Indonesia</_name>
+    <iso-code>ID</iso-code>
+    <tz-hint>Asia/Jakarta</tz-hint>
     <location>
       <_name>Biak / Mokmer</_name>
       <code>WABB</code>
@@ -24465,16 +24845,21 @@
   </country>
   <country>
     <_name>Kiribati</_name>
+    <iso-code>KI</iso-code>
     <location>
       <_name>Tarawa</_name>
+      <tz-hint>Pacific/Tarawa</tz-hint>
       <code>NGTA</code>
       <coordinates>01-21N 172-55E</coordinates>
     </location>
   </country>
   <country>
     <_name>Marshall Islands</_name>
+    <iso-code>MH</iso-code>
+    <tz-hint>Pacific/Majuro</tz-hint>
     <location>
       <_name>Kwajalein</_name>
+      <tz-hint>Pacific/Kwajalein</tz-hint>
       <code>PKWA</code>
       <coordinates>08-43N 167-44E</coordinates>
     </location>
@@ -24491,34 +24876,42 @@
   </country>
   <country>
     <_name>Micronesia, Federated States of</_name>
+    <iso-code>FM</iso-code>
     <location>
       <_name>Kosrae Island</_name>
+      <tz-hint>Pacific/Kosrae</tz-hint>
       <code>PTSA</code>
       <coordinates>05-21N 162-57E</coordinates>
     </location>
     <location>
       <_name>Pohnpei Island, Pohnpei Int. Airp.</_name>
+      <tz-hint>Pacific/Ponape</tz-hint>
       <code>PTPN</code>
       <coordinates>06-59N 158-12E</coordinates>
     </location>
     <location>
       <_name>Pohnpei, NWS Office</_name>
+      <tz-hint>Pacific/Ponape</tz-hint>
       <code>PTTP</code>
       <coordinates>06-58N 158-13E</coordinates>
     </location>
     <location>
       <_name>Weno Island</_name>
+      <tz-hint>Pacific/Truk</tz-hint>
       <code>PTKK</code>
       <coordinates>07-28N 151-51E</coordinates>
     </location>
     <location>
       <_name>Yap Island</_name>
+      <tz-hint>Pacific/Truk</tz-hint>
       <code>PTYA</code>
       <coordinates>09-29N 138-05E</coordinates>
     </location>
   </country>
   <country>
     <_name>New Caledonia</_name>
+    <iso-code>NC</iso-code>
+    <tz-hint>Pacific/Noumea</tz-hint>
     <location>
       <!-- Nlle is the abbreviation for "nouvelle", ("new"), and the first "e" of Caledonie should have an acute accent. --> 
       <_name>La Tontouta Nlle-Caledonie</_name>
@@ -24528,6 +24921,8 @@
   </country>
   <country>
     <_name>New Zealand</_name>
+    <iso-code>NZ</iso-code>
+    <tz-hint>Pacific/Auckland</tz-hint>
     <location>
       <_name>Auckland</_name>
       <code>NZAA</code>
@@ -24566,6 +24961,8 @@
   </country>
   <country>
     <_name>Northern Mariana Islands</_name>
+    <iso-code>MP</iso-code>
+    <tz-hint>Pacific/Saipan</tz-hint>
     <location>
       <_name>Saipan Island</_name>
       <code>PGSN</code>
@@ -24574,6 +24971,8 @@
   </country>
   <country>
     <_name>Palau</_name>
+    <iso-code>PW</iso-code>
+    <tz-hint>Pacific/Palau</tz-hint>
     <location>
       <_name>Babelthuap Island</_name>
       <code>PTRO</code>
@@ -24587,6 +24986,8 @@
   </country>
   <country>
     <_name>Papua New Guinea</_name>
+    <iso-code>PG</iso-code>
+    <tz-hint>Pacific/Port_Moresby</tz-hint>
     <location>
       <_name>Manus Island/Momote</_name>
       <code>AYMO</code>
@@ -24600,6 +25001,8 @@
   </country>
   <country>
     <_name>Samoa</_name>
+    <iso-code>WS</iso-code>
+    <tz-hint>Pacific/Apia</tz-hint>
     <location>
       <_name>Faleolo Intl / Apia</_name>
       <code>NSFA</code>
@@ -24608,6 +25011,8 @@
   </country>
   <country>
     <_name>Solomon Islands</_name>
+    <iso-code>SB</iso-code>
+    <tz-hint>Pacific/Guadalcanal</tz-hint>
     <location>
       <_name>Honiara / Henderson</_name>
       <code>AGGH</code>
@@ -24616,6 +25021,8 @@
   </country>
   <country>
     <_name>Tonga</_name>
+    <iso-code>TO</iso-code>
+    <tz-hint>Pacific/Tongatapu</tz-hint>
     <location>
       <_name>Fua'Amotu</_name>
       <code>NFTF</code>
@@ -24629,6 +25036,8 @@
   </country>
   <country>
     <_name>Tuvalu</_name>
+    <iso-code>TV</iso-code>
+    <tz-hint>Pacific/Funafuti</tz-hint>
     <location>
       <_name>Funafuti</_name>
       <code>NGFU</code>
@@ -24637,14 +25046,23 @@
   </country>
   <country>
     <_name>United States Minor Outlying Islands</_name>
+    <iso-code>UM</iso-code>
     <location>
+      <!-- FIXME: Pago Pago is in American Samoa, which is not part of
+           the "United States Minor Outlying Islands". Fix on head
+           after branch, when we can add new strings.
+        -->
       <_name>Pago Pago</_name>
+      <iso-code>AS</iso-code>
+      <tz-hint>Pacific/Pago_Pago</tz-hint>
       <code>NSTU</code>
       <coordinates>14-20S 170-43W</coordinates>
     </location>
   </country>
   <country>
     <_name>Vanuatu</_name>
+    <iso-code>VU</iso-code>
+    <tz-hint>Pacific/Efate</tz-hint>
     <location>
       <_name>Bauerfield Efate</_name>
       <code>NVVV</code>
@@ -24671,6 +25089,8 @@
   <_name>Asia</_name>
   <country>
     <_name>Armenia</_name>
+    <iso-code>AM</iso-code>
+    <tz-hint>Asia/Yerevan</tz-hint>
     <location>
       <_name>Yerevan</_name>
       <code>UDYZ</code>
@@ -24679,6 +25099,8 @@
   </country>
   <country>
     <_name>Afghanistan</_name>
+    <iso-code>AF</iso-code>
+    <tz-hint>Asia/Kabul</tz-hint>
     <location>
       <_name>Herat</_name>
       <code>OAHR</code>
@@ -24692,6 +25114,8 @@
   </country>
   <country>
     <_name>Philippines</_name>
+    <iso-code>PH</iso-code>
+    <tz-hint>Asia/Manila</tz-hint>
     <location>
       <_name>Clarkfield Pampanga</_name>
       <code>RPLC</code>
@@ -24730,6 +25154,8 @@
   </country>
   <country>
     <_name>Viet Nam</_name>
+    <iso-code>VN</iso-code>
+    <tz-hint>Asia/Ho_Chi_Minh</tz-hint>
     <location>
       <_name>Da Nang</_name>
       <code>VVDN</code>
@@ -24748,6 +25174,8 @@
   </country>
   <country>
     <_name>South Korea</_name>
+    <iso-code>KR</iso-code>
+    <tz-hint>Asia/Seoul</tz-hint>
     <location>
       <_name>Cheju</_name>
       <code>RKPC</code>
@@ -24826,6 +25254,8 @@
   </country>
   <country>
     <_name>North Korea</_name>
+    <iso-code>KP</iso-code>
+    <tz-hint>Asia/Pyongyang</tz-hint>
     <!-- No METAR info available (checked 2005-04-06)
     <location>
       <_name>Kimchaek</_name>
@@ -24841,6 +25271,8 @@
   </country>
   <country>
     <_name>Hong Kong</_name>
+    <iso-code>HK</iso-code>
+    <tz-hint>Asia/Hong_Kong</tz-hint>
     <!-- No METAR info available (checked 2005-04-06)
     <location>
       <_name>Cheung Chau</_name>
@@ -24856,6 +25288,8 @@
   </country>
   <country>
     <_name>Pakistan</_name>
+    <iso-code>PK</iso-code>
+    <tz-hint>Asia/Karachi</tz-hint>
     <location>
       <_name>Islamabad</_name>
       <code>OPRN</code>
@@ -24889,6 +25323,8 @@
   </country>
   <country>
     <_name>Georgia</_name>
+    <iso-code>GE</iso-code>
+    <tz-hint>Asia/Tbilisi</tz-hint>
     <location>
       <_name>Tbilisi</_name>
       <code>UGGG</code>
@@ -24897,6 +25333,8 @@
   </country>
   <country>
     <_name>India</_name>
+    <iso-code>IN</iso-code>
+    <tz-hint>Asia/Kolkata</tz-hint>
     <location>
       <_name>Ahmadabad</_name>
       <code>VAAH</code>
@@ -24975,6 +25413,8 @@
   </country>
   <country>
     <_name>Nepal</_name>
+    <iso-code>NP</iso-code>
+    <tz-hint>Asia/Katmandu</tz-hint>
     <location>
       <_name>Kathmandu</_name>
       <code>VNKT</code>
@@ -24983,6 +25423,8 @@
   </country>
   <country>
     <_name>People's Republic of China</_name>
+    <iso-code>CN</iso-code>
+    <tz-hint>Asia/Shanghai</tz-hint>
     <city>
       <!-- Translators: This is the capital of China -->
       <_name>Beijing</_name>
@@ -25366,6 +25808,8 @@
   </country>
   <country>
     <_name>Japan</_name>
+    <iso-code>JP</iso-code>
+    <tz-hint>Asia/Tokyo</tz-hint>
     <location>
       <_name>Akeno Ab</_name>
       <code>RJOE</code>
@@ -25899,8 +26343,11 @@
   </country>
   <country>
     <_name>Kazakhstan</_name>
+    <iso-code>KZ</iso-code>
+    <tz-hint>Asia/Almaty</tz-hint>
     <location>
       <_name>Aktau</_name>
+      <tz-hint>Asia/Aqtau</tz-hint>
       <code>UATE</code>
       <coordinates>43-52-12N 051-06E</coordinates>
     </location>
@@ -25931,6 +26378,7 @@
     </location>
     <location>
       <_name>Kzyl-Orda</_name>
+      <tz-hint>Asia/Qyzylorda</tz-hint>
       <code>UAOO</code>
       <coordinates>44-51N 065-30E</coordinates>
     </location>
@@ -25941,18 +26389,22 @@
     </location>
     <location>
       <_name>Uralsk</_name>
+      <tz-hint>Asia/Oral</tz-hint>
       <code>UARR</code>
       <coordinates>51-15N 051-17E</coordinates>
     </location>
   </country>
   <country>
     <_name>Malaysia</_name>
+    <iso-code>MY</iso-code>
+    <tz-hint>Asia/Kuala_Lumpur</tz-hint>
     <location>
       <_name>Alor Setar</_name>
       <code>WMKA</code>
     </location>
     <location>
       <_name>Bintulu</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBGB</code>
       <coordinates>03-12N 113-02E</coordinates>
     </location>
@@ -25968,6 +26420,7 @@
     </location>
     <location>
       <_name>Kota Kinabalu</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBKK</code>
       <coordinates>05-56N 116-03E</coordinates>
     </location>
@@ -25982,16 +26435,19 @@
     </location>
     <location>
       <_name>Kuching</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBGG</code>
       <coordinates>01-29N 110-20E</coordinates>
     </location>
     <location>
       <_name>Kudat</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBKT</code>
       <coordinates>06-55N 116-50E</coordinates>
     </location>
     <location>
       <_name>Labuan</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBKL</code>
       <coordinates>05-18N 115-15E</coordinates>
     </location>
@@ -26007,6 +26463,7 @@
     </location>
     <location>
       <_name>Miri</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBGR</code>
       <coordinates>04-20N 113-59E</coordinates>
     </location>
@@ -26017,6 +26474,7 @@
     </location>
     <location>
       <_name>Sandakan</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBKS</code>
       <coordinates>05-54N 118-04E</coordinates>
     </location>
@@ -26027,6 +26485,7 @@
     </location>
     <location>
       <_name>Sibu</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBGS</code>
       <coordinates>02-20N 111-50E</coordinates>
     </location>
@@ -26042,12 +26501,15 @@
     </location>
     <location>
       <_name>Tawau</_name>
+      <tz-hint>Asia/Kuching</tz-hint>
       <code>WBKW</code>
       <coordinates>04-16N 117-53E</coordinates>
     </location>
   </country>
   <country>
     <_name>Mongolia</_name>
+    <iso-code>MN</iso-code>
+    <tz-hint>Asia/Ulaanbaatar</tz-hint>
     <location>
       <_name>Ulan Bator</_name>
       <code>ZMUB</code>
@@ -26056,6 +26518,8 @@
   </country>
   <country>
     <_name>Myanmar</_name>
+    <iso-code>MM</iso-code>
+    <tz-hint>Asia/Rangoon</tz-hint>
     <location>
       <_name>Yangon</_name>
       <code>VYYY</code>
@@ -26064,6 +26528,8 @@
   </country>
   <country>
     <_name>Singapore</_name>
+    <iso-code>SG</iso-code>
+    <tz-hint>Asia/Singapore</tz-hint>
     <location>
       <_name>Singapore/Changi Airport</_name>
       <code>WSSS</code>
@@ -26077,6 +26543,8 @@
   </country>
   <country>
     <_name>Sri Lanka</_name>
+    <iso-code>LK</iso-code>
+    <tz-hint>Asia/Colombo</tz-hint>
     <location>
       <_name>Katunayake</_name>
       <code>VCBI</code>
@@ -26085,6 +26553,8 @@
   </country>
   <country>
     <_name>Tajikistan</_name>
+    <iso-code>TJ</iso-code>
+    <tz-hint>Asia/Dushanbe</tz-hint>
     <location>
       <_name>Dushanbe</_name>
       <code>UTDD</code>
@@ -26093,6 +26563,8 @@
   </country>
   <country>
     <_name>Thailand</_name>
+    <iso-code>TH</iso-code>
+    <tz-hint>Asia/Bangkok</tz-hint>
     <city>
       <!-- Translators: This is in Thailand. -->
       <_name>Bangkok</_name>
@@ -26231,6 +26703,8 @@
   </country>
   <country>
     <_name>Taiwan</_name>
+    <iso-code>TW</iso-code>
+    <tz-hint>Asia/Taipei</tz-hint>
     <location>
       <_name>Chiang Kai Shek</_name>
       <code>RCTP</code>
@@ -26249,6 +26723,8 @@
   </country>
   <country>
     <_name>Turkmenistan</_name>
+    <iso-code>TM</iso-code>
+    <tz-hint>Asia/Ashgabat</tz-hint>
     <location>
       <_name>Ashgabat</_name>
       <code>UTAA</code>
@@ -26257,6 +26733,8 @@
   </country>
   <country>
     <_name>Maldives</_name>
+    <iso-code>MV</iso-code>
+    <tz-hint>Indian/Maldives</tz-hint>
     <location>
       <_name>Male</_name>
       <code>VRMM</code>
@@ -26265,6 +26743,8 @@
   </country>
   <country>
     <_name>Azerbaijan</_name>
+    <iso-code>AZ</iso-code>
+    <tz-hint>Asia/Baku</tz-hint>
     <location>
       <_name>Baku</_name>
       <code>UBBB</code>
@@ -26278,6 +26758,8 @@
   </country>
   <country>
     <_name>Bangladesh</_name>
+    <iso-code>BD</iso-code>
+    <tz-hint>Asia/Dhaka</tz-hint>
     <location>
       <_name>Chittagong Patenga</_name>
       <code>VGEG</code>
@@ -26291,6 +26773,8 @@
   </country>
   <country>
     <_name>Brunei</_name>
+    <iso-code>BN</iso-code>
+    <tz-hint>Asia/Brunei</tz-hint>
     <location>
       <_name>Brunei</_name>
       <code>WBSB</code>
@@ -26299,6 +26783,8 @@
   </country>
   <country>
     <_name>Kyrgyzstan</_name>
+    <iso-code>KG</iso-code>
+    <tz-hint>Asia/Bishkek</tz-hint>
     <location>
       <_name>Bishkek</_name>
       <code>UAFM</code>
@@ -26307,6 +26793,8 @@
   </country>
   <country>
     <_name>Laos</_name>
+    <iso-code>LA</iso-code>
+    <tz-hint>Asia/Vientiane</tz-hint>
     <location>
       <_name>Vientiane</_name>
       <code>VLVT</code>
@@ -26315,6 +26803,8 @@
   </country>
   <country>
     <_name>Macau</_name>
+    <iso-code>MO</iso-code>
+    <tz-hint>Asia/Macau</tz-hint>
     <location>
       <_name>Taipa</_name>
       <code>VMMC</code>
@@ -26323,6 +26813,8 @@
   </country>
   <country>
     <_name>Uzbekistan</_name>
+    <iso-code>UZ</iso-code>
+    <tz-hint>Asia/Tashkent</tz-hint>
     <location>
       <_name>Nukus / Karakalpakstan</_name>
       <code>UTNN</code>
@@ -26335,6 +26827,7 @@
     </location>
     <location>
       <_name>Tashkent</_name>
+      <tz-hint>Asia/Tashkent</tz-hint>
       <code>UTTT</code>
       <coordinates>41-16N 069-16E</coordinates>
     </location>
@@ -26351,6 +26844,8 @@
   </country>
   <country>
     <_name>Cambodia</_name>
+    <iso-code>KH</iso-code>
+    <tz-hint>Asia/Phnom_Penh</tz-hint>
     <location>
       <_name>Phnom-Penh / Pochentong</_name>
       <code>VDPP</code>
@@ -26367,6 +26862,8 @@
   <_name>Central and South America</_name>
   <country>
     <_name>Aruba</_name>
+    <iso-code>AW</iso-code>
+    <tz-hint>America/Aruba</tz-hint>
     <location>
       <_name>Queen Beatrix Airport</_name>
       <code>TNCA</code>
@@ -26375,6 +26872,8 @@
   </country>
   <country>
     <_name>Bahamas</_name>
+    <iso-code>BS</iso-code>
+    <tz-hint>America/Nassau</tz-hint>
     <location>
       <_name>Freeport</_name>
       <code>MYGF</code>
@@ -26393,6 +26892,8 @@
   </country>
   <country>
     <_name>Belize</_name>
+    <iso-code>BZ</iso-code>
+    <tz-hint>America/Belize</tz-hint>
     <location>
       <_name>Belize</_name>
       <code>MZBZ</code>
@@ -26401,6 +26902,8 @@
   </country>
   <country>
     <_name>Bermuda</_name>
+    <iso-code>BM</iso-code>
+    <tz-hint>America/Bermuda</tz-hint>
     <location>
       <_name>Bermuda</_name>
       <code>TXKF</code>
@@ -26409,6 +26912,8 @@
   </country>
   <country>
     <_name>British Virgin Islands</_name>
+    <iso-code>VG</iso-code>
+    <tz-hint>America/Tortola</tz-hint>
     <location>
       <_name>Beef Island, Tortola</_name>
       <code>TUPJ</code>
@@ -26417,6 +26922,8 @@
   </country>
   <country>
     <_name>Cayman Islands</_name>
+    <iso-code>KY</iso-code>
+    <tz-hint>America/Cayman</tz-hint>
     <location>
       <_name>Cayman Brac</_name>
       <code>MWCB</code>
@@ -26430,6 +26937,8 @@
   </country>
   <country>
     <_name>Cuba</_name>
+    <iso-code>CU</iso-code>
+    <tz-hint>America/Havana</tz-hint>
     <location>
       <_name>Airport Jose MartÃ, Rancho-Boyeros, Habana</_name>
       <code>MUHA</code>
@@ -26514,6 +27023,8 @@
   </country>
   <country>
     <_name>Costa Rica</_name>
+    <iso-code>CR</iso-code>
+    <tz-hint>America/Costa_Rica</tz-hint>
     <location>
       <_name>Juan SantamarÃa</_name>
       <code>MROC</code>
@@ -26537,6 +27048,8 @@
   </country>
   <country>
     <_name>Dominican Republic</_name>
+    <iso-code>DO</iso-code>
+    <tz-hint>America/Santo_Domingo</tz-hint>
     <location>
       <_name>Herrera</_name>
       <code>MDHE</code>
@@ -26570,6 +27083,8 @@
   </country>
   <country>
     <_name>El Salvador</_name>
+    <iso-code>SV</iso-code>
+    <tz-hint>America/El_Salvador</tz-hint>
     <location>
       <_name>Acajutla</_name>
       <code>MSAC</code>
@@ -26598,6 +27113,8 @@
   </country>
   <country>
     <_name>French Polynesia</_name>
+    <iso-code>PF</iso-code>
+    <tz-hint>Pacific/Tahiti</tz-hint>
     <location>
       <_name>Tahiti-Faaa</_name>
       <code>NTAA</code>
@@ -26606,6 +27123,8 @@
   </country>
   <country>
     <_name>Grenada</_name>
+    <iso-code>GD</iso-code>
+    <tz-hint>America/Grenada</tz-hint>
     <location>
       <_name>Point Salines</_name>
       <code>TGPY</code>
@@ -26614,6 +27133,8 @@
   </country>
   <country>
     <_name>Guadeloupe</_name>
+    <iso-code>GP</iso-code>
+    <tz-hint>America/Guadeloupe</tz-hint>
     <location>
       <_name>Le Raizet, Guadeloupe</_name>
       <code>TFFR</code>
@@ -26622,6 +27143,8 @@
   </country>
   <country>
     <_name>Guatemala</_name>
+    <iso-code>GT</iso-code>
+    <tz-hint>America/Guatemala</tz-hint>
     <location>
       <_name>La Aurora Airport</_name>
       <code>MGGT</code>
@@ -26650,6 +27173,8 @@
   </country>
   <country>
     <_name>Guyana</_name>
+    <iso-code>GY</iso-code>
+    <tz-hint>America/Guyana</tz-hint>
     <location>
       <_name>Georgetown/Cheddi Jagan International Airport</_name>
       <code>SYCJ</code>
@@ -26658,6 +27183,8 @@
   </country>
   <country>
     <_name>Haiti</_name>
+    <iso-code>HT</iso-code>
+    <tz-hint>America/Port-au-Prince</tz-hint>
     <location>
       <_name>Cap-Haitien</_name>
       <code>MTCH</code>
@@ -26671,6 +27198,8 @@
   </country>
   <country>
     <_name>Honduras</_name>
+    <iso-code>HN</iso-code>
+    <tz-hint>America/Tegucigalpa</tz-hint>
     <location>
       <_name>Amapala</_name>
       <code>MHAM</code>
@@ -26748,6 +27277,8 @@
   </country>
   <country>
     <_name>Jamaica</_name>
+    <iso-code>JM</iso-code>
+    <tz-hint>America/Jamaica</tz-hint>
     <location>
       <_name>Kingston/Norman Manley</_name>
       <code>MKJP</code>
@@ -26766,6 +27297,8 @@
   </country>
   <country>
     <_name>Martinique</_name>
+    <iso-code>MQ</iso-code>
+    <tz-hint>America/Martinique</tz-hint>
     <location>
       <_name>Le Lamentin</_name>
       <code>TFFF</code>
@@ -26774,6 +27307,8 @@
   </country>
   <country>
     <_name>Netherlands Antilles</_name>
+    <iso-code>AN</iso-code>
+    <tz-hint>America/Curacao</tz-hint>
     <location>
       <_name>Bonaire</_name>
       <code>TNCB</code>
@@ -26797,6 +27332,8 @@
   </country>
   <country>
     <_name>Nicaragua</_name>
+    <iso-code>NI</iso-code>
+    <tz-hint>America/Managua</tz-hint>
     <location>
       <_name>Bluefields</_name>
       <code>MNBL</code>
@@ -26835,6 +27372,8 @@
   </country>
   <country>
     <_name>PanamÃ</_name>
+    <iso-code>PA</iso-code>
+    <tz-hint>America/Panama</tz-hint>
     <location>
       <_name>Bocas Del Toro International</_name>
       <code>MPBO</code>
@@ -26872,6 +27411,8 @@
   </country>
   <country>
     <_name>Saint Lucia</_name>
+    <iso-code>LC</iso-code>
+    <tz-hint>America/St_Lucia</tz-hint>
     <location>
       <_name>Hewanorra</_name>
       <code>TLPL</code>
@@ -26885,6 +27426,8 @@
   </country>
   <country>
     <_name>Saint Vincent and the Grenadines</_name>
+    <iso-code>VC</iso-code>
+    <tz-hint>America/St_Vincent</tz-hint>
     <location>
       <_name>Arnos Vale</_name>
       <code>TVSV</code>
@@ -26893,6 +27436,8 @@
   </country>
   <country>
     <_name>Trinidad and Tobago</_name>
+    <iso-code>TT</iso-code>
+    <tz-hint>America/Port_of_Spain</tz-hint>
     <location>
       <_name>Crown Pt./ Scarborou</_name>
       <code>TTCP</code>
@@ -26906,6 +27451,8 @@
   </country>
   <country>
     <_name>Turks and Caicos Islands</_name>
+    <iso-code>TC</iso-code>
+    <tz-hint>America/Grand_Turk</tz-hint>
     <location>
       <_name>Providenciales</_name>
       <code>MBPV</code>
@@ -26914,6 +27461,8 @@
   </country>
   <country>
     <_name>Bolivia</_name>
+    <iso-code>BO</iso-code>
+    <tz-hint>America/La_Paz</tz-hint>
     <location>
       <_name>AscensiÃn De Guarayos</_name>
       <code>SLAS</code>
@@ -27067,6 +27616,8 @@
   </country>
   <country>
     <_name>Chile</_name>
+    <iso-code>CL</iso-code>
+    <tz-hint>America/Santiago</tz-hint>
     <location>
       <_name>Antofagasta</_name>
       <code>SCFA</code>
@@ -27140,6 +27691,8 @@
   </country>
   <country>
     <_name>Colombia</_name>
+    <iso-code>CO</iso-code>
+    <tz-hint>America/Bogota</tz-hint>
     <location>
       <_name>Apartado/Los Cedros</_name>
       <code>SKLC</code>
@@ -27278,6 +27831,8 @@
   </country>
   <country>
     <_name>Ecuador</_name>
+    <iso-code>EC</iso-code>
+    <tz-hint>America/Guayaquil</tz-hint>
     <location>
       <_name>Guayaquil/SimÃn BolÃvar</_name>
       <code>SEGU</code>
@@ -27301,6 +27856,8 @@
   </country>
   <country>
     <_name>French Guiana</_name>
+    <iso-code>GF</iso-code>
+    <tz-hint>America/Cayenne</tz-hint>
     <location>
       <_name>Cayenne / Rochambeau</_name>
       <code>SOCA</code>
@@ -27309,6 +27866,8 @@
   </country>
   <country>
     <_name>Paraguay</_name>
+    <iso-code>PY</iso-code>
+    <tz-hint>America/Asuncion</tz-hint>
     <location>
       <_name>AsunciÃn</_name>
       <code>SGAS</code>
@@ -27322,6 +27881,8 @@
   </country>
   <country>
     <_name>Peru</_name>
+    <iso-code>PE</iso-code>
+    <tz-hint>America/Lima</tz-hint>
     <location>
       <_name>Andahuayla</_name>
       <code>SPHY</code>
@@ -27410,6 +27971,8 @@
   </country>
   <country>
     <_name>South Georgia and the Islands</_name>
+    <iso-code>GS</iso-code>
+    <tz-hint>Atlantic/South_Georgia</tz-hint>
     <location>
       <_name>Mount Pleasant</_name>
       <code>EGYP</code>
@@ -27418,6 +27981,8 @@
   </country>
   <country>
     <_name>Suriname</_name>
+    <iso-code>SR</iso-code>
+    <tz-hint>America/Paramaribo</tz-hint>
     <location>
       <_name>Johan A. Pengel</_name>
       <code>SMJP</code>
@@ -27426,6 +27991,8 @@
   </country>
   <country>
     <_name>Uruguay</_name>
+    <iso-code>UY</iso-code>
+    <tz-hint>America/Montevideo</tz-hint>
     <location>
       <_name>Artigas</_name>
       <code>SUAG</code>
@@ -27484,6 +28051,8 @@
   </country>
   <country>
     <_name>Venezuela</_name>
+    <iso-code>VE</iso-code>
+    <tz-hint>America/Caracus</tz-hint>
     <location>
       <_name>Acarigua</_name>
       <code>SVAC</code>
@@ -27662,6 +28231,8 @@
   </country>
   <country>
     <_name>Argentina</_name>
+    <iso-code>AR</iso-code>
+    <tz-hint>America/Argentina/Buenos_Aires</tz-hint>
     <location>
       <_name>Aeroparque</_name>
       <code>SABE</code>
@@ -27900,6 +28471,8 @@
   </country>
   <country>
     <_name>Brazil</_name>
+    <iso-code>BR</iso-code>
+    <tz-hint>America/Sao_Paulo</tz-hint>
     <location>
       <_name>BagÃ</_name>
       <code>SBBG</code>
@@ -27907,6 +28480,7 @@
     </location>
     <location>
       <_name>BelÃm</_name>
+      <tz-hint>America/Belem</tz-hint>
       <code>SBBE</code>
       <coordinates>01-23S 048-29W</coordinates>
     </location>
@@ -27920,6 +28494,7 @@
     </city>
     <location>
       <_name>Boa Vista</_name>
+      <tz-hint>America/Boa_Vista</tz-hint>
       <code>SBBV</code>
       <coordinates>02-50N 060-42W</coordinates>
     </location>
@@ -27935,6 +28510,7 @@
     </location>
     <location>
       <_name>Campo Grande</_name>
+      <tz-hint>America/Campo_Grande</tz-hint>
       <code>SBCG</code>
       <coordinates>20-28S 054-40W</coordinates>
     </location>
@@ -27950,6 +28526,7 @@
     </location>
     <location>
       <_name>CuiabÃ</_name>
+      <tz-hint>America/Cuiaba</tz-hint>
       <code>SBCY</code>
       <coordinates>15-39S 056-06W</coordinates>
     </location>
@@ -27978,6 +28555,7 @@
     </location>
     <location>
       <_name>Fortaleza</_name>
+      <tz-hint>America/Fortaleza</tz-hint>
       <code>SBFZ</code>
       <coordinates>03-47S 038-32W</coordinates>
     </location>
@@ -28008,6 +28586,7 @@
     </location>
     <location>
       <_name>MaceiÃ</_name>
+      <tz-hint>America/Maceio</tz-hint>
       <code>SBMO</code>
       <coordinates>09-31S 035-47W</coordinates>
     </location>
@@ -28015,6 +28594,7 @@
       <_name>Manaus</_name>
       <location>
         <_name>Eduardo Gomes International Airport</_name>
+	<tz-hint>America/Manaus</tz-hint>
         <code>SBEG</code>
         <coordinates>03-02S 060-03W</coordinates>
       </location>
@@ -28054,11 +28634,13 @@
     </city>
     <location>
       <_name>Porto Velho</_name>
+      <tz-hint>America/Porto_Velho</tz-hint>
       <code>SBPV</code>
       <coordinates>08-46S 063-55W</coordinates>
     </location>
     <location>
       <_name>Recife</_name>
+      <tz-hint>America/Recife</tz-hint>
       <code>SBRF</code>
       <coordinates>08-04S 034-51W</coordinates>
     </location>
@@ -28069,6 +28651,7 @@
     </location>
     <location>
       <_name>Rio Branco</_name>
+      <tz-hint>America/Rio_Branco</tz-hint>
       <code>SBRB</code>
       <coordinates>10-00S 067-48W</coordinates>
     </location>
@@ -28109,6 +28692,7 @@
       <_name>SÃo Paulo</_name>
       <location>
         <_name>Congonhas Airport</_name>
+	<tz-hint>America/Sao_Paulo</tz-hint>
         <code>SBSP</code>
         <coordinates>23-37S 046-39W</coordinates>
       </location>
@@ -28144,6 +28728,8 @@
   <_name>Atlantic</_name>
   <country>
     <_name>Antigua and Barbuda</_name>
+    <iso-code>AG</iso-code>
+    <tz-hint>America/Antigua</tz-hint>
     <location>
       <_name>Antigua</_name>
       <code>TAPA</code>
@@ -28157,6 +28743,8 @@
   </country>
   <country>
     <_name>Dominica</_name>
+    <iso-code>DM</iso-code>
+    <tz-hint>America/Dominica</tz-hint>
     <location>
       <_name>Canefield</_name>
       <code>TDCF</code>
@@ -28170,6 +28758,8 @@
   </country>
   <country>
     <_name>Greenland</_name>
+    <iso-code>GL</iso-code>
+    <tz-hint>America/Godthab</tz-hint>
     <location>
       <_name>Constable Pynt</_name>
       <code>BGCO</code>
@@ -28202,12 +28792,15 @@
     </location>
     <location>
       <_name>Thule A. B.</_name>
+      <tz-hint>America/Thule</tz-hint>
       <code>BGTL</code>
       <coordinates>76-32N 068-45W</coordinates>
     </location>
   </country>
   <country>
     <_name>Puerto Rico</_name>
+    <iso-code>PR</iso-code>
+    <tz-hint>America/Puerto_Rico</tz-hint>
       <location>
         <_name>Aquadilla</_name>
         <code>TJBQ</code>
@@ -28241,6 +28834,8 @@
   </country>
   <country>
     <_name>Saint Helena</_name>
+    <iso-code>SH</iso-code>
+    <tz-hint>Atlanta/Saint_Helena</tz-hint>
     <location>
       <_name>Wide Awake Field Ascension Island</_name>
       <code>FHAW</code>
@@ -28249,6 +28844,8 @@
   </country>
   <country>
     <_name>Virgin Islands</_name>
+    <iso-code>VI</iso-code>
+    <tz-hint>America/St_Thomas</tz-hint>
     <location>
       <_name>Charlotte Amalie St. Thomas</_name>
       <code>TIST</code>
@@ -28262,6 +28859,8 @@
   </country>
   <country>
     <_name>Barbados</_name>
+    <iso-code>BB</iso-code>
+    <tz-hint>America/Barbados</tz-hint>
     <location>
       <_name>Grantley Adams</_name>
       <code>TBPB</code>
@@ -28270,6 +28869,8 @@
   </country>
   <country>
     <_name>Saint Kitts and Nevis</_name>
+    <iso-code>KN</iso-code>
+    <tz-hint>America/St_Kitts</tz-hint>
     <location>
       <_name>Golden Rock</_name>
       <code>TKPK</code>
@@ -28281,18 +28882,22 @@
   <_name>Antarctica</_name>
   <country>
     <_name>Antarctica</_name>
+    <iso-code>AQ</iso-code>
     <location>
       <_name>Amundsen-Scott South Pole Station</_name>
+      <tz-hint>Antarctica/South_Pole</tz-hint>
       <code>NZSP</code>
       <coordinates>90-00S 00-00</coordinates>
     </location>
     <location>
       <_name>Ice Runway</_name>
+      <tz-hint>Antarctica/McMurdo</tz-hint>
       <code>NZIR</code>
       <coordinates>77-52S 166-32E</coordinates>
     </location>
     <location>
       <_name>Williams Field</_name>
+      <tz-hint>Antarctica/McMurdo</tz-hint>
       <code>NZCM</code>
       <coordinates>77-52S 166-58E</coordinates>
     </location>

Modified: trunk/data/locations.dtd
==============================================================================
--- trunk/data/locations.dtd	(original)
+++ trunk/data/locations.dtd	Mon Apr  7 10:40:38 2008
@@ -5,15 +5,17 @@
 <!ENTITY % name '(_name|name+)' >
 
 <!ELEMENT region (%name;, country+) >
-<!ELEMENT country (%name;, (location|state|city)+) >
-<!ELEMENT state (%name;, (location|city)+) >
+<!ELEMENT country (%name;, iso-code, tz-hint?, (location|state|city)+) >
+<!ELEMENT state (%name;, tz-hint?, (location|city)+) >
 <!ELEMENT city (%name;, zone?, radar?, location+) >
-<!ELEMENT location (%name;, code, zone?, radar?, coordinates?) >
+<!ELEMENT location (%name;, iso-code?, tz-hint?, code, zone?, radar?, coordinates?) >
 
 <!ELEMENT _name (#PCDATA) >
 <!ELEMENT name (#PCDATA) >
 <!ATTLIST name
   xml:lang CDATA #IMPLIED >
+<!ELEMENT iso-code (#PCDATA) >
+<!ELEMENT tz-hint (#PCDATA) >
 <!ELEMENT code (#PCDATA) >
 <!ELEMENT zone (#PCDATA) >
 <!ELEMENT radar (#PCDATA) >

Modified: trunk/libgweather/gweather-gconf.c
==============================================================================
--- trunk/libgweather/gweather-gconf.c	(original)
+++ trunk/libgweather/gweather-gconf.c	Mon Apr  7 10:40:38 2008
@@ -248,7 +248,8 @@
 	    coordinates = g_strdup ("40-32N 080-13W");
     }
     
-    location = weather_location_new (name, code, zone, radar, coordinates);
+    location = weather_location_new (name, code, zone, radar, coordinates,
+				     NULL, NULL);
     
     g_free (name);
     g_free (code);

Modified: trunk/libgweather/gweather-xml.c
==============================================================================
--- trunk/libgweather/gweather-xml.c	(original)
+++ trunk/libgweather/gweather-xml.c	Mon Apr  7 10:40:38 2008
@@ -31,6 +31,8 @@
  *  <name xml:lang="zz">Another Translated Name</name>
  *  <country>
  *   <name>Name of the country</name>
+ *   <iso-code>2-letter ISO 3166 code for the country</iso-code>
+ *   <tz-hint>default timezone</tz-hint>
  *   <location>
  *    <name>Name of the location</name>
  *    <code>IWIN code</code>
@@ -57,6 +59,9 @@
  *
  * The thing to note is that each country can either contain different locations
  * or be split into "states" which in turn contain a list of locations.
+ *
+ * <iso-code> can appear at the country or location level. <tz-hint>
+ * can appear at country, state, or location.
  */
 
 #include <string.h>
@@ -191,9 +196,11 @@
 gweather_xml_parse_node (xmlTextReaderPtr xml,
 			 GtkTreeStore *store, GtkTreeIter *parent,
                          const char *dflt_radar, const char *dflt_zone,
-			 const char *cityname)
+                         const char *dflt_country_code,
+			 const char *dflt_tz_hint, const char *cityname)
 {
   char *name, *code, *zone, *radar, *coordinates;
+  char *country_code, *tz_hint;
   char **city, *nocity = NULL;
   GtkTreeIter iter, *self;
   gboolean is_location;
@@ -229,6 +236,9 @@
   code = NULL;
   name = NULL;
 
+  country_code = dflt_country_code ? (char *) xmlStrdup( (xmlChar *) dflt_country_code ) : NULL;
+  tz_hint = dflt_tz_hint ? (char *) xmlStrdup( (xmlChar *) dflt_tz_hint ) : NULL;
+
   /* absorb the start tag */
   if( xmlTextReaderRead( xml ) != 1 )
     goto error_out;
@@ -254,7 +264,9 @@
         !strcmp( tagname, "location" ) )
     {
       /* recursively handle sub-sections */
-      if( !gweather_xml_parse_node( xml, store, self, radar, zone, *city ) )
+      if( !gweather_xml_parse_node( xml, store, self, 
+				    radar, zone, country_code, tz_hint,
+				    *city ) )
         goto error_out;
     }
     else if ( !strcmp( tagname, "name" ) )
@@ -263,6 +275,18 @@
       if( (name = gweather_xml_parse_name( xml )) == NULL )
         goto error_out;
     }
+    else if ( !strcmp( tagname, "iso-code" ) )
+    {
+      xmlFree( country_code );
+      if( (country_code = gweather_xml_get_value( xml )) == NULL )
+        goto error_out;
+    }
+    else if ( !strcmp( tagname, "tz-hint" ) )
+    {
+      xmlFree( tz_hint );
+      if( (tz_hint = gweather_xml_get_value( xml )) == NULL )
+        goto error_out;
+    }
     else if ( !strcmp( tagname, "code" ) )
     {
       xmlFree( code );
@@ -322,7 +346,8 @@
       dflt_zone = zone;
 
     new_loc =  weather_location_new( cityname, code, dflt_zone,
-                                     dflt_radar, coordinates);
+                                     dflt_radar, coordinates,
+				     country_code, tz_hint );
 
     gtk_tree_store_set( store, &iter, GWEATHER_XML_COL_POINTER, new_loc, -1 );
   }
@@ -335,6 +360,8 @@
   xmlFree( zone );
   xmlFree( radar );
   xmlFree( coordinates );
+  xmlFree( country_code );
+  xmlFree( tz_hint );
 
   return ret;
 }
@@ -378,7 +405,7 @@
 
   store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
 
-  if (!gweather_xml_parse_node( xml, store, NULL, NULL, NULL, NULL ))
+  if (!gweather_xml_parse_node( xml, store, NULL, NULL, NULL, NULL, NULL, NULL ))
   {
     g_object_unref( store );
     store = NULL;

Modified: trunk/libgweather/weather.c
==============================================================================
--- trunk/libgweather/weather.c	(original)
+++ trunk/libgweather/weather.c	Mon Apr  7 10:40:38 2008
@@ -85,7 +85,9 @@
 
 WeatherLocation *weather_location_new (const gchar *name, const gchar *code,
 				       const gchar *zone, const gchar *radar,
-                                       const gchar *coordinates)
+                                       const gchar *coordinates,
+				       const gchar *country_code,
+				       const gchar *tz_hint)
 {
     WeatherLocation *location;
 
@@ -138,6 +140,9 @@
     }
 
     location->latlon_valid = (location->latitude < DBL_MAX && location->longitude < DBL_MAX);
+
+    location->country_code = g_strdup (country_code);
+    location->tz_hint = g_strdup (tz_hint);
     
     return location;
 }
@@ -148,7 +153,8 @@
 
     clone = weather_location_new (location->name,
 				  location->code, location->zone,
-				  location->radar, location->coordinates);
+				  location->radar, location->coordinates,
+				  location->country_code, location->tz_hint);
     clone->latitude = location->latitude;
     clone->longitude = location->longitude;
     clone->latlon_valid = location->latlon_valid;
@@ -163,6 +169,8 @@
         g_free (location->zone);
         g_free (location->radar);
         g_free (location->coordinates);
+        g_free (location->country_code);
+        g_free (location->tz_hint);
     
         g_free (location);
     }

Modified: trunk/libgweather/weather.h
==============================================================================
--- trunk/libgweather/weather.h	(original)
+++ trunk/libgweather/weather.h	Mon Apr  7 10:40:38 2008
@@ -39,6 +39,8 @@
     gdouble  latitude;
     gdouble  longitude;
     gboolean latlon_valid;
+    gchar *country_code;
+    gchar *tz_hint;
 };
 
 typedef struct _WeatherLocation WeatherLocation;
@@ -47,7 +49,9 @@
 						 const gchar *code,
 						 const gchar *zone,
 						 const gchar *radar,
-						 const gchar *coordinates);
+						 const gchar *coordinates,
+						 const gchar *country_code,
+						 const gchar *tz_hint);
 WeatherLocation *	weather_location_clone	(const WeatherLocation *location);
 void			weather_location_free	(WeatherLocation *location);
 gboolean		weather_location_equal	(const WeatherLocation *location1,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]