Add exceptions for the USA and UK

12 files changed, 82 insertions, 0 deletions

diff --git a/gui/locales/de/countries.po b/gui/locales/de/countries.po
index 415873a44c..ab0ba7302f 100644
--- a/gui/locales/de/countries.po
+++ b/gui/locales/de/countries.po
@@ -98,6 +98,9 @@ msgstr "Puerto Rico"
 msgid "United States of America"
 msgstr "Vereinigte Staaten"
 
+msgid "USA"
+msgstr "Vereinigte Staaten"
+
 msgid "S. Geo. and the Is."
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
@@ -173,6 +176,9 @@ msgstr "Vereinigtes Königreich"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Vereinigtes Königreich"
 
+msgid "UK"
+msgstr "Vereinigtes Königreich"
+
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
diff --git a/gui/locales/es/countries.po b/gui/locales/es/countries.po
index 7b0597b9de..8d703af082 100644
--- a/gui/locales/es/countries.po
+++ b/gui/locales/es/countries.po
@@ -98,6 +98,9 @@ msgstr "Puerto Rico"
 msgid "United States of America"
 msgstr "Estados Unidos"
 
+msgid "USA"
+msgstr "Estados Unidos"
+
 msgid "S. Geo. and the Is."
 msgstr "Islas Georgias del Sur y Sándwich del Sur"
 
@@ -173,6 +176,9 @@ msgstr "Reino Unido"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Reino Unido"
 
+msgid "UK"
+msgstr "Reino Unido"
+
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
diff --git a/gui/locales/fr/countries.po b/gui/locales/fr/countries.po
index 180a477ff0..b94d13aa99 100644
--- a/gui/locales/fr/countries.po
+++ b/gui/locales/fr/countries.po
@@ -98,6 +98,9 @@ msgstr "Porto Rico"
 msgid "United States of America"
 msgstr "États-Unis"
 
+msgid "USA"
+msgstr "États-Unis"
+
 msgid "S. Geo. and the Is."
 msgstr "Géorgie du Sud-et-les Îles Sandwich du Sud"
 
@@ -173,6 +176,9 @@ msgstr "Royaume-Uni"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Royaume-Uni"
 
+msgid "UK"
+msgstr "Royaume-Uni"
+
 msgid "United Arab Emirates"
 msgstr "Émirats arabes unis"
 
diff --git a/gui/locales/it/countries.po b/gui/locales/it/countries.po
index b0f95b11a4..bdf9f7cf8d 100644
--- a/gui/locales/it/countries.po
+++ b/gui/locales/it/countries.po
@@ -98,6 +98,9 @@ msgstr "Porto Rico"
 msgid "United States of America"
 msgstr "Stati Uniti d'America"
 
+msgid "USA"
+msgstr "Stati Uniti d'America"
+
 msgid "S. Geo. and the Is."
 msgstr "Georgia del Sud e isole Sandwich meridionali"
 
@@ -173,6 +176,9 @@ msgstr "Regno Unito"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Regno Unito"
 
+msgid "UK"
+msgstr "Regno Unito"
+
 msgid "United Arab Emirates"
 msgstr "Emirati Arabi Uniti"
 
diff --git a/gui/locales/ja/countries.po b/gui/locales/ja/countries.po
index 2cff8320c4..f847e83c15 100644
--- a/gui/locales/ja/countries.po
+++ b/gui/locales/ja/countries.po
@@ -98,6 +98,9 @@ msgstr "プエルトリコ"
 msgid "United States of America"
 msgstr "アメリカ合衆国"
 
+msgid "USA"
+msgstr "アメリカ合衆国"
+
 msgid "S. Geo. and the Is."
 msgstr "サウスジョージア・サウスサンドウィッチ諸島"
 
@@ -173,6 +176,9 @@ msgstr "イギリス"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "イギリス"
 
+msgid "UK"
+msgstr "イギリス"
+
 msgid "United Arab Emirates"
 msgstr "アラブ首長国連邦"
 
diff --git a/gui/locales/nl/countries.po b/gui/locales/nl/countries.po
index dc8311fe69..1d29299b20 100644
--- a/gui/locales/nl/countries.po
+++ b/gui/locales/nl/countries.po
@@ -98,6 +98,9 @@ msgstr "Puerto Rico"
 msgid "United States of America"
 msgstr "Verenigde Staten van Amerika"
 
+msgid "USA"
+msgstr "Verenigde Staten van Amerika"
+
 msgid "S. Geo. and the Is."
 msgstr "Zuid-Georgia en de Zuidelijke Sandwicheilanden"
 
@@ -173,6 +176,9 @@ msgstr "Verenigd Koninkrijk"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Verenigd Koninkrijk"
 
+msgid "UK"
+msgstr "Verenigd Koninkrijk"
+
 msgid "United Arab Emirates"
 msgstr "Verenigde Arabische Emiraten"
 
diff --git a/gui/locales/pt/countries.po b/gui/locales/pt/countries.po
index 0e5ee63625..6b9a1f716e 100644
--- a/gui/locales/pt/countries.po
+++ b/gui/locales/pt/countries.po
@@ -98,6 +98,9 @@ msgstr "Porto Rico"
 msgid "United States of America"
 msgstr "Estados Unidos"
 
+msgid "USA"
+msgstr "Estados Unidos"
+
 msgid "S. Geo. and the Is."
 msgstr "Ilhas Geórgia do Sul e Sandwich do Sul"
 
@@ -173,6 +176,9 @@ msgstr "Reino Unido"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Reino Unido"
 
+msgid "UK"
+msgstr "Reino Unido"
+
 msgid "United Arab Emirates"
 msgstr "Emirados Árabes Unidos"
 
diff --git a/gui/locales/ru/countries.po b/gui/locales/ru/countries.po
index 6e57c60528..987f5cf9f3 100644
--- a/gui/locales/ru/countries.po
+++ b/gui/locales/ru/countries.po
@@ -98,6 +98,9 @@ msgstr "Пуэрто-Рико"
 msgid "United States of America"
 msgstr "Соединённые Штаты Америки"
 
+msgid "USA"
+msgstr "Соединённые Штаты Америки"
+
 msgid "S. Geo. and the Is."
 msgstr "Южная Георгия и Южные Сандвичевы острова"
 
@@ -173,6 +176,9 @@ msgstr "Великобритания"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Великобритания"
 
+msgid "UK"
+msgstr "Великобритания"
+
 msgid "United Arab Emirates"
 msgstr "Объединённые Арабские Эмираты"
 
diff --git a/gui/locales/sv/countries.po b/gui/locales/sv/countries.po
index c6932e2288..18e10d80e9 100644
--- a/gui/locales/sv/countries.po
+++ b/gui/locales/sv/countries.po
@@ -98,6 +98,9 @@ msgstr "Puerto Rico"
 msgid "United States of America"
 msgstr "USA"
 
+msgid "USA"
+msgstr "USA"
+
 msgid "S. Geo. and the Is."
 msgstr "Sydgeorgien och Sydsandwichöarna"
 
@@ -173,6 +176,9 @@ msgstr "Storbritannien"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Storbritannien"
 
+msgid "UK"
+msgstr "Storbritannien"
+
 msgid "United Arab Emirates"
 msgstr "Förenade Arabemiraten"
 
diff --git a/gui/locales/tr/countries.po b/gui/locales/tr/countries.po
index cdf7e16cb5..7f9619d14c 100644
--- a/gui/locales/tr/countries.po
+++ b/gui/locales/tr/countries.po
@@ -98,6 +98,9 @@ msgstr "Porto Riko"
 msgid "United States of America"
 msgstr "Amerika Birleşik Devletleri"
 
+msgid "USA"
+msgstr "Amerika Birleşik Devletleri"
+
 msgid "S. Geo. and the Is."
 msgstr "Güney Georgia ve Güney Sandwich Adaları"
 
@@ -173,6 +176,9 @@ msgstr "Birleşik Krallık"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "Birleşik Krallık"
 
+msgid "UK"
+msgstr "Birleşik Krallık"
+
 msgid "United Arab Emirates"
 msgstr "Birleşik Arap Emirlikleri"
 
diff --git a/gui/locales/zh-TW/countries.po b/gui/locales/zh-TW/countries.po
index 23a1d212d4..6d52581e12 100644
--- a/gui/locales/zh-TW/countries.po
+++ b/gui/locales/zh-TW/countries.po
@@ -98,6 +98,9 @@ msgstr "波多黎各"
 msgid "United States of America"
 msgstr "美国"
 
+msgid "USA"
+msgstr "美国"
+
 msgid "S. Geo. and the Is."
 msgstr "南喬治亞島與南桑威奇群島"
 
@@ -173,6 +176,9 @@ msgstr "英国"
 msgid "United Kingdom of Great Britain and Northern Ireland"
 msgstr "英国"
 
+msgid "UK"
+msgstr "英国"
+
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
diff --git a/gui/scripts/extract-geo-data.py b/gui/scripts/extract-geo-data.py
index e9e74259ab..273392e3ad 100644
--- a/gui/scripts/extract-geo-data.py
+++ b/gui/scripts/extract-geo-data.py
@@ -193,6 +193,22 @@ def extract_countries_po():
             )
             po.append(entry)
 
+          # exception for the US
+          if props.get("iso_a3") == "USA":
+            entry = POEntry(
+              msgid="USA",
+              msgstr=translated_name
+            )
+            po.append(entry)
+
+          # exception for the UK
+          if props.get("iso_a3") == "GBR":
+            entry = POEntry(
+              msgid="UK",
+              msgstr=translated_name
+            )
+            po.append(entry)
+
         po.save(output_path)
         print c.green("Extracted {} countries for {} to {}".format(len(po), locale, output_path))