Index: configure.in
===================================================================
--- configure.in	(revision 312)
+++ configure.in	(working copy)
@@ -23,7 +23,7 @@
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.40.3])
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PROG_CC
Index: data/Locations.xml.in
===================================================================
--- data/Locations.xml.in	(revision 312)
+++ data/Locations.xml.in	(working copy)
@@ -862,7 +862,7 @@
     </country>
     <country>
       <!-- DJ - Djibouti -->
-      <_name>Djibouti</_name>
+      <_name msgctxt="(Country)">Djibouti</_name>
       <iso-code>DJ</iso-code>
       <fips-code>DJ</fips-code>
       <timezones>
@@ -881,7 +881,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Djibouti -->
-        <_name>Djibouti</_name>
+        <_name msgctxt="Djibouti">Djibouti</_name>
         <coordinates>11.595000 43.148056</coordinates>
         <location>
           <name>Djibouti / Ambouli</name>
@@ -938,7 +938,7 @@
              "Alexandria" is the traditional English name.
              The local name in Arabic is "Al Iskandariyah".
           -->
-        <_name>Alexandria</_name>
+        <_name msgctxt="Egypt">Alexandria</_name>
         <coordinates>31.198056 29.919167</coordinates>
         <location>
           <_name>Nouzha Airport</_name>
@@ -976,7 +976,7 @@
              "Cairo" is the traditional English name.
              The local name in Arabic is "Al Qahirah".
           -->
-        <_name>Cairo</_name>
+        <_name msgctxt="Egypt">Cairo</_name>
         <coordinates>30.050000 31.250000</coordinates>
         <location>
           <name>Cairo Airport</name>
@@ -1284,7 +1284,7 @@
     </country>
     <country>
       <!-- LR - Liberia -->
-      <_name>Liberia</_name>
+      <_name msgctxt="(Country)">Liberia</_name>
       <!-- Could not find weather stations for the following major
            cities:
            Monrovia
@@ -1992,7 +1992,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Réunion -->
-        <_name>Saint-Pierre</_name>
+        <_name msgctxt="Réunion">Saint-Pierre</_name>
         <coordinates>-21.316667 55.483333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -2099,7 +2099,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of the Seychelles -->
-        <_name>Victoria</_name>
+        <_name msgctxt="Seychelles">Victoria</_name>
         <coordinates>-4.616667 55.450000</coordinates>
         <location>
           <name>Seychelles International Airport</name>
@@ -2854,10 +2854,10 @@
     </country>
   </region>
   <region>
-    <_name>Antarctica</_name>
+    <_name msgctxt="(Region)">Antarctica</_name>
     <country>
       <!-- AQ - Antarctica -->
-      <_name>Antarctica</_name>
+      <_name msgctxt="(Country)">Antarctica</_name>
       <iso-code>AQ</iso-code>
       <fips-code>AY</fips-code>
       <timezones>
@@ -3199,11 +3199,11 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in China -->
-        <_name>Beijing</_name>
+        <_name msgctxt="China">Beijing</_name>
         <fips-code>CH22</fips-code>
         <city>
           <!-- Translators: this is the capital of China -->
-          <_name>Beijing</_name>
+          <_name msgctxt="China, Beijing">Beijing</_name>
           <coordinates>39.928889 116.388333</coordinates>
           <location>
             <name>Beijing</name>
@@ -3214,13 +3214,13 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in China -->
-        <_name>Chongqing</_name>
+        <_name msgctxt="China">Chongqing</_name>
         <fips-code>CH33</fips-code>
         <city>
           <!-- Translators: this is a city in Chongqing in China.
                The name is also written "重庆".
             -->
-          <_name>Chongqing</_name>
+          <_name msgctxt="China, Chongqing">Chongqing</_name>
           <coordinates>29.562778 106.552778</coordinates>
           <location>
             <name>Chongqing</name>
@@ -3539,13 +3539,13 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in China -->
-        <_name>Shanghai</_name>
+        <_name msgctxt="China">Shanghai</_name>
         <fips-code>CH23</fips-code>
         <city>
           <!-- Translators: this is a city in Shanghai in China.
                The name is also written "上海".
             -->
-          <_name>Shanghai</_name>
+          <_name msgctxt="China, Shanghai">Shanghai</_name>
           <coordinates>31.222222 121.458056</coordinates>
           <location>
             <_name>Hongqiao Airport</_name>
@@ -3595,13 +3595,13 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in China -->
-        <_name>Tianjin</_name>
+        <_name msgctxt="China">Tianjin</_name>
         <fips-code>CH28</fips-code>
         <city>
           <!-- Translators: this is a city in Tianjin in China.
                The name is also written "天津".
             -->
-          <_name>Tianjin</_name>
+          <_name msgctxt="China, Tianjin">Tianjin</_name>
           <coordinates>39.142222 117.176667</coordinates>
           <location>
             <name>Zhangguizhu Airport</name>
@@ -3674,7 +3674,7 @@
     </country>
     <country>
       <!-- GE - Georgia (the country, not the US state) -->
-      <_name>Georgia</_name>
+      <_name msgctxt="(Country)">Georgia</_name>
       <!-- Could not find weather stations for the following major
            cities:
            Tbilisi
@@ -3901,7 +3901,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in India -->
-        <_name>Santa Cruz</_name>
+        <_name msgctxt="India">Santa Cruz</_name>
         <coordinates>19.083333 72.833333</coordinates>
         <location>
           <name>Bombay / Santa Cruz</name>
@@ -5046,7 +5046,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Malaysia -->
-        <_name>George Town</_name>
+        <_name msgctxt="Malaysia">George Town</_name>
         <coordinates>5.416667 100.333333</coordinates>
         <location>
           <name>Bayan Lepas Airport</name>
@@ -5216,7 +5216,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Malaysia -->
-        <_name>Victoria</_name>
+        <_name msgctxt="Malaysia">Victoria</_name>
         <coordinates>5.276667 115.241667</coordinates>
         <location>
           <name>Victoria</name>
@@ -5500,7 +5500,7 @@
     </country>
     <country>
       <!-- SG - Singapore -->
-      <_name>Singapore</_name>
+      <_name msgctxt="(Country)">Singapore</_name>
       <!-- Could not find information about the following stations,
            which may be in Singapore:
            WSSL 
@@ -5513,7 +5513,7 @@
       <tz-hint>Asia/Singapore</tz-hint>
       <city>
         <!-- Translators: this is the capital of Singapore -->
-        <_name>Singapore</_name>
+        <_name msgctxt="Singapore">Singapore</_name>
         <coordinates>1.293056 103.855833</coordinates>
         <location>
           <_name>Paya Lebar Airport</_name>
@@ -6130,7 +6130,7 @@
   </region>
   <region>
     <!-- FIXME: rename this to Atlantic Ocean -->
-    <_name>Atlantic</_name>
+    <_name msgctxt="(Region)">Atlantic</_name>
     <country>
       <!-- AI - Anguilla, a British territory in the Caribbean -->
       <_name>Anguilla</_name>
@@ -6172,7 +6172,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Antigua and Barbuda -->
-        <_name>Saint John's</_name>
+        <_name msgctxt="Antigua and Barbuda">Saint John's</_name>
         <coordinates>17.116667 -61.850000</coordinates>
         <location>
           <name>V. C. Bird International Airport, Antigua</name>
@@ -6224,7 +6224,7 @@
       <tz-hint>Atlantic/Bermuda</tz-hint>
       <city>
         <!-- Translators: this is the capital of Bermuda -->
-        <_name>Hamilton</_name>
+        <_name msgctxt="Bermuda">Hamilton</_name>
         <coordinates>32.294167 -64.783889</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6234,7 +6234,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Bermuda -->
-        <_name>Saint George</_name>
+        <_name msgctxt="Bermuda">Saint George</_name>
         <coordinates>32.381667 -64.678056</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6266,7 +6266,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Dominica -->
-        <_name>Roseau</_name>
+        <_name msgctxt="Dominica">Roseau</_name>
         <coordinates>15.300000 -61.400000</coordinates>
         <location>
           <name>Canefield Airport</name>
@@ -6489,7 +6489,7 @@
       <tz-hint>Atlantic/St_Helena</tz-hint>
       <city>
         <!-- Translators: this is a city in Saint Helena -->
-        <_name>Georgetown</_name>
+        <_name msgctxt="Saint Helena">Georgetown</_name>
         <coordinates>-7.933333 -14.416667</coordinates>
         <location>
           <name>Wide Awake Field Ascension Island</name>
@@ -6539,7 +6539,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Saint Kitts and Nevis -->
-        <_name>Newcastle</_name>
+        <_name msgctxt="Saint Kitts and Nevis">Newcastle</_name>
         <coordinates>17.200000 -62.583333</coordinates>
         <location>
           <name>Charlestown / Newcastle</name>
@@ -6767,7 +6767,7 @@
           <!-- Translators: this is a city in New South Wales in
                Australia
             -->
-          <_name>Richmond</_name>
+          <_name msgctxt="Australia, New South Wales">Richmond</_name>
           <coordinates>-33.600000 150.766667</coordinates>
           <location>
             <name>Richmond Air Force Base</name>
@@ -6779,7 +6779,7 @@
           <!-- Translators: this is a city in New South Wales in
                Australia
             -->
-          <_name>Sydney</_name>
+          <_name msgctxt="Australia, New South Wales">Sydney</_name>
           <coordinates>-33.883333 151.216667</coordinates>
           <location>
             <name>Sydney Airport</name>
@@ -6958,7 +6958,7 @@
         <tz-hint>Australia/Hobart</tz-hint>
         <city>
           <!-- Translators: this is a city in Tasmania in Australia -->
-          <_name>Hobart</_name>
+          <_name msgctxt="Australia, Tasmania">Hobart</_name>
           <coordinates>-42.916667 147.333333</coordinates>
           <location>
             <name>Hobart Airport</name>
@@ -6982,7 +6982,7 @@
         <!-- Translators: this is a state/province/territory in
              Australia
           -->
-        <_name>Victoria</_name>
+        <_name msgctxt="Australia">Victoria</_name>
         <fips-code>AS07</fips-code>
         <tz-hint>Australia/Melbourne</tz-hint>
         <city>
@@ -6997,7 +6997,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Victoria in Australia -->
-          <_name>Melbourne</_name>
+          <_name msgctxt="Australia, Victoria">Melbourne</_name>
           <coordinates>-37.816667 144.966667</coordinates>
           <location>
             <name>Melbourne Airport</name>
@@ -7442,7 +7442,7 @@
       <tz-hint>Pacific/Tarawa</tz-hint>
       <city>
         <!-- Translators: this is a city in Kiribati -->
-        <_name>London</_name>
+        <_name msgctxt="Kiribati">London</_name>
         <coordinates>1.983333 -157.466667</coordinates>
         <location>
           <name>Christmas, Cassidy Airport</name>
@@ -7654,7 +7654,7 @@
       <tz-hint>Pacific/Norfolk</tz-hint>
       <city>
         <!-- Translators: this is a city in Norfolk Island -->
-        <_name>Kingston</_name>
+        <_name msgctxt="Norfolk Island">Kingston</_name>
         <coordinates>-29.050000 167.950000</coordinates>
         <location>
           <name>Norfolk Island Airport</name>
@@ -8038,7 +8038,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Argentina -->
-        <_name>Córdoba</_name>
+        <_name msgctxt="Argentina">Córdoba</_name>
         <coordinates>-31.400000 -64.183333</coordinates>
         <location>
           <name>Córdoba Airport</name>
@@ -8198,7 +8198,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Argentina -->
-        <_name>San Fernando</_name>
+        <_name msgctxt="Argentina">San Fernando</_name>
         <coordinates>-34.444167 -58.577500</coordinates>
         <location>
           <name>San Fernando</name>
@@ -8280,7 +8280,7 @@
       <tz-hint>America/Nassau</tz-hint>
       <city>
         <!-- Translators: this is a city in Bahamas -->
-        <_name>Freeport</_name>
+        <_name msgctxt="Bahamas">Freeport</_name>
         <coordinates>26.533333 -78.700000</coordinates>
         <location>
           <name>Freeport, Grand Bahama</name>
@@ -8290,7 +8290,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Bahamas -->
-        <_name>Georgetown</_name>
+        <_name msgctxt="Bahamas">Georgetown</_name>
         <coordinates>23.500000 -75.766667</coordinates>
         <location>
           <name>Georgetown, Exuma</name>
@@ -8374,7 +8374,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Bolivia -->
-        <_name>Concepción</_name>
+        <_name msgctxt="Bolivia">Concepción</_name>
         <coordinates>-16.133333 -62.033333</coordinates>
         <location>
           <name>Concepción</name>
@@ -8384,7 +8384,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Bolivia -->
-        <_name>La Paz</_name>
+        <_name msgctxt="Bolivia">La Paz</_name>
         <coordinates>-16.500000 -68.150000</coordinates>
         <location>
           <name>Alto Airport</name>
@@ -8526,7 +8526,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Bolivia -->
-        <_name>Santa Cruz</_name>
+        <_name msgctxt="Bolivia">Santa Cruz</_name>
         <coordinates>-17.800000 -63.166667</coordinates>
         <location>
           <name>El Trompillo Airport</name>
@@ -8556,7 +8556,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Bolivia -->
-        <_name>Trinidad</_name>
+        <_name msgctxt="Bolivia">Trinidad</_name>
         <coordinates>-14.833333 -64.900000</coordinates>
         <location>
           <name>Trinidad</name>
@@ -8969,7 +8969,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Distrito Federal</_name>
+        <_name msgctxt="Brazil">Distrito Federal</_name>
         <fips-code>BR07</fips-code>
         <city>
           <!-- Translators: this is the capital of Brazil -->
@@ -9483,7 +9483,7 @@
           <!-- Translators: this is a city in Rio Grande do Norte in
                Brazil
             -->
-          <_name>Natal</_name>
+          <_name msgctxt="Brazil, Rio Grande do Norte">Natal</_name>
           <coordinates>-5.783333 -35.216667</coordinates>
           <location>
             <name>Natal Airport</name>
@@ -9532,7 +9532,7 @@
           <!-- Translators: this is a city in Rio Grande do Sul in
                Brazil
             -->
-          <_name>Santa Maria</_name>
+          <_name msgctxt="Brazil, Rio Grande do Sul">Santa Maria</_name>
           <coordinates>-29.683333 -53.800000</coordinates>
           <location>
             <name>Santa Maria Airport</name>
@@ -9556,7 +9556,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Rio de Janeiro</_name>
+        <_name msgctxt="Brazil">Rio de Janeiro</_name>
         <fips-code>BR21</fips-code>
         <city>
           <!-- Translators: this is a city in Rio de Janeiro in Brazil -->
@@ -9570,7 +9570,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Rio de Janeiro in Brazil -->
-          <_name>Rio de Janeiro</_name>
+          <_name msgctxt="Brazil, Rio de Janeiro">Rio de Janeiro</_name>
           <coordinates>-22.900000 -43.233333</coordinates>
           <location>
             <_name>Rio de Janeiro Airport</_name>
@@ -9688,7 +9688,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>São Paulo</_name>
+        <_name msgctxt="Brazil">São Paulo</_name>
         <fips-code>BR27</fips-code>
         <city>
           <!-- Translators: this is a city in São Paulo in Brazil -->
@@ -9786,7 +9786,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in São Paulo in Brazil -->
-          <_name>São Paulo</_name>
+          <_name msgctxt="Brazil, São Paulo">São Paulo</_name>
           <coordinates>-23.533333 -46.616667</coordinates>
           <location>
             <_name>Marte Airport</_name>
@@ -9852,7 +9852,7 @@
       <tz-hint>America/Cayman</tz-hint>
       <city>
         <!-- Translators: this is the capital of the Cayman Islands -->
-        <_name>George Town</_name>
+        <_name msgctxt="Cayman Islands">George Town</_name>
         <coordinates>19.300000 -81.383333</coordinates>
         <location>
           <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9934,7 +9934,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Chile -->
-        <_name>Concepción</_name>
+        <_name msgctxt="Chile">Concepción</_name>
         <coordinates>-36.833333 -73.050000</coordinates>
         <location>
           <name>Concepción</name>
@@ -10004,7 +10004,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Chile -->
-        <_name>Santiago</_name>
+        <_name msgctxt="Chile">Santiago</_name>
         <coordinates>-33.450000 -70.666667</coordinates>
         <location>
           <name>Pudahuel</name>
@@ -10154,7 +10154,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Costa Rica -->
-        <_name>Liberia</_name>
+        <_name msgctxt="Costa Rica">Liberia</_name>
         <coordinates>10.633333 -85.433333</coordinates>
         <location>
           <name>Liberia</name>
@@ -10260,7 +10260,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Cuba -->
-        <_name>Manzanillo</_name>
+        <_name msgctxt="Cuba">Manzanillo</_name>
         <coordinates>20.343333 -77.116667</coordinates>
         <location>
           <name>Manzanillo</name>
@@ -10374,7 +10374,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in the Dominican Republic -->
-        <_name>Santiago</_name>
+        <_name msgctxt="Dominican Republic">Santiago</_name>
         <coordinates>19.450000 -70.700000</coordinates>
         <location>
           <name>Santiago</name>
@@ -10517,7 +10517,7 @@
         <!-- Translators: this is the capital of the Falkland Islands
              (Malvinas)
           -->
-        <_name>Stanley</_name>
+        <_name msgctxt="Falkland Islands (Malvinas)">Stanley</_name>
         <coordinates>-51.700000 -57.850000</coordinates>
         <location>
           <name>Mount Pleasant Airport</name>
@@ -10612,7 +10612,7 @@
     </country>
     <country>
       <!-- GT - Guatemala -->
-      <_name>Guatemala</_name>
+      <_name msgctxt="(Country)">Guatemala</_name>
       <iso-code>GT</iso-code>
       <fips-code>GT</fips-code>
       <timezones>
@@ -10621,7 +10621,7 @@
       <tz-hint>America/Guatemala</tz-hint>
       <city>
         <!-- Translators: this is the capital of Guatemala -->
-        <_name>Guatemala</_name>
+        <_name msgctxt="Guatemala">Guatemala</_name>
         <coordinates>14.621111 -90.526944</coordinates>
         <location>
           <name>Guatemala Aurora Airport</name>
@@ -10691,7 +10691,7 @@
       <tz-hint>America/Guyana</tz-hint>
       <city>
         <!-- Translators: this is the capital of Guyana -->
-        <_name>Georgetown</_name>
+        <_name msgctxt="Guyana">Georgetown</_name>
         <coordinates>6.800000 -58.166667</coordinates>
         <location>
           <name>Cheddi Jagan International Airport</name>
@@ -10879,7 +10879,7 @@
       <tz-hint>America/Jamaica</tz-hint>
       <city>
         <!-- Translators: this is the capital of Jamaica -->
-        <_name>Kingston</_name>
+        <_name msgctxt="Jamaica">Kingston</_name>
         <coordinates>18.000000 -76.800000</coordinates>
         <location>
           <name>Norman Manley Airport</name>
@@ -11161,7 +11161,7 @@
     </country>
     <country>
       <!-- PE - Peru -->
-      <_name>Peru</_name>
+      <_name msgctxt="(Country)">Peru</_name>
       <!-- Could not find information about the following stations,
            which may be in Peru:
            SPLO 
@@ -11264,7 +11264,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Peru -->
-        <_name>Lima</_name>
+        <_name msgctxt="Peru">Lima</_name>
         <coordinates>-12.050000 -77.050000</coordinates>
         <location>
           <name>Lima-Callao, Jorge Chavez International Airport</name>
@@ -11613,7 +11613,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of Uruguay -->
-        <_name>Montevideo</_name>
+        <_name msgctxt="Uruguay">Montevideo</_name>
         <coordinates>-34.858056 -56.170833</coordinates>
         <location>
           <name>Melilla</name>
@@ -11643,7 +11643,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Venezuela -->
-        <_name>Barcelona</_name>
+        <_name msgctxt="Venezuela">Barcelona</_name>
         <coordinates>10.133333 -64.700000</coordinates>
         <location>
           <name>Barcelona</name>
@@ -11843,7 +11843,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Venezuela -->
-        <_name>Mérida</_name>
+        <_name msgctxt="Venezuela">Mérida</_name>
         <coordinates>8.598333 -71.145000</coordinates>
         <location>
           <name>Mérida</name>
@@ -11903,7 +11903,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Venezuela -->
-        <_name>San Fernando</_name>
+        <_name msgctxt="Venezuela">San Fernando</_name>
         <coordinates>7.896667 -67.467222</coordinates>
         <location>
           <name>San Fernando</name>
@@ -11943,7 +11943,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Venezuela -->
-        <_name>Valencia</_name>
+        <_name msgctxt="Venezuela">Valencia</_name>
         <coordinates>10.180556 -68.003889</coordinates>
         <location>
           <name>Valencia</name>
@@ -12158,7 +12158,7 @@
       <tz-hint>Europe/Minsk</tz-hint>
       <city>
         <!-- Translators: this is a city in Belarus -->
-        <_name>Brest</_name>
+        <_name msgctxt="Belarus">Brest</_name>
         <coordinates>52.100000 23.700000</coordinates>
         <location>
           <name>Brest</name>
@@ -12242,14 +12242,14 @@
              Antwerpen. local name (fr): Anvers. local name (de):
              Antwerpen.
           -->
-        <_name>Antwerp</_name>
+        <_name msgctxt="Belgium">Antwerp</_name>
         <fips-code>BE01</fips-code>
         <city>
           <!-- Translators: this is a city in Antwerp in Belgium.
                "Antwerp" is the traditional English name.
                The local name is "Antwerpen".
             -->
-          <_name>Antwerp</_name>
+          <_name msgctxt="Belgium, Antwerp">Antwerp</_name>
           <coordinates>51.216667 4.416667</coordinates>
           <location>
             <name>Antwerp / Deurne</name>
@@ -12409,11 +12409,11 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Belgium -->
-        <_name>Luxembourg</_name>
+        <_name msgctxt="Belgium">Luxembourg</_name>
         <fips-code>BE06</fips-code>
         <city>
           <!-- Translators: this is the capital of Belgium -->
-          <_name>Luxembourg</_name>
+          <_name msgctxt="Belgium, Luxembourg">Luxembourg</_name>
           <coordinates>49.611667 6.130000</coordinates>
           <location>
             <name>Luxembourg Airport</name>
@@ -13552,7 +13552,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in France -->
-        <_name>Bordeaux</_name>
+        <_name msgctxt="France">Bordeaux</_name>
         <coordinates>44.833333 -0.566667</coordinates>
         <location>
           <name>Bordeaux-Merignac Airport</name>
@@ -13572,7 +13572,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in France -->
-        <_name>Brest</_name>
+        <_name msgctxt="France">Brest</_name>
         <coordinates>48.400000 -4.483333</coordinates>
         <location>
           <name>Brest</name>
@@ -14104,7 +14104,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in France -->
-        <_name>Orange</_name>
+        <_name msgctxt="France">Orange</_name>
         <coordinates>44.133333 4.800000</coordinates>
         <location>
           <name>Orange</name>
@@ -14124,7 +14124,7 @@
       </city>
       <city>
         <!-- Translators: this is the capital of France -->
-        <_name>Paris</_name>
+        <_name msgctxt="France">Paris</_name>
         <coordinates>48.866667 2.333333</coordinates>
         <location>
           <_name>Paris-Le Bourget Airport</_name>
@@ -14359,7 +14359,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in France -->
-        <_name>Vichy</_name>
+        <_name msgctxt="France">Vichy</_name>
         <coordinates>46.116667 3.416667</coordinates>
         <location>
           <name>Vichy</name>
@@ -14521,7 +14521,7 @@
           <!-- Translators: this is a city in Baden-Württemberg in
                Germany
             -->
-          <_name>Stuttgart</_name>
+          <_name msgctxt="Germany, Baden-Württemberg">Stuttgart</_name>
           <coordinates>48.766667 9.183333</coordinates>
           <location>
             <name>Stuttgart-Echterdingen</name>
@@ -14689,11 +14689,11 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Berlin</_name>
+        <_name msgctxt="Germany">Berlin</_name>
         <fips-code>GM16</fips-code>
         <city>
           <!-- Translators: this is the capital of Germany -->
-          <_name>Berlin</_name>
+          <_name msgctxt="Germany, Berlin">Berlin</_name>
           <coordinates>52.516667 13.400000</coordinates>
           <location>
             <_name>Berlin-Tempelhof</_name>
@@ -14719,11 +14719,11 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Bremen</_name>
+        <_name msgctxt="Germany">Bremen</_name>
         <fips-code>GM03</fips-code>
         <city>
           <!-- Translators: this is a city in Bremen in Germany -->
-          <_name>Bremen</_name>
+          <_name msgctxt="Germany, Bremen">Bremen</_name>
           <coordinates>53.083333 8.800000</coordinates>
           <location>
             <name>Bremen</name>
@@ -14734,11 +14734,11 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Hamburg</_name>
+        <_name msgctxt="Germany">Hamburg</_name>
         <fips-code>GM04</fips-code>
         <city>
           <!-- Translators: this is a city in Hamburg in Germany -->
-          <_name>Hamburg</_name>
+          <_name msgctxt="Germany, Hamburg">Hamburg</_name>
           <coordinates>53.550000 10.000000</coordinates>
           <location>
             <_name>Hamburg-Fuhlsbuettel</_name>
@@ -15397,7 +15397,7 @@
       <!-- GI - Gibraltar, a British overseas territory on the southern
            tip of Spain.
         -->
-      <_name>Gibraltar</_name>
+      <_name msgctxt="(Country)">Gibraltar</_name>
       <iso-code>GI</iso-code>
       <fips-code>GI</fips-code>
       <timezones>
@@ -15406,7 +15406,7 @@
       <tz-hint>Europe/Gibraltar</tz-hint>
       <city>
         <!-- Translators: this is the capital of Gibraltar -->
-        <_name>Gibraltar</_name>
+        <_name msgctxt="Gibraltar">Gibraltar</_name>
         <coordinates>36.133333 -5.350000</coordinates>
         <location>
           <name>Gibraltar</name>
@@ -15463,7 +15463,7 @@
              "Athens" is the traditional English name.
              The local name in Greek is "Athína / Αθήνα".
           -->
-        <_name>Athens</_name>
+        <_name msgctxt="Greece">Athens</_name>
         <coordinates>37.983333 23.733333</coordinates>
         <location>
           <name>Athens Eleftherios Venizelos International Airport</name>
@@ -15964,7 +15964,7 @@
         <!-- Translators: this is the capital of Ireland.
              The local name in Irish is "Baile Átha Cliath".
           -->
-        <_name>Dublin</_name>
+        <_name msgctxt="Ireland">Dublin</_name>
         <coordinates>53.333056 -6.248889</coordinates>
         <location>
           <name>Dublin Airport</name>
@@ -16020,7 +16020,7 @@
       <tz-hint>Europe/Isle_of_Man</tz-hint>
       <city>
         <!-- Translators: this is the capital of the Isle of Man -->
-        <_name>Douglas</_name>
+        <_name msgctxt="Isle of Man">Douglas</_name>
         <coordinates>54.150000 -4.483333</coordinates>
         <location>
           <name>Isle of Man, Ronaldsway Airport</name>
@@ -16270,7 +16270,7 @@
              "Florence" is the traditional English name.
              The local name in Italian is "Firenze".
           -->
-        <_name>Florence</_name>
+        <_name msgctxt="Italy">Florence</_name>
         <coordinates>43.766667 11.250000</coordinates>
         <location>
           <name>Peretola Airport</name>
@@ -16454,7 +16454,7 @@
              "Naples" is the traditional English name.
              The local name in Italian is "Napoli".
           -->
-        <_name>Naples</_name>
+        <_name msgctxt="Italy">Naples</_name>
         <coordinates>40.833333 14.250000</coordinates>
         <location>
           <name>Capodichino Airport</name>
@@ -16632,7 +16632,7 @@
              "Rome" is the traditional English name.
              The local name in Italian is "Roma".
           -->
-        <_name>Rome</_name>
+        <_name msgctxt="Italy">Rome</_name>
         <coordinates>41.900000 12.483333</coordinates>
         <location>
           <_name>Urbe Airport</_name>
@@ -16966,7 +16966,7 @@
     </country>
     <country>
       <!-- LU - Luxembourg -->
-      <_name>Luxembourg</_name>
+      <_name msgctxt="(Country)">Luxembourg</_name>
       <iso-code>LU</iso-code>
       <fips-code>LU</fips-code>
       <timezones>
@@ -17006,7 +17006,7 @@
     </country>
     <country>
       <!-- MT - Malta -->
-      <_name>Malta</_name>
+      <_name msgctxt="(Country)">Malta</_name>
       <iso-code>MT</iso-code>
       <fips-code>MT</fips-code>
       <timezones>
@@ -17056,7 +17056,7 @@
     </country>
     <country>
       <!-- MC - Monaco -->
-      <_name>Monaco</_name>
+      <_name msgctxt="(Country)">Monaco</_name>
       <!-- Could not find information about the following stations,
            which may be in Monaco:
            LFAQ LFDB LFJR LFLP LFMV LFRG 
@@ -17069,7 +17069,7 @@
       <tz-hint>Europe/Monaco</tz-hint>
       <city>
         <!-- Translators: this is the capital of Monaco -->
-        <_name>Monaco</_name>
+        <_name msgctxt="Monaco">Monaco</_name>
         <coordinates>43.733333 7.416667</coordinates>
         <location>
           <name>Nice</name>
@@ -17881,7 +17881,7 @@
              "Warsaw" is the traditional English name.
              The local name in Polish is "Warszawa".
           -->
-        <_name>Warsaw</_name>
+        <_name msgctxt="Poland">Warsaw</_name>
         <coordinates>52.250000 21.000000</coordinates>
         <location>
           <name>Warszawa-Okecie</name>
@@ -18747,7 +18747,7 @@
              "Moscow" is the traditional English name.
              The local name in Russian is "Moskva / Москва".
           -->
-        <_name>Moscow</_name>
+        <_name msgctxt="Russia">Moscow</_name>
         <coordinates>55.752222 37.615556</coordinates>
         <location>
           <_name>Vnukovo Airport</_name>
@@ -19134,7 +19134,7 @@
     </country>
     <country>
       <!-- SM - San Marino -->
-      <_name>San Marino</_name>
+      <_name msgctxt="(Country)">San Marino</_name>
       <!-- Could not find information about the following stations,
            which may be in San Marino:
            LIBF LIMA 
@@ -19147,7 +19147,7 @@
       <tz-hint>Europe/San_Marino</tz-hint>
       <city>
         <!-- Translators: this is the capital of San Marino -->
-        <_name>San Marino</_name>
+        <_name msgctxt="San Marino">San Marino</_name>
         <coordinates>43.933333 12.450000</coordinates>
         <location>
           <name>Rimini</name>
@@ -19506,7 +19506,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Spain -->
-        <_name>Barcelona</_name>
+        <_name msgctxt="Spain">Barcelona</_name>
         <coordinates>41.383333 2.183333</coordinates>
         <location>
           <name>Barcelona Airport</name>
@@ -19557,7 +19557,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Spain -->
-        <_name>Córdoba</_name>
+        <_name msgctxt="Spain">Córdoba</_name>
         <coordinates>37.883333 -4.766667</coordinates>
         <location>
           <name>Córdoba Airport</name>
@@ -19660,7 +19660,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Spain -->
-        <_name>León</_name>
+        <_name msgctxt="Spain">León</_name>
         <coordinates>42.600000 -5.566667</coordinates>
         <location>
           <name>León Airport, Virgen del Camino</name>
@@ -19831,7 +19831,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Spain -->
-        <_name>Santiago</_name>
+        <_name msgctxt="Spain">Santiago</_name>
         <coordinates>42.883333 -8.550000</coordinates>
         <location>
           <name>Santiago Airport, Labacolla</name>
@@ -19872,7 +19872,7 @@
       </city>
       <city>
         <!-- Translators: this is a city in Spain -->
-        <_name>Valencia</_name>
+        <_name msgctxt="Spain">Valencia</_name>
         <coordinates>39.466667 -0.366667</coordinates>
         <location>
           <name>Valencia Airport</name>
@@ -20895,7 +20895,7 @@
           <!-- Translators: this is a city in East and South East
                England in the United Kingdom
             -->
-          <_name>Benson</_name>
+          <_name msgctxt="United Kingdom, East and South East England">Benson</_name>
           <coordinates>51.633333 -1.116667</coordinates>
           <location>
             <name>Benson</name>
@@ -20934,7 +20934,7 @@
           <!-- Translators: this is a city in East and South East
                England in the United Kingdom
             -->
-          <_name>Cambridge</_name>
+          <_name msgctxt="United Kingdom, East and South East England">Cambridge</_name>
           <coordinates>52.200000 0.116667</coordinates>
           <location>
             <name>Cambridge</name>
@@ -20969,7 +20969,7 @@
         </city>
         <city>
           <!-- Translators: this is the capital of the United Kingdom -->
-          <_name>London</_name>
+          <_name msgctxt="United Kingdom, East and South East England">London</_name>
           <coordinates>51.500000 -0.116667</coordinates>
           <location>
             <_name>Heathrow Airport</_name>
@@ -21118,7 +21118,7 @@
           <!-- Translators: this is a city in East and South East
                England in the United Kingdom
             -->
-          <_name>Southend</_name>
+          <_name msgctxt="United Kingdom, East and South East England">Southend</_name>
           <coordinates>51.533333 0.700000</coordinates>
           <location>
             <name>Southend</name>
@@ -21199,7 +21199,7 @@
           <!-- Translators: this is a city in Midlands in the United
                Kingdom
             -->
-          <_name>Birmingham</_name>
+          <_name msgctxt="United Kingdom, Midlands">Birmingham</_name>
           <coordinates>52.466667 -1.916667</coordinates>
           <location>
             <name>Birmingham Airport</name>
@@ -21305,7 +21305,7 @@
           <!-- Translators: this is a city in North East England in the
                United Kingdom
             -->
-          <_name>Newcastle</_name>
+          <_name msgctxt="United Kingdom, North East England">Newcastle</_name>
           <coordinates>54.988056 -1.619444</coordinates>
           <location>
             <name>Newcastle</name>
@@ -21318,7 +21318,7 @@
           <!-- Translators: this is a city in North East England in the
                United Kingdom
             -->
-          <_name>Stockton</_name>
+          <_name msgctxt="United Kingdom, North East England">Stockton</_name>
           <coordinates>54.583333 -1.416667</coordinates>
           <location>
             <name>Tees-Side</name>
@@ -21456,7 +21456,7 @@
           <!-- Translators: this is a city in North West England in the
                United Kingdom
             -->
-          <_name>Liverpool</_name>
+          <_name msgctxt="United Kingdom, North West England">Liverpool</_name>
           <coordinates>53.416667 -3.000000</coordinates>
           <location>
             <name>Liverpool Airport</name>
@@ -21469,7 +21469,7 @@
           <!-- Translators: this is a city in North West England in the
                United Kingdom
             -->
-          <_name>Manchester</_name>
+          <_name msgctxt="United Kingdom, North West England">Manchester</_name>
           <coordinates>53.500000 -2.216667</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -21541,7 +21541,7 @@
           <!-- Translators: this is a city in Scotland in the United
                Kingdom
             -->
-          <_name>Aberdeen</_name>
+          <_name msgctxt="United Kingdom, Scotland">Aberdeen</_name>
           <coordinates>57.133333 -2.100000</coordinates>
           <location>
             <name>Aberdeen / Dyce</name>
@@ -21618,7 +21618,7 @@
           <!-- Translators: this is a city in Scotland in the United
                Kingdom
             -->
-          <_name>Glasgow</_name>
+          <_name msgctxt="United Kingdom, Scotland">Glasgow</_name>
           <coordinates>55.833333 -4.250000</coordinates>
           <location>
             <name>Glasgow Airport</name>
@@ -21831,7 +21831,7 @@
           <!-- Translators: this is a city in South and South West
                England in the United Kingdom
             -->
-          <_name>Bristol</_name>
+          <_name msgctxt="United Kingdom, South and South West England">Bristol</_name>
           <coordinates>51.450000 -2.583333</coordinates>
           <location>
             <name>Bristol / Lulsgate</name>
@@ -21932,7 +21932,7 @@
           <!-- Translators: this is a city in South and South West
                England in the United Kingdom
             -->
-          <_name>Plymouth</_name>
+          <_name msgctxt="United Kingdom, South and South West England">Plymouth</_name>
           <coordinates>50.396389 -4.138611</coordinates>
           <location>
             <name>Plymouth / Roborough</name>
@@ -21992,7 +21992,7 @@
                Kingdom.
                The local name in Welsh is "Caerdydd".
             -->
-          <_name>Cardiff</_name>
+          <_name msgctxt="United Kingdom, Wales">Cardiff</_name>
           <coordinates>51.500000 -3.200000</coordinates>
           <location>
             <name>Cardiff-Wales Airport</name>
@@ -22778,7 +22778,7 @@
     </country>
     <country>
       <!-- JO - Jordan -->
-      <_name>Jordan</_name>
+      <_name msgctxt="(Country)">Jordan</_name>
       <iso-code>JO</iso-code>
       <fips-code>JO</fips-code>
       <timezones>
@@ -22821,7 +22821,7 @@
     </country>
     <country>
       <!-- KW - Kuwait -->
-      <_name>Kuwait</_name>
+      <_name msgctxt="(Country)">Kuwait</_name>
       <iso-code>KW</iso-code>
       <fips-code>KU</fips-code>
       <timezones>
@@ -22833,7 +22833,7 @@
              "Kuwait" is the traditional English name.
              The local name in Arabic is "Al Kuwayt / الكويت".
           -->
-        <_name>Kuwait</_name>
+        <_name msgctxt="Kuwait">Kuwait</_name>
         <coordinates>29.369722 47.978333</coordinates>
         <location>
           <name>Kuwait International Airport</name>
@@ -22844,7 +22844,7 @@
     </country>
     <country>
       <!-- LB - Lebanon -->
-      <_name>Lebanon</_name>
+      <_name msgctxt="(Country)">Lebanon</_name>
       <iso-code>LB</iso-code>
       <fips-code>LE</fips-code>
       <timezones>
@@ -23935,7 +23935,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Alberta in Canada -->
-          <_name>Jasper</_name>
+          <_name msgctxt="Canada, Alberta">Jasper</_name>
           <coordinates>52.883333 -118.083333</coordinates>
           <location>
             <name>Jasper Warden Automated Reporting Station</name>
@@ -24228,7 +24228,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Clinton</_name>
+          <_name msgctxt="Canada, British Columbia">Clinton</_name>
           <coordinates>51.100000 -121.600000</coordinates>
           <location>
             <name>Clinton</name>
@@ -24261,7 +24261,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Creston</_name>
+          <_name msgctxt="Canada, British Columbia">Creston</_name>
           <coordinates>49.100000 -116.516667</coordinates>
           <location>
             <name>Creston Automatic Weather Reporting System</name>
@@ -24470,7 +24470,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Natal</_name>
+          <_name msgctxt="Canada, British Columbia">Natal</_name>
           <coordinates>49.733333 -114.850000</coordinates>
           <location>
             <_name>Sparwood, Sparwood-Elk Valley Airport</_name>
@@ -24607,7 +24607,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Princeton</_name>
+          <_name msgctxt="Canada, British Columbia">Princeton</_name>
           <coordinates>49.450000 -120.500000</coordinates>
           <location>
             <name>Princeton Airport</name>
@@ -24794,7 +24794,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Vancouver</_name>
+          <_name msgctxt="Canada, British Columbia">Vancouver</_name>
           <coordinates>49.250000 -123.133333</coordinates>
           <location>
             <name>Vancouver International Airport</name>
@@ -24805,7 +24805,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Vernon</_name>
+          <_name msgctxt="Canada, British Columbia">Vernon</_name>
           <coordinates>50.266667 -119.266667</coordinates>
           <location>
             <name>Vernon</name>
@@ -24816,7 +24816,7 @@
         <city>
           <!-- Translators: this is a city in British Columbia in Canada
             -->
-          <_name>Victoria</_name>
+          <_name msgctxt="Canada, British Columbia">Victoria</_name>
           <coordinates>48.433333 -123.350000</coordinates>
           <location>
             <_name>Victoria Harbour</_name>
@@ -24985,7 +24985,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Manitoba in Canada -->
-          <_name>Grand Rapids</_name>
+          <_name msgctxt="Canada, Manitoba">Grand Rapids</_name>
           <coordinates>53.166667 -99.283333</coordinates>
           <location>
             <name>Grand Rapids</name>
@@ -25015,7 +25015,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Manitoba in Canada -->
-          <_name>Miami</_name>
+          <_name msgctxt="Canada, Manitoba">Miami</_name>
           <coordinates>49.366667 -98.250000</coordinates>
           <location>
             <name>Deerwood</name>
@@ -25317,7 +25317,7 @@
           <!-- Translators: this is a city in Newfoundland and Labrador
                in Canada
             -->
-          <_name>Hebron</_name>
+          <_name msgctxt="Canada, Newfoundland and Labrador">Hebron</_name>
           <coordinates>58.200000 -62.633333</coordinates>
           <location>
             <name>Saglek Bay</name>
@@ -25425,7 +25425,7 @@
           <!-- Translators: this is a city in Newfoundland and Labrador
                in Canada
             -->
-          <_name>Saint John's</_name>
+          <_name msgctxt="Canada, Newfoundland and Labrador">Saint John's</_name>
           <coordinates>47.550000 -52.666667</coordinates>
           <location>
             <name>St. John's</name>
@@ -25437,7 +25437,7 @@
           <!-- Translators: this is a city in Newfoundland and Labrador
                in Canada
             -->
-          <_name>Stephenville</_name>
+          <_name msgctxt="Canada, Newfoundland and Labrador">Stephenville</_name>
           <coordinates>48.550000 -58.566667</coordinates>
           <location>
             <name>Stephenville</name>
@@ -25568,7 +25568,7 @@
           <!-- Translators: this is a city in Northwest Territories in
                Canada
             -->
-          <_name>Fort Smith</_name>
+          <_name msgctxt="Canada, Northwest Territories">Fort Smith</_name>
           <coordinates>60.000000 -111.883333</coordinates>
           <location>
             <name>Fort Smith</name>
@@ -25801,7 +25801,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Greenwood</_name>
+          <_name msgctxt="Canada, Nova Scotia">Greenwood</_name>
           <coordinates>44.983333 -64.900000</coordinates>
           <location>
             <name>Greenwood</name>
@@ -25836,7 +25836,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Liverpool</_name>
+          <_name msgctxt="Canada, Nova Scotia">Liverpool</_name>
           <coordinates>44.033333 -64.716667</coordinates>
           <location>
             <name>Western Head</name>
@@ -25856,7 +25856,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Sydney</_name>
+          <_name msgctxt="Canada, Nova Scotia">Sydney</_name>
           <coordinates>46.150000 -60.166667</coordinates>
           <location>
             <name>Sydney</name>
@@ -25982,7 +25982,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Nunavut in Canada -->
-          <_name>Eureka</_name>
+          <_name msgctxt="Canada, Nunavut">Eureka</_name>
           <coordinates>80.216667 -86.183333</coordinates>
           <location>
             <name>Eureka</name>
@@ -26128,7 +26128,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Canada -->
-        <_name>Ontario</_name>
+        <_name msgctxt="Canada">Ontario</_name>
         <fips-code>CA08</fips-code>
         <tz-hint>America/Toronto</tz-hint>
         <city>
@@ -26163,7 +26163,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Burlington</_name>
+          <_name msgctxt="Canada, Ontario">Burlington</_name>
           <coordinates>43.316667 -79.800000</coordinates>
           <location>
             <name>Burlington Piers</name>
@@ -26233,7 +26233,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Dryden</_name>
+          <_name msgctxt="Canada, Ontario">Dryden</_name>
           <coordinates>49.783333 -92.833333</coordinates>
           <location>
             <name>Dryden Airport</name>
@@ -26323,7 +26323,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Hamilton</_name>
+          <_name msgctxt="Canada, Ontario">Hamilton</_name>
           <coordinates>43.250000 -79.833333</coordinates>
           <location>
             <name>Hamilton Airport</name>
@@ -26363,7 +26363,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Kingston</_name>
+          <_name msgctxt="Canada, Ontario">Kingston</_name>
           <coordinates>44.233333 -76.483333</coordinates>
           <location>
             <name>Kingston</name>
@@ -26374,7 +26374,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>London</_name>
+          <_name msgctxt="Canada, Ontario">London</_name>
           <coordinates>42.983333 -81.250000</coordinates>
           <location>
             <name>London</name>
@@ -26597,7 +26597,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Trenton</_name>
+          <_name msgctxt="Canada, Ontario">Trenton</_name>
           <coordinates>44.100000 -77.583333</coordinates>
           <location>
             <name>Trenton</name>
@@ -26618,7 +26618,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Waterloo</_name>
+          <_name msgctxt="Canada, Ontario">Waterloo</_name>
           <coordinates>43.466667 -80.533333</coordinates>
           <location>
             <name>Waterloo Well</name>
@@ -26688,7 +26688,7 @@
           <!-- Translators: this is a city in Prince Edward Island in
                Canada
             -->
-          <_name>Elmira</_name>
+          <_name msgctxt="Canada, Prince Edward Island">Elmira</_name>
           <coordinates>46.433333 -62.066667</coordinates>
           <location>
             <name>East Point</name>
@@ -26723,7 +26723,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Canada -->
-        <_name>Quebec</_name>
+        <_name msgctxt="Canada">Quebec</_name>
         <fips-code>CA10</fips-code>
         <tz-hint>America/Montreal</tz-hint>
         <city>
@@ -26798,7 +26798,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Quebec in Canada -->
-          <_name>Bedford</_name>
+          <_name msgctxt="Canada, Quebec">Bedford</_name>
           <coordinates>45.116667 -72.983333</coordinates>
           <location>
             <name>Frelighsburg</name>
@@ -27295,7 +27295,7 @@
           <!-- Translators: this is a city in Quebec in Canada.
                The local name in French is "Québec".
             -->
-          <_name>Quebec</_name>
+          <_name msgctxt="Canada, Quebec">Quebec</_name>
           <coordinates>46.800000 -71.250000</coordinates>
           <location>
             <name>Quebec</name>
@@ -27791,7 +27791,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Saskatchewan in Canada -->
-          <_name>Southend</_name>
+          <_name msgctxt="Canada, Saskatchewan">Southend</_name>
           <coordinates>56.333333 -103.233333</coordinates>
           <location>
             <name>Southend Automatic Weather Reporting System</name>
@@ -28039,12 +28039,12 @@
       </timezones>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Aguascalientes</_name>
+        <_name msgctxt="Mexico">Aguascalientes</_name>
         <fips-code>MX01</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Aguascalientes in Mexico -->
-          <_name>Aguascalientes</_name>
+          <_name msgctxt="Mexico, Aguascalientes">Aguascalientes</_name>
           <coordinates>21.883333 -102.300000</coordinates>
           <location>
             <name>Aguascalientes</name>
@@ -28088,7 +28088,7 @@
           <!-- Translators: this is a city in Baja California Sur in
                Mexico
             -->
-          <_name>La Paz</_name>
+          <_name msgctxt="Mexico, Baja California Sur">La Paz</_name>
           <coordinates>24.166667 -110.300000</coordinates>
           <location>
             <name>La Paz International Airport</name>
@@ -28123,12 +28123,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Campeche</_name>
+        <_name msgctxt="Mexico">Campeche</_name>
         <fips-code>MX04</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Campeche in Mexico -->
-          <_name>Campeche</_name>
+          <_name msgctxt="Mexico, Campeche">Campeche</_name>
           <coordinates>19.850000 -90.533333</coordinates>
           <location>
             <name>Campeche</name>
@@ -28175,12 +28175,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Chihuahua</_name>
+        <_name msgctxt="Mexico">Chihuahua</_name>
         <fips-code>MX06</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Chihuahua in Mexico -->
-          <_name>Chihuahua</_name>
+          <_name msgctxt="Mexico, Chihuahua">Chihuahua</_name>
           <coordinates>28.633333 -106.083333</coordinates>
           <location>
             <name>Chihuahua International Airport</name>
@@ -28237,12 +28237,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Colima</_name>
+        <_name msgctxt="Mexico">Colima</_name>
         <fips-code>MX08</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Colima in Mexico -->
-          <_name>Colima</_name>
+          <_name msgctxt="Mexico, Colima">Colima</_name>
           <coordinates>19.233333 -103.716667</coordinates>
           <location>
             <name>Colima</name>
@@ -28252,7 +28252,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Colima in Mexico -->
-          <_name>Manzanillo</_name>
+          <_name msgctxt="Mexico, Colima">Manzanillo</_name>
           <coordinates>19.050000 -104.333333</coordinates>
           <location>
             <name>Manzanillo International Airport</name>
@@ -28263,7 +28263,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Distrito Federal</_name>
+        <_name msgctxt="Mexico">Distrito Federal</_name>
         <fips-code>MX09</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
@@ -28282,12 +28282,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Durango</_name>
+        <_name msgctxt="Mexico">Durango</_name>
         <fips-code>MX10</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Durango in Mexico -->
-          <_name>Durango</_name>
+          <_name msgctxt="Mexico, Durango">Durango</_name>
           <coordinates>24.033333 -104.666667</coordinates>
           <location>
             <name>Durango Airport</name>
@@ -28303,7 +28303,7 @@
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Guanajuato in Mexico -->
-          <_name>León</_name>
+          <_name msgctxt="Mexico, Guanajuato">León</_name>
           <coordinates>21.116667 -101.666667</coordinates>
           <location>
             <name>Del Bajio, León Airport</name>
@@ -28351,7 +28351,7 @@
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Jalisco in Mexico -->
-          <_name>El Zapote</_name>
+          <_name msgctxt="Mexico, Jalisco">El Zapote</_name>
           <coordinates>20.516667 -103.300000</coordinates>
           <location>
             <name>Don Miguel, Guadalaj Airport</name>
@@ -28469,12 +28469,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Oaxaca</_name>
+        <_name msgctxt="Mexico">Oaxaca</_name>
         <fips-code>MX18</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Oaxaca in Mexico -->
-          <_name>El Zapote</_name>
+          <_name msgctxt="Mexico, Oaxaca">El Zapote</_name>
           <coordinates>15.771111 -96.263056</coordinates>
           <location>
             <name>Bahias de Huatulco</name>
@@ -28504,7 +28504,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Oaxaca in Mexico -->
-          <_name>Oaxaca</_name>
+          <_name msgctxt="Mexico, Oaxaca">Oaxaca</_name>
           <coordinates>17.050000 -96.716667</coordinates>
           <location>
             <name>Xoxocotlan Airport</name>
@@ -28525,12 +28525,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Puebla</_name>
+        <_name msgctxt="Mexico">Puebla</_name>
         <fips-code>MX21</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Puebla in Mexico -->
-          <_name>Puebla</_name>
+          <_name msgctxt="Mexico, Puebla">Puebla</_name>
           <coordinates>19.050000 -98.200000</coordinates>
           <location>
             <name>Puebla</name>
@@ -28541,12 +28541,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Querétaro</_name>
+        <_name msgctxt="Mexico">Querétaro</_name>
         <fips-code>MX22</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Querétaro in Mexico -->
-          <_name>Querétaro</_name>
+          <_name msgctxt="Mexico, Querétaro">Querétaro</_name>
           <coordinates>20.600000 -100.383333</coordinates>
           <location>
             <name>Querétaro</name>
@@ -28593,12 +28593,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>San Luis Potosí</_name>
+        <_name msgctxt="Mexico">San Luis Potosí</_name>
         <fips-code>MX24</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in San Luis Potosí in Mexico -->
-          <_name>San Luis Potosí</_name>
+          <_name msgctxt="Mexico, San Luis Potosí">San Luis Potosí</_name>
           <coordinates>22.150000 -100.983333</coordinates>
           <location>
             <name>San Luis Potosí</name>
@@ -28645,7 +28645,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Sonora</_name>
+        <_name msgctxt="Mexico">Sonora</_name>
         <fips-code>MX26</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
@@ -28759,7 +28759,7 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Veracruz</_name>
+        <_name msgctxt="Mexico">Veracruz</_name>
         <fips-code>MX30</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
@@ -28797,7 +28797,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Veracruz in Mexico -->
-          <_name>Veracruz</_name>
+          <_name msgctxt="Mexico, Veracruz">Veracruz</_name>
           <coordinates>19.200000 -96.133333</coordinates>
           <location>
             <name>Veracruz / Las Bajadas, General Heriberto Jara Airport</name>
@@ -28823,7 +28823,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Yucatán in Mexico -->
-          <_name>Mérida</_name>
+          <_name msgctxt="Mexico, Yucatán">Mérida</_name>
           <coordinates>20.966667 -89.616667</coordinates>
           <location>
             <name>Manuel Crecencio Airport</name>
@@ -28834,12 +28834,12 @@
       </state>
       <state>
         <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Zacatecas</_name>
+        <_name msgctxt="Mexico">Zacatecas</_name>
         <fips-code>MX32</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- Translators: this is a city in Zacatecas in Mexico -->
-          <_name>Zacatecas</_name>
+          <_name msgctxt="Mexico, Zacatecas">Zacatecas</_name>
           <coordinates>22.783333 -102.583333</coordinates>
           <location>
             <name>Zacatecas Airport</name>
@@ -28865,7 +28865,7 @@
         <!-- Translators: this is the capital of Saint Pierre and
              Miquelon
           -->
-        <_name>Saint-Pierre</_name>
+        <_name msgctxt="Saint Pierre and Miquelon">Saint-Pierre</_name>
         <coordinates>46.766667 -56.183333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -29068,7 +29068,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Auburn</_name>
+          <_name msgctxt="United States, Alabama">Auburn</_name>
           <coordinates>32.609857 -85.480783</coordinates>
           <location>
             <name>Auburn-Opelika Airport</name>
@@ -29082,7 +29082,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Birmingham</_name>
+          <_name msgctxt="United States, Alabama">Birmingham</_name>
           <coordinates>33.520661 -86.802490</coordinates>
           <location>
             <name>Birmingham International Airport</name>
@@ -29120,7 +29120,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Decatur</_name>
+          <_name msgctxt="United States, Alabama">Decatur</_name>
           <coordinates>34.605925 -86.983342</coordinates>
           <location>
             <name>Pryor Field</name>
@@ -29198,7 +29198,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Huntsville</_name>
+          <_name msgctxt="United States, Alabama">Huntsville</_name>
           <coordinates>34.730369 -86.586104</coordinates>
           <location>
             <_name>Madison County Executive Airport</_name>
@@ -29240,7 +29240,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Montgomery</_name>
+          <_name msgctxt="United States, Alabama">Montgomery</_name>
           <coordinates>32.366805 -86.299969</coordinates>
           <location>
             <_name>Maxwell Air Force Base / Montgomery</_name>
@@ -29294,7 +29294,7 @@
           <!-- Translators: this is a city in Alabama in the United
                States
             -->
-          <_name>Troy</_name>
+          <_name msgctxt="United States, Alabama">Troy</_name>
           <coordinates>31.808768 -85.969951</coordinates>
           <location>
             <name>Troy Municipal Airport</name>
@@ -29343,7 +29343,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Alpine</_name>
+          <_name msgctxt="United States, Alaska">Alpine</_name>
           <coordinates>70.328056 -150.977500</coordinates>
           <location>
             <name>Deadhorse, Alpine Airstrip</name>
@@ -29727,7 +29727,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Eagle</_name>
+          <_name msgctxt="United States, Alaska">Eagle</_name>
           <coordinates>64.788056 -141.200000</coordinates>
           <location>
             <name>Eagle Airport</name>
@@ -30001,7 +30001,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Juneau</_name>
+          <_name msgctxt="United States, Alaska">Juneau</_name>
           <coordinates>58.301944 -134.419722</coordinates>
           <location>
             <name>Juneau International Airport</name>
@@ -30418,7 +30418,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Petersburg</_name>
+          <_name msgctxt="United States, Alaska">Petersburg</_name>
           <coordinates>56.812500 -132.955556</coordinates>
           <location>
             <name>Petersburg</name>
@@ -30520,7 +30520,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Saint George</_name>
+          <_name msgctxt="United States, Alaska">Saint George</_name>
           <coordinates>56.600000 -169.541667</coordinates>
           <location>
             <name>St. George, St. George Airport</name>
@@ -30709,7 +30709,7 @@
           <!-- Translators: this is a city in Alaska in the United
                States
             -->
-          <_name>Sutton</_name>
+          <_name msgctxt="United States, Alaska">Sutton</_name>
           <coordinates>61.711389 -148.894167</coordinates>
           <location>
             <name>Sutton</name>
@@ -30955,7 +30955,7 @@
           <!-- Translators: this is a city in Arizona in the United
                States
             -->
-          <_name>Chandler</_name>
+          <_name msgctxt="United States, Arizona">Chandler</_name>
           <coordinates>33.306160 -111.841250</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -30981,7 +30981,7 @@
           <!-- Translators: this is a city in Arizona in the United
                States
             -->
-          <_name>Douglas</_name>
+          <_name msgctxt="United States, Arizona">Douglas</_name>
           <coordinates>31.344547 -109.545345</coordinates>
           <location>
             <name>Douglas Bisbee, Bisbee Douglas International Airport</name>
@@ -31021,7 +31021,7 @@
           <!-- Translators: this is a city in Arizona in the United
                States
             -->
-          <_name>Glendale</_name>
+          <_name msgctxt="United States, Arizona">Glendale</_name>
           <coordinates>33.538652 -112.185987</coordinates>
           <location>
             <name>Glendale Municipal Airport</name>
@@ -31122,7 +31122,7 @@
           <!-- Translators: this is a city in Arizona in the United
                States
             -->
-          <_name>Peoria</_name>
+          <_name msgctxt="United States, Arizona">Peoria</_name>
           <coordinates>33.580596 -112.237378</coordinates>
           <location>
             <name>Glendale, Glendale Municipal Airport</name>
@@ -31417,7 +31417,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Fayetteville</_name>
+          <_name msgctxt="United States, Arkansas">Fayetteville</_name>
           <coordinates>36.062579 -94.157426</coordinates>
           <location>
             <_name>Drake Field</_name>
@@ -31452,7 +31452,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Fort Smith</_name>
+          <_name msgctxt="United States, Arkansas">Fort Smith</_name>
           <coordinates>35.385924 -94.398548</coordinates>
           <location>
             <name>Fort Smith Regional Airport</name>
@@ -31491,7 +31491,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Hot Springs</_name>
+          <_name msgctxt="United States, Arkansas">Hot Springs</_name>
           <coordinates>34.503700 -93.055179</coordinates>
           <location>
             <name>Memorial Field Airport</name>
@@ -31552,7 +31552,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Monticello</_name>
+          <_name msgctxt="United States, Arkansas">Monticello</_name>
           <coordinates>33.628997 -91.790964</coordinates>
           <location>
             <name>Monticello Municipal Airport / Ellis Field</name>
@@ -31576,7 +31576,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Mountain Home</_name>
+          <_name msgctxt="United States, Arkansas">Mountain Home</_name>
           <coordinates>36.335345 -92.385159</coordinates>
           <location>
             <name>Baxter County Regional Airport</name>
@@ -31588,7 +31588,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Newport</_name>
+          <_name msgctxt="United States, Arkansas">Newport</_name>
           <coordinates>35.604802 -91.281795</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -31685,7 +31685,7 @@
           <!-- Translators: this is a city in Arkansas in the United
                States
             -->
-          <_name>Stuttgart</_name>
+          <_name msgctxt="United States, Arkansas">Stuttgart</_name>
           <coordinates>34.500375 -91.552628</coordinates>
           <location>
             <name>Stuttgart Municipal Airport</name>
@@ -31787,7 +31787,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Auburn</_name>
+          <_name msgctxt="United States, California">Auburn</_name>
           <coordinates>38.896565 -121.076890</coordinates>
           <location>
             <name>Auburn Municipal Airport</name>
@@ -31910,7 +31910,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Carlsbad</_name>
+          <_name msgctxt="United States, California">Carlsbad</_name>
           <coordinates>33.158093 -117.350594</coordinates>
           <location>
             <name>McClellan-Palomar Airport</name>
@@ -31980,7 +31980,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Concord</_name>
+          <_name msgctxt="United States, California">Concord</_name>
           <coordinates>37.977978 -122.031073</coordinates>
           <location>
             <name>Buchanan Field</name>
@@ -31994,7 +31994,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Corona</_name>
+          <_name msgctxt="United States, California">Corona</_name>
           <coordinates>33.875293 -117.566438</coordinates>
           <location>
             <name>Chino, Chino Airport</name>
@@ -32152,7 +32152,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Eureka</_name>
+          <_name msgctxt="United States, California">Eureka</_name>
           <coordinates>40.802071 -124.163673</coordinates>
           <location>
             <name>Arcata / Eureka, Arcata Airport</name>
@@ -32166,7 +32166,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Fairfield</_name>
+          <_name msgctxt="United States, California">Fairfield</_name>
           <coordinates>38.249358 -122.039966</coordinates>
           <location>
             <name>Fairfield / Travis Air Force Base</name>
@@ -32194,7 +32194,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Fremont</_name>
+          <_name msgctxt="United States, California">Fremont</_name>
           <coordinates>37.548270 -121.988572</coordinates>
           <location>
             <name>Palo Alto Airport</name>
@@ -32248,7 +32248,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Glendale</_name>
+          <_name msgctxt="United States, California">Glendale</_name>
           <coordinates>34.142508 -118.255075</coordinates>
           <location>
             <name>Burbank, Burbank-Glendale-Pasadena Airport</name>
@@ -32262,7 +32262,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Hanford</_name>
+          <_name msgctxt="United States, California">Hanford</_name>
           <coordinates>36.327450 -119.645684</coordinates>
           <location>
             <name>Hanford Municipal Airport</name>
@@ -32288,7 +32288,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Hayward</_name>
+          <_name msgctxt="United States, California">Hayward</_name>
           <coordinates>37.668821 -122.080796</coordinates>
           <location>
             <name>Hayward Air Terminal</name>
@@ -32316,7 +32316,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Imperial</_name>
+          <_name msgctxt="United States, California">Imperial</_name>
           <coordinates>32.847553 -115.569439</coordinates>
           <location>
             <name>Imperial County Airport</name>
@@ -32400,7 +32400,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Lancaster</_name>
+          <_name msgctxt="United States, California">Lancaster</_name>
           <coordinates>34.698041 -118.136739</coordinates>
           <location>
             <name>General William J. Fox Airfield Airport</name>
@@ -32529,7 +32529,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Marysville</_name>
+          <_name msgctxt="United States, California">Marysville</_name>
           <coordinates>39.145725 -121.591355</coordinates>
           <location>
             <_name>Yuba County Airport</_name>
@@ -32759,7 +32759,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Ontario</_name>
+          <_name msgctxt="United States, California">Ontario</_name>
           <coordinates>34.063344 -117.650888</coordinates>
           <location>
             <name>Ontario International Airport</name>
@@ -32773,7 +32773,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Orange</_name>
+          <_name msgctxt="United States, California">Orange</_name>
           <coordinates>33.787794 -117.853112</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -32866,7 +32866,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Pasadena</_name>
+          <_name msgctxt="United States, California">Pasadena</_name>
           <coordinates>34.147785 -118.144515</coordinates>
           <location>
             <name>Mount Wilson</name>
@@ -33201,7 +33201,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Santa Clara</_name>
+          <_name msgctxt="United States, California">Santa Clara</_name>
           <coordinates>37.354108 -121.955236</coordinates>
           <location>
             <name>San Jose, San Jose International Airport</name>
@@ -33215,7 +33215,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Santa Maria</_name>
+          <_name msgctxt="United States, California">Santa Maria</_name>
           <coordinates>34.953034 -120.435719</coordinates>
           <location>
             <name>Santa Maria Public Airport</name>
@@ -33283,7 +33283,7 @@
           <!-- Translators: this is a city in California in the United
                States
             -->
-          <_name>Stockton</_name>
+          <_name msgctxt="United States, California">Stockton</_name>
           <coordinates>37.957702 -121.290780</coordinates>
           <location>
             <name>Stockton Metropolitan Airport</name>
@@ -33495,7 +33495,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Akron</_name>
+          <_name msgctxt="United States, Colorado">Akron</_name>
           <coordinates>40.160537 -103.214384</coordinates>
           <location>
             <name>Akron-Washington County Airport</name>
@@ -33549,7 +33549,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Aurora</_name>
+          <_name msgctxt="United States, Colorado">Aurora</_name>
           <coordinates>39.729432 -104.831919</coordinates>
           <location>
             <name>Buckley Air Force Base Airport</name>
@@ -33577,7 +33577,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, Colorado">Burlington</_name>
           <coordinates>39.306108 -102.269356</coordinates>
           <location>
             <name>Carson County Airport</name>
@@ -33589,7 +33589,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Cardiff</_name>
+          <_name msgctxt="United States, Colorado">Cardiff</_name>
           <coordinates>39.506093 -107.310887</coordinates>
           <location>
             <name>Sunlight</name>
@@ -33688,7 +33688,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Durango</_name>
+          <_name msgctxt="United States, Colorado">Durango</_name>
           <coordinates>37.275280 -107.880067</coordinates>
           <location>
             <name>Durango-La Plata County Airport</name>
@@ -33702,7 +33702,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Eagle</_name>
+          <_name msgctxt="United States, Colorado">Eagle</_name>
           <coordinates>39.655263 -106.828651</coordinates>
           <location>
             <name>Eagle County Regional</name>
@@ -34028,7 +34028,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Colorado">Springfield</_name>
           <coordinates>37.408349 -102.614362</coordinates>
           <location>
             <name>Springfield, Comanche National Grassland</name>
@@ -34076,7 +34076,7 @@
           <!-- Translators: this is a city in Colorado in the United
                States
             -->
-          <_name>Trinidad</_name>
+          <_name msgctxt="United States, Colorado">Trinidad</_name>
           <coordinates>37.169463 -104.500541</coordinates>
           <location>
             <name>Perry Stokes Airport</name>
@@ -34208,7 +34208,7 @@
           <!-- Translators: this is a city in Connecticut in the United
                States
             -->
-          <_name>Oxford</_name>
+          <_name msgctxt="United States, Connecticut">Oxford</_name>
           <coordinates>41.433985 -73.116777</coordinates>
           <location>
             <name>Waterbury-Oxford Airport</name>
@@ -34298,7 +34298,7 @@
           <!-- Translators: this is a city in Delaware in the United
                States
             -->
-          <_name>Georgetown</_name>
+          <_name msgctxt="United States, Delaware">Georgetown</_name>
           <coordinates>38.690113 -75.385473</coordinates>
           <location>
             <name>Sussex County Airport</name>
@@ -34310,7 +34310,7 @@
           <!-- Translators: this is a city in Delaware in the United
                States
             -->
-          <_name>Wilmington</_name>
+          <_name msgctxt="United States, Delaware">Wilmington</_name>
           <coordinates>39.745947 -75.546589</coordinates>
           <location>
             <name>New Castle County Airport</name>
@@ -34330,7 +34330,7 @@
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- Translators: this is the capital of the United States -->
-          <_name>Washington</_name>
+          <_name msgctxt="United States, District of Columbia">Washington</_name>
           <coordinates>38.895112 -77.036366</coordinates>
           <location>
             <_name>Washington DC, Reagan National Airport</_name>
@@ -34623,7 +34623,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Gainesville</_name>
+          <_name msgctxt="United States, Florida">Gainesville</_name>
           <coordinates>29.651634 -82.324826</coordinates>
           <location>
             <name>Gainesville Regional Airport</name>
@@ -34677,7 +34677,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Jacksonville</_name>
+          <_name msgctxt="United States, Florida">Jacksonville</_name>
           <coordinates>30.332184 -81.655651</coordinates>
           <location>
             <_name>Jacksonville, Naval Air Station</_name>
@@ -34745,7 +34745,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Leesburg</_name>
+          <_name msgctxt="United States, Florida">Leesburg</_name>
           <coordinates>28.810823 -81.877858</coordinates>
           <location>
             <name>Leesburg Regional Airport</name>
@@ -34801,7 +34801,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Melbourne</_name>
+          <_name msgctxt="United States, Florida">Melbourne</_name>
           <coordinates>28.083627 -80.608109</coordinates>
           <location>
             <name>Melbourne International Airport</name>
@@ -34815,7 +34815,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Miami</_name>
+          <_name msgctxt="United States, Florida">Miami</_name>
           <coordinates>25.774266 -80.193659</coordinates>
           <location>
             <_name>Miami International Airport</_name>
@@ -34863,7 +34863,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Naples</_name>
+          <_name msgctxt="United States, Florida">Naples</_name>
           <coordinates>26.142036 -81.794810</coordinates>
           <location>
             <name>Naples Municipal Airport</name>
@@ -35063,7 +35063,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Florida">Springfield</_name>
           <coordinates>30.153257 -85.611315</coordinates>
           <location>
             <name>Tyndall Air Force Base</name>
@@ -35173,7 +35173,7 @@
           <!-- Translators: this is a city in Florida in the United
                States
             -->
-          <_name>Valparaiso</_name>
+          <_name msgctxt="United States, Florida">Valparaiso</_name>
           <coordinates>30.508531 -86.502728</coordinates>
           <location>
             <name>Valparaiso / Eglin Air Force Base</name>
@@ -35242,14 +35242,14 @@
         <!-- Translators: this is a state/province/territory in United
              States
           -->
-        <_name>Georgia</_name>
+        <_name msgctxt="United States">Georgia</_name>
         <fips-code>US13</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Albany</_name>
+          <_name msgctxt="United States, Georgia">Albany</_name>
           <coordinates>31.578507 -84.155741</coordinates>
           <location>
             <name>Southwest Georgia Regional Airport</name>
@@ -35263,7 +35263,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Alma</_name>
+          <_name msgctxt="United States, Georgia">Alma</_name>
           <coordinates>31.539370 -82.462356</coordinates>
           <location>
             <name>Bacon County Airport</name>
@@ -35277,7 +35277,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Athens</_name>
+          <_name msgctxt="United States, Georgia">Athens</_name>
           <coordinates>33.960948 -83.377936</coordinates>
           <location>
             <name>Athens Airport</name>
@@ -35326,7 +35326,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Augusta</_name>
+          <_name msgctxt="United States, Georgia">Augusta</_name>
           <coordinates>33.470970 -81.974838</coordinates>
           <location>
             <_name>Daniel Field</_name>
@@ -35371,7 +35371,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Brunswick</_name>
+          <_name msgctxt="United States, Georgia">Brunswick</_name>
           <coordinates>31.149953 -81.491489</coordinates>
           <location>
             <_name>Malcolm McKinnon Airport</_name>
@@ -35414,7 +35414,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Columbus</_name>
+          <_name msgctxt="United States, Georgia">Columbus</_name>
           <coordinates>32.460976 -84.987709</coordinates>
           <location>
             <name>Columbus Metropolitan Airport</name>
@@ -35440,7 +35440,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Douglas</_name>
+          <_name msgctxt="United States, Georgia">Douglas</_name>
           <coordinates>31.508807 -82.849865</coordinates>
           <location>
             <name>Douglas Municipal Airport</name>
@@ -35452,7 +35452,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Dublin</_name>
+          <_name msgctxt="United States, Georgia">Dublin</_name>
           <coordinates>32.540445 -82.903754</coordinates>
           <location>
             <name>W H 'Bud' Barron Airport</name>
@@ -35478,7 +35478,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Gainesville</_name>
+          <_name msgctxt="United States, Georgia">Gainesville</_name>
           <coordinates>34.297879 -83.824066</coordinates>
           <location>
             <name>Gilmer Memorial Airport</name>
@@ -35502,7 +35502,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Greensboro</_name>
+          <_name msgctxt="United States, Georgia">Greensboro</_name>
           <coordinates>33.575683 -83.182379</coordinates>
           <location>
             <name>Greene County Regional Airport</name>
@@ -35528,7 +35528,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>La Grange</_name>
+          <_name msgctxt="United States, Georgia">La Grange</_name>
           <coordinates>33.039291 -85.031327</coordinates>
           <location>
             <name>Callaway Airport</name>
@@ -35540,7 +35540,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Lawrenceville</_name>
+          <_name msgctxt="United States, Georgia">Lawrenceville</_name>
           <coordinates>33.956215 -83.987962</coordinates>
           <location>
             <name>Gwinnett County-Briscoe Field Airport</name>
@@ -35636,7 +35636,7 @@
           <!-- Translators: this is a city in Georgia in the United
                States
             -->
-          <_name>Rome</_name>
+          <_name msgctxt="United States, Georgia">Rome</_name>
           <coordinates>34.257038 -85.164673</coordinates>
           <location>
             <name>R. B. Russell Airport</name>
@@ -35990,7 +35990,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Caldwell</_name>
+          <_name msgctxt="United States, Idaho">Caldwell</_name>
           <coordinates>43.662938 -116.687360</coordinates>
           <location>
             <name>Caldwell Industrial Airport</name>
@@ -36077,7 +36077,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Lowell</_name>
+          <_name msgctxt="United States, Idaho">Lowell</_name>
           <coordinates>46.144073 -115.595690</coordinates>
           <location>
             <name>Lowell</name>
@@ -36091,7 +36091,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Malta</_name>
+          <_name msgctxt="United States, Idaho">Malta</_name>
           <coordinates>42.306302 -113.369168</coordinates>
           <location>
             <name>Malta</name>
@@ -36117,7 +36117,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Moscow</_name>
+          <_name msgctxt="United States, Idaho">Moscow</_name>
           <coordinates>46.732388 -117.000165</coordinates>
           <location>
             <name>Pullman / Moscow, Pullman / Moscow Regional Airport</name>
@@ -36130,7 +36130,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Mountain Home</_name>
+          <_name msgctxt="United States, Idaho">Mountain Home</_name>
           <coordinates>43.132950 -115.691198</coordinates>
           <location>
             <name>Mountain Home Air Force Base</name>
@@ -36217,7 +36217,7 @@
         <city>
           <!-- Translators: this is a city in Idaho in the United States
             -->
-          <_name>Stanley</_name>
+          <_name msgctxt="United States, Idaho">Stanley</_name>
           <coordinates>44.211297 -114.945918</coordinates>
           <location>
             <name>Stanley Ranger Station</name>
@@ -36264,7 +36264,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Aurora</_name>
+          <_name msgctxt="United States, Illinois">Aurora</_name>
           <coordinates>41.760585 -88.320071</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -36292,7 +36292,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Bloomington</_name>
+          <_name msgctxt="United States, Illinois">Bloomington</_name>
           <coordinates>40.484203 -88.993687</coordinates>
           <location>
             <name>Bloomington / Normal, Central Illinois Regional Airport at Bloomington-Normal</name>
@@ -36320,7 +36320,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Cairo</_name>
+          <_name msgctxt="United States, Illinois">Cairo</_name>
           <coordinates>37.005329 -89.176461</coordinates>
           <location>
             <name>Cairo Regional Airport</name>
@@ -36386,7 +36386,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Charleston</_name>
+          <_name msgctxt="United States, Illinois">Charleston</_name>
           <coordinates>39.496146 -88.176152</coordinates>
           <location>
             <name>Mattoon / Charleston, Coles County Memorial Airport</name>
@@ -36400,7 +36400,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Chicago</_name>
+          <_name msgctxt="United States, Illinois">Chicago</_name>
           <coordinates>41.850033 -87.650052</coordinates>
           <location>
             <_name>Chicago Midway Airport</_name>
@@ -36442,7 +36442,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Danville</_name>
+          <_name msgctxt="United States, Illinois">Danville</_name>
           <coordinates>40.124481 -87.630021</coordinates>
           <location>
             <name>Vermilion County Airport</name>
@@ -36468,7 +36468,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Decatur</_name>
+          <_name msgctxt="United States, Illinois">Decatur</_name>
           <coordinates>39.840315 -88.954800</coordinates>
           <location>
             <name>Decatur Airport</name>
@@ -36494,7 +36494,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Fairfield</_name>
+          <_name msgctxt="United States, Illinois">Fairfield</_name>
           <coordinates>38.378937 -88.359768</coordinates>
           <location>
             <name>Fairfield Municipal Airport</name>
@@ -36518,7 +36518,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Freeport</_name>
+          <_name msgctxt="United States, Illinois">Freeport</_name>
           <coordinates>42.296686 -89.621227</coordinates>
           <location>
             <name>Albertus Airport</name>
@@ -36557,7 +36557,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Harrisburg</_name>
+          <_name msgctxt="United States, Illinois">Harrisburg</_name>
           <coordinates>37.738381 -88.540607</coordinates>
           <location>
             <name>Harrisburg-Raleigh Airport</name>
@@ -36569,7 +36569,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Jacksonville</_name>
+          <_name msgctxt="United States, Illinois">Jacksonville</_name>
           <coordinates>39.733936 -90.229010</coordinates>
           <location>
             <name>Jacksonville Municipal Airport</name>
@@ -36617,7 +36617,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Lawrenceville</_name>
+          <_name msgctxt="United States, Illinois">Lawrenceville</_name>
           <coordinates>38.729214 -87.681693</coordinates>
           <location>
             <name>Lawrenceville-Vincennes International Airport</name>
@@ -36629,7 +36629,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Lincoln</_name>
+          <_name msgctxt="United States, Illinois">Lincoln</_name>
           <coordinates>40.148377 -89.364818</coordinates>
           <location>
             <name>Logan County Airport</name>
@@ -36641,7 +36641,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Litchfield</_name>
+          <_name msgctxt="United States, Illinois">Litchfield</_name>
           <coordinates>39.175326 -89.654258</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -36665,7 +36665,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Marion</_name>
+          <_name msgctxt="United States, Illinois">Marion</_name>
           <coordinates>37.730605 -88.933126</coordinates>
           <location>
             <name>Williamson County Regional Airport</name>
@@ -36719,7 +36719,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Morris</_name>
+          <_name msgctxt="United States, Illinois">Morris</_name>
           <coordinates>41.357254 -88.421178</coordinates>
           <location>
             <name>Morris Municipal-James R Washburn Field Airport</name>
@@ -36743,7 +36743,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Mount Vernon</_name>
+          <_name msgctxt="United States, Illinois">Mount Vernon</_name>
           <coordinates>38.317271 -88.903120</coordinates>
           <location>
             <name>Mount Vernon Airport</name>
@@ -36811,7 +36811,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Paris</_name>
+          <_name msgctxt="United States, Illinois">Paris</_name>
           <coordinates>39.611146 -87.696137</coordinates>
           <location>
             <name>Edgar County Airport</name>
@@ -36823,7 +36823,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Peoria</_name>
+          <_name msgctxt="United States, Illinois">Peoria</_name>
           <coordinates>40.693649 -89.588986</coordinates>
           <location>
             <name>Greater Peoria Regional Airport</name>
@@ -36837,7 +36837,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Peru</_name>
+          <_name msgctxt="United States, Illinois">Peru</_name>
           <coordinates>41.327535 -89.128973</coordinates>
           <location>
             <name>Illinois Valley Regional-Walter A Duncan Field Airport</name>
@@ -36849,7 +36849,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Pittsfield</_name>
+          <_name msgctxt="United States, Illinois">Pittsfield</_name>
           <coordinates>39.607825 -90.805129</coordinates>
           <location>
             <name>Pittsfield Penstone Municipal Airport</name>
@@ -36861,7 +36861,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Pontiac</_name>
+          <_name msgctxt="United States, Illinois">Pontiac</_name>
           <coordinates>40.880867 -88.629784</coordinates>
           <location>
             <name>Pontiac Municipal Airport</name>
@@ -36951,7 +36951,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Salem</_name>
+          <_name msgctxt="United States, Illinois">Salem</_name>
           <coordinates>38.626993 -88.945616</coordinates>
           <location>
             <name>Salem-Leckrone Airport</name>
@@ -36977,7 +36977,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Sparta</_name>
+          <_name msgctxt="United States, Illinois">Sparta</_name>
           <coordinates>38.123105 -89.701766</coordinates>
           <location>
             <name>Sparta Community-Hunter Field Airport</name>
@@ -36989,7 +36989,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Illinois">Springfield</_name>
           <coordinates>39.801717 -89.643711</coordinates>
           <location>
             <name>Abraham Lincoln Capital Airport</name>
@@ -37069,7 +37069,7 @@
           <!-- Translators: this is a city in Illinois in the United
                States
             -->
-          <_name>Wheeling</_name>
+          <_name msgctxt="United States, Illinois">Wheeling</_name>
           <coordinates>42.139193 -87.928959</coordinates>
           <location>
             <name>Chicago / Wheeling, Pal-Waukee Airport</name>
@@ -37084,14 +37084,14 @@
         <!-- Translators: this is a state/province/territory in United
              States
           -->
-        <_name>Indiana</_name>
+        <_name msgctxt="United States">Indiana</_name>
         <fips-code>US18</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Anderson</_name>
+          <_name msgctxt="United States, Indiana">Anderson</_name>
           <coordinates>40.105320 -85.680254</coordinates>
           <location>
             <name>Anderson Municipal</name>
@@ -37103,7 +37103,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Bloomington</_name>
+          <_name msgctxt="United States, Indiana">Bloomington</_name>
           <coordinates>39.165325 -86.526386</coordinates>
           <location>
             <name>Monroe County Airport</name>
@@ -37117,7 +37117,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Columbus</_name>
+          <_name msgctxt="United States, Indiana">Columbus</_name>
           <coordinates>39.201440 -85.921380</coordinates>
           <location>
             <name>Columbus / Bakalar</name>
@@ -37129,7 +37129,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Elkhart</_name>
+          <_name msgctxt="United States, Indiana">Elkhart</_name>
           <coordinates>41.681993 -85.976667</coordinates>
           <location>
             <name>Elkhart Municipal</name>
@@ -37230,7 +37230,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Lafayette</_name>
+          <_name msgctxt="United States, Indiana">Lafayette</_name>
           <coordinates>40.416702 -86.875287</coordinates>
           <location>
             <name>Purdue University Airport</name>
@@ -37258,7 +37258,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Peru</_name>
+          <_name msgctxt="United States, Indiana">Peru</_name>
           <coordinates>40.753653 -86.068881</coordinates>
           <location>
             <name>Grissom Air Force Base / Peru</name>
@@ -37312,7 +37312,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Valparaiso</_name>
+          <_name msgctxt="United States, Indiana">Valparaiso</_name>
           <coordinates>41.473095 -87.061141</coordinates>
           <location>
             <name>Porter County Municipal Airport</name>
@@ -37325,7 +37325,7 @@
           <!-- Translators: this is a city in Indiana in the United
                States
             -->
-          <_name>Warsaw</_name>
+          <_name msgctxt="United States, Indiana">Warsaw</_name>
           <coordinates>41.238100 -85.853047</coordinates>
           <location>
             <name>Warsaw Municipal Airport</name>
@@ -37365,7 +37365,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Atlantic</_name>
+          <_name msgctxt="United States, Iowa">Atlantic</_name>
           <coordinates>41.403601 -95.013878</coordinates>
           <location>
             <name>Atlantic</name>
@@ -37387,7 +37387,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Boone</_name>
+          <_name msgctxt="United States, Iowa">Boone</_name>
           <coordinates>42.059705 -93.880227</coordinates>
           <location>
             <name>Boone Municipal</name>
@@ -37399,7 +37399,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, Iowa">Burlington</_name>
           <coordinates>40.807539 -91.112923</coordinates>
           <location>
             <name>Burlington Regional Airport</name>
@@ -37493,7 +37493,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Clinton</_name>
+          <_name msgctxt="United States, Iowa">Clinton</_name>
           <coordinates>41.844473 -90.188738</coordinates>
           <location>
             <name>Clinton Municipal Airport</name>
@@ -37517,7 +37517,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Creston</_name>
+          <_name msgctxt="United States, Iowa">Creston</_name>
           <coordinates>41.058600 -94.361347</coordinates>
           <location>
             <name>Creston</name>
@@ -37553,7 +37553,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Denison</_name>
+          <_name msgctxt="United States, Iowa">Denison</_name>
           <coordinates>42.017766 -95.355276</coordinates>
           <location>
             <name>Denison</name>
@@ -37601,7 +37601,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Fairfield</_name>
+          <_name msgctxt="United States, Iowa">Fairfield</_name>
           <coordinates>41.008631 -91.962673</coordinates>
           <location>
             <name>Fairfield</name>
@@ -37670,7 +37670,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Knoxville</_name>
+          <_name msgctxt="United States, Iowa">Knoxville</_name>
           <coordinates>41.320830 -93.109371</coordinates>
           <location>
             <name>Knoxville</name>
@@ -37728,7 +37728,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Monticello</_name>
+          <_name msgctxt="United States, Iowa">Monticello</_name>
           <coordinates>42.238335 -91.187094</coordinates>
           <location>
             <name>Monticello Municipal</name>
@@ -37740,7 +37740,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Mount Pleasant</_name>
+          <_name msgctxt="United States, Iowa">Mount Pleasant</_name>
           <coordinates>40.963640 -91.557938</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -37840,7 +37840,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Shenandoah</_name>
+          <_name msgctxt="United States, Iowa">Shenandoah</_name>
           <coordinates>40.765553 -95.372210</coordinates>
           <location>
             <name>Shenandoah Municipal</name>
@@ -37898,7 +37898,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Washington</_name>
+          <_name msgctxt="United States, Iowa">Washington</_name>
           <coordinates>41.299184 -91.692945</coordinates>
           <location>
             <name>Washington</name>
@@ -37910,7 +37910,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Waterloo</_name>
+          <_name msgctxt="United States, Iowa">Waterloo</_name>
           <coordinates>42.492764 -92.342963</coordinates>
           <location>
             <name>Waterloo Municipal Airport</name>
@@ -38009,7 +38009,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Elkhart</_name>
+          <_name msgctxt="United States, Kansas">Elkhart</_name>
           <coordinates>37.008079 -101.890166</coordinates>
           <location>
             <name>Elkhart-Morton County Airport</name>
@@ -38035,7 +38035,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Emporia</_name>
+          <_name msgctxt="United States, Kansas">Emporia</_name>
           <coordinates>38.403903 -96.181663</coordinates>
           <location>
             <name>Emporia Municipal Airport</name>
@@ -38049,7 +38049,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Garden City</_name>
+          <_name msgctxt="United States, Kansas">Garden City</_name>
           <coordinates>37.971690 -100.872662</coordinates>
           <location>
             <name>Garden City Regional Airport</name>
@@ -38118,7 +38118,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Hutchinson</_name>
+          <_name msgctxt="United States, Kansas">Hutchinson</_name>
           <coordinates>38.060845 -97.929774</coordinates>
           <location>
             <name>Hutchinson Municipal Airport</name>
@@ -38144,7 +38144,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Kansas City</_name>
+          <_name msgctxt="United States, Kansas">Kansas City</_name>
           <coordinates>39.114171 -94.627457</coordinates>
           <location>
             <_name>Kansas City Downtown Airport</_name>
@@ -38165,7 +38165,7 @@
           <!-- Translators: this is a city in Kansas in the United
                States
             -->
-          <_name>Lawrence</_name>
+          <_name msgctxt="United States, Kansas">Lawrence</_name>
           <coordinates>38.971669 -95.235250</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -38414,7 +38414,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Frankfort</_name>
+          <_name msgctxt="United States, Kentucky">Frankfort</_name>
           <coordinates>38.200905 -84.873284</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -38428,7 +38428,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Glasgow</_name>
+          <_name msgctxt="United States, Kentucky">Glasgow</_name>
           <coordinates>36.995884 -85.911922</coordinates>
           <location>
             <name>Glasgow Municipal Airport</name>
@@ -38441,7 +38441,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Henderson</_name>
+          <_name msgctxt="United States, Kentucky">Henderson</_name>
           <coordinates>37.836154 -87.590013</coordinates>
           <location>
             <name>Henderson City</name>
@@ -38456,7 +38456,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Kentucky">Jackson</_name>
           <coordinates>37.553146 -83.383514</coordinates>
           <location>
             <name>Carroll Airport</name>
@@ -38470,7 +38470,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Lexington</_name>
+          <_name msgctxt="United States, Kentucky">Lexington</_name>
           <coordinates>37.988689 -84.477715</coordinates>
           <location>
             <name>Blue Grass Airport</name>
@@ -38484,7 +38484,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>London</_name>
+          <_name msgctxt="United States, Kentucky">London</_name>
           <coordinates>37.128977 -84.083265</coordinates>
           <location>
             <name>London-Corbin Airport-Magee Field</name>
@@ -38530,7 +38530,7 @@
           <!-- Translators: this is a city in Kentucky in the United
                States
             -->
-          <_name>Monticello</_name>
+          <_name msgctxt="United States, Kentucky">Monticello</_name>
           <coordinates>36.829794 -84.849113</coordinates>
           <location>
             <name>Wayne County Airport</name>
@@ -38608,7 +38608,7 @@
           <!-- Translators: this is a city in Louisiana in the United
                States
             -->
-          <_name>Alexandria</_name>
+          <_name msgctxt="United States, Louisiana">Alexandria</_name>
           <coordinates>31.311294 -92.445137</coordinates>
           <location>
             <_name>Alexandria International Airport</_name>
@@ -38706,7 +38706,7 @@
           <!-- Translators: this is a city in Louisiana in the United
                States
             -->
-          <_name>Garden City</_name>
+          <_name msgctxt="United States, Louisiana">Garden City</_name>
           <coordinates>29.765485 -91.465666</coordinates>
           <location>
             <name>Salt Point</name>
@@ -38781,7 +38781,7 @@
           <!-- Translators: this is a city in Louisiana in the United
                States
             -->
-          <_name>Lafayette</_name>
+          <_name msgctxt="United States, Louisiana">Lafayette</_name>
           <coordinates>30.224090 -92.019843</coordinates>
           <location>
             <name>Lafayette Regional Airport</name>
@@ -38822,7 +38822,7 @@
           <!-- Translators: this is a city in Louisiana in the United
                States
             -->
-          <_name>Monroe</_name>
+          <_name msgctxt="United States, Louisiana">Monroe</_name>
           <coordinates>32.509311 -92.119301</coordinates>
           <location>
             <name>Monroe Regional Airport</name>
@@ -38982,7 +38982,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Auburn</_name>
+          <_name msgctxt="United States, Maine">Auburn</_name>
           <coordinates>44.097851 -70.231166</coordinates>
           <location>
             <name>Auburn-Lewiston</name>
@@ -38995,7 +38995,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Augusta</_name>
+          <_name msgctxt="United States, Maine">Augusta</_name>
           <coordinates>44.310624 -69.779490</coordinates>
           <location>
             <name>Augusta State Airport</name>
@@ -39034,7 +39034,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Brunswick</_name>
+          <_name msgctxt="United States, Maine">Brunswick</_name>
           <coordinates>43.914524 -69.965328</coordinates>
           <location>
             <name>Brunswick, Naval Air Station</name>
@@ -39085,7 +39085,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Greenville</_name>
+          <_name msgctxt="United States, Maine">Greenville</_name>
           <coordinates>45.459491 -69.590610</coordinates>
           <location>
             <name>Greenville</name>
@@ -39122,7 +39122,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Portland</_name>
+          <_name msgctxt="United States, Maine">Portland</_name>
           <coordinates>43.661471 -70.255326</coordinates>
           <location>
             <name>Portland International Jetport</name>
@@ -39161,7 +39161,7 @@
         <city>
           <!-- Translators: this is a city in Maine in the United States
             -->
-          <_name>Sanford</_name>
+          <_name msgctxt="United States, Maine">Sanford</_name>
           <coordinates>43.439249 -70.774225</coordinates>
           <location>
             <name>Sanford Regional Airport</name>
@@ -39293,7 +39293,7 @@
           <!-- Translators: this is a city in Maryland in the United
                States
             -->
-          <_name>Frederick</_name>
+          <_name msgctxt="United States, Maryland">Frederick</_name>
           <coordinates>39.414269 -77.410541</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -39357,7 +39357,7 @@
           <!-- Translators: this is a city in Maryland in the United
                States
             -->
-          <_name>Salisbury</_name>
+          <_name msgctxt="United States, Maryland">Salisbury</_name>
           <coordinates>38.360674 -75.599369</coordinates>
           <location>
             <name>Salisbury-Ocean City Wicomico County Regional Airport</name>
@@ -39379,7 +39379,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Bedford</_name>
+          <_name msgctxt="United States, Massachusetts">Bedford</_name>
           <coordinates>42.490650 -71.276169</coordinates>
           <location>
             <name>Hanscom Field</name>
@@ -39421,7 +39421,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Cambridge</_name>
+          <_name msgctxt="United States, Massachusetts">Cambridge</_name>
           <coordinates>42.375097 -71.105608</coordinates>
           <location>
             <name>Boston, Logan International Airport</name>
@@ -39501,7 +39501,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Lawrence</_name>
+          <_name msgctxt="United States, Massachusetts">Lawrence</_name>
           <coordinates>42.707035 -71.163114</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -39515,7 +39515,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Lowell</_name>
+          <_name msgctxt="United States, Massachusetts">Lowell</_name>
           <coordinates>42.633425 -71.316172</coordinates>
           <location>
             <name>Lawrence, Lawrence Municipal Airport</name>
@@ -39583,7 +39583,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Orange</_name>
+          <_name msgctxt="United States, Massachusetts">Orange</_name>
           <coordinates>42.590365 -72.309807</coordinates>
           <location>
             <name>Orange Municipal Airport</name>
@@ -39596,7 +39596,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Pittsfield</_name>
+          <_name msgctxt="United States, Massachusetts">Pittsfield</_name>
           <coordinates>42.450085 -73.245382</coordinates>
           <location>
             <name>Pittsfield Municipal Airport</name>
@@ -39608,7 +39608,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Plymouth</_name>
+          <_name msgctxt="United States, Massachusetts">Plymouth</_name>
           <coordinates>41.958437 -70.667258</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -39649,7 +39649,7 @@
           <!-- Translators: this is a city in Massachusetts in the
                United States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Massachusetts">Springfield</_name>
           <coordinates>42.101483 -72.589811</coordinates>
           <location>
             <name>Chicopee Falls / Westover Air Force Base</name>
@@ -39736,7 +39736,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Alma</_name>
+          <_name msgctxt="United States, Michigan">Alma</_name>
           <coordinates>43.378920 -84.659727</coordinates>
           <location>
             <name>Gratiot Community Airport</name>
@@ -39875,7 +39875,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Charlotte</_name>
+          <_name msgctxt="United States, Michigan">Charlotte</_name>
           <coordinates>42.563648 -84.835821</coordinates>
           <location>
             <name>Fitch H Beach Airport</name>
@@ -39986,7 +39986,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Frankfort</_name>
+          <_name msgctxt="United States, Michigan">Frankfort</_name>
           <coordinates>44.633610 -86.234540</coordinates>
           <location>
             <name>Frankfort Dow Memorial Field Airport</name>
@@ -40010,7 +40010,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Grand Rapids</_name>
+          <_name msgctxt="United States, Michigan">Grand Rapids</_name>
           <coordinates>42.963360 -85.668086</coordinates>
           <location>
             <name>Gerald R. Ford International Airport</name>
@@ -40153,7 +40153,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Michigan">Jackson</_name>
           <coordinates>42.245869 -84.401346</coordinates>
           <location>
             <name>Jackson County-Reynolds Field Airport</name>
@@ -40313,7 +40313,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Marshall</_name>
+          <_name msgctxt="United States, Michigan">Marshall</_name>
           <coordinates>42.272264 -84.963315</coordinates>
           <location>
             <name>Brooks Field Airport</name>
@@ -40325,7 +40325,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Marysville</_name>
+          <_name msgctxt="United States, Michigan">Marysville</_name>
           <coordinates>42.912531 -82.486860</coordinates>
           <location>
             <name>St. Clair County International Airport</name>
@@ -40364,7 +40364,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Monroe</_name>
+          <_name msgctxt="United States, Michigan">Monroe</_name>
           <coordinates>41.916434 -83.397710</coordinates>
           <location>
             <name>Custer Airport</name>
@@ -40376,7 +40376,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Mount Pleasant</_name>
+          <_name msgctxt="United States, Michigan">Mount Pleasant</_name>
           <coordinates>43.597808 -84.767514</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -40466,7 +40466,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Pontiac</_name>
+          <_name msgctxt="United States, Michigan">Pontiac</_name>
           <coordinates>42.638922 -83.291047</coordinates>
           <location>
             <name>Oakland County International Airport</name>
@@ -40525,7 +40525,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Saint James</_name>
+          <_name msgctxt="United States, Michigan">Saint James</_name>
           <coordinates>45.751110 -85.515643</coordinates>
           <location>
             <name>Beaver Island, Beaver Island Airport</name>
@@ -40603,7 +40603,7 @@
           <!-- Translators: this is a city in Michigan in the United
                States
             -->
-          <_name>Troy</_name>
+          <_name msgctxt="United States, Michigan">Troy</_name>
           <coordinates>42.605589 -83.149930</coordinates>
           <location>
             <name>Oakland / Troy Airport</name>
@@ -40661,7 +40661,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Alexandria</_name>
+          <_name msgctxt="United States, Minnesota">Alexandria</_name>
           <coordinates>45.885240 -95.377538</coordinates>
           <location>
             <name>Chandler Field</name>
@@ -40687,7 +40687,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Appleton</_name>
+          <_name msgctxt="United States, Minnesota">Appleton</_name>
           <coordinates>45.196906 -96.019767</coordinates>
           <location>
             <name>Appleton Municipal Airport</name>
@@ -40699,7 +40699,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Austin</_name>
+          <_name msgctxt="United States, Minnesota">Austin</_name>
           <coordinates>43.666630 -92.974637</coordinates>
           <location>
             <name>Austin Municipal</name>
@@ -40737,7 +40737,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Benson</_name>
+          <_name msgctxt="United States, Minnesota">Benson</_name>
           <coordinates>45.314960 -95.600035</coordinates>
           <location>
             <name>Benson Municipal</name>
@@ -40789,7 +40789,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Buffalo</_name>
+          <_name msgctxt="United States, Minnesota">Buffalo</_name>
           <coordinates>45.171908 -93.874694</coordinates>
           <location>
             <name>Buffalo Municipal Airport</name>
@@ -40801,7 +40801,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Cambridge</_name>
+          <_name msgctxt="United States, Minnesota">Cambridge</_name>
           <coordinates>45.572741 -93.224392</coordinates>
           <location>
             <name>Cambridge Municipal</name>
@@ -40908,7 +40908,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Ely</_name>
+          <_name msgctxt="United States, Minnesota">Ely</_name>
           <coordinates>47.903237 -91.867087</coordinates>
           <location>
             <name>Ely Municipal Airport</name>
@@ -41031,7 +41031,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Grand Rapids</_name>
+          <_name msgctxt="United States, Minnesota">Grand Rapids</_name>
           <coordinates>47.237166 -93.530214</coordinates>
           <location>
             <name>Grand Rapids / Itasca County Airport-Gordon Newstrom Field</name>
@@ -41083,7 +41083,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Hutchinson</_name>
+          <_name msgctxt="United States, Minnesota">Hutchinson</_name>
           <coordinates>44.887740 -94.369706</coordinates>
           <location>
             <name>Hutchinson Municipal Airport-Butler Field</name>
@@ -41121,7 +41121,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Minnesota">Jackson</_name>
           <coordinates>43.620792 -94.988602</coordinates>
           <location>
             <name>Jackson Municipal Airport</name>
@@ -41133,7 +41133,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Litchfield</_name>
+          <_name msgctxt="United States, Minnesota">Litchfield</_name>
           <coordinates>45.127185 -94.528047</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -41183,7 +41183,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Madison</_name>
+          <_name msgctxt="United States, Minnesota">Madison</_name>
           <coordinates>45.009685 -96.195876</coordinates>
           <location>
             <name>Madison-Lac Qui Parle County Airport</name>
@@ -41221,7 +41221,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Marshall</_name>
+          <_name msgctxt="United States, Minnesota">Marshall</_name>
           <coordinates>44.446903 -95.788354</coordinates>
           <location>
             <name>Southwest Minnesota Regional Airport - Marshall / Ryan Field</name>
@@ -41296,7 +41296,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Montevideo</_name>
+          <_name msgctxt="United States, Minnesota">Montevideo</_name>
           <coordinates>44.942457 -95.723637</coordinates>
           <location>
             <name>Montevideo-Chippewa County Airport</name>
@@ -41344,7 +41344,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Morris</_name>
+          <_name msgctxt="United States, Minnesota">Morris</_name>
           <coordinates>45.586072 -95.913941</coordinates>
           <location>
             <name>Morris Municipal Airport</name>
@@ -41476,7 +41476,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Princeton</_name>
+          <_name msgctxt="United States, Minnesota">Princeton</_name>
           <coordinates>45.569965 -93.581628</coordinates>
           <location>
             <name>Princeton</name>
@@ -41514,7 +41514,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Rochester</_name>
+          <_name msgctxt="United States, Minnesota">Rochester</_name>
           <coordinates>44.021631 -92.469899</coordinates>
           <location>
             <name>Rochester International Airport</name>
@@ -41528,7 +41528,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Roseau</_name>
+          <_name msgctxt="United States, Minnesota">Roseau</_name>
           <coordinates>48.846093 -95.762766</coordinates>
           <location>
             <name>Roseau Municipal Airport / Rudy Billberg Field</name>
@@ -41566,7 +41566,7 @@
           <!-- Translators: this is a city in Minnesota in the United
                States
             -->
-          <_name>Saint James</_name>
+          <_name msgctxt="United States, Minnesota">Saint James</_name>
           <coordinates>43.982458 -94.626918</coordinates>
           <location>
             <name>St. James, St. James Municipal Airport</name>
@@ -41784,7 +41784,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>Columbus</_name>
+          <_name msgctxt="United States, Mississippi">Columbus</_name>
           <coordinates>33.495674 -88.427263</coordinates>
           <location>
             <_name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</_name>
@@ -41805,7 +41805,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>Greenville</_name>
+          <_name msgctxt="United States, Mississippi">Greenville</_name>
           <coordinates>33.410116 -91.061774</coordinates>
           <location>
             <name>Mid Delta Regional Airport</name>
@@ -41818,7 +41818,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>Greenwood</_name>
+          <_name msgctxt="United States, Mississippi">Greenwood</_name>
           <coordinates>33.516232 -90.179528</coordinates>
           <location>
             <name>Greenwood-LeFlore Airport</name>
@@ -41865,7 +41865,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Mississippi">Jackson</_name>
           <coordinates>32.298757 -90.184810</coordinates>
           <location>
             <_name>Hawkins Field Airport</_name>
@@ -41959,7 +41959,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>Oxford</_name>
+          <_name msgctxt="United States, Mississippi">Oxford</_name>
           <coordinates>34.366495 -89.519248</coordinates>
           <location>
             <name>University-Oxford Airport</name>
@@ -42037,7 +42037,7 @@
           <!-- Translators: this is a city in Mississippi in the United
                States
             -->
-          <_name>West Point</_name>
+          <_name msgctxt="United States, Mississippi">West Point</_name>
           <coordinates>33.607619 -88.650325</coordinates>
           <location>
             <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
@@ -42100,7 +42100,7 @@
           <!-- Translators: this is a city in Missouri in the United
                States
             -->
-          <_name>Columbia</_name>
+          <_name msgctxt="United States, Missouri">Columbia</_name>
           <coordinates>38.951705 -92.334072</coordinates>
           <location>
             <name>Columbia Regional Airport</name>
@@ -42114,7 +42114,7 @@
           <!-- Translators: this is a city in Missouri in the United
                States
             -->
-          <_name>Farmington</_name>
+          <_name msgctxt="United States, Missouri">Farmington</_name>
           <coordinates>37.780885 -90.421790</coordinates>
           <location>
             <name>Farmington Airport</name>
@@ -42181,7 +42181,7 @@
           <!-- Translators: this is a city in Missouri in the United
                States
             -->
-          <_name>Kansas City</_name>
+          <_name msgctxt="United States, Missouri">Kansas City</_name>
           <coordinates>39.099727 -94.578567</coordinates>
           <location>
             <name>Kansas City Downtown Airport</name>
@@ -42275,7 +42275,7 @@
           <!-- Translators: this is a city in Missouri in the United
                States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Missouri">Springfield</_name>
           <coordinates>37.215326 -93.298244</coordinates>
           <location>
             <name>Springfield Regional Airport</name>
@@ -42302,7 +42302,7 @@
           <!-- Translators: this is a city in Missouri in the United
                States
             -->
-          <_name>Vichy</_name>
+          <_name msgctxt="United States, Missouri">Vichy</_name>
           <coordinates>38.111432 -91.760439</coordinates>
           <location>
             <name>Rolla / Vichy, Rolla National Airport</name>
@@ -42473,7 +42473,7 @@
           <!-- Translators: this is a city in Montana in the United
                States
             -->
-          <_name>Glasgow</_name>
+          <_name msgctxt="United States, Montana">Glasgow</_name>
           <coordinates>48.196964 -106.636713</coordinates>
           <location>
             <name>Glasgow International Airport</name>
@@ -42541,7 +42541,7 @@
           <!-- Translators: this is a city in Montana in the United
                States
             -->
-          <_name>Jordan</_name>
+          <_name msgctxt="United States, Montana">Jordan</_name>
           <coordinates>47.320834 -106.910066</coordinates>
           <location>
             <name>Jordan Airport</name>
@@ -42623,7 +42623,7 @@
           <!-- Translators: this is a city in Montana in the United
                States
             -->
-          <_name>Sidney</_name>
+          <_name msgctxt="United States, Montana">Sidney</_name>
           <coordinates>47.716684 -104.156325</coordinates>
           <location>
             <name>Sidney-Richland</name>
@@ -42712,7 +42712,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Aurora</_name>
+          <_name msgctxt="United States, Nebraska">Aurora</_name>
           <coordinates>40.867234 -98.004221</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -42767,7 +42767,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Columbus</_name>
+          <_name msgctxt="United States, Nebraska">Columbus</_name>
           <coordinates>41.429734 -97.368375</coordinates>
           <location>
             <name>Columbus Municipal Airport</name>
@@ -42795,7 +42795,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Fremont</_name>
+          <_name msgctxt="United States, Nebraska">Fremont</_name>
           <coordinates>41.433333 -96.498081</coordinates>
           <location>
             <name>Fremont Municipal Airport</name>
@@ -42835,7 +42835,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Hebron</_name>
+          <_name msgctxt="United States, Nebraska">Hebron</_name>
           <coordinates>40.166393 -97.585875</coordinates>
           <location>
             <name>Hebron Municipal Airport</name>
@@ -42859,7 +42859,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Imperial</_name>
+          <_name msgctxt="United States, Nebraska">Imperial</_name>
           <coordinates>40.516940 -101.643225</coordinates>
           <location>
             <name>Imperial Municipal Airport</name>
@@ -42901,7 +42901,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Lexington</_name>
+          <_name msgctxt="United States, Nebraska">Lexington</_name>
           <coordinates>40.780840 -99.741505</coordinates>
           <location>
             <name>Jim Kelly Field Airport</name>
@@ -42913,7 +42913,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Lincoln</_name>
+          <_name msgctxt="United States, Nebraska">Lincoln</_name>
           <coordinates>40.800001 -96.666960</coordinates>
           <location>
             <name>Lincoln Municipal Airport</name>
@@ -42954,7 +42954,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Norfolk</_name>
+          <_name msgctxt="United States, Nebraska">Norfolk</_name>
           <coordinates>42.028338 -97.416996</coordinates>
           <location>
             <name>Stefan Memorial Airport</name>
@@ -43078,7 +43078,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>Sidney</_name>
+          <_name msgctxt="United States, Nebraska">Sidney</_name>
           <coordinates>41.142762 -102.977979</coordinates>
           <location>
             <name>Sidney Municipal Airport</name>
@@ -43142,7 +43142,7 @@
           <!-- Translators: this is a city in Nebraska in the United
                States
             -->
-          <_name>York</_name>
+          <_name msgctxt="United States, Nebraska">York</_name>
           <coordinates>40.868067 -97.591995</coordinates>
           <location>
             <name>York Municipal Airport</name>
@@ -43176,7 +43176,7 @@
           <!-- Translators: this is a city in Nevada in the United
                States
             -->
-          <_name>Ely</_name>
+          <_name msgctxt="United States, Nevada">Ely</_name>
           <coordinates>39.247439 -114.888630</coordinates>
           <location>
             <name>Ely Airport</name>
@@ -43190,7 +43190,7 @@
           <!-- Translators: this is a city in Nevada in the United
                States
             -->
-          <_name>Eureka</_name>
+          <_name msgctxt="United States, Nevada">Eureka</_name>
           <coordinates>39.512707 -115.960613</coordinates>
           <location>
             <name>Eureka</name>
@@ -43218,7 +43218,7 @@
           <!-- Translators: this is a city in Nevada in the United
                States
             -->
-          <_name>Henderson</_name>
+          <_name msgctxt="United States, Nevada">Henderson</_name>
           <coordinates>36.039699 -114.981937</coordinates>
           <location>
             <name>Las Vegas, Henderson Executive Airport</name>
@@ -43232,7 +43232,7 @@
           <!-- Translators: this is a city in Nevada in the United
                States
             -->
-          <_name>Las Vegas</_name>
+          <_name msgctxt="United States, Nevada">Las Vegas</_name>
           <coordinates>36.174971 -115.137223</coordinates>
           <location>
             <_name>North Las Vegas Airport</_name>
@@ -43363,7 +43363,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Berlin</_name>
+          <_name msgctxt="United States, New Hampshire">Berlin</_name>
           <coordinates>44.468670 -71.185077</coordinates>
           <location>
             <name>Berlin Municipal Airport</name>
@@ -43377,7 +43377,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Concord</_name>
+          <_name msgctxt="United States, New Hampshire">Concord</_name>
           <coordinates>43.208137 -71.537572</coordinates>
           <location>
             <name>Concord Municipal Airport</name>
@@ -43446,7 +43446,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Lebanon</_name>
+          <_name msgctxt="United States, New Hampshire">Lebanon</_name>
           <coordinates>43.642293 -72.251757</coordinates>
           <location>
             <name>Lebanon Municipal Airport</name>
@@ -43460,7 +43460,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Manchester</_name>
+          <_name msgctxt="United States, New Hampshire">Manchester</_name>
           <coordinates>42.995640 -71.454789</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -43488,7 +43488,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Plymouth</_name>
+          <_name msgctxt="United States, New Hampshire">Plymouth</_name>
           <coordinates>43.757017 -71.688134</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -43500,7 +43500,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Portsmouth</_name>
+          <_name msgctxt="United States, New Hampshire">Portsmouth</_name>
           <coordinates>43.071755 -70.762553</coordinates>
           <location>
             <name>Pease Air Force Base / Portsmouth</name>
@@ -43514,7 +43514,7 @@
           <!-- Translators: this is a city in New Hampshire in the
                United States
             -->
-          <_name>Rochester</_name>
+          <_name msgctxt="United States, New Hampshire">Rochester</_name>
           <coordinates>43.304526 -70.975619</coordinates>
           <location>
             <name>Skyhaven Airport</name>
@@ -43587,7 +43587,7 @@
           <!-- Translators: this is a city in New Jersey in the United
                States
             -->
-          <_name>Caldwell</_name>
+          <_name msgctxt="United States, New Jersey">Caldwell</_name>
           <coordinates>40.839822 -74.276537</coordinates>
           <location>
             <name>Essex County Airport</name>
@@ -43684,7 +43684,7 @@
           <!-- Translators: this is a city in New Jersey in the United
                States
             -->
-          <_name>Newark</_name>
+          <_name msgctxt="United States, New Jersey">Newark</_name>
           <coordinates>40.735657 -74.172367</coordinates>
           <location>
             <name>Newark International Airport</name>
@@ -43750,7 +43750,7 @@
           <!-- Translators: this is a city in New Jersey in the United
                States
             -->
-          <_name>Trenton</_name>
+          <_name msgctxt="United States, New Jersey">Trenton</_name>
           <coordinates>40.217053 -74.742938</coordinates>
           <location>
             <name>Mercer County Airport</name>
@@ -43824,7 +43824,7 @@
           <!-- Translators: this is a city in New Mexico in the United
                States
             -->
-          <_name>Carlsbad</_name>
+          <_name msgctxt="United States, New Mexico">Carlsbad</_name>
           <coordinates>32.420674 -104.228837</coordinates>
           <location>
             <name>Cavern City Air Terminal Airport</name>
@@ -43897,7 +43897,7 @@
           <!-- Translators: this is a city in New Mexico in the United
                States
             -->
-          <_name>Corona</_name>
+          <_name msgctxt="United States, New Mexico">Corona</_name>
           <coordinates>34.250907 -105.596669</coordinates>
           <location>
             <name>Corona / Lincoln</name>
@@ -43925,7 +43925,7 @@
           <!-- Translators: this is a city in New Mexico in the United
                States
             -->
-          <_name>Farmington</_name>
+          <_name msgctxt="United States, New Mexico">Farmington</_name>
           <coordinates>36.728058 -108.218686</coordinates>
           <location>
             <name>Four Corners Regional Airport</name>
@@ -43993,7 +43993,7 @@
           <!-- Translators: this is a city in New Mexico in the United
                States
             -->
-          <_name>Las Vegas</_name>
+          <_name msgctxt="United States, New Mexico">Las Vegas</_name>
           <coordinates>35.593933 -105.223897</coordinates>
           <location>
             <name>Las Vegas Municipal Airport</name>
@@ -44156,14 +44156,14 @@
         <!-- Translators: this is a state/province/territory in United
              States
           -->
-        <_name>New York</_name>
+        <_name msgctxt="United States">New York</_name>
         <fips-code>US36</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Albany</_name>
+          <_name msgctxt="United States, New York">Albany</_name>
           <coordinates>42.652579 -73.756232</coordinates>
           <location>
             <name>Albany International Airport</name>
@@ -44205,7 +44205,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Buffalo</_name>
+          <_name msgctxt="United States, New York">Buffalo</_name>
           <coordinates>42.886447 -78.878369</coordinates>
           <location>
             <name>Greater Buffalo International Airport</name>
@@ -44255,7 +44255,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Elmira</_name>
+          <_name msgctxt="United States, New York">Elmira</_name>
           <coordinates>42.089796 -76.807734</coordinates>
           <location>
             <name>Elmira / Corning Regional Airport</name>
@@ -44337,7 +44337,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Jamestown</_name>
+          <_name msgctxt="United States, New York">Jamestown</_name>
           <coordinates>42.097002 -79.235326</coordinates>
           <location>
             <name>Chautauqua County / Jamestown Airport</name>
@@ -44377,7 +44377,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Montgomery</_name>
+          <_name msgctxt="United States, New York">Montgomery</_name>
           <coordinates>41.527594 -74.236816</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -44391,7 +44391,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Monticello</_name>
+          <_name msgctxt="United States, New York">Monticello</_name>
           <coordinates>41.655647 -74.689328</coordinates>
           <location>
             <name>Sullivan County International Airport</name>
@@ -44405,7 +44405,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>New York</_name>
+          <_name msgctxt="United States, New York">New York</_name>
           <coordinates>40.714269 -74.005973</coordinates>
           <location>
             <_name>New York City, Central Park</_name>
@@ -44500,7 +44500,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Rochester</_name>
+          <_name msgctxt="United States, New York">Rochester</_name>
           <coordinates>43.154784 -77.615557</coordinates>
           <location>
             <name>Greater Rochester International Airport</name>
@@ -44514,7 +44514,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Rome</_name>
+          <_name msgctxt="United States, New York">Rome</_name>
           <coordinates>43.212847 -75.455730</coordinates>
           <location>
             <name>Griffiss Air Force Base / Rome</name>
@@ -44566,7 +44566,7 @@
           <!-- Translators: this is a city in New York in the United
                States
             -->
-          <_name>Watertown</_name>
+          <_name msgctxt="United States, New York">Watertown</_name>
           <coordinates>43.974784 -75.910757</coordinates>
           <location>
             <name>Watertown International Airport</name>
@@ -44718,7 +44718,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Beaufort</_name>
+          <_name msgctxt="United States, North Carolina">Beaufort</_name>
           <coordinates>34.718217 -76.663819</coordinates>
           <location>
             <name>Michael J Smith Field Airport</name>
@@ -44742,7 +44742,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Boone</_name>
+          <_name msgctxt="United States, North Carolina">Boone</_name>
           <coordinates>36.216795 -81.674552</coordinates>
           <location>
             <name>Watauga County Hospital Heliport</name>
@@ -44754,7 +44754,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, North Carolina">Burlington</_name>
           <coordinates>36.095692 -79.437799</coordinates>
           <location>
             <name>Burlington Alamance Regional Airport</name>
@@ -44778,7 +44778,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Charlotte</_name>
+          <_name msgctxt="United States, North Carolina">Charlotte</_name>
           <coordinates>35.227087 -80.843127</coordinates>
           <location>
             <name>Charlotte / Douglas International Airport</name>
@@ -44792,7 +44792,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Clinton</_name>
+          <_name msgctxt="United States, North Carolina">Clinton</_name>
           <coordinates>34.997945 -78.323333</coordinates>
           <location>
             <name>Sampson County Airport</name>
@@ -44804,7 +44804,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Concord</_name>
+          <_name msgctxt="United States, North Carolina">Concord</_name>
           <coordinates>35.408752 -80.579511</coordinates>
           <location>
             <name>Concord Regional Airport</name>
@@ -44892,7 +44892,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Fayetteville</_name>
+          <_name msgctxt="United States, North Carolina">Fayetteville</_name>
           <coordinates>35.052664 -78.878359</coordinates>
           <location>
             <_name>Fayetteville Regional Airport</_name>
@@ -44920,7 +44920,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Franklin</_name>
+          <_name msgctxt="United States, North Carolina">Franklin</_name>
           <coordinates>35.182317 -83.381543</coordinates>
           <location>
             <name>Macon County Airport</name>
@@ -44958,7 +44958,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Greensboro</_name>
+          <_name msgctxt="United States, North Carolina">Greensboro</_name>
           <coordinates>36.072635 -79.791975</coordinates>
           <location>
             <name>Piedmont Triad International Airport</name>
@@ -45024,7 +45024,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Jacksonville</_name>
+          <_name msgctxt="United States, North Carolina">Jacksonville</_name>
           <coordinates>34.754052 -77.430241</coordinates>
           <location>
             <name>Jacksonville, New River, Marine Corps Air Station</name>
@@ -45088,7 +45088,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Lexington</_name>
+          <_name msgctxt="United States, North Carolina">Lexington</_name>
           <coordinates>35.824027 -80.253384</coordinates>
           <location>
             <name>Davidson County Airport</name>
@@ -45160,7 +45160,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Monroe</_name>
+          <_name msgctxt="United States, North Carolina">Monroe</_name>
           <coordinates>34.985428 -80.549511</coordinates>
           <location>
             <name>Monroe Airport</name>
@@ -45198,7 +45198,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>New River</_name>
+          <_name msgctxt="United States, North Carolina">New River</_name>
           <coordinates>34.757385 -77.409685</coordinates>
           <location>
             <name>Jacksonville, New River, Marine Corps Air Station</name>
@@ -45236,7 +45236,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Oxford</_name>
+          <_name msgctxt="United States, North Carolina">Oxford</_name>
           <coordinates>36.310700 -78.590834</coordinates>
           <location>
             <name>Henderson-Oxford Airport</name>
@@ -45324,7 +45324,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Salisbury</_name>
+          <_name msgctxt="United States, North Carolina">Salisbury</_name>
           <coordinates>35.670973 -80.474226</coordinates>
           <location>
             <name>Rowan County Airport</name>
@@ -45336,7 +45336,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Sanford</_name>
+          <_name msgctxt="United States, North Carolina">Sanford</_name>
           <coordinates>35.479876 -79.180299</coordinates>
           <location>
             <name>Sanford-Lee County Regional Airport</name>
@@ -45420,7 +45420,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Washington</_name>
+          <_name msgctxt="United States, North Carolina">Washington</_name>
           <coordinates>35.546552 -77.052174</coordinates>
           <location>
             <name>Warren Field Airport</name>
@@ -45444,7 +45444,7 @@
           <!-- Translators: this is a city in North Carolina in the
                United States
             -->
-          <_name>Wilmington</_name>
+          <_name msgctxt="United States, North Carolina">Wilmington</_name>
           <coordinates>34.225726 -77.944710</coordinates>
           <location>
             <name>Wilmington International Airport</name>
@@ -45607,7 +45607,7 @@
           <!-- Translators: this is a city in North Dakota in the
                United States
             -->
-          <_name>Jamestown</_name>
+          <_name msgctxt="United States, North Dakota">Jamestown</_name>
           <coordinates>46.910544 -98.708436</coordinates>
           <location>
             <name>Jamestown Municipal Airport</name>
@@ -45674,7 +45674,7 @@
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Akron</_name>
+          <_name msgctxt="United States, Ohio">Akron</_name>
           <coordinates>41.081445 -81.519005</coordinates>
           <location>
             <_name>Akron Fulton International Airport</_name>
@@ -45748,7 +45748,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Columbus</_name>
+          <_name msgctxt="United States, Ohio">Columbus</_name>
           <coordinates>39.961176 -82.998794</coordinates>
           <location>
             <_name>Port Columbus International Airport</_name>
@@ -45839,7 +45839,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Hamilton</_name>
+          <_name msgctxt="United States, Ohio">Hamilton</_name>
           <coordinates>39.399501 -84.561335</coordinates>
           <location>
             <name>Butler County Regional Airport</name>
@@ -45851,7 +45851,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Lancaster</_name>
+          <_name msgctxt="United States, Ohio">Lancaster</_name>
           <coordinates>39.713675 -82.599329</coordinates>
           <location>
             <name>Fairfield County Airport</name>
@@ -45863,7 +45863,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Lima</_name>
+          <_name msgctxt="United States, Ohio">Lima</_name>
           <coordinates>40.742551 -84.105226</coordinates>
           <location>
             <name>Lima Allen County Airport</name>
@@ -45895,7 +45895,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Marion</_name>
+          <_name msgctxt="United States, Ohio">Marion</_name>
           <coordinates>40.588670 -83.128524</coordinates>
           <location>
             <name>Marion Municipal Airport</name>
@@ -45915,7 +45915,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Newark</_name>
+          <_name msgctxt="United States, Ohio">Newark</_name>
           <coordinates>40.058121 -82.401264</coordinates>
           <location>
             <name>Newark Heath Airport</name>
@@ -45925,7 +45925,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Ohio">Springfield</_name>
           <coordinates>39.924227 -83.808817</coordinates>
           <location>
             <name>Springfield-Beckley Municipal Airport</name>
@@ -45954,7 +45954,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Wilmington</_name>
+          <_name msgctxt="United States, Ohio">Wilmington</_name>
           <coordinates>39.445339 -83.828537</coordinates>
           <location>
             <name>Airborne Airpark Airport</name>
@@ -46102,7 +46102,7 @@
           <!-- Translators: this is a city in Oklahoma in the United
                States
             -->
-          <_name>Chandler</_name>
+          <_name msgctxt="United States, Oklahoma">Chandler</_name>
           <coordinates>35.701731 -96.880858</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -46138,7 +46138,7 @@
           <!-- Translators: this is a city in Oklahoma in the United
                States
             -->
-          <_name>Clinton</_name>
+          <_name msgctxt="United States, Oklahoma">Clinton</_name>
           <coordinates>35.515606 -98.967307</coordinates>
           <location>
             <_name>Clinton Regional Airport</_name>
@@ -46226,7 +46226,7 @@
           <!-- Translators: this is a city in Oklahoma in the United
                States
             -->
-          <_name>Frederick</_name>
+          <_name msgctxt="United States, Oklahoma">Frederick</_name>
           <coordinates>34.392026 -99.018409</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -46289,7 +46289,7 @@
           <!-- Translators: this is a city in Oklahoma in the United
                States
             -->
-          <_name>Hobart</_name>
+          <_name msgctxt="United States, Oklahoma">Hobart</_name>
           <coordinates>35.029501 -99.093132</coordinates>
           <location>
             <name>Hobart Municipal Airport</name>
@@ -46464,7 +46464,7 @@
           <!-- Translators: this is a city in Oklahoma in the United
                States
             -->
-          <_name>Seminole</_name>
+          <_name msgctxt="United States, Oklahoma">Seminole</_name>
           <coordinates>35.224520 -96.670573</coordinates>
           <location>
             <name>Seminole Municipal Airport</name>
@@ -46581,7 +46581,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Aurora</_name>
+          <_name msgctxt="United States, Oregon">Aurora</_name>
           <coordinates>45.230954 -122.755927</coordinates>
           <location>
             <name>Aurora State Airport</name>
@@ -46609,7 +46609,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Brookings</_name>
+          <_name msgctxt="United States, Oregon">Brookings</_name>
           <coordinates>42.052611 -124.283982</coordinates>
           <location>
             <name>Brookings Airport</name>
@@ -46739,7 +46739,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Medford</_name>
+          <_name msgctxt="United States, Oregon">Medford</_name>
           <coordinates>42.326515 -122.875595</coordinates>
           <location>
             <name>Rogue Valley International Airport</name>
@@ -46753,7 +46753,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Newport</_name>
+          <_name msgctxt="United States, Oregon">Newport</_name>
           <coordinates>44.636784 -124.053450</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -46781,7 +46781,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Ontario</_name>
+          <_name msgctxt="United States, Oregon">Ontario</_name>
           <coordinates>44.026553 -116.962938</coordinates>
           <location>
             <name>Ontario Municipal Airport</name>
@@ -46824,7 +46824,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Portland</_name>
+          <_name msgctxt="United States, Oregon">Portland</_name>
           <coordinates>45.523452 -122.676207</coordinates>
           <location>
             <_name>Portland International Airport</_name>
@@ -46866,7 +46866,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Rome</_name>
+          <_name msgctxt="United States, Oregon">Rome</_name>
           <coordinates>42.839045 -117.628211</coordinates>
           <location>
             <name>Rome</name>
@@ -46893,7 +46893,7 @@
           <!-- Translators: this is a city in Oregon in the United
                States
             -->
-          <_name>Salem</_name>
+          <_name msgctxt="United States, Oregon">Salem</_name>
           <coordinates>44.942898 -123.035096</coordinates>
           <location>
             <name>McNary Field</name>
@@ -47059,7 +47059,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>Franklin</_name>
+          <_name msgctxt="United States, Pennsylvania">Franklin</_name>
           <coordinates>41.397836 -79.831444</coordinates>
           <location>
             <name>Venango Regional Airport</name>
@@ -47073,7 +47073,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>Harrisburg</_name>
+          <_name msgctxt="United States, Pennsylvania">Harrisburg</_name>
           <coordinates>40.273700 -76.884418</coordinates>
           <location>
             <_name>Capital City Airport</_name>
@@ -47094,7 +47094,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>Indiana</_name>
+          <_name msgctxt="United States, Pennsylvania">Indiana</_name>
           <coordinates>40.621455 -79.152535</coordinates>
           <location>
             <name>Indiana / Stewart Field</name>
@@ -47134,7 +47134,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>Lancaster</_name>
+          <_name msgctxt="United States, Pennsylvania">Lancaster</_name>
           <coordinates>40.037875 -76.305514</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -47323,7 +47323,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>Washington</_name>
+          <_name msgctxt="United States, Pennsylvania">Washington</_name>
           <coordinates>40.173960 -80.246171</coordinates>
           <location>
             <name>Washington County Airport</name>
@@ -47375,7 +47375,7 @@
           <!-- Translators: this is a city in Pennsylvania in the
                United States
             -->
-          <_name>York</_name>
+          <_name msgctxt="United States, Pennsylvania">York</_name>
           <coordinates>39.962598 -76.727745</coordinates>
           <location>
             <name>York Airport</name>
@@ -47409,7 +47409,7 @@
           <!-- Translators: this is a city in Rhode Island in the
                United States
             -->
-          <_name>Newport</_name>
+          <_name msgctxt="United States, Rhode Island">Newport</_name>
           <coordinates>41.490102 -71.312828</coordinates>
           <location>
             <name>Newport State Airport</name>
@@ -47476,7 +47476,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Anderson</_name>
+          <_name msgctxt="United States, South Carolina">Anderson</_name>
           <coordinates>34.503439 -82.650133</coordinates>
           <location>
             <name>Anderson County Airport</name>
@@ -47490,7 +47490,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Beaufort</_name>
+          <_name msgctxt="United States, South Carolina">Beaufort</_name>
           <coordinates>32.431581 -80.669829</coordinates>
           <location>
             <name>Beaufort, Marine Corps Air Station</name>
@@ -47504,7 +47504,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Charleston</_name>
+          <_name msgctxt="United States, South Carolina">Charleston</_name>
           <coordinates>32.776566 -79.930922</coordinates>
           <location>
             <name>Charleston Air Force Base</name>
@@ -47530,7 +47530,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Columbia</_name>
+          <_name msgctxt="United States, South Carolina">Columbia</_name>
           <coordinates>34.000710 -81.034814</coordinates>
           <location>
             <_name>Columbia Owens Downtown Airport</_name>
@@ -47584,7 +47584,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Florence</_name>
+          <_name msgctxt="United States, South Carolina">Florence</_name>
           <coordinates>34.195433 -79.762563</coordinates>
           <location>
             <name>Florence Regional Airport</name>
@@ -47598,7 +47598,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Greenville</_name>
+          <_name msgctxt="United States, South Carolina">Greenville</_name>
           <coordinates>34.852618 -82.394010</coordinates>
           <location>
             <name>Greenville Downtown Airport</name>
@@ -47612,7 +47612,7 @@
           <!-- Translators: this is a city in South Carolina in the
                United States
             -->
-          <_name>Greenwood</_name>
+          <_name msgctxt="United States, South Carolina">Greenwood</_name>
           <coordinates>34.195400 -82.161788</coordinates>
           <location>
             <name>Greenwood County Airport</name>
@@ -47710,7 +47710,7 @@
           <!-- Translators: this is a city in South Dakota in the
                United States
             -->
-          <_name>Aberdeen</_name>
+          <_name msgctxt="United States, South Dakota">Aberdeen</_name>
           <coordinates>45.464698 -98.486483</coordinates>
           <location>
             <name>Aberdeen Regional Airport</name>
@@ -47739,7 +47739,7 @@
           <!-- Translators: this is a city in South Dakota in the
                United States
             -->
-          <_name>Brookings</_name>
+          <_name msgctxt="United States, South Dakota">Brookings</_name>
           <coordinates>44.311357 -96.798388</coordinates>
           <location>
             <name>Brookings Municipal Airport</name>
@@ -47753,7 +47753,7 @@
           <!-- Translators: this is a city in South Dakota in the
                United States
             -->
-          <_name>Buffalo</_name>
+          <_name msgctxt="United States, South Dakota">Buffalo</_name>
           <coordinates>45.584164 -103.546025</coordinates>
           <location>
             <name>Buffalo</name>
@@ -47933,7 +47933,7 @@
           <!-- Translators: this is a city in South Dakota in the
                United States
             -->
-          <_name>Watertown</_name>
+          <_name msgctxt="United States, South Dakota">Watertown</_name>
           <coordinates>44.899409 -97.115073</coordinates>
           <location>
             <name>Watertown Municipal Airport</name>
@@ -47969,7 +47969,7 @@
           <!-- Translators: this is a city in Tennessee in the United
                States
             -->
-          <_name>Bristol</_name>
+          <_name msgctxt="United States, Tennessee">Bristol</_name>
           <coordinates>36.595106 -82.188744</coordinates>
           <location>
             <name>Bristol / Johnson / Kingsport, Tri-City Regional Airport</name>
@@ -47999,7 +47999,7 @@
           <!-- Translators: this is a city in Tennessee in the United
                States
             -->
-          <_name>Clarksville</_name>
+          <_name msgctxt="United States, Tennessee">Clarksville</_name>
           <coordinates>36.529771 -87.359453</coordinates>
           <location>
             <_name>Outlaw Field Airport</_name>
@@ -48047,7 +48047,7 @@
           <!-- Translators: this is a city in Tennessee in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Tennessee">Jackson</_name>
           <coordinates>35.614517 -88.813947</coordinates>
           <location>
             <name>McKellar-Sipes Regional Airport</name>
@@ -48076,7 +48076,7 @@
           <!-- Translators: this is a city in Tennessee in the United
                States
             -->
-          <_name>Knoxville</_name>
+          <_name msgctxt="United States, Tennessee">Knoxville</_name>
           <coordinates>35.960638 -83.920739</coordinates>
           <location>
             <name>McGhee Tyson Airport</name>
@@ -48200,7 +48200,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Alpine</_name>
+          <_name msgctxt="United States, Texas">Alpine</_name>
           <coordinates>30.358492 -103.661012</coordinates>
           <location>
             <name>Alpine-Casparis Municipal Airport</name>
@@ -48236,7 +48236,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Arlington</_name>
+          <_name msgctxt="United States, Texas">Arlington</_name>
           <coordinates>32.735687 -97.108066</coordinates>
           <location>
             <name>Arlington Municipal Airport</name>
@@ -48249,7 +48249,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Austin</_name>
+          <_name msgctxt="United States, Texas">Austin</_name>
           <coordinates>30.267153 -97.743061</coordinates>
           <location>
             <_name>Austin City, Austin Camp Mabry</_name>
@@ -48375,7 +48375,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Caldwell</_name>
+          <_name msgctxt="United States, Texas">Caldwell</_name>
           <coordinates>30.531315 -96.693030</coordinates>
           <location>
             <name>Caldwell Municipal Airport</name>
@@ -48423,7 +48423,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Clarksville</_name>
+          <_name msgctxt="United States, Texas">Clarksville</_name>
           <coordinates>33.610665 -95.052722</coordinates>
           <location>
             <name>Clarksville / Red River County-J D Trissell Field Airport</name>
@@ -48563,7 +48563,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Decatur</_name>
+          <_name msgctxt="United States, Texas">Decatur</_name>
           <coordinates>33.234283 -97.586139</coordinates>
           <location>
             <name>Decatur Municipal Airport</name>
@@ -48587,7 +48587,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Denison</_name>
+          <_name msgctxt="United States, Texas">Denison</_name>
           <coordinates>33.755659 -96.536658</coordinates>
           <location>
             <name>Sherman / Denison, Grayson County Airport</name>
@@ -48610,7 +48610,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Dryden</_name>
+          <_name msgctxt="United States, Texas">Dryden</_name>
           <coordinates>30.044635 -102.114578</coordinates>
           <location>
             <name>Terrel County Airport</name>
@@ -48733,7 +48733,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Gainesville</_name>
+          <_name msgctxt="United States, Texas">Gainesville</_name>
           <coordinates>33.625941 -97.133345</coordinates>
           <location>
             <name>Gainesville Municipal Airport</name>
@@ -48781,7 +48781,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Georgetown</_name>
+          <_name msgctxt="United States, Texas">Georgetown</_name>
           <coordinates>30.632694 -97.677231</coordinates>
           <location>
             <name>Georgetown Municipal Airport</name>
@@ -48849,7 +48849,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Greenville</_name>
+          <_name msgctxt="United States, Texas">Greenville</_name>
           <coordinates>33.138449 -96.110807</coordinates>
           <location>
             <name>Greenville / Majors</name>
@@ -48968,7 +48968,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Huntsville</_name>
+          <_name msgctxt="United States, Texas">Huntsville</_name>
           <coordinates>30.723526 -95.550777</coordinates>
           <location>
             <name>Huntsville Municipal Airport</name>
@@ -48993,7 +48993,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Jacksonville</_name>
+          <_name msgctxt="United States, Texas">Jacksonville</_name>
           <coordinates>31.963778 -95.270504</coordinates>
           <location>
             <name>Cherokee County Airport</name>
@@ -49004,7 +49004,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Jasper</_name>
+          <_name msgctxt="United States, Texas">Jasper</_name>
           <coordinates>30.920199 -93.996576</coordinates>
           <location>
             <name>Jasper County-Bell Field Airport</name>
@@ -49077,7 +49077,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>La Grange</_name>
+          <_name msgctxt="United States, Texas">La Grange</_name>
           <coordinates>29.905503 -96.876647</coordinates>
           <location>
             <name>Fayette Regional Air Center Airport</name>
@@ -49100,7 +49100,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Lancaster</_name>
+          <_name msgctxt="United States, Texas">Lancaster</_name>
           <coordinates>32.592080 -96.756108</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -49262,7 +49262,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Mount Pleasant</_name>
+          <_name msgctxt="United States, Texas">Mount Pleasant</_name>
           <coordinates>33.156786 -94.968269</coordinates>
           <location>
             <name>Mount Pleasant Regional Airport</name>
@@ -49308,7 +49308,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Orange</_name>
+          <_name msgctxt="United States, Texas">Orange</_name>
           <coordinates>30.092988 -93.736555</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -49354,7 +49354,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Paris</_name>
+          <_name msgctxt="United States, Texas">Paris</_name>
           <coordinates>33.660939 -95.555513</coordinates>
           <location>
             <name>Paris / Cox Field</name>
@@ -49367,7 +49367,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Pasadena</_name>
+          <_name msgctxt="United States, Texas">Pasadena</_name>
           <coordinates>29.691063 -95.209101</coordinates>
           <location>
             <name>Houston, Houston Hobby Airport</name>
@@ -49572,7 +49572,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Seminole</_name>
+          <_name msgctxt="United States, Texas">Seminole</_name>
           <coordinates>32.718993 -102.644910</coordinates>
           <location>
             <name>Gaines County Airport</name>
@@ -49605,7 +49605,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Sonora</_name>
+          <_name msgctxt="United States, Texas">Sonora</_name>
           <coordinates>30.566848 -100.643427</coordinates>
           <location>
             <name>Sonora Municipal Airport</name>
@@ -49628,7 +49628,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Stephenville</_name>
+          <_name msgctxt="United States, Texas">Stephenville</_name>
           <coordinates>32.220696 -98.202263</coordinates>
           <location>
             <name>Clark Field Municipal Airport</name>
@@ -49735,7 +49735,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Vernon</_name>
+          <_name msgctxt="United States, Texas">Vernon</_name>
           <coordinates>34.154531 -99.265080</coordinates>
           <location>
             <name>Wilbarger County Airport</name>
@@ -49746,7 +49746,7 @@
         <city>
           <!-- Translators: this is a city in Texas in the United States
             -->
-          <_name>Victoria</_name>
+          <_name msgctxt="United States, Texas">Victoria</_name>
           <coordinates>28.805267 -97.003598</coordinates>
           <location>
             <name>Victoria Regional Airport</name>
@@ -50001,7 +50001,7 @@
         </city>
         <city>
           <!-- Translators: this is a city in Utah in the United States -->
-          <_name>Santa Clara</_name>
+          <_name msgctxt="United States, Utah">Santa Clara</_name>
           <coordinates>37.133035 -113.654127</coordinates>
           <location>
             <name>St George, St George Municipal Airport</name>
@@ -50085,7 +50085,7 @@
           <!-- Translators: this is a city in Vermont in the United
                States
             -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, Vermont">Burlington</_name>
           <coordinates>44.475882 -73.212072</coordinates>
           <location>
             <name>Burlington International Airport</name>
@@ -50153,7 +50153,7 @@
           <!-- Translators: this is a city in Vermont in the United
                States
             -->
-          <_name>Springfield</_name>
+          <_name msgctxt="United States, Vermont">Springfield</_name>
           <coordinates>43.298408 -72.482312</coordinates>
           <location>
             <name>Hartness State Springfield Airport</name>
@@ -50189,7 +50189,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Alexandria</_name>
+          <_name msgctxt="United States, Virginia">Alexandria</_name>
           <coordinates>38.804836 -77.046921</coordinates>
           <location>
             <name>Washington DC, Reagan National Airport</name>
@@ -50203,7 +50203,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Ashland</_name>
+          <_name msgctxt="United States, Virginia">Ashland</_name>
           <coordinates>37.759032 -77.479984</coordinates>
           <location>
             <name>Hanover County Municipal Airport</name>
@@ -50282,7 +50282,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Danville</_name>
+          <_name msgctxt="United States, Virginia">Danville</_name>
           <coordinates>36.585972 -79.395023</coordinates>
           <location>
             <name>Danville Regional Airport</name>
@@ -50296,7 +50296,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Dublin</_name>
+          <_name msgctxt="United States, Virginia">Dublin</_name>
           <coordinates>37.105678 -80.685343</coordinates>
           <location>
             <name>Dublin / New River Valley</name>
@@ -50310,7 +50310,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Emporia</_name>
+          <_name msgctxt="United States, Virginia">Emporia</_name>
           <coordinates>36.685983 -77.542481</coordinates>
           <location>
             <name>Emporia-Greensville Regional Airport</name>
@@ -50336,7 +50336,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Franklin</_name>
+          <_name msgctxt="United States, Virginia">Franklin</_name>
           <coordinates>36.677651 -76.922461</coordinates>
           <location>
             <name>Franklin / J B Rose</name>
@@ -50378,7 +50378,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Hot Springs</_name>
+          <_name msgctxt="United States, Virginia">Hot Springs</_name>
           <coordinates>37.999570 -79.831719</coordinates>
           <location>
             <name>Hot Springs / Ingalls</name>
@@ -50392,7 +50392,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Leesburg</_name>
+          <_name msgctxt="United States, Virginia">Leesburg</_name>
           <coordinates>39.115662 -77.563602</coordinates>
           <location>
             <name>Leesburg / Godfrey</name>
@@ -50446,7 +50446,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Marion</_name>
+          <_name msgctxt="United States, Virginia">Marion</_name>
           <coordinates>36.834838 -81.514837</coordinates>
           <location>
             <name>Marion / Wytheville</name>
@@ -50488,7 +50488,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>New River</_name>
+          <_name msgctxt="United States, Virginia">New River</_name>
           <coordinates>37.133459 -80.591449</coordinates>
           <location>
             <name>Dublin / New River Valley</name>
@@ -50522,7 +50522,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Norfolk</_name>
+          <_name msgctxt="United States, Virginia">Norfolk</_name>
           <coordinates>36.846815 -76.285218</coordinates>
           <location>
             <_name>Norfolk, Naval Air Station</_name>
@@ -50557,7 +50557,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Orange</_name>
+          <_name msgctxt="United States, Virginia">Orange</_name>
           <coordinates>38.245411 -78.110834</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -50569,7 +50569,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Petersburg</_name>
+          <_name msgctxt="United States, Virginia">Petersburg</_name>
           <coordinates>37.227928 -77.401927</coordinates>
           <location>
             <name>Dinwiddie County Airport</name>
@@ -50597,7 +50597,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Portsmouth</_name>
+          <_name msgctxt="United States, Virginia">Portsmouth</_name>
           <coordinates>36.835426 -76.298274</coordinates>
           <location>
             <name>Norfolk, Naval Air Station</name>
@@ -50637,7 +50637,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Richmond</_name>
+          <_name msgctxt="United States, Virginia">Richmond</_name>
           <coordinates>37.553758 -77.460262</coordinates>
           <location>
             <name>Richmond International Airport</name>
@@ -50665,7 +50665,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>Shenandoah</_name>
+          <_name msgctxt="United States, Virginia">Shenandoah</_name>
           <coordinates>38.485124 -78.625016</coordinates>
           <location>
             <name>Staunton / Shenandoah</name>
@@ -50757,7 +50757,7 @@
           <!-- Translators: this is a city in Virginia in the United
                States
             -->
-          <_name>West Point</_name>
+          <_name msgctxt="United States, Virginia">West Point</_name>
           <coordinates>37.531534 -76.796350</coordinates>
           <location>
             <name>Middle Peninsula Regional Airport</name>
@@ -50824,14 +50824,14 @@
         <!-- Translators: this is a state/province/territory in United
              States
           -->
-        <_name>Washington</_name>
+        <_name msgctxt="United States">Washington</_name>
         <fips-code>US53</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
           <!-- Translators: this is a city in Washington in the United
                States
             -->
-          <_name>Arlington</_name>
+          <_name msgctxt="United States, Washington">Arlington</_name>
           <coordinates>48.198712 -122.125142</coordinates>
           <location>
             <name>Arlington Municipal</name>
@@ -50885,7 +50885,7 @@
           <!-- Translators: this is a city in Washington in the United
                States
             -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, Washington">Burlington</_name>
           <coordinates>48.475662 -122.325438</coordinates>
           <location>
             <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
@@ -50990,7 +50990,7 @@
           <!-- Translators: this is a city in Washington in the United
                States
             -->
-          <_name>Hanford</_name>
+          <_name msgctxt="United States, Washington">Hanford</_name>
           <coordinates>46.583748 -119.387799</coordinates>
           <location>
             <name>Hanford</name>
@@ -51040,7 +51040,7 @@
           <!-- Translators: this is a city in Washington in the United
                States
             -->
-          <_name>Mount Vernon</_name>
+          <_name msgctxt="United States, Washington">Mount Vernon</_name>
           <coordinates>48.421216 -122.334047</coordinates>
           <location>
             <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
@@ -51267,7 +51267,7 @@
           <!-- Translators: this is a city in Washington in the United
                States
             -->
-          <_name>Vancouver</_name>
+          <_name msgctxt="United States, Washington">Vancouver</_name>
           <coordinates>45.638728 -122.661486</coordinates>
           <location>
             <name>Pearson Field Airport</name>
@@ -51371,7 +51371,7 @@
           <!-- Translators: this is a city in West Virginia in the
                United States
             -->
-          <_name>Charleston</_name>
+          <_name msgctxt="United States, West Virginia">Charleston</_name>
           <coordinates>38.349820 -81.632623</coordinates>
           <location>
             <name>Yeager Airport</name>
@@ -51483,7 +51483,7 @@
           <!-- Translators: this is a city in West Virginia in the
                United States
             -->
-          <_name>Petersburg</_name>
+          <_name msgctxt="United States, West Virginia">Petersburg</_name>
           <coordinates>38.992610 -79.123924</coordinates>
           <location>
             <name>Grant County Airport</name>
@@ -51507,7 +51507,7 @@
           <!-- Translators: this is a city in West Virginia in the
                United States
             -->
-          <_name>Sutton</_name>
+          <_name msgctxt="United States, West Virginia">Sutton</_name>
           <coordinates>38.664544 -80.709819</coordinates>
           <location>
             <name>Braxton County Airport</name>
@@ -51519,7 +51519,7 @@
           <!-- Translators: this is a city in West Virginia in the
                United States
             -->
-          <_name>Wheeling</_name>
+          <_name msgctxt="United States, West Virginia">Wheeling</_name>
           <coordinates>40.063962 -80.720915</coordinates>
           <location>
             <name>Wheeling Ohio County Airport</name>
@@ -51555,7 +51555,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Appleton</_name>
+          <_name msgctxt="United States, Wisconsin">Appleton</_name>
           <coordinates>44.261931 -88.415385</coordinates>
           <location>
             <name>Appleton / Outagamie</name>
@@ -51569,7 +51569,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Ashland</_name>
+          <_name msgctxt="United States, Wisconsin">Ashland</_name>
           <coordinates>46.592443 -90.883798</coordinates>
           <location>
             <name>Kennedy Memorial Airport</name>
@@ -51608,7 +51608,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Burlington</_name>
+          <_name msgctxt="United States, Wisconsin">Burlington</_name>
           <coordinates>42.678073 -88.276203</coordinates>
           <location>
             <name>Burlington Municipal Airport</name>
@@ -51633,7 +51633,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Chicago</_name>
+          <_name msgctxt="United States, Wisconsin">Chicago</_name>
           <coordinates>42.586131 -87.824797</coordinates>
           <location>
             <name>Chicago / Waukegan, Waukegan Regional Airport</name>
@@ -51715,7 +51715,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Hayward</_name>
+          <_name msgctxt="United States, Wisconsin">Hayward</_name>
           <coordinates>46.013007 -91.484621</coordinates>
           <location>
             <name>Hayward Municipal Airport</name>
@@ -51743,7 +51743,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Juneau</_name>
+          <_name msgctxt="United States, Wisconsin">Juneau</_name>
           <coordinates>43.405550 -88.705104</coordinates>
           <location>
             <name>Dodge County Airport</name>
@@ -51825,7 +51825,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Madison</_name>
+          <_name msgctxt="United States, Wisconsin">Madison</_name>
           <coordinates>43.073052 -89.401230</coordinates>
           <location>
             <name>Dane County Regional-Truax Field</name>
@@ -51867,7 +51867,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Medford</_name>
+          <_name msgctxt="United States, Wisconsin">Medford</_name>
           <coordinates>45.138580 -90.340140</coordinates>
           <location>
             <name>Taylor County Airport</name>
@@ -51940,7 +51940,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Monroe</_name>
+          <_name msgctxt="United States, Wisconsin">Monroe</_name>
           <coordinates>42.601119 -89.638453</coordinates>
           <location>
             <name>Monroe Municipal Airport</name>
@@ -52101,7 +52101,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Sparta</_name>
+          <_name msgctxt="United States, Wisconsin">Sparta</_name>
           <coordinates>43.944133 -90.812912</coordinates>
           <location>
             <name>Sparta / Fort McCoy Airport</name>
@@ -52167,7 +52167,7 @@
           <!-- Translators: this is a city in Wisconsin in the United
                States
             -->
-          <_name>Watertown</_name>
+          <_name msgctxt="United States, Wisconsin">Watertown</_name>
           <coordinates>43.194721 -88.728992</coordinates>
           <location>
             <name>Watertown</name>
@@ -52275,7 +52275,7 @@
         <!-- Translators: this is a state/province/territory in United
              States
           -->
-        <_name>Wyoming</_name>
+        <_name msgctxt="United States">Wyoming</_name>
         <fips-code>US56</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
@@ -52296,7 +52296,7 @@
           <!-- Translators: this is a city in Wyoming in the United
                States
             -->
-          <_name>Bordeaux</_name>
+          <_name msgctxt="United States, Wyoming">Bordeaux</_name>
           <coordinates>41.936081 -104.844691</coordinates>
           <location>
             <name>Bordeaux</name>
@@ -52308,7 +52308,7 @@
           <!-- Translators: this is a city in Wyoming in the United
                States
             -->
-          <_name>Buffalo</_name>
+          <_name msgctxt="United States, Wyoming">Buffalo</_name>
           <coordinates>44.348307 -106.698938</coordinates>
           <location>
             <name>Buffalo Johnson County Airport</name>
@@ -52362,7 +52362,7 @@
           <!-- Translators: this is a city in Wyoming in the United
                States
             -->
-          <_name>Douglas</_name>
+          <_name msgctxt="United States, Wyoming">Douglas</_name>
           <coordinates>42.759690 -105.382207</coordinates>
           <location>
             <name>Converse County Airport</name>
@@ -52414,7 +52414,7 @@
           <!-- Translators: this is a city in Wyoming in the United
                States
             -->
-          <_name>Jackson</_name>
+          <_name msgctxt="United States, Wyoming">Jackson</_name>
           <coordinates>43.479929 -110.762428</coordinates>
           <location>
             <name>Jackson Hole Airport</name>
@@ -52564,7 +52564,7 @@
           <!-- Translators: this is a city in Wyoming in the United
                States
             -->
-          <_name>Wyoming</_name>
+          <_name msgctxt="United States, Wyoming">Wyoming</_name>
           <coordinates>41.477475 -105.636657</coordinates>
           <location>
             <name>Vedauwoo</name>
Index: data/update-locations.py
===================================================================
--- data/update-locations.py	(revision 312)
+++ data/update-locations.py	(working copy)
@@ -165,6 +165,7 @@
     def __init__(self, parent, arg):
         self.parent = parent
         self.contents = []
+        self.dup_name = False
 
         if isinstance(arg, minidom.Element):
             self.name = getChildContentByName(arg, '_name')
@@ -216,6 +217,28 @@
         for item in self.contents:
             item.print_xml(indent + '  ')
 
+    def print_name(self, indent, name=None, localize=True):
+        if name is None:
+            name = self.name
+
+        if localize:
+            if self.dup_name:
+                if self.parent is not None:
+                    msgctxt = ''
+                    c = self.parent
+                    while c is not None:
+                        msgctxt = saxutils.escape(c.name) + ', ' + msgctxt
+                        c = c.parent
+                    msgctxt = ' msgctxt="%s"' % msgctxt[:-2]
+                else:
+                    msgctxt = ' msgctxt="(%s)"' % self.__class__.__name__
+            else:
+                msgctxt = ''
+
+            print '%s  <_name%s>%s</_name>' % (indent, msgctxt, saxutils.escape(name))
+        else:
+            print '%s  <name>%s</name>' % (indent, saxutils.escape(name))
+
     def station_prefixes(self):
         return reduce(set.__or__, [x.station_prefixes() for x in self.contents], set())
 
@@ -227,7 +250,7 @@
         print '%s<region>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         LocBase.print_xml(self, indent)
         print '%s</region>' % indent
 
@@ -254,7 +277,7 @@
         print '%s<country>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         if len(self.missing_stations):
             self.missing_stations.sort()
             comment = 'Could not find cities for the following weather stations:\n'
@@ -287,7 +310,7 @@
         print '%s<state>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         LocBase.print_xml(self, indent)
         print '%s</state>' % indent
 
@@ -343,7 +366,7 @@
             comment += '\n'.join(self.name_comment)
         if len(comment):
             printComment(indent + '  ', comment, True)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         print '%s  <coordinates>%s</coordinates>' % (indent, self.coordinates)
         for item in self.contents:
             item.print_xml(indent + '  ', self, len(self.contents) > 1)
@@ -379,10 +402,7 @@
                 name = name[:-len(city.name) - 2]
         #if self.comment is not None:
         #    print '%s  <!-- %s -->' % (indent, self.comment)
-        if localize:
-            print '%s  <_name>%s</_name>' % (indent, saxutils.escape(name))
-        else:
-            print '%s  <name>%s</name>' % (indent, saxutils.escape(name))
+        self.print_name(indent, name, localize)
         print '%s  <code>%s</code>' % (indent, self.code)
         LocBase.print_xml(self, indent)
         print '%s</location>' % indent
@@ -732,6 +752,26 @@
                 continue
     city.parent.contents.append(city)
 
+# Find duplicate names
+names = {}
+
+def add_names(container):
+    if container.name in names:
+        names[container.name].append(container)
+    else:
+        names[container.name] = [container]
+    if not isinstance(container, City):
+        for c in container.contents:
+            add_names(c)
+
+for region in regions:
+    add_names(region)
+for name in names:
+    name_list = names[name]
+    if len(name_list) > 1:
+        for container in name_list:
+            container.dup_name = True
+
 # Note unknown weather stations
 for id in stations:
     for code in stations[id]:
