[libgweather] po-locations/vi.po: import from Damned Lies

From: Nguyen Thai Ngoc Duy <pclouds src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgweather] po-locations/vi.po: import from Damned Lies
Date: Sat, 2 Apr 2011 04:51:24 +0000 (UTC)
commit fd13ae3095ac50c558ed87826052ecfb4b0532f3
Author: Nguyá»?n ThÃ¡i Ngá»?c Duy <pclouds gmail com>
Date:   Sat Apr 2 11:37:38 2011 +0700

    po-locations/vi.po: import from Damned Lies

 po-locations/vi.po | 1248 +++++++++++++++++++--------------------------------
 1 files changed, 465 insertions(+), 783 deletions(-)
---
diff --git a/po-locations/vi.po b/po-locations/vi.po
index d094b28..f67066a 100644
--- a/po-locations/vi.po
+++ b/po-locations/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: weather-locations 2.25.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-23 17:03+0000\n"
+"POT-Creation-Date: 2011-03-18 22:05+0000\n"
 "PO-Revision-Date: 2009-02-10 20:13+1030\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
@@ -20,7 +20,6 @@ msgstr ""
 msgid "Africa"
 msgstr "ChÃ¢u Phi"
 
-#| msgid "Antarctica"
 msgctxt "Region"
 msgid "Antarctica"
 msgstr "Nam Cá»±c"
@@ -29,7 +28,6 @@ msgid "Asia"
 msgstr "ChÃ¢u Ã?"
 
 #. FIXME: rename this to Atlantic Ocean
-#| msgid "Atlantic"
 msgctxt "Region"
 msgid "Atlantic"
 msgstr "Ä?áº¡i TÃ¢y DÆ°Æ¡ng"
@@ -81,7 +79,6 @@ msgid "Anguilla"
 msgstr "Anguilla"
 
 #. AQ - Antarctica
-#| msgid "Antarctica"
 msgctxt "Country"
 msgid "Antarctica"
 msgstr "Nam Cá»±c"
@@ -95,6 +92,7 @@ msgid "Argentina"
 msgstr "Ã?c-hen-ti-na"
 
 #. AM - Armenia
+#. A city in Colombia
 msgid "Armenia"
 msgstr "Armenia"
 
@@ -309,7 +307,6 @@ msgid "Denmark"
 msgstr "Ä?an-máº¡ch"
 
 #. DJ - Djibouti
-#| msgid "Djibouti"
 msgctxt "Country"
 msgid "Djibouti"
 msgstr "Djibouti"
@@ -409,7 +406,6 @@ msgid "Gambia"
 msgstr "Gambia"
 
 #. GE - Georgia (the country, not the US state)
-#| msgid "Georgia"
 msgctxt "Country"
 msgid "Georgia"
 msgstr "Gi-oa-gi-a"
@@ -425,7 +421,6 @@ msgstr "Ghana"
 #. GI - Gibraltar, a British overseas territory on the southern
 #. tip of Spain.
 #.
-#| msgid "Gibraltar"
 msgctxt "Country"
 msgid "Gibraltar"
 msgstr "Gi-boa-tha"
@@ -457,7 +452,6 @@ msgid "Guam"
 msgstr "Guam"
 
 #. GT - Guatemala
-#| msgid "Guatemala"
 msgctxt "Country"
 msgid "Guatemala"
 msgstr "Gua-tÃª-ma-la"
@@ -545,7 +539,6 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. JO - Jordan
-#| msgid "Jordan"
 msgctxt "Country"
 msgid "Jordan"
 msgstr "Gi-oa-Ä?an"
@@ -563,7 +556,6 @@ msgid "Kiribati"
 msgstr "Kiribati"
 
 #. KW - Kuwait
-#| msgid "Kuwait"
 msgctxt "Country"
 msgid "Kuwait"
 msgstr "Cu-ouai-th"
@@ -581,7 +573,6 @@ msgid "Latvia"
 msgstr "LÃ¡t-vi-a"
 
 #. LB - Lebanon
-#| msgid "Lebanon"
 msgctxt "Country"
 msgid "Lebanon"
 msgstr "Lebanon"
@@ -591,7 +582,6 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #. LR - Liberia
-#| msgid "Liberia"
 msgctxt "Country"
 msgid "Liberia"
 msgstr "Li-bÃª-ri-a"
@@ -609,7 +599,6 @@ msgid "Lithuania"
 msgstr "Li-tu-a-ni"
 
 #. LU - Luxembourg
-#| msgid "Luxembourg"
 msgctxt "Country"
 msgid "Luxembourg"
 msgstr "LÃºc-xÄ?m-buac"
@@ -619,7 +608,6 @@ msgstr "LÃºc-xÄ?m-buac"
 #. used. The "u" spelling is currently slightly more popular in
 #. English.)
 #.
-#| msgid "Macau"
 msgctxt "Country"
 msgid "Macau"
 msgstr "Ma Cao"
@@ -649,7 +637,6 @@ msgid "Mali"
 msgstr "Mali"
 
 #. MT - Malta
-#| msgid "Malta"
 msgctxt "Country"
 msgid "Malta"
 msgstr "Moa-ta"
@@ -689,7 +676,6 @@ msgid "Moldova"
 msgstr "Moldova"
 
 #. MC - Monaco
-#| msgid "Monaco"
 msgctxt "Country"
 msgid "Monaco"
 msgstr "Mo-na-cÃ´"
@@ -821,7 +807,6 @@ msgid "Paraguay"
 msgstr "Ba-ra-guay"
 
 #. PE - Peru
-#| msgid "Peru"
 msgctxt "Country"
 msgid "Peru"
 msgstr "PÃª-ru"
@@ -913,7 +898,6 @@ msgid "Samoa"
 msgstr "Samoa"
 
 #. SM - San Marino
-#| msgid "San Marino"
 msgctxt "Country"
 msgid "San Marino"
 msgstr "San Marino"
@@ -946,7 +930,6 @@ msgid "Sierra Leone"
 msgstr "Xi-e-ra LÃª-Ã´-ne"
 
 #. SG - Singapore
-#| msgid "Singapore"
 msgctxt "Country"
 msgid "Singapore"
 msgstr "Xin-ga-po"
@@ -1538,7 +1521,6 @@ msgstr "Tocantins"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Bahia"
 msgctxt "Timezone"
 msgid "Bahia"
 msgstr "Bahia"
@@ -1557,7 +1539,6 @@ msgstr "AmapÃ¡ / East ParÃ¡"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Roraima"
 msgctxt "Timezone"
 msgid "Roraima"
 msgstr "Roraima"
@@ -1567,7 +1548,6 @@ msgstr "Roraima"
 #. for more details. This string is only used in places
 #. where "Brazil" is already clear from context.
 #.
-#| msgid "Mato Grosso do Sul"
 msgctxt "Timezone"
 msgid "Mato Grosso do Sul"
 msgstr "Mato Grosso do Sul"
@@ -1577,7 +1557,6 @@ msgstr "Mato Grosso do Sul"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Mato Grosso"
 msgctxt "Timezone"
 msgid "Mato Grosso"
 msgstr "Mato Grosso"
@@ -1639,7 +1618,6 @@ msgstr "West ParÃ¡, RondÃ´nia"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Pernambuco"
 msgctxt "Timezone"
 msgid "Pernambuco"
 msgstr "Pernambuco"
@@ -1649,7 +1627,6 @@ msgstr "Pernambuco"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Acre"
 msgctxt "Timezone"
 msgid "Acre"
 msgstr "Acre"
@@ -1985,7 +1962,6 @@ msgstr "Tasmania"
 
 # Tiá»?u bang cá»§a Ã?c.
 #. A state/province/territory in Australia
-#| msgid "Victoria"
 msgctxt "State in Australia"
 msgid "Victoria"
 msgstr "Victoria"
@@ -1998,7 +1974,6 @@ msgstr "TÃ¢y Ã?c"
 #. A state in Belgium. local name (nl): Antwerpen. local name
 #. (fr): Anvers. local name (de): Antwerpen.
 #.
-#| msgid "Antwerp"
 msgctxt "State in Belgium"
 msgid "Antwerp"
 msgstr "Anvers"
@@ -2036,7 +2011,6 @@ msgid "LiÃ¨ge"
 msgstr "LÃ®dge"
 
 #. A state/province/territory in Belgium
-#| msgid "Luxembourg"
 msgctxt "State in Belgium"
 msgid "Luxembourg"
 msgstr "LÃºc-xÄ?m-buac"
@@ -2053,7 +2027,6 @@ msgid "West-Flanders"
 msgstr "Flandre occidentale"
 
 #. A state/province/territory in Brazil
-#| msgid "Acre"
 msgctxt "State in Brazil"
 msgid "Acre"
 msgstr "Acre"
@@ -2071,7 +2044,6 @@ msgid "Amazonas"
 msgstr "Arizona"
 
 #. A state/province/territory in Brazil
-#| msgid "Bahia"
 msgctxt "State in Brazil"
 msgid "Bahia"
 msgstr "Bahia"
@@ -2081,7 +2053,6 @@ msgid "CearÃ¡"
 msgstr "CearÃ¡"
 
 #. A state/province/territory in Brazil
-#| msgid "Distrito Federal"
 msgctxt "State in Brazil"
 msgid "Distrito Federal"
 msgstr "Distrito Federal"
@@ -2099,13 +2070,11 @@ msgid "MaranhÃ£o"
 msgstr "MaranhÃ£o"
 
 #. A state/province/territory in Brazil
-#| msgid "Mato Grosso"
 msgctxt "State in Brazil"
 msgid "Mato Grosso"
 msgstr "Mato Grosso"
 
 #. A state/province/territory in Brazil
-#| msgid "Mato Grosso do Sul"
 msgctxt "State in Brazil"
 msgid "Mato Grosso do Sul"
 msgstr "Mato Grosso do Sul"
@@ -2127,7 +2096,6 @@ msgid "ParÃ¡"
 msgstr "ParÃ¡"
 
 #. A state/province/territory in Brazil
-#| msgid "Pernambuco"
 msgctxt "State in Brazil"
 msgid "Pernambuco"
 msgstr "Pernambuco"
@@ -2145,7 +2113,6 @@ msgid "Rio Grande do Sul"
 msgstr "Rio Grande do Sul"
 
 #. A state/province/territory in Brazil
-#| msgid "Rio de Janeiro"
 msgctxt "State in Brazil"
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
@@ -2155,7 +2122,6 @@ msgid "RondÃ´nia"
 msgstr "RondÃ´nia"
 
 #. A state/province/territory in Brazil
-#| msgid "Roraima"
 msgctxt "State in Brazil"
 msgid "Roraima"
 msgstr "Roraima"
@@ -2169,7 +2135,6 @@ msgid "Sergipe"
 msgstr "Sergipe"
 
 #. A state/province/territory in Brazil
-#| msgid "SÃ£o Paulo"
 msgctxt "State in Brazil"
 msgid "SÃ£o Paulo"
 msgstr "SÃ£o Paulo"
@@ -2211,7 +2176,6 @@ msgid "Nunavut"
 msgstr "Nunavut"
 
 #. A state/province/territory in Canada
-#| msgid "Ontario"
 msgctxt "State in Canada"
 msgid "Ontario"
 msgstr "Ontario"
@@ -2221,7 +2185,6 @@ msgid "Prince Edward Island"
 msgstr "Ä?áº£o Prince Edward"
 
 #. A state/province/territory in Canada
-#| msgid "Quebec"
 msgctxt "State in Canada"
 msgid "Quebec"
 msgstr "QuÃ©bec"
@@ -2239,13 +2202,11 @@ msgid "Anhui"
 msgstr "An Huy"
 
 #. A state/province/territory in China
-#| msgid "Beijing"
 msgctxt "State in China"
 msgid "Beijing"
 msgstr "Báº¯c Kinh"
 
 #. A state/province/territory in China
-#| msgid "Chongqing"
 msgctxt "State in China"
 msgid "Chongqing"
 msgstr "TrÃ¹ng KhÃ¡nh"
@@ -2315,7 +2276,6 @@ msgid "Shandong"
 msgstr "SÆ¡n Ä?Ã´ng"
 
 #. A state/province/territory in China
-#| msgid "Shanghai"
 msgctxt "State in China"
 msgid "Shanghai"
 msgstr "ThÆ°á»£ng Háº£i"
@@ -2329,7 +2289,6 @@ msgid "Sichuan"
 msgstr "Tá»© XuyÃªn"
 
 #. A state/province/territory in China
-#| msgid "Tianjin"
 msgctxt "State in China"
 msgid "Tianjin"
 msgstr "ThiÃªn TÃ¢n"
@@ -2358,7 +2317,6 @@ msgid "Bavaria"
 msgstr "Bayern"
 
 #. A state/province/territory in Germany
-#| msgid "Berlin"
 msgctxt "State in Germany"
 msgid "Berlin"
 msgstr "BÃ©c-lin"
@@ -2368,13 +2326,11 @@ msgid "Brandenburg"
 msgstr "Brandenburg"
 
 #. A state/province/territory in Germany
-#| msgid "Bremen"
 msgctxt "State in Germany"
 msgid "Bremen"
 msgstr "Bremen"
 
 #. A state/province/territory in Germany
-#| msgid "Hamburg"
 msgctxt "State in Germany"
 msgid "Hamburg"
 msgstr "Hamburg"
@@ -2444,7 +2400,6 @@ msgid "Thuringia"
 msgstr "ThÃ¼ringen"
 
 #. A state/province/territory in Mexico
-#| msgid "Aguascalientes"
 msgctxt "State in Mexico"
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
@@ -2458,7 +2413,6 @@ msgid "Baja California Sur"
 msgstr "Baja California Sur"
 
 #. A state/province/territory in Mexico
-#| msgid "Campeche"
 msgctxt "State in Mexico"
 msgid "Campeche"
 msgstr "Campeche"
@@ -2468,7 +2422,6 @@ msgid "Chiapas"
 msgstr "Chiapas"
 
 #. A state/province/territory in Mexico
-#| msgid "Chihuahua"
 msgctxt "State in Mexico"
 msgid "Chihuahua"
 msgstr "Chihuahua"
@@ -2478,19 +2431,16 @@ msgid "Coahuila"
 msgstr "Coahuila"
 
 #. A state/province/territory in Mexico
-#| msgid "Colima"
 msgctxt "State in Mexico"
 msgid "Colima"
 msgstr "Colima"
 
 #. A state/province/territory in Mexico
-#| msgid "Distrito Federal"
 msgctxt "State in Mexico"
 msgid "Distrito Federal"
 msgstr "Distrito Federal"
 
 #. A state/province/territory in Mexico
-#| msgid "Durango"
 msgctxt "State in Mexico"
 msgid "Durango"
 msgstr "Durango"
@@ -2532,19 +2482,16 @@ msgid "Nuevo LeÃ³n"
 msgstr "Nuevo LeÃ³n"
 
 #. A state/province/territory in Mexico
-#| msgid "Oaxaca"
 msgctxt "State in Mexico"
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
 #. A state/province/territory in Mexico
-#| msgid "Puebla"
 msgctxt "State in Mexico"
 msgid "Puebla"
 msgstr "Puebla"
 
 #. A state/province/territory in Mexico
-#| msgid "QuerÃ©taro"
 msgctxt "State in Mexico"
 msgid "QuerÃ©taro"
 msgstr "QuerÃ©taro"
@@ -2554,7 +2501,6 @@ msgid "Quintana Roo"
 msgstr "Quintana Roo"
 
 #. A state/province/territory in Mexico
-#| msgid "San Luis PotosÃ"
 msgctxt "State in Mexico"
 msgid "San Luis PotosÃ"
 msgstr "San Luis PotosÃ"
@@ -2564,7 +2510,6 @@ msgid "Sinaloa"
 msgstr "Sinaloa"
 
 #. A state/province/territory in Mexico
-#| msgid "Sonora"
 msgctxt "State in Mexico"
 msgid "Sonora"
 msgstr "Sonora"
@@ -2582,7 +2527,6 @@ msgid "Tlaxcala"
 msgstr "Tlaxcala"
 
 #. A state/province/territory in Mexico
-#| msgid "Veracruz"
 msgctxt "State in Mexico"
 msgid "Veracruz"
 msgstr "Veracruz"
@@ -2592,7 +2536,6 @@ msgid "YucatÃ¡n"
 msgstr "YucatÃ¡n"
 
 #. A state/province/territory in Mexico
-#| msgid "Zacatecas"
 msgctxt "State in Mexico"
 msgid "Zacatecas"
 msgstr "Zacatecas"
@@ -2670,7 +2613,6 @@ msgid "Florida"
 msgstr "Florida"
 
 #. A state/province/territory in United States
-#| msgid "Georgia"
 msgctxt "State in United States"
 msgid "Georgia"
 msgstr "Georgia"
@@ -2688,7 +2630,6 @@ msgid "Illinois"
 msgstr "Illinois"
 
 #. A state/province/territory in United States
-#| msgid "Indiana"
 msgctxt "State in United States"
 msgid "Indiana"
 msgstr "Indiana"
@@ -2762,7 +2703,6 @@ msgid "New Mexico"
 msgstr "New Mexico"
 
 #. A state/province/territory in United States
-#| msgid "New York"
 msgctxt "State in United States"
 msgid "New York"
 msgstr "New York"
@@ -2824,7 +2764,6 @@ msgid "Virginia"
 msgstr "Virginia"
 
 #. A state/province/territory in United States
-#| msgid "Washington"
 msgctxt "State in United States"
 msgid "Washington"
 msgstr "Washington"
@@ -2838,7 +2777,6 @@ msgid "Wisconsin"
 msgstr "Wisconsin"
 
 #. A state/province/territory in United States
-#| msgid "Wyoming"
 msgctxt "State in United States"
 msgid "Wyoming"
 msgstr "Wyoming"
@@ -3005,10 +2943,6 @@ msgstr "Touggourt"
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#. The capital of Angola
-msgid "Luanda"
-msgstr "Luanda"
-
 #. The capital of Anguilla
 msgid "The Valley"
 msgstr "The Valley"
@@ -3018,7 +2952,6 @@ msgid "Fitches Creek"
 msgstr "Fitches Creek"
 
 #. The capital of Antigua and Barbuda
-#| msgid "Saint John's"
 msgctxt "City in Antigua and Barbuda"
 msgid "Saint John's"
 msgstr "Saint John's"
@@ -3036,7 +2969,6 @@ msgid "Corrientes"
 msgstr "Corrientes"
 
 #. A city in Argentina
-#| msgid "CÃ³rdoba"
 msgctxt "City in Argentina"
 msgid "CÃ³rdoba"
 msgstr "CÃ³rdoba"
@@ -3102,16 +3034,11 @@ msgid "San Carlos de Bariloche"
 msgstr "San Carlos de Bariloche"
 
 #. A city in Argentina
-#| msgid "San Fernando"
 msgctxt "City in Argentina"
 msgid "San Fernando"
 msgstr "San Fernando"
 
 #. A city in Argentina
-msgid "San Miguel de TucumÃ¡n"
-msgstr "San Miguel de TucumÃ¡n"
-
-#. A city in Argentina
 msgid "San Salvador de Jujuy"
 msgstr "San Salvador de Jujuy"
 
@@ -3183,7 +3110,6 @@ msgid "Forest Hill"
 msgstr "Forest Hill"
 
 #. A city in Tasmania in Australia
-#| msgid "Hobart"
 msgctxt "City in Tasmania, Australia"
 msgid "Hobart"
 msgstr "Hobart"
@@ -3214,7 +3140,6 @@ msgstr "Learmonth"
 
 # Thá»§ Ä?Ã´ tiá»?u bang Victoria táº¡i Ã?c.
 #. A city in Victoria in Australia
-#| msgid "Melbourne"
 msgctxt "City in Victoria, Australia"
 msgid "Melbourne"
 msgstr "Melbourne"
@@ -3229,7 +3154,6 @@ msgid "Perth"
 msgstr "Perth"
 
 #. A city in New South Wales in Australia
-#| msgid "Richmond"
 msgctxt "City in New South Wales, Australia"
 msgid "Richmond"
 msgstr "Richmond"
@@ -3244,7 +3168,6 @@ msgstr "Shellborough"
 
 # Thá»§ Ä?Ã´ cá»§a tiá»?u bang New South Wales, táº¡i Ã?c.
 #. A city in New South Wales in Australia
-#| msgid "Sydney"
 msgctxt "City in New South Wales, Australia"
 msgid "Sydney"
 msgstr "Sydney"
@@ -3332,13 +3255,11 @@ msgid "Ganca"
 msgstr "Ganca"
 
 #. A city in the Bahamas
-#| msgid "Freeport"
 msgctxt "City in Bahamas"
 msgid "Freeport"
 msgstr "Freeport"
 
 #. A city in the Bahamas
-#| msgid "Georgetown"
 msgctxt "City in Bahamas"
 msgid "Georgetown"
 msgstr "Georgetown"
@@ -3385,7 +3306,6 @@ msgid "Paragon"
 msgstr "Paragon"
 
 #. A city in Belarus
-#| msgid "Brest"
 msgctxt "City in Belarus"
 msgid "Brest"
 msgstr "Brest"
@@ -3410,7 +3330,6 @@ msgstr "Vitsyebsk"
 #. "Antwerp" is the traditional English name.
 #. The local name is "Antwerpen".
 #.
-#| msgid "Antwerp"
 msgctxt "City in Antwerp, Belgium"
 msgid "Antwerp"
 msgstr "Antwerpen"
@@ -3480,13 +3399,11 @@ msgid "Porto-Novo"
 msgstr "Porto-Novo"
 
 #. The capital of Bermuda
-#| msgid "Hamilton"
 msgctxt "City in Bermuda"
 msgid "Hamilton"
 msgstr "Hamilton"
 
 #. A city in Bermuda
-#| msgid "Saint George"
 msgctxt "City in Bermuda"
 msgid "Saint George"
 msgstr "Saint George"
@@ -3504,13 +3421,11 @@ msgid "Cochabamba"
 msgstr "Cochabamba"
 
 #. A city in Bolivia
-#| msgid "ConcepciÃ³n"
 msgctxt "City in Bolivia"
 msgid "ConcepciÃ³n"
 msgstr "ConcepciÃ³n"
 
 #. The capital of Bolivia
-#| msgid "La Paz"
 msgctxt "City in Bolivia"
 msgid "La Paz"
 msgstr "La Paz"
@@ -3582,7 +3497,6 @@ msgid "Tarija"
 msgstr "Tarija"
 
 #. A city in Bolivia
-#| msgid "Trinidad"
 msgctxt "City in Bolivia"
 msgid "Trinidad"
 msgstr "Trinidad"
@@ -3820,7 +3734,6 @@ msgid "MossorÃ³"
 msgstr "MossorÃ³"
 
 #. A city in Rio Grande do Norte in Brazil
-#| msgid "Natal"
 msgctxt "City in Rio Grande do Norte, Brazil"
 msgid "Natal"
 msgstr "Natal"
@@ -3890,7 +3803,6 @@ msgid "Rio Branco"
 msgstr "Rio Branco"
 
 #. A city in Rio de Janeiro in Brazil
-#| msgid "Rio de Janeiro"
 msgctxt "City in Rio de Janeiro, Brazil"
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
@@ -3900,7 +3812,6 @@ msgid "Salvador"
 msgstr "Salvador"
 
 #. A city in Rio Grande do Sul in Brazil
-#| msgid "Santa Maria"
 msgctxt "City in Rio Grande do Sul, Brazil"
 msgid "Santa Maria"
 msgstr "Santa Maria"
@@ -3930,7 +3841,6 @@ msgid "SÃ£o LuÃs"
 msgstr "SÃ£o LuÃs"
 
 #. A city in SÃ£o Paulo in Brazil
-#| msgid "SÃ£o Paulo"
 msgctxt "City in SÃ£o Paulo, Brazil"
 msgid "SÃ£o Paulo"
 msgstr "SÃ£o Paulo"
@@ -4146,7 +4056,6 @@ msgid "Beaver Harbour"
 msgstr "Cáº£ng Beaver"
 
 #. A city in Quebec in Canada
-#| msgid "Bedford"
 msgctxt "City in Quebec, Canada"
 msgid "Bedford"
 msgstr "Bedford"
@@ -4204,7 +4113,6 @@ msgid "Buffalo Narrows"
 msgstr "Buffalo Narrows"
 
 #. A city in Ontario in Canada
-#| msgid "Burlington"
 msgctxt "City in Ontario, Canada"
 msgid "Burlington"
 msgstr "Burlington"
@@ -4327,7 +4235,6 @@ msgid "Claresholm"
 msgstr "Claresholm"
 
 #. A city in British Columbia in Canada
-#| msgid "Clinton"
 msgctxt "City in British Columbia, Canada"
 msgid "Clinton"
 msgstr "Clinton"
@@ -4373,7 +4280,6 @@ msgid "Cranbrook"
 msgstr "Cranbrook"
 
 #. A city in British Columbia in Canada
-#| msgid "Creston"
 msgctxt "City in British Columbia, Canada"
 msgid "Creston"
 msgstr "Creston"
@@ -4411,7 +4317,6 @@ msgid "Drumheller"
 msgstr "Drumheller"
 
 #. A city in Ontario in Canada
-#| msgid "Dryden"
 msgctxt "City in Ontario, Canada"
 msgid "Dryden"
 msgstr "Dryden"
@@ -4445,7 +4350,6 @@ msgid "Elliot Lake"
 msgstr "Elliot Lake"
 
 #. A city in Prince Edward Island in Canada
-#| msgid "Elmira"
 msgctxt "City in Prince Edward Island, Canada"
 msgid "Elmira"
 msgstr "Elmira"
@@ -4479,7 +4383,6 @@ msgid "Esther"
 msgstr "Esther"
 
 #. A city in Nunavut in Canada
-#| msgid "Eureka"
 msgctxt "City in Nunavut, Canada"
 msgid "Eureka"
 msgstr "Eureka"
@@ -4521,7 +4424,6 @@ msgid "Fort Simpson"
 msgstr "Fort Simpson"
 
 #. A city in Northwest Territories in Canada
-#| msgid "Fort Smith"
 msgctxt "City in Northwest Territories, Canada"
 msgid "Fort Smith"
 msgstr "Fort Smith"
@@ -4530,10 +4432,6 @@ msgstr "Fort Smith"
 msgid "Fort-Rupert"
 msgstr "Fort-Rupert"
 
-#. A city in Quebec in Canada
-msgid "Fox Bay"
-msgstr "Fox Bay"
-
 #. A city in New Brunswick in Canada
 msgid "Fredericton"
 msgstr "Fredericton"
@@ -4595,7 +4493,6 @@ msgid "Gore Bay"
 msgstr "Gore Bay"
 
 #. A city in Manitoba in Canada
-#| msgid "Grand Rapids"
 msgctxt "City in Manitoba, Canada"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
@@ -4609,7 +4506,6 @@ msgid "Grande Prairie"
 msgstr "Grande Prairie"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Greenwood"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Greenwood"
 msgstr "Greenwood"
@@ -4631,7 +4527,6 @@ msgid "Hallowell"
 msgstr "Hallowell"
 
 #. A city in Ontario in Canada
-#| msgid "Hamilton"
 msgctxt "City in Ontario, Canada"
 msgid "Hamilton"
 msgstr "Hamilton"
@@ -4653,7 +4548,6 @@ msgid "Hay River"
 msgstr "Hay River"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Hebron"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Hebron"
 msgstr "Hebron"
@@ -4711,7 +4605,6 @@ msgid "Jacques-Cartier"
 msgstr "Jacques-Cartier"
 
 #. A city in Alberta in Canada
-#| msgid "Jasper"
 msgctxt "City in Alberta, Canada"
 msgid "Jasper"
 msgstr "Jasper"
@@ -4745,7 +4638,6 @@ msgid "Kindersley"
 msgstr "Kindersley"
 
 #. A city in Ontario in Canada
-#| msgid "Kingston"
 msgctxt "City in Ontario, Canada"
 msgid "Kingston"
 msgstr "Kingston"
@@ -4819,7 +4711,6 @@ msgid "Little Prairie"
 msgstr "Little Prairie"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Liverpool"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Liverpool"
 msgstr "Liverpool"
@@ -4829,7 +4720,6 @@ msgid "Lloydminster"
 msgstr "Lloydminster"
 
 #. A city in Ontario in Canada
-#| msgid "London"
 msgctxt "City in Ontario, Canada"
 msgid "London"
 msgstr "London"
@@ -4854,10 +4744,6 @@ msgstr "Lytton"
 msgid "Makkovik"
 msgstr "Makkovik"
 
-#. A city in British Columbia in Canada
-msgid "Malahat"
-msgstr "Malahat"
-
 #. A city in Quebec in Canada
 msgid "Maniwaki"
 msgstr "Maniwaki"
@@ -4899,7 +4785,6 @@ msgid "Melfort"
 msgstr "Melfort"
 
 #. A city in Manitoba in Canada
-#| msgid "Miami"
 msgctxt "City in Manitoba, Canada"
 msgid "Miami"
 msgstr "Miami"
@@ -4975,7 +4860,6 @@ msgid "Nanticoke"
 msgstr "Nanticoke"
 
 #. A city in British Columbia in Canada
-#| msgid "Natal"
 msgctxt "City in British Columbia, Canada"
 msgid "Natal"
 msgstr "Natal"
@@ -5108,10 +4992,6 @@ msgstr "Pitt Meadows"
 msgid "Pond Inlet"
 msgstr "Pond Inlet"
 
-#. A city in Ontario in Canada
-msgid "Port Colborne"
-msgstr "Port Colborne"
-
 #. A city in British Columbia in Canada
 msgid "Port Hardy"
 msgstr "Port Hardy"
@@ -5153,7 +5033,6 @@ msgid "Prince Rupert"
 msgstr "Prince Rupert"
 
 #. A city in British Columbia in Canada
-#| msgid "Princeton"
 msgctxt "City in British Columbia, Canada"
 msgid "Princeton"
 msgstr "Princeton"
@@ -5169,7 +5048,6 @@ msgstr "Qikiqtarjuaq"
 #. A city in Quebec in Canada.
 #. The local name in French is "QuÃ©bec".
 #.
-#| msgid "Quebec"
 msgctxt "City in Quebec, Canada"
 msgid "Quebec"
 msgstr "QuÃ©bec"
@@ -5263,7 +5141,6 @@ msgid "Saint John"
 msgstr "Saint John"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Saint John's"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Saint John's"
 msgstr "Saint John's"
@@ -5381,7 +5258,6 @@ msgid "Snag"
 msgstr "Snag"
 
 #. A city in Saskatchewan in Canada
-#| msgid "Southend"
 msgctxt "City in Saskatchewan, Canada"
 msgid "Southend"
 msgstr "Southend"
@@ -5403,7 +5279,6 @@ msgid "Stephen"
 msgstr "Stephen"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Stephenville"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Stephenville"
 msgstr "Stephenville"
@@ -5446,7 +5321,6 @@ msgstr "Swift Current"
 
 # Thá»§ Ä?Ã´ cá»§a tiá»?u bang New South Wales, táº¡i Ã?c.
 #. A city in Nova Scotia in Canada
-#| msgid "Sydney"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Sydney"
 msgstr "Sydney"
@@ -5508,7 +5382,6 @@ msgid "Tow Hill"
 msgstr "Tow Hill"
 
 #. A city in Ontario in Canada
-#| msgid "Trenton"
 msgctxt "City in Ontario, Canada"
 msgid "Trenton"
 msgstr "Trenton"
@@ -5554,7 +5427,6 @@ msgid "Valcartier Station"
 msgstr "Valcartier Station"
 
 #. A city in British Columbia in Canada
-#| msgid "Vancouver"
 msgctxt "City in British Columbia, Canada"
 msgid "Vancouver"
 msgstr "Vancouver"
@@ -5568,14 +5440,12 @@ msgid "Vegreville"
 msgstr "Vegreville"
 
 #. A city in British Columbia in Canada
-#| msgid "Vernon"
 msgctxt "City in British Columbia, Canada"
 msgid "Vernon"
 msgstr "Vernon"
 
 # Tiá»?u bang cá»§a Ã?c.
 #. A city in British Columbia in Canada
-#| msgid "Victoria"
 msgctxt "City in British Columbia, Canada"
 msgid "Victoria"
 msgstr "Victoria"
@@ -5589,7 +5459,6 @@ msgid "Wabush"
 msgstr "Wabush"
 
 #. A city in Ontario in Canada
-#| msgid "Waterloo"
 msgctxt "City in Ontario, Canada"
 msgid "Waterloo"
 msgstr "Waterloo"
@@ -5676,7 +5545,6 @@ msgid "PreguiÃ§a"
 msgstr "PreguiÃ§a"
 
 #. The capital of the Cayman Islands
-#| msgid "George Town"
 msgctxt "City in Cayman Islands"
 msgid "George Town"
 msgstr "George Town"
@@ -5726,7 +5594,6 @@ msgid "Balmaceda"
 msgstr "Balmaceda"
 
 #. A city in Chile
-#| msgid "ConcepciÃ³n"
 msgctxt "City in Chile"
 msgid "ConcepciÃ³n"
 msgstr "ConcepciÃ³n"
@@ -5756,7 +5623,6 @@ msgid "Santa Teresa de Lo Ovalle"
 msgstr "Santa Teresa de Lo Ovalle"
 
 #. The capital of Chile
-#| msgid "Santiago"
 msgctxt "City in Chile"
 msgid "Santiago"
 msgstr "Santiago"
@@ -5766,7 +5632,6 @@ msgid "Temuco"
 msgstr "Temuco"
 
 #. The capital of China
-#| msgid "Beijing"
 msgctxt "City in Beijing, China"
 msgid "Beijing"
 msgstr "Báº¯c Kinh"
@@ -5792,7 +5657,6 @@ msgstr "ThÃ nh Ä?Ã´"
 #. A city in Chongqing in China.
 #. The name is also written "é??åº?".
 #.
-#| msgid "Chongqing"
 msgctxt "City in Chongqing, China"
 msgid "Chongqing"
 msgstr "TrÃ¹ng KhÃ¡nh"
@@ -5880,7 +5744,6 @@ msgstr "Tam Ã?"
 #. A city in Shanghai in China.
 #. The name is also written "ä¸?æµ·".
 #.
-#| msgid "Shanghai"
 msgctxt "City in Shanghai, China"
 msgid "Shanghai"
 msgstr "ThÆ°á»£ng Háº£i"
@@ -5908,7 +5771,6 @@ msgstr "ThÃ¡i NguyÃªn"
 #. A city in Tianjin in China.
 #. The name is also written "å¤©æ´¥".
 #.
-#| msgid "Tianjin"
 msgctxt "City in Tianjin, China"
 msgid "Tianjin"
 msgstr "ThiÃªn TÃ¢n"
@@ -5980,14 +5842,58 @@ msgid "CÃºcuta"
 msgstr "CÃºcuta"
 
 #. A city in Colombia
+msgid "IbaguÃ©"
+msgstr ""
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Wales"
+msgid "Ipiales"
+msgstr "Wales"
+
+#. A city in Colombia
 msgid "Leticia"
 msgstr "Leticia"
 
 #. A city in Colombia
+#, fuzzy
+#| msgid "Meriden"
+msgid "MedellÃn"
+msgstr "Meriden"
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Montserrat"
+msgid "Monteria"
+msgstr "Montserrat"
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Pasco"
+msgid "Pasto"
+msgstr "Pasco"
+
+#. A city in Colombia
 msgid "Pereira"
 msgstr "Pereira"
 
 #. A city in Colombia
+#, fuzzy
+#| msgid "RoatÃ¡n"
+msgid "PopayÃ¡n"
+msgstr "RoatÃ¡n"
+
+#. A city in Colombia
+msgid "QuibdÃ³"
+msgstr ""
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Rafha"
+msgid "Riohacha"
+msgstr "Rafha"
+
+#. A city in Colombia
 msgid "Rionegro"
 msgstr "Rionegro"
 
@@ -5995,6 +5901,17 @@ msgstr "Rionegro"
 msgid "San AndrÃ©s"
 msgstr "San AndrÃ©s"
 
+#. A city in Colombia
+#, fuzzy
+#| msgctxt "City in Rio Grande do Sul, Brazil"
+#| msgid "Santa Maria"
+msgid "Santa Marta"
+msgstr "Santa Maria"
+
+#. A city in Colombia
+msgid "Villavicencio"
+msgstr ""
+
 #. A city in Comoros
 msgid "MbalÃ©ni"
 msgstr "MbalÃ©ni"
@@ -6024,7 +5941,6 @@ msgid "Alajuela"
 msgstr "Alajuela"
 
 #. A city in Costa Rica
-#| msgid "Liberia"
 msgctxt "City in Costa Rica"
 msgid "Liberia"
 msgstr "Liberia"
@@ -6101,7 +6017,6 @@ msgid "HolguÃn"
 msgstr "HolguÃn"
 
 #. A city in Cuba
-#| msgid "Manzanillo"
 msgctxt "City in Cuba"
 msgid "Manzanillo"
 msgstr "Manzanillo"
@@ -6226,7 +6141,6 @@ msgid "Ã?lborg"
 msgstr "Ã?lborg"
 
 #. The capital of Djibouti
-#| msgid "Djibouti"
 msgctxt "City in Djibouti"
 msgid "Djibouti"
 msgstr "Djibouti"
@@ -6236,7 +6150,6 @@ msgid "Marigot"
 msgstr "Marigot"
 
 #. The capital of Dominica
-#| msgid "Roseau"
 msgctxt "City in Dominica"
 msgid "Roseau"
 msgstr "Roseau"
@@ -6266,7 +6179,6 @@ msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
 #. A city in the Dominican Republic
-#| msgid "Santiago"
 msgctxt "City in Dominican Republic"
 msgid "Santiago"
 msgstr "Santiago"
@@ -6307,7 +6219,6 @@ msgstr "Al Qabuti"
 #. "Alexandria" is the traditional English name.
 #. The local name in Arabic is "Al Iskandariyah".
 #.
-#| msgid "Alexandria"
 msgctxt "City in Egypt"
 msgid "Alexandria"
 msgstr "Alexandria"
@@ -6324,7 +6235,6 @@ msgstr "Asyut"
 #. "Cairo" is the traditional English name.
 #. The local name in Arabic is "Al Qahirah".
 #.
-#| msgid "Cairo"
 msgctxt "City in Egypt"
 msgid "Cairo"
 msgstr "Cairo"
@@ -6385,7 +6295,6 @@ msgid "Tartu"
 msgstr "Tartu"
 
 #. The capital of the Falkland Islands (Malvinas)
-#| msgid "Stanley"
 msgctxt "City in Falkland Islands (Malvinas)"
 msgid "Stanley"
 msgstr "Stanley"
@@ -6398,14 +6307,6 @@ msgstr "SÃ¸rvÃ¡gur"
 msgid "TÃ³rshavn"
 msgstr "TÃ³rshavn"
 
-#. A city in Fiji
-msgid "Nausori"
-msgstr "Nausori"
-
-#. The capital of Fiji
-msgid "Suva"
-msgstr "Suva"
-
 #. A city in Finland
 msgid "EnontekiÃ¶"
 msgstr "EnontekiÃ¶"
@@ -6510,6 +6411,14 @@ msgstr "Utti"
 msgid "Vaasa"
 msgstr "Vaasa"
 
+#. A city in Finland.
+#. The local name in Swedish is "Vanda".
+#.
+#, fuzzy
+#| msgid "Varna"
+msgid "Vantaa"
+msgstr "Varna"
+
 #. A city in Finland
 msgid "Varkaus"
 msgstr "Varkaus"
@@ -6569,7 +6478,6 @@ msgid "Biarritz"
 msgstr "Biarritz"
 
 #. A city in France
-#| msgid "Bordeaux"
 msgctxt "City in France"
 msgid "Bordeaux"
 msgstr "Bordeaux"
@@ -6579,7 +6487,6 @@ msgid "Bourges"
 msgstr "Bourges"
 
 #. A city in France
-#| msgid "Brest"
 msgctxt "City in France"
 msgid "Brest"
 msgstr "Brest"
@@ -6691,10 +6598,6 @@ msgid "HyÃ¨res"
 msgstr "HyÃ¨res"
 
 #. A city in France
-msgid "HÃ©singue"
-msgstr "HÃ©singue"
-
-#. A city in France
 msgid "Istres"
 msgstr "Istres"
 
@@ -6764,6 +6667,12 @@ msgid "MontÃ©limar"
 msgstr "MontÃ©limar"
 
 #. A city in France
+#, fuzzy
+#| msgid "Toulouse"
+msgid "Mulhouse"
+msgstr "Toulouse"
+
+#. A city in France
 msgid "MÃ¢con"
 msgstr "MÃ¢con"
 
@@ -6792,7 +6701,6 @@ msgid "NÃ®mes"
 msgstr "Nome"
 
 #. A city in France
-#| msgid "Orange"
 msgctxt "City in France"
 msgid "Orange"
 msgstr "Orange"
@@ -6802,7 +6710,6 @@ msgid "OrlÃ©ans"
 msgstr "OrlÃ©ans"
 
 #. The capital of France
-#| msgid "Paris"
 msgctxt "City in France"
 msgid "Paris"
 msgstr "Pa-ri"
@@ -6892,7 +6799,6 @@ msgid "Veauche"
 msgstr "Veauche"
 
 #. A city in France
-#| msgid "Vichy"
 msgctxt "City in France"
 msgid "Vichy"
 msgstr "Vichy"
@@ -6946,7 +6852,6 @@ msgid "Baal"
 msgstr "Baal"
 
 #. The capital of Germany
-#| msgid "Berlin"
 msgctxt "City in Berlin, Germany"
 msgid "Berlin"
 msgstr "BÃ©c-lin"
@@ -6968,7 +6873,6 @@ msgid "Bredeck"
 msgstr "Bredeck"
 
 #. A city in Bremen in Germany
-#| msgid "Bremen"
 msgctxt "City in Bremen, Germany"
 msgid "Bremen"
 msgstr "Bremen"
@@ -7026,7 +6930,6 @@ msgid "Hahn"
 msgstr "Hahn"
 
 #. A city in Hamburg in Germany
-#| msgid "Hamburg"
 msgctxt "City in Hamburg, Germany"
 msgid "Hamburg"
 msgstr "Hamburg"
@@ -7188,7 +7091,6 @@ msgid "Spangdahlem"
 msgstr "Spangdahlem"
 
 #. A city in Baden-WÃ¼rttemberg in Germany
-#| msgid "Stuttgart"
 msgctxt "City in Baden-WÃ¼rttemberg, Germany"
 msgid "Stuttgart"
 msgstr "Stuttgart"
@@ -7234,7 +7136,6 @@ msgid "Accra"
 msgstr "Accra"
 
 #. The capital of Gibraltar
-#| msgid "Gibraltar"
 msgctxt "City in Gibraltar"
 msgid "Gibraltar"
 msgstr "Gi-boa-tha"
@@ -7255,7 +7156,6 @@ msgstr "ArgostÃ³lion"
 #. "Athens" is the traditional English name.
 #. The local name in Greek is "AthÃna / Î?Î¸Î®Î½Î±".
 #.
-#| msgid "Athens"
 msgctxt "City in Greece"
 msgid "Athens"
 msgstr "Athens"
@@ -7441,7 +7341,6 @@ msgid "HagÃ¥tÃ±a"
 msgstr "HagÃ¥tÃ±a"
 
 #. The capital of Guatemala
-#| msgid "Guatemala"
 msgctxt "City in Guatemala"
 msgid "Guatemala"
 msgstr "Gua-tÃª-ma-la"
@@ -7479,11 +7378,16 @@ msgid "Conakry"
 msgstr "Conakry"
 
 #. The capital of Guyana
-#| msgid "Georgetown"
 msgctxt "City in Guyana"
 msgid "Georgetown"
 msgstr "Georgetown"
 
+#. Capital of Haiti
+#, fuzzy
+#| msgid "Port Mathurin"
+msgid "Port-au-Prince"
+msgstr "Port Mathurin"
+
 #. A city in Honduras
 msgid "Amapala"
 msgstr "Amapala"
@@ -7589,13 +7493,58 @@ msgid "Ytri-NjarÃ°vÃk"
 msgstr "Ytri-NjarÃ°vÃk"
 
 #. A city in India
+#. the local name in Bengali is "à¦?à¦?à¦°à¦¤à¦²à¦¾/AgortÃ´la"
+#, fuzzy
+#| msgid "Amapala"
+msgid "Agartala"
+msgstr "Amapala"
+
+#. A city in India
+#. the local name in Hindi is "à¤?à¤?à¤°à¤¾"
+#.
+#, fuzzy
+#| msgid "Arad"
+msgid "Agra"
+msgstr "Arad"
+
+#. A city in India
 msgid "Ahmadabad"
 msgstr "Ahmadabad"
 
 #. A city in India
+#. the local name in Hindi is "à¤?à¤²à¤¾à¤¹à¤¾à¤¬à¤¾à¤¦"
+#, fuzzy
+#| msgid "Ahmadabad"
+msgid "Allahabad"
+msgstr "Ahmadabad"
+
+#. A city in India
+#. the local name in Punjabi is "à¨?à©°à¨®à©?à¨°à¨¿à¨¤à¨¸à¨°"
+#.
 msgid "Amritsar"
 msgstr "Amritsar"
 
+#. A city in India
+#. the local name in Marathi is "à¤?à¤°à¤?à¤?à¤¾à¤¬à¤¾à¤¦"
+#, fuzzy
+#| msgid "Ahmadabad"
+msgid "Aurangabad"
+msgstr "Ahmadabad"
+
+#. A city in India
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bagdogra"
+msgstr "Bangor"
+
+#. A city in India - local airport
+#. "Bengaluru" is the new name
+#.
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bangalore"
+msgstr "Bangor"
+
 #. A city in India.
 #. "Benares" is the traditional English name.
 #. The local name is "Varanasi".
@@ -7604,19 +7553,79 @@ msgstr "Amritsar"
 msgid "Benares"
 msgstr "Benares"
 
+#. A city in India
+#. the local name in Gujrati is "àªàª¾àªµàª¨àª?àª°"
+#. the local name in Hindi is "à¤à¤¾à¤µà¤¨à¤?à¤°"
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bhavnagar"
+msgstr "Bangor"
+
 #. A city in India.
-#. "Bombay" is the traditional English name.
-#. The local name in Marathi is "Mumbai /  à¤®à¥?à¤?à¤¬à¤?".
+#. The local name in Hindi is "à¤à¥?à¤ªà¤¾à¤²".
 #.
-msgid "Bombay"
-msgstr "Bombay"
+#, fuzzy
+#| msgid "Bol"
+msgid "Bhopal"
+msgstr "Bol"
 
 #. A city in India.
-#. "Calcutta" is the traditional English name.
-#. The local name in Bengali is "Kolkata /  à¦?à¦²à¦?à¦¾à¦¤à¦¾".
+#. The local name in Oriya is "à¬à?à¬¬à?à¬¨à¬¶à?à¬¬à¬°".
+#.
+#, fuzzy
+#| msgid "Changsha"
+msgid "Bhubaneshwar"
+msgstr "TrÆ°á»?ng Sa"
+
+#. A city in India.
+#, fuzzy
+#| msgid "Bhutan"
+msgid "Bhuj"
+msgstr "Bhutan"
+
+#. A union territory in India.
+#. The local name in Hindi is "à¤?à¤£à¥?à¤¡à¥?à¤?à¤¢à¤¼ / à¤?à¤?à¤¡à¥?à¤?à¤¢à¤¼"
+#. The local name in Punjabi is "à¨?à©°à¨¡à©?à¨?à©?à©?à¨¹"
+#, fuzzy
+#| msgid "Chandalar"
+msgid "Chandigarh"
+msgstr "Chandalar"
+
+#. A city in India.
+#. "Madras" is the traditional English name.
+#. The local name in Tamil is "Chennai / à®?à¯?à®©à¯?à®©à¯?".
 #.
-msgid "Calcutta"
-msgstr "Calcutta"
+#, fuzzy
+#| msgid "China"
+msgid "Chennai"
+msgstr "Trung Quá»?c"
+
+#. A city in India.
+#. The local name in Tamil is "à®?à¯?à®¯à®®à¯?à®ªà¯?à®¤à¯?à®¤à¯?à®°à¯?".
+#.
+#, fuzzy
+#| msgid "Colmar"
+msgid "Coimbatore"
+msgstr "Colmar"
+
+#. A city in India
+#. also known as Dehra Doon
+#. the local name in Hindi is "à¤¦à¥?à¤¹à¤°à¤¾à¤¦à¥?à¤¨"
+#, fuzzy
+#| msgid "Tehran"
+msgid "Dehradun"
+msgstr "Tehran"
+
+#. A city in India
+msgid "Dibrugarh"
+msgstr ""
+
+#. A city in India
+#. the local name in Hindi is "à¤¦à¥?à¤®à¤¾à¤ªà¥?à¤°"
+#, fuzzy
+#| msgid "Dinard"
+msgid "Dimapur"
+msgstr "Dinard"
 
 #. A city in India
 msgid "Hyderabad"
@@ -7627,17 +7636,48 @@ msgid "Jaipur"
 msgstr "Jaipur"
 
 #. A city in India.
+#. The local name in Dogri is "à¤?à¤®à¥?à¤®à¥?"
+#, fuzzy
+#| msgid "Namur"
+msgid "Jammu"
+msgstr "Namur"
+
+#. A city in India.
+#. The old name is "Cochin"
+#. A city in Japan
+msgid "Kochi"
+msgstr "Kochi"
+
+#. A city in India.
+#. "Calcutta" is the traditional English name.
+#. The local name in Bengali is "Kolkata /  à¦?à¦²à¦?à¦¾à¦¤à¦¾".
+#.
+#, fuzzy
+#| msgid "Koartac"
+msgid "Kolkata"
+msgstr "Koartac"
+
+#. A city in India.
+#. The local name in Hindi is "à¤²à¥?à¤¹"
+#, fuzzy
+#| msgid "Lesotho"
+msgid "Leh"
+msgstr "Lesotho"
+
+#. A city in India.
 #. The local name in Hindi is "à¤²à¤?à¤¨à¤?".
 #.
 msgid "Lucknow"
 msgstr "Lucknow"
 
 #. A city in India.
-#. "Madras" is the traditional English name.
-#. The local name in Tamil is "Chennai / à®?à¯?à®©à¯?à®©à¯?".
+#. "Bombay" is the traditional English name.
+#. The local name in Marathi is "Mumbai /  à¤®à¥?à¤?à¤¬à¤?".
 #.
-msgid "Madras"
-msgstr "Madras"
+#, fuzzy
+#| msgid "Dubai"
+msgid "Mumbai"
+msgstr "Dubai"
 
 #. A city in India
 msgid "Nagpur"
@@ -7655,6 +7695,27 @@ msgstr "New Delhi"
 msgid "Patna"
 msgstr "Patna"
 
+#. A city in India
+#, fuzzy
+#| msgid "Cuneo"
+msgid "Pune"
+msgstr "Cuneo"
+
+#. A city in India.
+#. The local name in Hindi is "à¤¶à¤¿à¤®à¤²à¤¾"
+#, fuzzy
+#| msgid "Shiraz"
+msgid "Shimla"
+msgstr "Shiraz"
+
+#. A city in India.
+#. The local name in Dogri is "à¤¶à¥?à¤°à¥?à¤¨à¤?à¤°"
+#. The local name in Urdu is "Ø´Ø±Û?Ù?Ú¯Ø±"
+#, fuzzy
+#| msgid "Iringa"
+msgid "Srinagar"
+msgstr "Iringa"
+
 #. A city in India.
 #. The local name in Malayalam is "à´¤à´¿à´°àµ?à´µà´¨à´¨àµ?à´¤à´ªàµ?à´°à´?".
 #.
@@ -7676,10 +7737,6 @@ msgid "Makassar"
 msgstr "Makassar"
 
 #. A city in Indonesia
-msgid "Manado"
-msgstr "Manado"
-
-#. A city in Indonesia
 msgid "Medan"
 msgstr "Medan"
 
@@ -7960,7 +8017,6 @@ msgstr "Cork"
 #. The capital of Ireland.
 #. The local name in Irish is "Baile Ã?tha Cliath".
 #.
-#| msgid "Dublin"
 msgctxt "City in Ireland"
 msgid "Dublin"
 msgstr "Dublin"
@@ -7982,7 +8038,6 @@ msgid "Shannon"
 msgstr "Shannon"
 
 #. The capital of the Isle of Man
-#| msgid "Douglas"
 msgctxt "City in Isle of Man"
 msgid "Douglas"
 msgstr "Douglas"
@@ -8100,7 +8155,6 @@ msgstr "Ferrara"
 #. "Florence" is the traditional English name.
 #. The local name in Italian is "Firenze".
 #.
-#| msgid "Florence"
 msgctxt "City in Italy"
 msgid "Florence"
 msgstr "Firenze"
@@ -8179,7 +8233,6 @@ msgstr "Molino di Ancona"
 #. "Naples" is the traditional English name.
 #. The local name in Italian is "Napoli".
 #.
-#| msgid "Naples"
 msgctxt "City in Italy"
 msgid "Naples"
 msgstr "Napoli"
@@ -8252,7 +8305,6 @@ msgstr "Rimini"
 #. "Rome" is the traditional English name.
 #. The local name in Italian is "Roma".
 #.
-#| msgid "Rome"
 msgctxt "City in Italy"
 msgid "Rome"
 msgstr "Roma"
@@ -8328,7 +8380,6 @@ msgid "Ã?rbatax"
 msgstr "Ã?rbatax"
 
 #. The capital of Jamaica
-#| msgid "Kingston"
 msgctxt "City in Jamaica"
 msgid "Kingston"
 msgstr "Kingston"
@@ -8450,10 +8501,6 @@ msgid "Kitakyushu"
 msgstr "Kitakyushu"
 
 #. A city in Japan
-msgid "Kochi"
-msgstr "Kochi"
-
-#. A city in Japan
 msgid "Komatsu"
 msgstr "Komatsu"
 
@@ -8466,10 +8513,6 @@ msgid "Kumamoto"
 msgstr "Kumamoto"
 
 #. A city in Japan
-msgid "Kunigami"
-msgstr "Kunigami"
-
-#. A city in Japan
 msgid "Kushiro"
 msgstr "Kushiro"
 
@@ -8753,7 +8796,6 @@ msgid "Nairobi"
 msgstr "Nairobi"
 
 #. A city in Kiribati
-#| msgid "London"
 msgctxt "City in Kiribati"
 msgid "London"
 msgstr "LuÃ¢n-Ä?Ã´n"
@@ -8762,7 +8804,6 @@ msgstr "LuÃ¢n-Ä?Ã´n"
 #. "Kuwait" is the traditional English name.
 #. The local name in Arabic is "Al Kuwayt / Ø§Ù?Ù?Ù?Ù?Øª".
 #.
-#| msgid "Kuwait"
 msgctxt "City in Kuwait"
 msgid "Kuwait"
 msgstr "Cu-ouai-th"
@@ -8829,7 +8870,6 @@ msgid "Å iauliai"
 msgstr "Å iauliai"
 
 #. The capital of Luxembourg
-#| msgid "Luxembourg"
 msgctxt "City in Luxembourg"
 msgid "Luxembourg"
 msgstr "LÃºc-xÄ?m-buac"
@@ -8837,7 +8877,6 @@ msgstr "LÃºc-xÄ?m-buac"
 #. The capital of Macau.
 #. The local name in Chinese is "Aomen / æ¾³é?¨".
 #.
-#| msgid "Macau"
 msgctxt "City in Macau"
 msgid "Macau"
 msgstr "Ma Cao"
@@ -8890,7 +8929,6 @@ msgid "Bintulu"
 msgstr "Bintulu"
 
 #. A city in Malaysia
-#| msgid "George Town"
 msgctxt "City in Malaysia"
 msgid "George Town"
 msgstr "George Town"
@@ -8960,7 +8998,6 @@ msgid "Tawau"
 msgstr "Tawau"
 
 #. A city in Malaysia
-#| msgid "Victoria"
 msgctxt "City in Malaysia"
 msgid "Victoria"
 msgstr "Victoria"
@@ -9025,13 +9062,11 @@ msgid "Acapulco"
 msgstr "Acapulco"
 
 #. A city in Aguascalientes in Mexico
-#| msgid "Aguascalientes"
 msgctxt "City in Aguascalientes, Mexico"
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
 
 #. A city in Campeche in Mexico
-#| msgid "Campeche"
 msgctxt "City in Campeche, Mexico"
 msgid "Campeche"
 msgstr "Campeche"
@@ -9053,7 +9088,6 @@ msgid "ChichÃ©n-ItzÃ¡"
 msgstr "ChichÃ©n-ItzÃ¡"
 
 #. A city in Chihuahua in Mexico
-#| msgid "Chihuahua"
 msgctxt "City in Chihuahua, Mexico"
 msgid "Chihuahua"
 msgstr "Chihuahua"
@@ -9073,7 +9107,6 @@ msgid "Ciudad Victoria"
 msgstr "Ciudad Victoria"
 
 #. A city in Colima in Mexico
-#| msgid "Colima"
 msgctxt "City in Colima, Mexico"
 msgid "Colima"
 msgstr "Colima"
@@ -9091,7 +9124,6 @@ msgid "CuliacÃ¡n"
 msgstr "CuliacÃ¡n"
 
 #. A city in Durango in Mexico
-#| msgid "Durango"
 msgctxt "City in Durango, Mexico"
 msgid "Durango"
 msgstr "Durango"
@@ -9121,7 +9153,6 @@ msgid "Ixtepec"
 msgstr "Ixtepec"
 
 #. A city in Baja California Sur in Mexico
-#| msgid "La Paz"
 msgctxt "City in Baja California Sur, Mexico"
 msgid "La Paz"
 msgstr "La Paz"
@@ -9131,7 +9162,6 @@ msgid "Laguna Tepic"
 msgstr "Laguna Tepic"
 
 #. A city in Guanajuato in Mexico
-#| msgid "LeÃ³n"
 msgctxt "City in Guanajuato, Mexico"
 msgid "LeÃ³n"
 msgstr "LeÃ³n"
@@ -9145,7 +9175,6 @@ msgid "Los Mochis"
 msgstr "Los Mochis"
 
 #. A city in Colima in Mexico
-#| msgid "Manzanillo"
 msgctxt "City in Colima, Mexico"
 msgid "Manzanillo"
 msgstr "Manzanillo"
@@ -9186,7 +9215,6 @@ msgid "Morelia"
 msgstr "Morelia"
 
 #. A city in YucatÃ¡n in Mexico
-#| msgid "MÃ©rida"
 msgctxt "City in YucatÃ¡n, Mexico"
 msgid "MÃ©rida"
 msgstr "MÃ©rida"
@@ -9196,7 +9224,6 @@ msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
 #. A city in Oaxaca in Mexico
-#| msgid "Oaxaca"
 msgctxt "City in Oaxaca, Mexico"
 msgid "Oaxaca"
 msgstr "Oaxaca"
@@ -9212,7 +9239,6 @@ msgid "Poza Rica de Hidalgo"
 msgstr "Poza Rica de Hidalgo"
 
 #. A city in Puebla in Mexico
-#| msgid "Puebla"
 msgctxt "City in Puebla, Mexico"
 msgid "Puebla"
 msgstr "Puebla"
@@ -9226,7 +9252,6 @@ msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
 #. A city in QuerÃ©taro in Mexico
-#| msgid "QuerÃ©taro"
 msgctxt "City in QuerÃ©taro, Mexico"
 msgid "QuerÃ©taro"
 msgstr "QuerÃ©taro"
@@ -9244,7 +9269,6 @@ msgid "San JosÃ© del Cabo"
 msgstr "San JosÃ© del Cabo"
 
 #. A city in San Luis PotosÃ in Mexico
-#| msgid "San Luis PotosÃ"
 msgctxt "City in San Luis PotosÃ, Mexico"
 msgid "San Luis PotosÃ"
 msgstr "San Luis PotosÃ"
@@ -9278,7 +9302,6 @@ msgid "Uruapan"
 msgstr "Uruapan"
 
 #. A city in Veracruz in Mexico
-#| msgid "Veracruz"
 msgctxt "City in Veracruz, Mexico"
 msgid "Veracruz"
 msgstr "Veracruz"
@@ -9288,7 +9311,6 @@ msgid "Villahermosa"
 msgstr "Villahermosa"
 
 #. A city in Zacatecas in Mexico
-#| msgid "Zacatecas"
 msgctxt "City in Zacatecas, Mexico"
 msgid "Zacatecas"
 msgstr "Zacatecas"
@@ -9302,7 +9324,6 @@ msgid "ChiÅ?inÄ?u"
 msgstr "ChiÅ?inÄ?u"
 
 #. The capital of Monaco
-#| msgid "Monaco"
 msgctxt "City in Monaco"
 msgid "Monaco"
 msgstr "MÃ´-na-cÃ´"
@@ -9330,10 +9351,6 @@ msgid "Al Hoceima"
 msgstr "Al Hoceima"
 
 #. A city in Morocco
-msgid "Casablanca"
-msgstr "Casablanca"
-
-#. A city in Morocco
 msgid "Fes"
 msgstr "Fes"
 
@@ -9385,10 +9402,6 @@ msgid "Chimoio"
 msgstr "Chimoio"
 
 #. A city in Mozambique
-msgid "Inhambane"
-msgstr "Inhambane"
-
-#. A city in Mozambique
 msgid "Lichinga"
 msgstr "Lichinga"
 
@@ -9408,10 +9421,6 @@ msgstr "Pemba"
 msgid "Quelimane"
 msgstr "Quelimane"
 
-#. A city in Mozambique
-msgid "Tete"
-msgstr "Tete"
-
 #. The capital of Myanmar.
 #. "Rangoon" is the traditional English name.
 #. The local name in Burmese is "Yangon".
@@ -9419,10 +9428,6 @@ msgstr "Tete"
 msgid "Rangoon"
 msgstr "Yangon"
 
-#. The capital of Namibia
-msgid "Windhoek"
-msgstr "Windhoek"
-
 #. The capital of Nepal.
 #. The local name in Nepali is "à¤?à¤¾à¤ à¤®à¤¾à¤¡à¥?à¤?".
 #.
@@ -9469,10 +9474,6 @@ msgstr "Oost-Vlieland"
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#. A city in the Netherlands
-msgid "Soesterberg"
-msgstr "Soesterberg"
-
 #. The capital of the Netherlands.
 #. "The Hague" is the traditional English name.
 #. The local name in Dutch is "'s-Gravenhage".
@@ -9568,11 +9569,7 @@ msgstr "Niamey"
 msgid "Zinder"
 msgstr "Zinder"
 
-#. A city in Nigeria
-msgid "Ibadan"
-msgstr "Ibadan"
-
-#. A city in Nigeria
+#. A city in Lagos Nigeria
 msgid "Ikeja"
 msgstr "Ikeja"
 
@@ -9597,7 +9594,6 @@ msgid "Alofi"
 msgstr "Alofi"
 
 #. A city in Norfolk Island
-#| msgid "Kingston"
 msgctxt "City in Norfolk Island"
 msgid "Kingston"
 msgstr "Kingston"
@@ -9703,10 +9699,6 @@ msgid "Kristiansund"
 msgstr "Kristiansund"
 
 #. A city in Norway
-msgid "Langenes"
-msgstr "Langenes"
-
-#. A city in Norway
 msgid "Mehamn"
 msgstr "Mehamn"
 
@@ -9795,6 +9787,12 @@ msgid "Torp"
 msgstr "Torp"
 
 #. A city in Norway
+#, fuzzy
+#| msgid "Troyes"
+msgid "TromsÃ¸"
+msgstr "Troyes"
+
+#. A city in Norway
 msgid "Trondheim"
 msgstr "Trondheim"
 
@@ -9869,10 +9867,6 @@ msgstr "Tocumen"
 msgid "Port Moresby"
 msgstr "Port Moresby"
 
-#. A city in Papua New Guinea
-msgid "Wewak"
-msgstr "Wewak"
-
 #. The capital of Paraguay
 msgid "AsunciÃ³n"
 msgstr "AsunciÃ³n"
@@ -9894,10 +9888,6 @@ msgid "Ayacucho"
 msgstr "Ayacucho"
 
 #. A city in Peru
-msgid "Cajamarca"
-msgstr "Cajamarca"
-
-#. A city in Peru
 msgid "Chiclayo"
 msgstr "Chiclayo"
 
@@ -9910,15 +9900,10 @@ msgid "Iquitos"
 msgstr "Iquitos"
 
 #. A city in Peru
-msgid "JuanjuÃ"
-msgstr "JuanjuÃ"
-
-#. A city in Peru
 msgid "Juliaca"
 msgstr "Juliaca"
 
 #. The capital of Peru
-#| msgid "Lima"
 msgctxt "City in Peru"
 msgid "Lima"
 msgstr "Li-ma"
@@ -9948,10 +9933,6 @@ msgid "Tarapoto"
 msgstr "Tarapoto"
 
 #. A city in Peru
-msgid "Tingo MarÃa"
-msgstr "Tingo MarÃa"
-
-#. A city in Peru
 msgid "Trujillo"
 msgstr "Trujillo"
 
@@ -9959,10 +9940,6 @@ msgstr "Trujillo"
 msgid "Tumbes"
 msgstr "Tumbes"
 
-#. A city in Peru
-msgid "Yurimaguas"
-msgstr "Yurimaguas"
-
 #. A city in the Philippines
 msgid "Angeles"
 msgstr "Angeles"
@@ -10023,19 +10000,18 @@ msgstr "Szczecin"
 #. "Warsaw" is the traditional English name.
 #. The local name in Polish is "Warszawa".
 #.
-#| msgid "Warsaw"
 msgctxt "City in Poland"
 msgid "Warsaw"
 msgstr "Warszawa"
 
 #. A city in Poland
-msgid "Warszawa"
-msgstr "Warszawa"
-
-#. A city in Poland
 msgid "WrocÅ?aw"
 msgstr "WrocÅ?aw"
 
+#. A city in Poland
+msgid "Å?Ã³dÅº"
+msgstr ""
+
 #. A city in Portugal
 msgid "Beja"
 msgstr "Beja"
@@ -10308,6 +10284,14 @@ msgid "Krasnodar"
 msgstr "Krasnodar"
 
 #. A city in Russia.
+#. The local name in Russian is "Ð?Ñ?Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ðº".
+#.
+#, fuzzy
+#| msgid "Krasnoyarsk Time"
+msgid "Krasnoyarsk"
+msgstr "Giá»? Krasnoyarsk"
+
+#. A city in Russia.
 #. The local name in Russian is "Ð?Ð°Ð³Ð°Ð´Ð°Ð½".
 #.
 msgid "Magadan"
@@ -10330,7 +10314,6 @@ msgstr "Mirnyy"
 #. "Moscow" is the traditional English name.
 #. The local name in Russian is "Moskva / Ð?Ð¾Ñ?ÐºÐ²Ð°".
 #.
-#| msgid "Moscow"
 msgctxt "City in Russia"
 msgid "Moscow"
 msgstr "Moskva"
@@ -10446,6 +10429,12 @@ msgid "Tiksi"
 msgstr "Tiksi"
 
 #. A city in Russia
+#, fuzzy
+#| msgid "Tocumen"
+msgid "Tyumen"
+msgstr "Tocumen"
+
+#. A city in Russia
 msgid "Udachnyy"
 msgstr "Udachnyy"
 
@@ -10494,13 +10483,11 @@ msgid "Saint-Denis"
 msgstr "Saint-Denis"
 
 #. A city in RÃ©union
-#| msgid "Saint-Pierre"
 msgctxt "City in RÃ©union"
 msgid "Saint-Pierre"
 msgstr "Xan-Pi-e"
 
 #. A city in Saint Helena
-#| msgid "Georgetown"
 msgctxt "City in Saint Helena"
 msgid "Georgetown"
 msgstr "Georgetown"
@@ -10514,7 +10501,6 @@ msgid "Golden Rock"
 msgstr "Golden Rock"
 
 #. A city in Saint Kitts and Nevis
-#| msgid "Newcastle"
 msgctxt "City in Saint Kitts and Nevis"
 msgid "Newcastle"
 msgstr "Newcastle"
@@ -10532,7 +10518,6 @@ msgid "Vigie"
 msgstr "Vigie"
 
 #. The capital of Saint Pierre and Miquelon
-#| msgid "Saint-Pierre"
 msgctxt "City in Saint Pierre and Miquelon"
 msgid "Saint-Pierre"
 msgstr "Xan-Pi-e"
@@ -10550,7 +10535,6 @@ msgid "Apia"
 msgstr "Apia"
 
 #. The capital of San Marino
-#| msgid "San Marino"
 msgctxt "City in San Marino"
 msgid "San Marino"
 msgstr "San Marino"
@@ -10723,7 +10707,6 @@ msgid "Cascade"
 msgstr "Cascade"
 
 #. The capital of the Seychelles
-#| msgid "Victoria"
 msgctxt "City in Seychelles"
 msgid "Victoria"
 msgstr "Victoria"
@@ -10737,7 +10720,6 @@ msgid "Lungi"
 msgstr "Lungi"
 
 #. The capital of Singapore
-#| msgid "Singapore"
 msgctxt "City in Singapore"
 msgid "Singapore"
 msgstr "Xin-ga-po"
@@ -10831,18 +10813,10 @@ msgid "Pretoria"
 msgstr "Pretoria"
 
 #. A city in South Africa
-msgid "Rustenburg"
-msgstr "Rustenburg"
-
-#. A city in South Africa
 msgid "Springs"
 msgstr "Springs"
 
 #. A city in South Africa
-msgid "Standerton"
-msgstr "Standerton"
-
-#. A city in South Africa
 msgid "Upington"
 msgstr "Upington"
 
@@ -10873,10 +10847,6 @@ msgid "Osan"
 msgstr "Osan"
 
 #. A city in South Korea
-msgid "P'ohang"
-msgstr "P'ohang"
-
-#. A city in South Korea
 msgid "P'yongt'aek"
 msgstr "P'yongt'aek"
 
@@ -10884,10 +10854,6 @@ msgstr "P'yongt'aek"
 msgid "Pusan"
 msgstr "Pusan"
 
-#. A city in South Korea
-msgid "Sach'on"
-msgstr "Sach'on"
-
 #. The capital of South Korea.
 #. "Seoul" is the traditional English name.
 #. The local name in Korean is "Soul".
@@ -10936,7 +10902,6 @@ msgid "Barajas"
 msgstr "Barajas"
 
 #. A city in Spain
-#| msgid "Barcelona"
 msgctxt "City in Spain"
 msgid "Barcelona"
 msgstr "Barcelona"
@@ -10958,7 +10923,6 @@ msgid "Cuatro Vientos"
 msgstr "Cuatro Vientos"
 
 #. A city in Spain
-#| msgid "CÃ³rdoba"
 msgctxt "City in Spain"
 msgid "CÃ³rdoba"
 msgstr "CÃ³rdoba"
@@ -11000,7 +10964,6 @@ msgid "Jerez"
 msgstr "Jerez"
 
 #. A city in Spain
-#| msgid "LeÃ³n"
 msgctxt "City in Spain"
 msgid "LeÃ³n"
 msgstr "LeÃ³n"
@@ -11070,7 +11033,6 @@ msgid "Santander"
 msgstr "Santander"
 
 #. A city in Spain
-#| msgid "Santiago"
 msgctxt "City in Spain"
 msgid "Santiago"
 msgstr "Santiago"
@@ -11088,7 +11050,6 @@ msgid "TorrejÃ³n del Rey"
 msgstr "TorrejÃ³n del Rey"
 
 #. A city in Spain
-#| msgid "Valencia"
 msgctxt "City in Spain"
 msgid "Valencia"
 msgstr "Valencia"
@@ -11273,6 +11234,12 @@ msgstr "Ã?rebro"
 msgid "Ã?rnskÃ¶ldsvik"
 msgstr "Ornskoldsvik"
 
+#. A city in Switzerland
+#, fuzzy
+#| msgid "Kassel"
+msgid "Basel"
+msgstr "Kassel"
+
 #. The capital of Switzerland
 msgid "Bern"
 msgstr "Bern"
@@ -11305,6 +11272,10 @@ msgid "Sion"
 msgstr "Sion"
 
 #. A city in Switzerland
+msgid "St. Moritz"
+msgstr ""
+
+#. A city in Switzerland
 msgid "ZÃ¼rich"
 msgstr "ZÃ¼rich"
 
@@ -11338,22 +11309,28 @@ msgid "Latakia"
 msgstr "Latakia"
 
 #. A city in Taiwan.
-#. The name is also written "é«?é??å·¿".
+#. The name is also written "é«?é??".
 #.
-msgid "Kao-hsiung-shih"
+#, fuzzy
+#| msgid "Kao-hsiung-shih"
+msgid "Kaohsiung"
 msgstr "Kao-hsiung-shih"
 
-#. A city in Taiwan.
-#. The name is also written "å??é ?".
+#. The capital of Taiwan.
+#. The name is also written "è?ºå??".
 #.
-msgid "Pu-ting"
-msgstr "Pu-ting"
+#, fuzzy
+#| msgid "Taipa"
+msgid "Taipei"
+msgstr "Taipa"
 
-#. The capital of Taiwan.
-#. The name is also written "è?ºå??å¸?".
+#. A city in Taiwan.
+#. The name is also written "å??é ?".
 #.
-msgid "T'ai-pei Shih"
-msgstr "T'ai-pei Shih"
+#, fuzzy
+#| msgid "Taiyuan"
+msgid "Taoyuan"
+msgstr "ThÃ¡i NguyÃªn"
 
 #. The capital of Tajikistan
 msgid "Dushanbe"
@@ -11815,7 +11792,6 @@ msgid "Sharjah"
 msgstr "Sharjah"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Aberdeen"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Aberdeen"
 msgstr "Aberdeen"
@@ -11827,7 +11803,6 @@ msgstr "Belfast"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Benson"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Benson"
 msgstr "Benson"
@@ -11839,7 +11814,6 @@ msgid "Biggin Hill"
 msgstr "Biggin Hill"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Birmingham"
 msgctxt "City in Midlands, United Kingdom"
 msgid "Birmingham"
 msgstr "Birmingham"
@@ -11881,7 +11855,6 @@ msgstr "Butes"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Cambridge"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Cambridge"
 msgstr "Cambridge"
@@ -11893,7 +11866,6 @@ msgstr "Campbeltown"
 #. A city in Wales in the United Kingdom.
 #. The local name in Welsh is "Caerdydd".
 #.
-#| msgid "Cardiff"
 msgctxt "City in Wales, United Kingdom"
 msgid "Cardiff"
 msgstr "Cardiff"
@@ -11903,7 +11875,9 @@ msgid "Carlisle"
 msgstr "Carlisle"
 
 #. A city in Midlands in the United Kingdom
-msgid "Castle Donnington"
+#, fuzzy
+#| msgid "Castle Donnington"
+msgid "Castle Donington"
 msgstr "Castle Donnington"
 
 #. A city in North West England in the United Kingdom
@@ -11969,7 +11943,6 @@ msgid "Filton"
 msgstr "Filton"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Glasgow"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Glasgow"
 msgstr "Glasgow"
@@ -12041,13 +12014,11 @@ msgid "Linton upon Ouse"
 msgstr "Linton upon Ouse"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Liverpool"
 msgctxt "City in North West England, United Kingdom"
 msgid "Liverpool"
 msgstr "Liverpool"
 
 #. The capital of the United Kingdom
-#| msgid "London"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "London"
 msgstr "LuÃ¢n-Ä?Ã´n"
@@ -12075,7 +12046,6 @@ msgid "Lyneham"
 msgstr "Lyneham"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Manchester"
 msgctxt "City in North West England, United Kingdom"
 msgid "Manchester"
 msgstr "Manchester"
@@ -12109,7 +12079,6 @@ msgid "Mossbank"
 msgstr "Mossbank"
 
 #. A city in North East England in the United Kingdom
-#| msgid "Newcastle"
 msgctxt "City in North East England, United Kingdom"
 msgid "Newcastle"
 msgstr "Newcastle"
@@ -12139,7 +12108,6 @@ msgstr "Pembrey"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Plymouth"
 msgctxt "City in South and South West England, United Kingdom"
 msgid "Plymouth"
 msgstr "Plymouth"
@@ -12152,12 +12120,6 @@ msgstr "Prestwick"
 msgid "Saint Athan"
 msgstr "Saint Athan"
 
-#. A city in South and South West England in the United
-#. Kingdom
-#.
-msgid "Saint Mawgan"
-msgstr "Saint Mawgan"
-
 #. A city in North West England in the United Kingdom
 msgid "Shawbury"
 msgstr "Shawbury"
@@ -12177,7 +12139,6 @@ msgstr "Southampton"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Southend"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Southend"
 msgstr "Southend"
@@ -12195,7 +12156,6 @@ msgid "Staverton"
 msgstr "Staverton"
 
 #. A city in North East England in the United Kingdom
-#| msgid "Stockton"
 msgctxt "City in North East England, United Kingdom"
 msgid "Stockton"
 msgstr "Stockton"
@@ -12249,7 +12209,6 @@ msgid "Yeovilton"
 msgstr "Yeovilton"
 
 #. A city in South Dakota in the United States
-#| msgid "Aberdeen"
 msgctxt "City in South Dakota, United States"
 msgid "Aberdeen"
 msgstr "Aberdeen"
@@ -12291,13 +12250,11 @@ msgid "Aitkin"
 msgstr "Aitkin"
 
 #. A city in Colorado in the United States
-#| msgid "Akron"
 msgctxt "City in Colorado, United States"
 msgid "Akron"
 msgstr "Akron"
 
 #. A city in Ohio in the United States
-#| msgid "Akron"
 msgctxt "City in Ohio, United States"
 msgid "Akron"
 msgstr "Akron"
@@ -12315,13 +12272,11 @@ msgid "Alamosa"
 msgstr "Alamosa"
 
 #. A city in Georgia in the United States
-#| msgid "Albany"
 msgctxt "City in Georgia, United States"
 msgid "Albany"
 msgstr "Albany"
 
 #. A city in New York in the United States
-#| msgid "Albany"
 msgctxt "City in New York, United States"
 msgid "Albany"
 msgstr "Albany"
@@ -12351,19 +12306,16 @@ msgid "Alexander City"
 msgstr "Alexander City"
 
 #. A city in Louisiana in the United States
-#| msgid "Alexandria"
 msgctxt "City in Louisiana, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Minnesota in the United States
-#| msgid "Alexandria"
 msgctxt "City in Minnesota, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Virginia in the United States
-#| msgid "Alexandria"
 msgctxt "City in Virginia, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
@@ -12381,13 +12333,11 @@ msgid "Alliance"
 msgstr "Alliance"
 
 #. A city in Georgia in the United States
-#| msgid "Alma"
 msgctxt "City in Georgia, United States"
 msgid "Alma"
 msgstr "Alma"
 
 #. A city in Michigan in the United States
-#| msgid "Alma"
 msgctxt "City in Michigan, United States"
 msgid "Alma"
 msgstr "Alma"
@@ -12397,13 +12347,11 @@ msgid "Alpena"
 msgstr "Alpena"
 
 #. A city in Alaska in the United States
-#| msgid "Alpine"
 msgctxt "City in Alaska, United States"
 msgid "Alpine"
 msgstr "Alpine"
 
 #. A city in Texas in the United States
-#| msgid "Alpine"
 msgctxt "City in Texas, United States"
 msgid "Alpine"
 msgstr "Alpine"
@@ -12461,13 +12409,11 @@ msgid "Andalusia"
 msgstr "Andalusia"
 
 #. A city in Indiana in the United States
-#| msgid "Anderson"
 msgctxt "City in Indiana, United States"
 msgid "Anderson"
 msgstr "Anderson"
 
 #. A city in South Carolina in the United States
-#| msgid "Anderson"
 msgctxt "City in South Carolina, United States"
 msgid "Anderson"
 msgstr "Anderson"
@@ -12529,13 +12475,11 @@ msgid "Apalachicola"
 msgstr "Apalachicola"
 
 #. A city in Minnesota in the United States
-#| msgid "Appleton"
 msgctxt "City in Minnesota, United States"
 msgid "Appleton"
 msgstr "Appleton"
 
 #. A city in Wisconsin in the United States
-#| msgid "Appleton"
 msgctxt "City in Wisconsin, United States"
 msgid "Appleton"
 msgstr "Appleton"
@@ -12557,13 +12501,11 @@ msgid "Arkadelphia"
 msgstr "Arkadelphia"
 
 #. A city in Texas in the United States
-#| msgid "Arlington"
 msgctxt "City in Texas, United States"
 msgid "Arlington"
 msgstr "Arlington"
 
 #. A city in Washington in the United States
-#| msgid "Arlington"
 msgctxt "City in Washington, United States"
 msgid "Arlington"
 msgstr "Arlington"
@@ -12585,13 +12527,11 @@ msgid "Asheville"
 msgstr "Asheville"
 
 #. A city in Virginia in the United States
-#| msgid "Ashland"
 msgctxt "City in Virginia, United States"
 msgid "Ashland"
 msgstr "Ashland"
 
 #. A city in Wisconsin in the United States
-#| msgid "Ashland"
 msgctxt "City in Wisconsin, United States"
 msgid "Ashland"
 msgstr "Ashland"
@@ -12609,7 +12549,6 @@ msgid "Astoria"
 msgstr "Astoria"
 
 #. A city in Georgia in the United States
-#| msgid "Athens"
 msgctxt "City in Georgia, United States"
 msgid "Athens"
 msgstr "Athens"
@@ -12619,7 +12558,6 @@ msgid "Atlanta"
 msgstr "Atlanta"
 
 #. A city in Iowa in the United States
-#| msgid "Atlantic"
 msgctxt "City in Iowa, United States"
 msgid "Atlantic"
 msgstr "Atlantic"
@@ -12633,19 +12571,16 @@ msgid "Atoka"
 msgstr "Atoka"
 
 #. A city in Alabama in the United States
-#| msgid "Auburn"
 msgctxt "City in Alabama, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in California in the United States
-#| msgid "Auburn"
 msgctxt "City in California, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in Maine in the United States
-#| msgid "Auburn"
 msgctxt "City in Maine, United States"
 msgid "Auburn"
 msgstr "Auburn"
@@ -12655,49 +12590,41 @@ msgid "Audubon"
 msgstr "Audubon"
 
 #. A city in Georgia in the United States
-#| msgid "Augusta"
 msgctxt "City in Georgia, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Maine in the United States
-#| msgid "Augusta"
 msgctxt "City in Maine, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Colorado in the United States
-#| msgid "Aurora"
 msgctxt "City in Colorado, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Illinois in the United States
-#| msgid "Aurora"
 msgctxt "City in Illinois, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Nebraska in the United States
-#| msgid "Aurora"
 msgctxt "City in Nebraska, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Oregon in the United States
-#| msgid "Aurora"
 msgctxt "City in Oregon, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Minnesota in the United States
-#| msgid "Austin"
 msgctxt "City in Minnesota, United States"
 msgid "Austin"
 msgstr "Austin"
 
 #. A city in Texas in the United States
-#| msgid "Austin"
 msgctxt "City in Texas, United States"
 msgid "Austin"
 msgstr "Austin"
@@ -12787,13 +12714,11 @@ msgid "Beatrice"
 msgstr "Beatrice"
 
 #. A city in North Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in North Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
 
 #. A city in South Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in South Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
@@ -12811,7 +12736,6 @@ msgid "Beckley"
 msgstr "Beckley"
 
 #. A city in Massachusetts in the United States
-#| msgid "Bedford"
 msgctxt "City in Massachusetts, United States"
 msgid "Bedford"
 msgstr "Bedford"
@@ -12845,7 +12769,6 @@ msgid "Bennington"
 msgstr "Bennington"
 
 #. A city in Minnesota in the United States
-#| msgid "Benson"
 msgctxt "City in Minnesota, United States"
 msgid "Benson"
 msgstr "Benson"
@@ -12863,7 +12786,6 @@ msgid "Berkeley"
 msgstr "Berkeley"
 
 #. A city in New Hampshire in the United States
-#| msgid "Berlin"
 msgctxt "City in New Hampshire, United States"
 msgid "Berlin"
 msgstr "Berlin"
@@ -12913,7 +12835,6 @@ msgid "Birchwood"
 msgstr "Birchwood"
 
 #. A city in Alabama in the United States
-#| msgid "Birmingham"
 msgctxt "City in Alabama, United States"
 msgid "Birmingham"
 msgstr "Birmingham"
@@ -12939,13 +12860,11 @@ msgid "Blacksburg"
 msgstr "Blacksburg"
 
 #. A city in Illinois in the United States
-#| msgid "Bloomington"
 msgctxt "City in Illinois, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
 
 #. A city in Indiana in the United States
-#| msgid "Bloomington"
 msgctxt "City in Indiana, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
@@ -12975,13 +12894,11 @@ msgid "Boise"
 msgstr "Boise"
 
 #. A city in Iowa in the United States
-#| msgid "Boone"
 msgctxt "City in Iowa, United States"
 msgid "Boone"
 msgstr "Boone"
 
 #. A city in North Carolina in the United States
-#| msgid "Boone"
 msgctxt "City in North Carolina, United States"
 msgid "Boone"
 msgstr "Boone"
@@ -12991,7 +12908,6 @@ msgid "Boothville"
 msgstr "Boothville"
 
 #. A city in Wyoming in the United States
-#| msgid "Bordeaux"
 msgctxt "City in Wyoming, United States"
 msgid "Bordeaux"
 msgstr "Bordeaux"
@@ -13053,13 +12969,11 @@ msgid "Broken Bow"
 msgstr "Broken Bow"
 
 #. A city in Oregon in the United States
-#| msgid "Brookings"
 msgctxt "City in Oregon, United States"
 msgid "Brookings"
 msgstr "Brookings"
 
 #. A city in South Dakota in the United States
-#| msgid "Brookings"
 msgctxt "City in South Dakota, United States"
 msgid "Brookings"
 msgstr "Brookings"
@@ -13085,13 +12999,11 @@ msgid "Brownwood"
 msgstr "Brownwood"
 
 #. A city in Georgia in the United States
-#| msgid "Brunswick"
 msgctxt "City in Georgia, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
 
 #. A city in Maine in the United States
-#| msgid "Brunswick"
 msgctxt "City in Maine, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
@@ -13109,25 +13021,21 @@ msgid "Buckland"
 msgstr "Buckland"
 
 #. A city in Minnesota in the United States
-#| msgid "Buffalo"
 msgctxt "City in Minnesota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in New York in the United States
-#| msgid "Buffalo"
 msgctxt "City in New York, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in South Dakota in the United States
-#| msgid "Buffalo"
 msgctxt "City in South Dakota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in Wyoming in the United States
-#| msgid "Buffalo"
 msgctxt "City in Wyoming, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
@@ -13145,37 +13053,31 @@ msgid "Burley"
 msgstr "Burley"
 
 #. A city in Colorado in the United States
-#| msgid "Burlington"
 msgctxt "City in Colorado, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Iowa in the United States
-#| msgid "Burlington"
 msgctxt "City in Iowa, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in North Carolina in the United States
-#| msgid "Burlington"
 msgctxt "City in North Carolina, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Vermont in the United States
-#| msgid "Burlington"
 msgctxt "City in Vermont, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Washington in the United States
-#| msgid "Burlington"
 msgctxt "City in Washington, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Wisconsin in the United States
-#| msgid "Burlington"
 msgctxt "City in Wisconsin, United States"
 msgid "Burlington"
 msgstr "Burlington"
@@ -13205,25 +13107,21 @@ msgid "Cahokia"
 msgstr "Cahokia"
 
 #. A city in Illinois in the United States
-#| msgid "Cairo"
 msgctxt "City in Illinois, United States"
 msgid "Cairo"
 msgstr "Cairo"
 
 #. A city in Idaho in the United States
-#| msgid "Caldwell"
 msgctxt "City in Idaho, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in New Jersey in the United States
-#| msgid "Caldwell"
 msgctxt "City in New Jersey, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in Texas in the United States
-#| msgid "Caldwell"
 msgctxt "City in Texas, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
@@ -13233,13 +13131,11 @@ msgid "Camarillo"
 msgstr "Camarillo"
 
 #. A city in Massachusetts in the United States
-#| msgid "Cambridge"
 msgctxt "City in Massachusetts, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
 
 #. A city in Minnesota in the United States
-#| msgid "Cambridge"
 msgctxt "City in Minnesota, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
@@ -13268,10 +13164,6 @@ msgstr "Canadian"
 msgid "Canton"
 msgstr "Canton"
 
-#. A city in Alaska in the United States
-msgid "Cantwell"
-msgstr "Cantwell"
-
 #. A city in Florida in the United States
 msgid "Cape Canaveral"
 msgstr "Cape Canaveral"
@@ -13289,7 +13181,6 @@ msgid "Carbondale"
 msgstr "Carbondale"
 
 #. A city in Colorado in the United States
-#| msgid "Cardiff"
 msgctxt "City in Colorado, United States"
 msgid "Cardiff"
 msgstr "Cardiff"
@@ -13299,13 +13190,11 @@ msgid "Caribou"
 msgstr "Caribou"
 
 #. A city in California in the United States
-#| msgid "Carlsbad"
 msgctxt "City in California, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
 #. A city in New Mexico in the United States
-#| msgid "Carlsbad"
 msgctxt "City in New Mexico, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
@@ -13346,10 +13235,6 @@ msgstr "Cedar City"
 msgid "Cedar Rapids"
 msgstr "Cedar Rapids"
 
-#. A city in Alaska in the United States
-msgid "Central"
-msgstr "Central"
-
 #. A city in Illinois in the United States
 msgid "Centralia"
 msgstr "Centralia"
@@ -13379,13 +13264,11 @@ msgid "Chandalar"
 msgstr "Chandalar"
 
 #. A city in Arizona in the United States
-#| msgid "Chandler"
 msgctxt "City in Arizona, United States"
 msgid "Chandler"
 msgstr "Chandler"
 
 #. A city in Oklahoma in the United States
-#| msgid "Chandler"
 msgctxt "City in Oklahoma, United States"
 msgid "Chandler"
 msgstr "Chandler"
@@ -13407,13 +13290,11 @@ msgid "Charles City"
 msgstr "ThÃ nh phá»? Charles"
 
 #. A city in South Carolina in the United States
-#| msgid "Charleston"
 msgctxt "City in South Carolina, United States"
 msgid "Charleston"
 msgstr "Charleston"
 
 #. A city in West Virginia in the United States
-#| msgid "Charleston"
 msgctxt "City in West Virginia, United States"
 msgid "Charleston"
 msgstr "Charleston"
@@ -13423,13 +13304,11 @@ msgid "Charlevoix"
 msgstr "Charlevoix"
 
 #. A city in Michigan in the United States
-#| msgid "Charlotte"
 msgctxt "City in Michigan, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
 
 #. A city in North Carolina in the United States
-#| msgid "Charlotte"
 msgctxt "City in North Carolina, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
@@ -13547,13 +13426,11 @@ msgid "Clarksburg"
 msgstr "Clarksburg"
 
 #. A city in Tennessee in the United States
-#| msgid "Clarksville"
 msgctxt "City in Tennessee, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
 
 #. A city in Texas in the United States
-#| msgid "Clarksville"
 msgctxt "City in Texas, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
@@ -13583,19 +13460,16 @@ msgid "Clines Corners"
 msgstr "Clines Corners"
 
 #. A city in Iowa in the United States
-#| msgid "Clinton"
 msgctxt "City in Iowa, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in North Carolina in the United States
-#| msgid "Clinton"
 msgctxt "City in North Carolina, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in Oklahoma in the United States
-#| msgid "Clinton"
 msgctxt "City in Oklahoma, United States"
 msgid "Clinton"
 msgstr "Clinton"
@@ -13645,61 +13519,51 @@ msgid "Colorado Springs"
 msgstr "Colorado Springs"
 
 #. A city in Missouri in the United States
-#| msgid "Columbia"
 msgctxt "City in Missouri, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in South Carolina in the United States
-#| msgid "Columbia"
 msgctxt "City in South Carolina, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in Georgia in the United States
-#| msgid "Columbus"
 msgctxt "City in Georgia, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Indiana in the United States
-#| msgid "Columbus"
 msgctxt "City in Indiana, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Mississippi in the United States
-#| msgid "Columbus"
 msgctxt "City in Mississippi, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Nebraska in the United States
-#| msgid "Columbus"
 msgctxt "City in Nebraska, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Ohio in the United States
-#| msgid "Columbus"
 msgctxt "City in Ohio, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in California in the United States
-#| msgid "Concord"
 msgctxt "City in California, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in New Hampshire in the United States
-#| msgid "Concord"
 msgctxt "City in New Hampshire, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in North Carolina in the United States
-#| msgid "Concord"
 msgctxt "City in North Carolina, United States"
 msgid "Concord"
 msgstr "Concord"
@@ -13725,13 +13589,11 @@ msgid "Cordova"
 msgstr "Cordova"
 
 #. A city in California in the United States
-#| msgid "Corona"
 msgctxt "City in California, United States"
 msgid "Corona"
 msgstr "Corona"
 
 #. A city in New Mexico in the United States
-#| msgid "Corona"
 msgctxt "City in New Mexico, United States"
 msgid "Corona"
 msgstr "Corona"
@@ -13777,7 +13639,6 @@ msgid "Crescent City"
 msgstr "Crescent City"
 
 #. A city in Iowa in the United States
-#| msgid "Creston"
 msgctxt "City in Iowa, United States"
 msgid "Creston"
 msgstr "Creston"
@@ -13867,13 +13728,11 @@ msgid "Dansville"
 msgstr "Dansville"
 
 #. A city in Illinois in the United States
-#| msgid "Danville"
 msgctxt "City in Illinois, United States"
 msgid "Danville"
 msgstr "Danville"
 
 #. A city in Virginia in the United States
-#| msgid "Danville"
 msgctxt "City in Virginia, United States"
 msgid "Danville"
 msgstr "Danville"
@@ -13911,19 +13770,16 @@ msgid "Deadhorse"
 msgstr "Deadhorse"
 
 #. A city in Alabama in the United States
-#| msgid "Decatur"
 msgctxt "City in Alabama, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Illinois in the United States
-#| msgid "Decatur"
 msgctxt "City in Illinois, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Texas in the United States
-#| msgid "Decatur"
 msgctxt "City in Texas, United States"
 msgid "Decatur"
 msgstr "Decatur"
@@ -13936,10 +13792,6 @@ msgstr "Decorah"
 msgid "Deer Park"
 msgstr "Deer Park"
 
-#. A city in Alaska in the United States
-msgid "Deering"
-msgstr "Deering"
-
 #. A city in Ohio in the United States
 msgid "Defiance"
 msgstr "Defiance"
@@ -14017,19 +13869,16 @@ msgid "Dothan"
 msgstr "Dothan"
 
 #. A city in Arizona in the United States
-#| msgid "Douglas"
 msgctxt "City in Arizona, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Georgia in the United States
-#| msgid "Douglas"
 msgctxt "City in Georgia, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Wyoming in the United States
-#| msgid "Douglas"
 msgctxt "City in Wyoming, United States"
 msgid "Douglas"
 msgstr "Douglas"
@@ -14047,7 +13896,6 @@ msgid "Drummond"
 msgstr "Drummond"
 
 #. A city in Texas in the United States
-#| msgid "Dryden"
 msgctxt "City in Texas, United States"
 msgid "Dryden"
 msgstr "Dryden"
@@ -14057,13 +13905,11 @@ msgid "Du Bois"
 msgstr "Du Bois"
 
 #. A city in Georgia in the United States
-#| msgid "Dublin"
 msgctxt "City in Georgia, United States"
 msgid "Dublin"
 msgstr "Dublin"
 
 #. A city in Virginia in the United States
-#| msgid "Dublin"
 msgctxt "City in Virginia, United States"
 msgid "Dublin"
 msgstr "Dublin"
@@ -14089,7 +13935,6 @@ msgid "Dunkirk"
 msgstr "Dunkirk"
 
 #. A city in Colorado in the United States
-#| msgid "Durango"
 msgctxt "City in Colorado, United States"
 msgid "Durango"
 msgstr "Durango"
@@ -14107,13 +13952,11 @@ msgid "Dyersburg"
 msgstr "Dyersburg"
 
 #. A city in Alaska in the United States
-#| msgid "Eagle"
 msgctxt "City in Alaska, United States"
 msgid "Eagle"
 msgstr "Eagle"
 
 #. A city in Colorado in the United States
-#| msgid "Eagle"
 msgctxt "City in Colorado, United States"
 msgid "Eagle"
 msgstr "Eagle"
@@ -14203,13 +14046,11 @@ msgid "Elizabethtown"
 msgstr "Elizabethtown"
 
 #. A city in Indiana in the United States
-#| msgid "Elkhart"
 msgctxt "City in Indiana, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
 
 #. A city in Kansas in the United States
-#| msgid "Elkhart"
 msgctxt "City in Kansas, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
@@ -14227,7 +14068,6 @@ msgid "Ellensburg"
 msgstr "Ellensburg"
 
 #. A city in New York in the United States
-#| msgid "Elmira"
 msgctxt "City in New York, United States"
 msgid "Elmira"
 msgstr "Elmira"
@@ -14237,13 +14077,11 @@ msgid "Elwood"
 msgstr "Elwood"
 
 #. A city in Minnesota in the United States
-#| msgid "Ely"
 msgctxt "City in Minnesota, United States"
 msgid "Ely"
 msgstr "Ely"
 
 #. A city in Nevada in the United States
-#| msgid "Ely"
 msgctxt "City in Nevada, United States"
 msgid "Ely"
 msgstr "Ely"
@@ -14261,13 +14099,11 @@ msgid "Emmonak"
 msgstr "Emmonak"
 
 #. A city in Kansas in the United States
-#| msgid "Emporia"
 msgctxt "City in Kansas, United States"
 msgid "Emporia"
 msgstr "Emporia"
 
 #. A city in Virginia in the United States
-#| msgid "Emporia"
 msgctxt "City in Virginia, United States"
 msgid "Emporia"
 msgstr "Emporia"
@@ -14305,7 +14141,6 @@ msgid "Eugene"
 msgstr "Eugene"
 
 #. A city in Nevada in the United States
-#| msgid "Eureka"
 msgctxt "City in Nevada, United States"
 msgid "Eureka"
 msgstr "Eureka"
@@ -14343,19 +14178,16 @@ msgid "Fairchild"
 msgstr "Fairchild"
 
 #. A city in California in the United States
-#| msgid "Fairfield"
 msgctxt "City in California, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Illinois in the United States
-#| msgid "Fairfield"
 msgctxt "City in Illinois, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Iowa in the United States
-#| msgid "Fairfield"
 msgctxt "City in Iowa, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
@@ -14393,13 +14225,11 @@ msgid "Farmingdale"
 msgstr "Farmingdale"
 
 #. A city in Missouri in the United States
-#| msgid "Farmington"
 msgctxt "City in Missouri, United States"
 msgid "Farmington"
 msgstr "Farmington"
 
 #. A city in New Mexico in the United States
-#| msgid "Farmington"
 msgctxt "City in New Mexico, United States"
 msgid "Farmington"
 msgstr "Farmington"
@@ -14409,13 +14239,11 @@ msgid "Farmville"
 msgstr "Farmville"
 
 #. A city in Arkansas in the United States
-#| msgid "Fayetteville"
 msgctxt "City in Arkansas, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
 #. A city in North Carolina in the United States
-#| msgid "Fayetteville"
 msgctxt "City in North Carolina, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
@@ -14449,7 +14277,6 @@ msgid "Flora"
 msgstr "Flora"
 
 #. A city in South Carolina in the United States
-#| msgid "Florence"
 msgctxt "City in South Carolina, United States"
 msgid "Florence"
 msgstr "Florence"
@@ -14503,7 +14330,6 @@ msgid "Fort Polk"
 msgstr "Fort Polk"
 
 #. A city in Arkansas in the United States
-#| msgid "Fort Smith"
 msgctxt "City in Arkansas, United States"
 msgid "Fort Smith"
 msgstr "Fort Smith"
@@ -14533,43 +14359,36 @@ msgid "Fosston"
 msgstr "Fosston"
 
 #. A city in Kentucky in the United States
-#| msgid "Frankfort"
 msgctxt "City in Kentucky, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in Michigan in the United States
-#| msgid "Frankfort"
 msgctxt "City in Michigan, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in North Carolina in the United States
-#| msgid "Franklin"
 msgctxt "City in North Carolina, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Franklin"
 msgctxt "City in Pennsylvania, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Virginia in the United States
-#| msgid "Franklin"
 msgctxt "City in Virginia, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Maryland in the United States
-#| msgid "Frederick"
 msgctxt "City in Maryland, United States"
 msgid "Frederick"
 msgstr "Frederick"
 
 #. A city in Oklahoma in the United States
-#| msgid "Frederick"
 msgctxt "City in Oklahoma, United States"
 msgid "Frederick"
 msgstr "Frederick"
@@ -14579,19 +14398,16 @@ msgid "Fredericksburg"
 msgstr "Fredericksburg"
 
 #. A city in Illinois in the United States
-#| msgid "Freeport"
 msgctxt "City in Illinois, United States"
 msgid "Freeport"
 msgstr "Freeport"
 
 #. A city in California in the United States
-#| msgid "Fremont"
 msgctxt "City in California, United States"
 msgid "Fremont"
 msgstr "Fremont"
 
 #. A city in Nebraska in the United States
-#| msgid "Fremont"
 msgctxt "City in Nebraska, United States"
 msgid "Fremont"
 msgstr "Fremont"
@@ -14629,19 +14445,16 @@ msgid "Gage"
 msgstr "Gage"
 
 #. A city in Florida in the United States
-#| msgid "Gainesville"
 msgctxt "City in Florida, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Georgia in the United States
-#| msgid "Gainesville"
 msgctxt "City in Georgia, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Texas in the United States
-#| msgid "Gainesville"
 msgctxt "City in Texas, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
@@ -14671,13 +14484,11 @@ msgid "Gambell"
 msgstr "Gambell"
 
 #. A city in Kansas in the United States
-#| msgid "Garden City"
 msgctxt "City in Kansas, United States"
 msgid "Garden City"
 msgstr "Garden City"
 
 #. A city in Louisiana in the United States
-#| msgid "Garden City"
 msgctxt "City in Louisiana, United States"
 msgid "Garden City"
 msgstr "Garden City"
@@ -14711,13 +14522,11 @@ msgid "Gaylord"
 msgstr "Gaylord"
 
 #. A city in Delaware in the United States
-#| msgid "Georgetown"
 msgctxt "City in Delaware, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. A city in Texas in the United States
-#| msgid "Georgetown"
 msgctxt "City in Texas, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
@@ -14739,13 +14548,11 @@ msgid "Gilmer"
 msgstr "Gilmer"
 
 #. A city in Kentucky in the United States
-#| msgid "Glasgow"
 msgctxt "City in Kentucky, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Montana in the United States
-#| msgid "Glasgow"
 msgctxt "City in Montana, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
@@ -14755,13 +14562,11 @@ msgid "Glencoe"
 msgstr "Glencoe"
 
 #. A city in Arizona in the United States
-#| msgid "Glendale"
 msgctxt "City in Arizona, United States"
 msgid "Glendale"
 msgstr "Glendale"
 
 #. A city in California in the United States
-#| msgid "Glendale"
 msgctxt "City in California, United States"
 msgid "Glendale"
 msgstr "Glendale"
@@ -14782,10 +14587,6 @@ msgstr "Glenwood"
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
-#. A city in Alaska in the United States
-msgid "Golovin"
-msgstr "Golovin"
-
 #. A city in Kansas in the United States
 msgid "Goodland"
 msgstr "Goodland"
@@ -14847,13 +14648,11 @@ msgid "Grand Prairie"
 msgstr "Grand Prairie"
 
 #. A city in Michigan in the United States
-#| msgid "Grand Rapids"
 msgctxt "City in Michigan, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Minnesota in the United States
-#| msgid "Grand Rapids"
 msgctxt "City in Minnesota, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
@@ -14882,54 +14681,42 @@ msgstr "Great Falls"
 msgid "Green Bay"
 msgstr "Green Bay"
 
-#. A city in Utah in the United States
-msgid "Green River"
-msgstr "Green River"
-
 #. A city in Georgia in the United States
-#| msgid "Greensboro"
 msgctxt "City in Georgia, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
 
 #. A city in North Carolina in the United States
-#| msgid "Greensboro"
 msgctxt "City in North Carolina, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
 
 #. A city in Maine in the United States
-#| msgid "Greenville"
 msgctxt "City in Maine, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Mississippi in the United States
-#| msgid "Greenville"
 msgctxt "City in Mississippi, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in South Carolina in the United States
-#| msgid "Greenville"
 msgctxt "City in South Carolina, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Texas in the United States
-#| msgid "Greenville"
 msgctxt "City in Texas, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Mississippi in the United States
-#| msgid "Greenwood"
 msgctxt "City in Mississippi, United States"
 msgid "Greenwood"
 msgstr "Greenwood"
 
 #. A city in South Carolina in the United States
-#| msgid "Greenwood"
 msgctxt "City in South Carolina, United States"
 msgid "Greenwood"
 msgstr "Greenwood"
@@ -14995,7 +14782,6 @@ msgid "Hallock"
 msgstr "Hallock"
 
 #. A city in Ohio in the United States
-#| msgid "Hamilton"
 msgctxt "City in Ohio, United States"
 msgid "Hamilton"
 msgstr "Hamilton"
@@ -15013,13 +14799,11 @@ msgid "Hancock"
 msgstr "Hancock"
 
 #. A city in California in the United States
-#| msgid "Hanford"
 msgctxt "City in California, United States"
 msgid "Hanford"
 msgstr "Hanford"
 
 #. A city in Washington in the United States
-#| msgid "Hanford"
 msgctxt "City in Washington, United States"
 msgid "Hanford"
 msgstr "Hanford"
@@ -15041,13 +14825,11 @@ msgid "Harlingen"
 msgstr "Harlingen"
 
 #. A city in Illinois in the United States
-#| msgid "Harrisburg"
 msgctxt "City in Illinois, United States"
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Harrisburg"
 msgctxt "City in Pennsylvania, United States"
 msgid "Harrisburg"
 msgstr "Harrisburg"
@@ -15093,13 +14875,11 @@ msgid "Hays"
 msgstr "Hays"
 
 #. A city in California in the United States
-#| msgid "Hayward"
 msgctxt "City in California, United States"
 msgid "Hayward"
 msgstr "Hayward"
 
 #. A city in Wisconsin in the United States
-#| msgid "Hayward"
 msgctxt "City in Wisconsin, United States"
 msgid "Hayward"
 msgstr "Hayward"
@@ -15117,7 +14897,6 @@ msgid "Hebbronville"
 msgstr "Hebbronville"
 
 #. A city in Nebraska in the United States
-#| msgid "Hebron"
 msgctxt "City in Nebraska, United States"
 msgid "Hebron"
 msgstr "Hebron"
@@ -15127,13 +14906,11 @@ msgid "Helena"
 msgstr "Helena"
 
 #. A city in Kentucky in the United States
-#| msgid "Henderson"
 msgctxt "City in Kentucky, United States"
 msgid "Henderson"
 msgstr "Henderson"
 
 #. A city in Nevada in the United States
-#| msgid "Henderson"
 msgctxt "City in Nevada, United States"
 msgid "Henderson"
 msgstr "Henderson"
@@ -15191,7 +14968,6 @@ msgid "Hinesville"
 msgstr "Hinesville"
 
 #. A city in Oklahoma in the United States
-#| msgid "Hobart"
 msgctxt "City in Oklahoma, United States"
 msgid "Hobart"
 msgstr "Hobart"
@@ -15245,13 +15021,11 @@ msgid "Hoquiam"
 msgstr "Hoquiam"
 
 #. A city in Arkansas in the United States
-#| msgid "Hot Springs"
 msgctxt "City in Arkansas, United States"
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
 #. A city in Virginia in the United States
-#| msgid "Hot Springs"
 msgctxt "City in Virginia, United States"
 msgid "Hot Springs"
 msgstr "Hot Springs"
@@ -15285,13 +15059,11 @@ msgid "Huntington Beach"
 msgstr "Huntington Beach"
 
 #. A city in Alabama in the United States
-#| msgid "Huntsville"
 msgctxt "City in Alabama, United States"
 msgid "Huntsville"
 msgstr "Huntsville"
 
 #. A city in Texas in the United States
-#| msgid "Huntsville"
 msgctxt "City in Texas, United States"
 msgid "Huntsville"
 msgstr "Huntsville"
@@ -15305,13 +15077,11 @@ msgid "Huslia"
 msgstr "Huslia"
 
 #. A city in Kansas in the United States
-#| msgid "Hutchinson"
 msgctxt "City in Kansas, United States"
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
 #. A city in Minnesota in the United States
-#| msgid "Hutchinson"
 msgctxt "City in Minnesota, United States"
 msgid "Hutchinson"
 msgstr "Hutchinson"
@@ -15333,13 +15103,11 @@ msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
 #. A city in California in the United States
-#| msgid "Imperial"
 msgctxt "City in California, United States"
 msgid "Imperial"
 msgstr "Imperial"
 
 #. A city in Nebraska in the United States
-#| msgid "Imperial"
 msgctxt "City in Nebraska, United States"
 msgid "Imperial"
 msgstr "Imperial"
@@ -15353,7 +15121,6 @@ msgid "Independence"
 msgstr "Independence"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Indiana"
 msgctxt "City in Pennsylvania, United States"
 msgid "Indiana"
 msgstr "Indiana"
@@ -15411,61 +15178,51 @@ msgid "Ithaca"
 msgstr "Ithaca"
 
 #. A city in Kentucky in the United States
-#| msgid "Jackson"
 msgctxt "City in Kentucky, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Michigan in the United States
-#| msgid "Jackson"
 msgctxt "City in Michigan, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Minnesota in the United States
-#| msgid "Jackson"
 msgctxt "City in Minnesota, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Mississippi in the United States
-#| msgid "Jackson"
 msgctxt "City in Mississippi, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Tennessee in the United States
-#| msgid "Jackson"
 msgctxt "City in Tennessee, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Wyoming in the United States
-#| msgid "Jackson"
 msgctxt "City in Wyoming, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Florida in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Florida, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in Illinois in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Illinois, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in North Carolina in the United States
-#| msgid "Jacksonville"
 msgctxt "City in North Carolina, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in Texas in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Texas, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
@@ -15475,13 +15232,11 @@ msgid "Jaffrey"
 msgstr "Jaffrey"
 
 #. A city in New York in the United States
-#| msgid "Jamestown"
 msgctxt "City in New York, United States"
 msgid "Jamestown"
 msgstr "Jamestown"
 
 #. A city in North Dakota in the United States
-#| msgid "Jamestown"
 msgctxt "City in North Dakota, United States"
 msgid "Jamestown"
 msgstr "Jamestown"
@@ -15491,7 +15246,6 @@ msgid "Janesville"
 msgstr "Janesville"
 
 #. A city in Texas in the United States
-#| msgid "Jasper"
 msgctxt "City in Texas, United States"
 msgid "Jasper"
 msgstr "Jasper"
@@ -15529,7 +15283,6 @@ msgid "Joplin"
 msgstr "Joplin"
 
 #. A city in Montana in the United States
-#| msgid "Jordan"
 msgctxt "City in Montana, United States"
 msgid "Jordan"
 msgstr "Gi-oa-Ä?an"
@@ -15547,13 +15300,11 @@ msgid "Junction City"
 msgstr "Junction City"
 
 #. A city in Alaska in the United States
-#| msgid "Juneau"
 msgctxt "City in Alaska, United States"
 msgid "Juneau"
 msgstr "Juneau"
 
 #. A city in Wisconsin in the United States
-#| msgid "Juneau"
 msgctxt "City in Wisconsin, United States"
 msgid "Juneau"
 msgstr "Juneau"
@@ -15595,13 +15346,11 @@ msgid "Kankakee"
 msgstr "Kankakee"
 
 #. A city in Kansas in the United States
-#| msgid "Kansas City"
 msgctxt "City in Kansas, United States"
 msgid "Kansas City"
 msgstr "Kansas City"
 
 #. A city in Missouri in the United States
-#| msgid "Kansas City"
 msgctxt "City in Missouri, United States"
 msgid "Kansas City"
 msgstr "Kansas City"
@@ -15719,13 +15468,11 @@ msgid "Knob Noster"
 msgstr "Knob Noster"
 
 #. A city in Iowa in the United States
-#| msgid "Knoxville"
 msgctxt "City in Iowa, United States"
 msgid "Knoxville"
 msgstr "Knoxville"
 
 #. A city in Tennessee in the United States
-#| msgid "Knoxville"
 msgctxt "City in Tennessee, United States"
 msgid "Knoxville"
 msgstr "Knoxville"
@@ -15746,10 +15493,6 @@ msgstr "Kotzebue"
 msgid "Koyuk"
 msgstr "Koyuk"
 
-#. A city in Colorado in the United States
-msgid "Kremmling"
-msgstr "Kremmling"
-
 #. A city in Alaska in the United States
 msgid "Kustatan"
 msgstr "Kustatan"
@@ -15763,13 +15506,11 @@ msgid "La Grande"
 msgstr "La Grande"
 
 #. A city in Georgia in the United States
-#| msgid "La Grange"
 msgctxt "City in Georgia, United States"
 msgid "La Grange"
 msgstr "La Grange"
 
 #. A city in Texas in the United States
-#| msgid "La Grange"
 msgctxt "City in Texas, United States"
 msgid "La Grange"
 msgstr "La Grange"
@@ -15799,13 +15540,11 @@ msgid "Ladysmith"
 msgstr "Ladysmith"
 
 #. A city in Indiana in the United States
-#| msgid "Lafayette"
 msgctxt "City in Indiana, United States"
 msgid "Lafayette"
 msgstr "Lafayette"
 
 #. A city in Louisiana in the United States
-#| msgid "Lafayette"
 msgctxt "City in Louisiana, United States"
 msgid "Lafayette"
 msgstr "Lafayette"
@@ -15851,25 +15590,21 @@ msgid "Lamoni"
 msgstr "Lamoni"
 
 #. A city in California in the United States
-#| msgid "Lancaster"
 msgctxt "City in California, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Ohio in the United States
-#| msgid "Lancaster"
 msgctxt "City in Ohio, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Lancaster"
 msgctxt "City in Pennsylvania, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Texas in the United States
-#| msgid "Lancaster"
 msgctxt "City in Texas, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
@@ -15899,13 +15634,11 @@ msgid "Las Cruces"
 msgstr "Las Cruces"
 
 #. A city in Nevada in the United States
-#| msgid "Las Vegas"
 msgctxt "City in Nevada, United States"
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
 #. A city in New Mexico in the United States
-#| msgid "Las Vegas"
 msgctxt "City in New Mexico, United States"
 msgid "Las Vegas"
 msgstr "Las Vegas"
@@ -15915,25 +15648,21 @@ msgid "Latrobe"
 msgstr "Latrobe"
 
 #. A city in Kansas in the United States
-#| msgid "Lawrence"
 msgctxt "City in Kansas, United States"
 msgid "Lawrence"
 msgstr "Lawrence"
 
 #. A city in Massachusetts in the United States
-#| msgid "Lawrence"
 msgctxt "City in Massachusetts, United States"
 msgid "Lawrence"
 msgstr "Lawrence"
 
 #. A city in Georgia in the United States
-#| msgid "Lawrenceville"
 msgctxt "City in Georgia, United States"
 msgid "Lawrenceville"
 msgstr "Lawrenceville"
 
 #. A city in Illinois in the United States
-#| msgid "Lawrenceville"
 msgctxt "City in Illinois, United States"
 msgid "Lawrenceville"
 msgstr "Lawrenceville"
@@ -15951,19 +15680,16 @@ msgid "Leadville"
 msgstr "Leadville"
 
 #. A city in New Hampshire in the United States
-#| msgid "Lebanon"
 msgctxt "City in New Hampshire, United States"
 msgid "Lebanon"
 msgstr "Lebanon"
 
 #. A city in Florida in the United States
-#| msgid "Leesburg"
 msgctxt "City in Florida, United States"
 msgid "Leesburg"
 msgstr "Leesburg"
 
 #. A city in Virginia in the United States
-#| msgid "Leesburg"
 msgctxt "City in Virginia, United States"
 msgid "Leesburg"
 msgstr "Leesburg"
@@ -15989,19 +15715,16 @@ msgid "Lewistown"
 msgstr "Lewistown"
 
 #. A city in Kentucky in the United States
-#| msgid "Lexington"
 msgctxt "City in Kentucky, United States"
 msgid "Lexington"
 msgstr "Lexington"
 
 #. A city in Nebraska in the United States
-#| msgid "Lexington"
 msgctxt "City in Nebraska, United States"
 msgid "Lexington"
 msgstr "Lexington"
 
 #. A city in North Carolina in the United States
-#| msgid "Lexington"
 msgctxt "City in North Carolina, United States"
 msgid "Lexington"
 msgstr "Lexington"
@@ -16015,7 +15738,6 @@ msgid "Lihue"
 msgstr "Lihue"
 
 #. A city in Ohio in the United States
-#| msgid "Lima"
 msgctxt "City in Ohio, United States"
 msgid "Lima"
 msgstr "Li-ma"
@@ -16029,29 +15751,21 @@ msgid "Limon"
 msgstr "Limon"
 
 #. A city in Illinois in the United States
-#| msgid "Lincoln"
 msgctxt "City in Illinois, United States"
 msgid "Lincoln"
 msgstr "Lincoln"
 
 #. A city in Nebraska in the United States
-#| msgid "Lincoln"
 msgctxt "City in Nebraska, United States"
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#. A city in North Carolina in the United States
-msgid "Lincolnton"
-msgstr "Lincolnton"
-
 #. A city in Illinois in the United States
-#| msgid "Litchfield"
 msgctxt "City in Illinois, United States"
 msgid "Litchfield"
 msgstr "Litchfield"
 
 #. A city in Minnesota in the United States
-#| msgid "Litchfield"
 msgctxt "City in Minnesota, United States"
 msgid "Litchfield"
 msgstr "Litchfield"
@@ -16089,7 +15803,6 @@ msgid "Lompoc"
 msgstr "Lompoc"
 
 #. A city in Kentucky in the United States
-#| msgid "London"
 msgctxt "City in Kentucky, United States"
 msgid "London"
 msgstr "London"
@@ -16139,13 +15852,11 @@ msgid "Lovelock"
 msgstr "Lovelock"
 
 #. A city in Idaho in the United States
-#| msgid "Lowell"
 msgctxt "City in Idaho, United States"
 msgid "Lowell"
 msgstr "Lowell"
 
 #. A city in Massachusetts in the United States
-#| msgid "Lowell"
 msgctxt "City in Massachusetts, United States"
 msgid "Lowell"
 msgstr "Lowell"
@@ -16191,19 +15902,16 @@ msgid "Madera"
 msgstr "Madera"
 
 #. A city in Minnesota in the United States
-#| msgid "Madison"
 msgctxt "City in Minnesota, United States"
 msgid "Madison"
 msgstr "Madison"
 
 #. A city in Wisconsin in the United States
-#| msgid "Madison"
 msgctxt "City in Wisconsin, United States"
 msgid "Madison"
 msgstr "Madison"
 
 #. A city in Idaho in the United States
-#| msgid "Malta"
 msgctxt "City in Idaho, United States"
 msgid "Malta"
 msgstr "Moa-ta"
@@ -16213,7 +15921,6 @@ msgid "Manassas"
 msgstr "Manassas"
 
 #. A city in New Hampshire in the United States
-#| msgid "Manchester"
 msgctxt "City in New Hampshire, United States"
 msgid "Manchester"
 msgstr "Manchester"
@@ -16271,19 +15978,16 @@ msgid "Marietta"
 msgstr "Marietta"
 
 #. A city in Illinois in the United States
-#| msgid "Marion"
 msgctxt "City in Illinois, United States"
 msgid "Marion"
 msgstr "Marion"
 
 #. A city in Ohio in the United States
-#| msgid "Marion"
 msgctxt "City in Ohio, United States"
 msgid "Marion"
 msgstr "Marion"
 
 #. A city in Virginia in the United States
-#| msgid "Marion"
 msgctxt "City in Virginia, United States"
 msgid "Marion"
 msgstr "Marion"
@@ -16293,13 +15997,11 @@ msgid "Marquette"
 msgstr "Marquette"
 
 #. A city in Michigan in the United States
-#| msgid "Marshall"
 msgctxt "City in Michigan, United States"
 msgid "Marshall"
 msgstr "Marshall"
 
 #. A city in Minnesota in the United States
-#| msgid "Marshall"
 msgctxt "City in Minnesota, United States"
 msgid "Marshall"
 msgstr "Marshall"
@@ -16321,13 +16023,11 @@ msgid "Martinsville"
 msgstr "Martinsville"
 
 #. A city in California in the United States
-#| msgid "Marysville"
 msgctxt "City in California, United States"
 msgid "Marysville"
 msgstr "Marysville"
 
 #. A city in Michigan in the United States
-#| msgid "Marysville"
 msgctxt "City in Michigan, United States"
 msgid "Marysville"
 msgstr "Marysville"
@@ -16409,13 +16109,11 @@ msgid "Meadville"
 msgstr "Meadville"
 
 #. A city in Oregon in the United States
-#| msgid "Medford"
 msgctxt "City in Oregon, United States"
 msgid "Medford"
 msgstr "Medford"
 
 #. A city in Wisconsin in the United States
-#| msgid "Medford"
 msgctxt "City in Wisconsin, United States"
 msgid "Medford"
 msgstr "Medford"
@@ -16434,7 +16132,6 @@ msgstr "Mekoryuk"
 
 # Thá»§ Ä?Ã´ tiá»?u bang Victoria táº¡i Ã?c.
 #. A city in Florida in the United States
-#| msgid "Melbourne"
 msgctxt "City in Florida, United States"
 msgid "Melbourne"
 msgstr "Melbourne"
@@ -16496,7 +16193,6 @@ msgid "Metropolis"
 msgstr "Metropolis"
 
 #. A city in Florida in the United States
-#| msgid "Miami"
 msgctxt "City in Florida, United States"
 msgid "Miami"
 msgstr "Miami"
@@ -16586,25 +16282,21 @@ msgid "Moline"
 msgstr "Moline"
 
 #. A city in Louisiana in the United States
-#| msgid "Monroe"
 msgctxt "City in Louisiana, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in Michigan in the United States
-#| msgid "Monroe"
 msgctxt "City in Michigan, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in North Carolina in the United States
-#| msgid "Monroe"
 msgctxt "City in North Carolina, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in Wisconsin in the United States
-#| msgid "Monroe"
 msgctxt "City in Wisconsin, United States"
 msgid "Monroe"
 msgstr "Monroe"
@@ -16622,43 +16314,31 @@ msgid "Monterey"
 msgstr "Monterey"
 
 #. A city in Minnesota in the United States
-#| msgid "Montevideo"
 msgctxt "City in Minnesota, United States"
 msgid "Montevideo"
 msgstr "Montevideo"
 
 #. A city in Alabama in the United States
-#| msgid "Montgomery"
 msgctxt "City in Alabama, United States"
 msgid "Montgomery"
 msgstr "Montgomery"
 
 #. A city in New York in the United States
-#| msgid "Montgomery"
 msgctxt "City in New York, United States"
 msgid "Montgomery"
 msgstr "Montgomery"
 
 #. A city in Arkansas in the United States
-#| msgid "Monticello"
 msgctxt "City in Arkansas, United States"
 msgid "Monticello"
 msgstr "Monticello"
 
 #. A city in Iowa in the United States
-#| msgid "Monticello"
 msgctxt "City in Iowa, United States"
 msgid "Monticello"
 msgstr "Monticello"
 
-#. A city in Kentucky in the United States
-#| msgid "Monticello"
-msgctxt "City in Kentucky, United States"
-msgid "Monticello"
-msgstr "Monticello"
-
 #. A city in New York in the United States
-#| msgid "Monticello"
 msgctxt "City in New York, United States"
 msgid "Monticello"
 msgstr "Monticello"
@@ -16688,13 +16368,11 @@ msgid "Moriarty"
 msgstr "Moriarty"
 
 #. A city in Illinois in the United States
-#| msgid "Morris"
 msgctxt "City in Illinois, United States"
 msgid "Morris"
 msgstr "Morris"
 
 #. A city in Minnesota in the United States
-#| msgid "Morris"
 msgctxt "City in Minnesota, United States"
 msgid "Morris"
 msgstr "Morris"
@@ -16709,7 +16387,6 @@ msgstr "Morrisville"
 
 # Thá»§ Ä?Ã´ Nga
 #. A city in Idaho in the United States
-#| msgid "Moscow"
 msgctxt "City in Idaho, United States"
 msgid "Moscow"
 msgstr "Moscow"
@@ -16743,19 +16420,16 @@ msgid "Mount Ida"
 msgstr "Mount Ida"
 
 #. A city in Iowa in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Iowa, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
 
 #. A city in Michigan in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Michigan, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
 
 #. A city in Texas in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Texas, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
@@ -16777,13 +16451,11 @@ msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
 #. A city in Arkansas in the United States
-#| msgid "Mountain Home"
 msgctxt "City in Arkansas, United States"
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
 #. A city in Idaho in the United States
-#| msgid "Mountain Home"
 msgctxt "City in Idaho, United States"
 msgid "Mountain Home"
 msgstr "Mountain Home"
@@ -16849,7 +16521,6 @@ msgid "Naperville"
 msgstr "Naperville"
 
 #. A city in Florida in the United States
-#| msgid "Naples"
 msgctxt "City in Florida, United States"
 msgid "Naples"
 msgstr "Naples"
@@ -16918,10 +16589,6 @@ msgstr "New Philadelphia"
 msgid "New Richmond"
 msgstr "New Richmond"
 
-#. A city in Rhode Island in the United States
-msgid "New Shoreham"
-msgstr "New Shoreham"
-
 #. A city in Florida in the United States
 msgid "New Smyrna Beach"
 msgstr "New Smyrna Beach"
@@ -16931,19 +16598,16 @@ msgid "New Ulm"
 msgstr "New Ulm"
 
 #. A city in New York in the United States
-#| msgid "New York"
 msgctxt "City in New York, United States"
 msgid "New York"
 msgstr "New York"
 
 #. A city in New Jersey in the United States
-#| msgid "Newark"
 msgctxt "City in New Jersey, United States"
 msgid "Newark"
 msgstr "Newark"
 
 #. A city in Ohio in the United States
-#| msgid "Newark"
 msgctxt "City in Ohio, United States"
 msgid "Newark"
 msgstr "Newark"
@@ -16969,19 +16633,16 @@ msgid "Newnan"
 msgstr "Newnan"
 
 #. A city in Arkansas in the United States
-#| msgid "Newport"
 msgctxt "City in Arkansas, United States"
 msgid "Newport"
 msgstr "Newport"
 
 #. A city in Oregon in the United States
-#| msgid "Newport"
 msgctxt "City in Oregon, United States"
 msgid "Newport"
 msgstr "Newport"
 
 #. A city in Rhode Island in the United States
-#| msgid "Newport"
 msgctxt "City in Rhode Island, United States"
 msgid "Newport"
 msgstr "Newport"
@@ -17011,13 +16672,11 @@ msgid "Nome"
 msgstr "Nome"
 
 #. A city in Nebraska in the United States
-#| msgid "Norfolk"
 msgctxt "City in Nebraska, United States"
 msgid "Norfolk"
 msgstr "Norfolk"
 
 #. A city in Virginia in the United States
-#| msgid "Norfolk"
 msgctxt "City in Virginia, United States"
 msgid "Norfolk"
 msgstr "Norfolk"
@@ -17159,37 +16818,31 @@ msgid "Omak"
 msgstr "Omak"
 
 #. A city in California in the United States
-#| msgid "Ontario"
 msgctxt "City in California, United States"
 msgid "Ontario"
 msgstr "Ontario"
 
 #. A city in Oregon in the United States
-#| msgid "Ontario"
 msgctxt "City in Oregon, United States"
 msgid "Ontario"
 msgstr "Ontario"
 
 #. A city in California in the United States
-#| msgid "Orange"
 msgctxt "City in California, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Massachusetts in the United States
-#| msgid "Orange"
 msgctxt "City in Massachusetts, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Texas in the United States
-#| msgid "Orange"
 msgctxt "City in Texas, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Virginia in the United States
-#| msgid "Orange"
 msgctxt "City in Virginia, United States"
 msgid "Orange"
 msgstr "Orange"
@@ -17263,19 +16916,16 @@ msgid "Owosso"
 msgstr "Owosso"
 
 #. A city in Connecticut in the United States
-#| msgid "Oxford"
 msgctxt "City in Connecticut, United States"
 msgid "Oxford"
 msgstr "Oxford"
 
 #. A city in Mississippi in the United States
-#| msgid "Oxford"
 msgctxt "City in Mississippi, United States"
 msgid "Oxford"
 msgstr "Oxford"
 
 #. A city in North Carolina in the United States
-#| msgid "Oxford"
 msgctxt "City in North Carolina, United States"
 msgid "Oxford"
 msgstr "Oxford"
@@ -17333,13 +16983,11 @@ msgid "Panama City"
 msgstr "Panama City"
 
 #. A city in Illinois in the United States
-#| msgid "Paris"
 msgctxt "City in Illinois, United States"
 msgid "Paris"
 msgstr "Paris"
 
 #. A city in Texas in the United States
-#| msgid "Paris"
 msgctxt "City in Texas, United States"
 msgid "Paris"
 msgstr "Paris"
@@ -17357,13 +17005,11 @@ msgid "Parsons"
 msgstr "Parsons"
 
 #. A city in California in the United States
-#| msgid "Pasadena"
 msgctxt "City in California, United States"
 msgid "Pasadena"
 msgstr "Pasadena"
 
 #. A city in Texas in the United States
-#| msgid "Pasadena"
 msgctxt "City in Texas, United States"
 msgid "Pasadena"
 msgstr "Pasadena"
@@ -17441,13 +17087,11 @@ msgid "Pensacola"
 msgstr "Pensacola"
 
 #. A city in Arizona in the United States
-#| msgid "Peoria"
 msgctxt "City in Arizona, United States"
 msgid "Peoria"
 msgstr "Peoria"
 
 #. A city in Illinois in the United States
-#| msgid "Peoria"
 msgctxt "City in Illinois, United States"
 msgid "Peoria"
 msgstr "Peoria"
@@ -17461,31 +17105,26 @@ msgid "Perryton"
 msgstr "Perryton"
 
 #. A city in Illinois in the United States
-#| msgid "Peru"
 msgctxt "City in Illinois, United States"
 msgid "Peru"
 msgstr "PÃª-ru"
 
 #. A city in Indiana in the United States
-#| msgid "Peru"
 msgctxt "City in Indiana, United States"
 msgid "Peru"
 msgstr "PÃª-ru"
 
 #. A city in Alaska in the United States
-#| msgid "Petersburg"
 msgctxt "City in Alaska, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
 
 #. A city in Virginia in the United States
-#| msgid "Petersburg"
 msgctxt "City in Virginia, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
 
 #. A city in West Virginia in the United States
-#| msgid "Petersburg"
 msgctxt "City in West Virginia, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
@@ -17543,13 +17182,11 @@ msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
 #. A city in Illinois in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Illinois, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
 
 #. A city in Massachusetts in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
@@ -17579,13 +17216,11 @@ msgid "Plattsmouth"
 msgstr "Plattsmouth"
 
 #. A city in Massachusetts in the United States
-#| msgid "Plymouth"
 msgctxt "City in Massachusetts, United States"
 msgid "Plymouth"
 msgstr "Plymouth"
 
 #. A city in New Hampshire in the United States
-#| msgid "Plymouth"
 msgctxt "City in New Hampshire, United States"
 msgid "Plymouth"
 msgstr "Plymouth"
@@ -17623,13 +17258,11 @@ msgid "Ponca City"
 msgstr "Ponca City"
 
 #. A city in Illinois in the United States
-#| msgid "Pontiac"
 msgctxt "City in Illinois, United States"
 msgid "Pontiac"
 msgstr "Pontiac"
 
 #. A city in Michigan in the United States
-#| msgid "Pontiac"
 msgctxt "City in Michigan, United States"
 msgid "Pontiac"
 msgstr "Pontiac"
@@ -17675,25 +17308,21 @@ msgid "Porterville"
 msgstr "Porterville"
 
 #. A city in Maine in the United States
-#| msgid "Portland"
 msgctxt "City in Maine, United States"
 msgid "Portland"
 msgstr "Portland"
 
 #. A city in Oregon in the United States
-#| msgid "Portland"
 msgctxt "City in Oregon, United States"
 msgid "Portland"
 msgstr "Portland"
 
 #. A city in New Hampshire in the United States
-#| msgid "Portsmouth"
 msgctxt "City in New Hampshire, United States"
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
 #. A city in Virginia in the United States
-#| msgid "Portsmouth"
 msgctxt "City in Virginia, United States"
 msgid "Portsmouth"
 msgstr "Portsmouth"
@@ -17735,7 +17364,6 @@ msgid "Price"
 msgstr "Price"
 
 #. A city in Minnesota in the United States
-#| msgid "Princeton"
 msgctxt "City in Minnesota, United States"
 msgid "Princeton"
 msgstr "Princeton"
@@ -17816,10 +17444,6 @@ msgstr "Reading"
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#. A city in Colorado in the United States
-msgid "Red Cliff"
-msgstr "Red Cliff"
-
 #. A city in Iowa in the United States
 msgid "Red Oak"
 msgstr "Red Oak"
@@ -17861,11 +17485,6 @@ msgid "Rice Lake"
 msgstr "Rice Lake"
 
 #. A city in Virginia in the United States
-msgid "Richlands"
-msgstr "Richlands"
-
-#. A city in Virginia in the United States
-#| msgid "Richmond"
 msgctxt "City in Virginia, United States"
 msgid "Richmond"
 msgstr "Richmond"
@@ -17890,10 +17509,6 @@ msgstr "Roanoke"
 msgid "Roanoke Rapids"
 msgstr "Roanoke Rapids"
 
-#. A city in Missouri in the United States
-msgid "Robertson"
-msgstr "Robertson"
-
 #. A city in Illinois in the United States
 msgid "Robinson"
 msgstr "Robinson"
@@ -17903,19 +17518,16 @@ msgid "Rochelle"
 msgstr "Rochelle"
 
 #. A city in Minnesota in the United States
-#| msgid "Rochester"
 msgctxt "City in Minnesota, United States"
 msgid "Rochester"
 msgstr "Rochester"
 
 #. A city in New Hampshire in the United States
-#| msgid "Rochester"
 msgctxt "City in New Hampshire, United States"
 msgid "Rochester"
 msgstr "Rochester"
 
 #. A city in New York in the United States
-#| msgid "Rochester"
 msgctxt "City in New York, United States"
 msgid "Rochester"
 msgstr "Rochester"
@@ -17961,25 +17573,21 @@ msgid "Rogers City"
 msgstr "Rogers City"
 
 #. A city in Georgia in the United States
-#| msgid "Rome"
 msgctxt "City in Georgia, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in New York in the United States
-#| msgid "Rome"
 msgctxt "City in New York, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in Oregon in the United States
-#| msgid "Rome"
 msgctxt "City in Oregon, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in Minnesota in the United States
-#| msgid "Roseau"
 msgctxt "City in Minnesota, United States"
 msgid "Roseau"
 msgstr "Roseau"
@@ -18020,10 +17628,6 @@ msgstr "Ruston"
 msgid "Rutland"
 msgstr "Rutland"
 
-#. A city in Texas in the United States
-msgid "Sabine Pass"
-msgstr "Sabine Pass"
-
 #. A city in California in the United States
 msgid "Sacramento"
 msgstr "Sacramento"
@@ -18045,19 +17649,16 @@ msgid "Saint Cloud"
 msgstr "Saint Cloud"
 
 #. A city in Alaska in the United States
-#| msgid "Saint George"
 msgctxt "City in Alaska, United States"
 msgid "Saint George"
 msgstr "Saint George"
 
 #. A city in Michigan in the United States
-#| msgid "Saint James"
 msgctxt "City in Michigan, United States"
 msgid "Saint James"
 msgstr "Saint James"
 
 #. A city in Minnesota in the United States
-#| msgid "Saint James"
 msgctxt "City in Minnesota, United States"
 msgid "Saint James"
 msgstr "Saint James"
@@ -18083,13 +17684,11 @@ msgid "Saint Paul"
 msgstr "Saint Paul"
 
 #. A city in Illinois in the United States
-#| msgid "Salem"
 msgctxt "City in Illinois, United States"
 msgid "Salem"
 msgstr "Salem"
 
 #. A city in Oregon in the United States
-#| msgid "Salem"
 msgctxt "City in Oregon, United States"
 msgid "Salem"
 msgstr "Salem"
@@ -18107,13 +17706,11 @@ msgid "Salinas"
 msgstr "Salinas"
 
 #. A city in Maryland in the United States
-#| msgid "Salisbury"
 msgctxt "City in Maryland, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
 
 #. A city in North Carolina in the United States
-#| msgid "Salisbury"
 msgctxt "City in North Carolina, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
@@ -18183,13 +17780,11 @@ msgid "Sandwich"
 msgstr "Sandwich"
 
 #. A city in Maine in the United States
-#| msgid "Sanford"
 msgctxt "City in Maine, United States"
 msgid "Sanford"
 msgstr "Sanford"
 
 #. A city in North Carolina in the United States
-#| msgid "Sanford"
 msgctxt "City in North Carolina, United States"
 msgid "Sanford"
 msgstr "Sanford"
@@ -18203,13 +17798,11 @@ msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
 #. A city in California in the United States
-#| msgid "Santa Clara"
 msgctxt "City in California, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
 
 #. A city in Utah in the United States
-#| msgid "Santa Clara"
 msgctxt "City in Utah, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
@@ -18219,7 +17812,6 @@ msgid "Santa Fe"
 msgstr "Santa Fe"
 
 #. A city in California in the United States
-#| msgid "Santa Maria"
 msgctxt "City in California, United States"
 msgid "Santa Maria"
 msgstr "Santa Maria"
@@ -18297,13 +17889,11 @@ msgid "Selinsgrove"
 msgstr "Selinsgrove"
 
 #. A city in Oklahoma in the United States
-#| msgid "Seminole"
 msgctxt "City in Oklahoma, United States"
 msgid "Seminole"
 msgstr "Seminole"
 
 #. A city in Texas in the United States
-#| msgid "Seminole"
 msgctxt "City in Texas, United States"
 msgid "Seminole"
 msgstr "Seminole"
@@ -18365,13 +17955,11 @@ msgid "Shreveport"
 msgstr "Shreveport"
 
 #. A city in Montana in the United States
-#| msgid "Sidney"
 msgctxt "City in Montana, United States"
 msgid "Sidney"
 msgstr "Sidney"
 
 #. A city in Nebraska in the United States
-#| msgid "Sidney"
 msgctxt "City in Nebraska, United States"
 msgid "Sidney"
 msgstr "Sidney"
@@ -18461,7 +18049,6 @@ msgid "Somerville"
 msgstr "Somerville"
 
 #. A city in Texas in the United States
-#| msgid "Sonora"
 msgctxt "City in Texas, United States"
 msgid "Sonora"
 msgstr "Sonora"
@@ -18483,13 +18070,11 @@ msgid "South Lake Tahoe"
 msgstr "South Lake Tahoe"
 
 #. A city in Illinois in the United States
-#| msgid "Sparta"
 msgctxt "City in Illinois, United States"
 msgid "Sparta"
 msgstr "Sparta"
 
 #. A city in Wisconsin in the United States
-#| msgid "Sparta"
 msgctxt "City in Wisconsin, United States"
 msgid "Sparta"
 msgstr "Sparta"
@@ -18511,47 +18096,46 @@ msgid "Springdale"
 msgstr "Springdale"
 
 #. A city in Colorado in the United States
-#| msgid "Springfield"
 msgctxt "City in Colorado, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Florida in the United States
-#| msgid "Springfield"
 msgctxt "City in Florida, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Illinois in the United States
-#| msgid "Springfield"
 msgctxt "City in Illinois, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Massachusetts in the United States
-#| msgid "Springfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Missouri in the United States
-#| msgid "Springfield"
 msgctxt "City in Missouri, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Ohio in the United States
-#| msgid "Springfield"
 msgctxt "City in Ohio, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Vermont in the United States
-#| msgid "Springfield"
 msgctxt "City in Vermont, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
+#. A city in Missouri in the United States
+#, fuzzy
+#| msgid "Port Louis"
+msgid "St. Louis"
+msgstr "Port Louis"
+
 #. A city in Virginia in the United States
 msgid "Stafford"
 msgstr "Stafford"
@@ -18565,7 +18149,6 @@ msgid "Stampede"
 msgstr "Stampede"
 
 #. A city in Idaho in the United States
-#| msgid "Stanley"
 msgctxt "City in Idaho, United States"
 msgid "Stanley"
 msgstr "Stanley"
@@ -18599,7 +18182,6 @@ msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
 #. A city in Texas in the United States
-#| msgid "Stephenville"
 msgctxt "City in Texas, United States"
 msgid "Stephenville"
 msgstr "Stephenville"
@@ -18621,7 +18203,6 @@ msgid "Stillwater"
 msgstr "Stillwater"
 
 #. A city in California in the United States
-#| msgid "Stockton"
 msgctxt "City in California, United States"
 msgid "Stockton"
 msgstr "Stockton"
@@ -18643,7 +18224,6 @@ msgid "Sturgis"
 msgstr "Sturgis"
 
 #. A city in Arkansas in the United States
-#| msgid "Stuttgart"
 msgctxt "City in Arkansas, United States"
 msgid "Stuttgart"
 msgstr "Stuttgart"
@@ -18669,13 +18249,11 @@ msgid "Sussex"
 msgstr "Sussex"
 
 #. A city in Alaska in the United States
-#| msgid "Sutton"
 msgctxt "City in Alaska, United States"
 msgid "Sutton"
 msgstr "Sutton"
 
 #. A city in West Virginia in the United States
-#| msgid "Sutton"
 msgctxt "City in West Virginia, United States"
 msgid "Sutton"
 msgstr "Sutton"
@@ -18728,10 +18306,6 @@ msgstr "Taos"
 msgid "Tarryall"
 msgstr "Tarryall"
 
-#. A city in Massachusetts in the United States
-msgid "Taunton"
-msgstr "Taunton"
-
 #. A city in Illinois in the United States
 msgid "Taylorville"
 msgstr "Taylorville"
@@ -18849,25 +18423,21 @@ msgid "Traverse City"
 msgstr "Traverse City"
 
 #. A city in New Jersey in the United States
-#| msgid "Trenton"
 msgctxt "City in New Jersey, United States"
 msgid "Trenton"
 msgstr "Trenton"
 
 #. A city in Colorado in the United States
-#| msgid "Trinidad"
 msgctxt "City in Colorado, United States"
 msgid "Trinidad"
 msgstr "Trinidad"
 
 #. A city in Alabama in the United States
-#| msgid "Troy"
 msgctxt "City in Alabama, United States"
 msgid "Troy"
 msgstr "Troy"
 
 #. A city in Michigan in the United States
-#| msgid "Troy"
 msgctxt "City in Michigan, United States"
 msgid "Troy"
 msgstr "Troy"
@@ -18965,13 +18535,11 @@ msgid "Vallejo"
 msgstr "Vallejo"
 
 #. A city in Florida in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Florida, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
 #. A city in Indiana in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Indiana, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
@@ -18981,7 +18549,6 @@ msgid "Van Nuys"
 msgstr "Van Nuys"
 
 #. A city in Washington in the United States
-#| msgid "Vancouver"
 msgctxt "City in Washington, United States"
 msgid "Vancouver"
 msgstr "Vancouver"
@@ -18995,7 +18562,6 @@ msgid "Vernal"
 msgstr "Vernal"
 
 #. A city in Texas in the United States
-#| msgid "Vernon"
 msgctxt "City in Texas, United States"
 msgid "Vernon"
 msgstr "Vernon"
@@ -19005,7 +18571,6 @@ msgid "Vero Beach"
 msgstr "Vero Beach"
 
 #. A city in Missouri in the United States
-#| msgid "Vichy"
 msgctxt "City in Missouri, United States"
 msgid "Vichy"
 msgstr "Vichy"
@@ -19016,7 +18581,6 @@ msgstr "Vicksburg"
 
 # Tiá»?u bang cá»§a Ã?c.
 #. A city in Texas in the United States
-#| msgid "Victoria"
 msgctxt "City in Texas, United States"
 msgid "Victoria"
 msgstr "Victoria"
@@ -19103,7 +18667,6 @@ msgid "Warroad"
 msgstr "Warroad"
 
 #. A city in Indiana in the United States
-#| msgid "Warsaw"
 msgctxt "City in Indiana, United States"
 msgid "Warsaw"
 msgstr "Warsaw"
@@ -19113,25 +18676,21 @@ msgid "Waseca"
 msgstr "Waseca"
 
 #. The capital of the United States
-#| msgid "Washington"
 msgctxt "City in District of Columbia, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Iowa in the United States
-#| msgid "Washington"
 msgctxt "City in Iowa, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in North Carolina in the United States
-#| msgid "Washington"
 msgctxt "City in North Carolina, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Washington"
 msgctxt "City in Pennsylvania, United States"
 msgid "Washington"
 msgstr "Washington"
@@ -19149,25 +18708,21 @@ msgid "Waterbury"
 msgstr "Waterbury"
 
 #. A city in Iowa in the United States
-#| msgid "Waterloo"
 msgctxt "City in Iowa, United States"
 msgid "Waterloo"
 msgstr "Waterloo"
 
 #. A city in New York in the United States
-#| msgid "Watertown"
 msgctxt "City in New York, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in South Dakota in the United States
-#| msgid "Watertown"
 msgctxt "City in South Dakota, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in Wisconsin in the United States
-#| msgid "Watertown"
 msgctxt "City in Wisconsin, United States"
 msgid "Watertown"
 msgstr "Watertown"
@@ -19272,10 +18827,6 @@ msgstr "West Thumb"
 msgid "West Valley City"
 msgstr "West Valley City"
 
-#. A city in Montana in the United States
-msgid "West Yellowstone"
-msgstr "West Yellowstone"
-
 #. A city in Rhode Island in the United States
 msgid "Westerly"
 msgstr "Westerly"
@@ -19312,10 +18863,6 @@ msgstr "White Plains"
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#. A city in North Carolina in the United States
-msgid "Whiteville"
-msgstr "Whiteville"
-
 #. A city in Alaska in the United States
 msgid "Whittier"
 msgstr "Whittier"
@@ -19340,10 +18887,6 @@ msgstr "Williamsburg"
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#. A city in Connecticut in the United States
-msgid "Willimantic"
-msgstr "Willimantic"
-
 #. A city in North Dakota in the United States
 msgid "Williston"
 msgstr "Williston"
@@ -19357,19 +18900,16 @@ msgid "Willow Grove"
 msgstr "Willow Grove"
 
 #. A city in Delaware in the United States
-#| msgid "Wilmington"
 msgctxt "City in Delaware, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A city in North Carolina in the United States
-#| msgid "Wilmington"
 msgctxt "City in North Carolina, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A city in Ohio in the United States
-#| msgid "Wilmington"
 msgctxt "City in Ohio, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
@@ -19446,10 +18986,6 @@ msgstr "Wolf Point"
 msgid "Woodruff"
 msgstr "Woodruff"
 
-#. A city in Oklahoma in the United States
-msgid "Woodward"
-msgstr "Woodward"
-
 #. A city in Ohio in the United States
 msgid "Wooster"
 msgstr "Wooster"
@@ -19471,7 +19007,6 @@ msgid "Wrangell"
 msgstr "Wrangell"
 
 #. A city in Wyoming in the United States
-#| msgid "Wyoming"
 msgctxt "City in Wyoming, United States"
 msgid "Wyoming"
 msgstr "Wyoming"
@@ -19493,13 +19028,11 @@ msgid "Yonkers"
 msgstr "Yonkers"
 
 #. A city in Nebraska in the United States
-#| msgid "York"
 msgctxt "City in Nebraska, United States"
 msgid "York"
 msgstr "York"
 
 #. A city in Pennsylvania in the United States
-#| msgid "York"
 msgctxt "City in Pennsylvania, United States"
 msgid "York"
 msgstr "York"
@@ -19545,7 +19078,6 @@ msgid "Maldonado"
 msgstr "Maldonado"
 
 #. The capital of Uruguay
-#| msgid "Montevideo"
 msgctxt "City in Uruguay"
 msgid "Montevideo"
 msgstr "Montevideo"
@@ -19578,7 +19110,6 @@ msgid "Acarigua"
 msgstr "Acarigua"
 
 #. A city in Venezuela
-#| msgid "Barcelona"
 msgctxt "City in Venezuela"
 msgid "Barcelona"
 msgstr "Barcelona"
@@ -19656,7 +19187,6 @@ msgid "Morocure"
 msgstr "Morocure"
 
 #. A city in Venezuela
-#| msgid "MÃ©rida"
 msgctxt "City in Venezuela"
 msgid "MÃ©rida"
 msgstr "MÃ©rida"
@@ -19682,7 +19212,6 @@ msgid "San Felipe"
 msgstr "San Felipe"
 
 #. A city in Venezuela
-#| msgid "San Fernando"
 msgctxt "City in Venezuela"
 msgid "San Fernando"
 msgstr "San Fernando"
@@ -19700,7 +19229,6 @@ msgid "Santa BÃ¡rbara"
 msgstr "Santa BÃ¡rbara"
 
 #. A city in Venezuela
-#| msgid "Valencia"
 msgctxt "City in Venezuela"
 msgid "Valencia"
 msgstr "Valencia"
@@ -19789,12 +19317,166 @@ msgstr "Lusaka"
 msgid "Ndola"
 msgstr "Ndola"
 
-#. The capital of Zimbabwe
-msgid "Harare"
-msgstr "Harare"
-
 #. A city in the Ã?land Islands.
 #. The local name in Finnish is "Maarianhamina".
 #.
 msgid "Mariehamn"
-msgstr "Maarianhamina"
\ No newline at end of file
+msgstr "Maarianhamina"
+
+#~ msgid "Luanda"
+#~ msgstr "Luanda"
+
+#~ msgid "San Miguel de TucumÃ¡n"
+#~ msgstr "San Miguel de TucumÃ¡n"
+
+#~ msgid "Fox Bay"
+#~ msgstr "Fox Bay"
+
+#~ msgid "Malahat"
+#~ msgstr "Malahat"
+
+#~ msgid "Port Colborne"
+#~ msgstr "Port Colborne"
+
+#~ msgid "Nausori"
+#~ msgstr "Nausori"
+
+#~ msgid "Suva"
+#~ msgstr "Suva"
+
+#~ msgid "HÃ©singue"
+#~ msgstr "HÃ©singue"
+
+#~ msgid "Bombay"
+#~ msgstr "Bombay"
+
+#~ msgid "Calcutta"
+#~ msgstr "Calcutta"
+
+#~ msgid "Madras"
+#~ msgstr "Madras"
+
+#~ msgid "Manado"
+#~ msgstr "Manado"
+
+#~ msgid "Kunigami"
+#~ msgstr "Kunigami"
+
+#~ msgid "Casablanca"
+#~ msgstr "Casablanca"
+
+#~ msgid "Inhambane"
+#~ msgstr "Inhambane"
+
+#~ msgid "Tete"
+#~ msgstr "Tete"
+
+#~ msgid "Windhoek"
+#~ msgstr "Windhoek"
+
+#~ msgid "Soesterberg"
+#~ msgstr "Soesterberg"
+
+#~ msgid "Ibadan"
+#~ msgstr "Ibadan"
+
+#~ msgid "Langenes"
+#~ msgstr "Langenes"
+
+#~ msgid "Wewak"
+#~ msgstr "Wewak"
+
+#~ msgid "Cajamarca"
+#~ msgstr "Cajamarca"
+
+#~ msgid "JuanjuÃ"
+#~ msgstr "JuanjuÃ"
+
+#~ msgid "Tingo MarÃa"
+#~ msgstr "Tingo MarÃa"
+
+#~ msgid "Yurimaguas"
+#~ msgstr "Yurimaguas"
+
+#~ msgid "Warszawa"
+#~ msgstr "Warszawa"
+
+#~ msgid "Rustenburg"
+#~ msgstr "Rustenburg"
+
+#~ msgid "Standerton"
+#~ msgstr "Standerton"
+
+#~ msgid "P'ohang"
+#~ msgstr "P'ohang"
+
+#~ msgid "Sach'on"
+#~ msgstr "Sach'on"
+
+#~ msgid "Pu-ting"
+#~ msgstr "Pu-ting"
+
+#~ msgid "T'ai-pei Shih"
+#~ msgstr "T'ai-pei Shih"
+
+#~ msgid "Saint Mawgan"
+#~ msgstr "Saint Mawgan"
+
+#~ msgid "Cantwell"
+#~ msgstr "Cantwell"
+
+#~ msgid "Central"
+#~ msgstr "Central"
+
+#~ msgid "Deering"
+#~ msgstr "Deering"
+
+#~ msgid "Golovin"
+#~ msgstr "Golovin"
+
+#~ msgid "Green River"
+#~ msgstr "Green River"
+
+#~ msgid "Kremmling"
+#~ msgstr "Kremmling"
+
+#~ msgid "Lincolnton"
+#~ msgstr "Lincolnton"
+
+#~| msgid "Monticello"
+#~ msgctxt "City in Kentucky, United States"
+#~ msgid "Monticello"
+#~ msgstr "Monticello"
+
+#~ msgid "New Shoreham"
+#~ msgstr "New Shoreham"
+
+#~ msgid "Red Cliff"
+#~ msgstr "Red Cliff"
+
+#~ msgid "Richlands"
+#~ msgstr "Richlands"
+
+#~ msgid "Robertson"
+#~ msgstr "Robertson"
+
+#~ msgid "Sabine Pass"
+#~ msgstr "Sabine Pass"
+
+#~ msgid "Taunton"
+#~ msgstr "Taunton"
+
+#~ msgid "West Yellowstone"
+#~ msgstr "West Yellowstone"
+
+#~ msgid "Whiteville"
+#~ msgstr "Whiteville"
+
+#~ msgid "Willimantic"
+#~ msgstr "Willimantic"
+
+#~ msgid "Woodward"
+#~ msgstr "Woodward"
+
+#~ msgid "Harare"
+#~ msgstr "Harare"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]