Update file mapping

7 files changed, 51 insertions, 38 deletions

diff --git a/gui/locales/de/messages-de.po b/gui/locales/de/messages.po
index 7a63056da1..3e0df5a557 100644
--- a/gui/locales/de/messages-de.po
+++ b/gui/locales/de/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad <admin@mullvad.net>\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2019-03-18 14:19\n"
+"PO-Revision-Date: 2019-03-18 15:52\n"
 
 #: src/renderer/components/SecuredLabel.tsx:40
 msgid "BLOCKED CONNECTION"
@@ -55,7 +55,7 @@ msgctxt "account-view"
 msgid "Account ID"
 msgstr "Konto-ID"
 
-#: src/renderer/components/Account.tsx:69
+#: src/renderer/components/Account.tsx:71
 msgctxt "account-view"
 msgid "Buy more credit"
 msgstr "Mehr Guthaben erwerben"
@@ -65,21 +65,26 @@ msgctxt "account-view"
 msgid "COPIED TO CLIPBOARD!"
 msgstr "IN DIE ZWISCHENABLAGE KOPIERT!"
 
-#: src/renderer/components/Account.tsx:101
+#: src/renderer/components/Account.tsx:103
 msgctxt "account-view"
 msgid "Currently unavailable"
 msgstr "Derzeit nicht verfügbar"
 
-#: src/renderer/components/Account.tsx:74
+#: src/renderer/components/Account.tsx:76
 msgctxt "account-view"
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/renderer/components/Account.tsx:93
+#: src/renderer/components/Account.tsx:95
 msgctxt "account-view"
 msgid "OUT OF TIME"
 msgstr "ZEIT ABGELAUFEN"
 
+#: src/renderer/components/Account.tsx:57
+msgctxt "account-view"
+msgid "Paid until"
+msgstr ""
+
 #. Title label in navigation bar
 #: src/renderer/components/AdvancedSettings.tsx:97
 msgctxt "advanced-settings-nav"
diff --git a/gui/locales/es/messages-es.po b/gui/locales/es/messages.po
index f32b2ef4f7..890173af5d 100644
--- a/gui/locales/es/messages-es.po
+++ b/gui/locales/es/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad <admin@mullvad.net>\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2019-03-18 14:19\n"
+"PO-Revision-Date: 2019-03-18 15:52\n"
 
 #: src/renderer/components/SecuredLabel.tsx:40
 msgid "BLOCKED CONNECTION"
@@ -55,7 +55,7 @@ msgctxt "account-view"
 msgid "Account ID"
 msgstr "Id. de cuenta"
 
-#: src/renderer/components/Account.tsx:69
+#: src/renderer/components/Account.tsx:71
 msgctxt "account-view"
 msgid "Buy more credit"
 msgstr "Comprar más crédito"
@@ -65,21 +65,26 @@ msgctxt "account-view"
 msgid "COPIED TO CLIPBOARD!"
 msgstr "¡COPIADO EN EL PORTAPAPELES!"
 
-#: src/renderer/components/Account.tsx:101
+#: src/renderer/components/Account.tsx:103
 msgctxt "account-view"
 msgid "Currently unavailable"
 msgstr "No disponible actualmente"
 
-#: src/renderer/components/Account.tsx:74
+#: src/renderer/components/Account.tsx:76
 msgctxt "account-view"
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: src/renderer/components/Account.tsx:93
+#: src/renderer/components/Account.tsx:95
 msgctxt "account-view"
 msgid "OUT OF TIME"
 msgstr "TIEMPO AGOTADO"
 
+#: src/renderer/components/Account.tsx:57
+msgctxt "account-view"
+msgid "Paid until"
+msgstr ""
+
 #. Title label in navigation bar
 #: src/renderer/components/AdvancedSettings.tsx:97
 msgctxt "advanced-settings-nav"
diff --git a/gui/locales/fr/messages-fr.po b/gui/locales/fr/messages.po
index c16070c0d1..9b991a087a 100644
--- a/gui/locales/fr/messages-fr.po
+++ b/gui/locales/fr/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad <admin@mullvad.net>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2019-03-18 14:19\n"
+"PO-Revision-Date: 2019-03-18 15:52\n"
 
 #: src/renderer/components/SecuredLabel.tsx:40
 msgid "BLOCKED CONNECTION"
@@ -55,7 +55,7 @@ msgctxt "account-view"
 msgid "Account ID"
 msgstr "ID de compte"
 
-#: src/renderer/components/Account.tsx:69
+#: src/renderer/components/Account.tsx:71
 msgctxt "account-view"
 msgid "Buy more credit"
 msgstr "Acheter plus de crédits"
@@ -65,21 +65,26 @@ msgctxt "account-view"
 msgid "COPIED TO CLIPBOARD!"
 msgstr "COPIÉ DANS LE PRESSE-PAPIERS !"
 
-#: src/renderer/components/Account.tsx:101
+#: src/renderer/components/Account.tsx:103
 msgctxt "account-view"
 msgid "Currently unavailable"
 msgstr "Actuellement indisponible"
 
-#: src/renderer/components/Account.tsx:74
+#: src/renderer/components/Account.tsx:76
 msgctxt "account-view"
 msgid "Log out"
 msgstr "Déconnexion"
 
-#: src/renderer/components/Account.tsx:93
+#: src/renderer/components/Account.tsx:95
 msgctxt "account-view"
 msgid "OUT OF TIME"
 msgstr "PLUS DE TEMPS"
 
+#: src/renderer/components/Account.tsx:57
+msgctxt "account-view"
+msgid "Paid until"
+msgstr ""
+
 #. Title label in navigation bar
 #: src/renderer/components/AdvancedSettings.tsx:97
 msgctxt "advanced-settings-nav"
diff --git a/gui/locales/sv/messages-sv.po b/gui/locales/sv/messages.po
index df4d5bdf11..99e92a89f3 100644
--- a/gui/locales/sv/messages-sv.po
+++ b/gui/locales/sv/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad <admin@mullvad.net>\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2019-03-18 14:19\n"
+"PO-Revision-Date: 2019-03-18 15:52\n"
 
 #: src/renderer/components/SecuredLabel.tsx:40
 msgid "BLOCKED CONNECTION"
@@ -55,7 +55,7 @@ msgctxt "account-view"
 msgid "Account ID"
 msgstr "Konto-ID"
 
-#: src/renderer/components/Account.tsx:69
+#: src/renderer/components/Account.tsx:71
 msgctxt "account-view"
 msgid "Buy more credit"
 msgstr "Köp mer kredit"
@@ -65,21 +65,26 @@ msgctxt "account-view"
 msgid "COPIED TO CLIPBOARD!"
 msgstr "KOPIERAT TILL URKLIPP!"
 
-#: src/renderer/components/Account.tsx:101
+#: src/renderer/components/Account.tsx:103
 msgctxt "account-view"
 msgid "Currently unavailable"
 msgstr "Inte tillgänglig för närvarande"
 
-#: src/renderer/components/Account.tsx:74
+#: src/renderer/components/Account.tsx:76
 msgctxt "account-view"
 msgid "Log out"
 msgstr "Logga ut"
 
-#: src/renderer/components/Account.tsx:93
+#: src/renderer/components/Account.tsx:95
 msgctxt "account-view"
 msgid "OUT OF TIME"
 msgstr "INGEN TID KVAR"
 
+#: src/renderer/components/Account.tsx:57
+msgctxt "account-view"
+msgid "Paid until"
+msgstr ""
+
 #. Title label in navigation bar
 #: src/renderer/components/AdvancedSettings.tsx:97
 msgctxt "advanced-settings-nav"
diff --git a/gui/locales/zh-TW/messages-zh-TW.po b/gui/locales/zh-TW/messages.po
index 83522b2d7b..e53c5fe2c2 100644
--- a/gui/locales/zh-TW/messages-zh-TW.po
+++ b/gui/locales/zh-TW/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad <admin@mullvad.net>\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2019-03-18 14:19\n"
+"PO-Revision-Date: 2019-03-18 15:52\n"
 
 #: src/renderer/components/SecuredLabel.tsx:40
 msgid "BLOCKED CONNECTION"
@@ -55,7 +55,7 @@ msgctxt "account-view"
 msgid "Account ID"
 msgstr "帳戶 ID"
 
-#: src/renderer/components/Account.tsx:69
+#: src/renderer/components/Account.tsx:71
 msgctxt "account-view"
 msgid "Buy more credit"
 msgstr "購買更多點數"
@@ -65,21 +65,26 @@ msgctxt "account-view"
 msgid "COPIED TO CLIPBOARD!"
 msgstr "已複製到剪貼簿！"
 
-#: src/renderer/components/Account.tsx:101
+#: src/renderer/components/Account.tsx:103
 msgctxt "account-view"
 msgid "Currently unavailable"
 msgstr "目前不可用"
 
-#: src/renderer/components/Account.tsx:74
+#: src/renderer/components/Account.tsx:76
 msgctxt "account-view"
 msgid "Log out"
 msgstr "登出"
 
-#: src/renderer/components/Account.tsx:93
+#: src/renderer/components/Account.tsx:95
 msgctxt "account-view"
 msgid "OUT OF TIME"
 msgstr "逾時"
 
+#: src/renderer/components/Account.tsx:57
+msgctxt "account-view"
+msgid "Paid until"
+msgstr ""
+
 #. Title label in navigation bar
 #: src/renderer/components/AdvancedSettings.tsx:97
 msgctxt "advanced-settings-nav"
diff --git a/gui/scripts/crowdin.sh b/gui/scripts/crowdin.sh
index ce1bb75a42..914007ac87 100755
--- a/gui/scripts/crowdin.sh
+++ b/gui/scripts/crowdin.sh
@@ -34,18 +34,6 @@ function download_translations {
     unzip -o all.zip -d $LOCALE_DIR
     find $LOCALE_DIR -type d -exec chmod 755 {} \;
     find $LOCALE_DIR -type f -exec chmod 644 {} \;
-
-    # Rename some of the locales to align with the locale codes expected by Electron
-    # [1] https://electronjs.org/docs/api/locales
-    # [2] https://support.crowdin.com/api/language-codes/
-    rm -rf "$LOCALE_DIR/es"
-    mv "$LOCALE_DIR/es-ES" "$LOCALE_DIR/es"
-    mv "$LOCALE_DIR/es/messages-es-ES.po" "$LOCALE_DIR/es/messages-es.po"
-
-    rm -rf "$LOCALE_DIR/sv"
-    mv "$LOCALE_DIR/sv-SE" "$LOCALE_DIR/sv"
-    mv "$LOCALE_DIR/sv/messages-sv-SE.po" "$LOCALE_DIR/sv/messages-sv.po"
-
     rm all.zip
 }
 
diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts
index b466a44134..45ff8d3637 100644
--- a/gui/src/shared/gettext.ts
+++ b/gui/src/shared/gettext.ts
@@ -47,7 +47,7 @@ export function loadTranslations(currentLocale: string) {
 }
 
 function parseTranslation(locale: string, domain: string): boolean {
-  const filename = path.join(LOCALES_DIR, locale, `${domain}-${locale}.po`);
+  const filename = path.join(LOCALES_DIR, locale, `${domain}.po`);
   let buffer: Buffer;
 
   try {