Merge branch 'update-translations'

15 files changed, 727 insertions, 192 deletions

diff --git a/gui/locales/de/messages.po b/gui/locales/de/messages.po
index 1e09e7dfe3..fa4fb2d2e6 100644
--- a/gui/locales/de/messages.po
+++ b/gui/locales/de/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:17\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "GESPERRTE VERBINDUNG"
@@ -18,6 +18,9 @@ msgstr "GESPERRTE VERBINDUNG"
 msgid "CREATING SECURE CONNECTION"
 msgstr "SICHERE VERBINDUNG WIRD ERSTELLT"
 
+msgid "Invalid account number"
+msgstr "Ungültige Kontonummer"
+
 msgid "SECURE CONNECTION"
 msgstr "SICHERE VERBINDUNG"
 
@@ -171,7 +174,7 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard-Schlüssel"
 
 msgctxt "advanced-settings-view"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Fehler beim Anwenden der Firewall-Regeln. Das Gerät ist derzeit möglicherweise ungesichert"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Auflösen des Hosts des benutzerdefinierten Tunnels fehlgeschlagen. Erwägen Sie, die Einstellungen zu ändern"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Fehler beim Festlegen des System-DNS-Servers"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "UPDATE VERFÜGBAR"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard Key wurde nicht auf unseren Serven veröffentlicht. Sie können Ihren Schlüssel in den Erweiterten Einstellungen verwalten."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Monochromatisches Leistensymbol statt Farbsymbol nutzen."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Eingang"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Ausgang"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Ort auswählen"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Ort auswählen"
+msgid "Closest to exit server"
+msgstr "Am nächsten zum Ausgangsserver"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Wenn Sie verbunden sind, wird Ihr tatsächlicher Standort mit einem privaten und sicheren Standort in der ausgewählten Region maskiert"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Wenn Sie verbunden sind, wird Ihr tatsächlicher Standort mit einem privaten und sicheren Standort in der ausgewählten Region maskiert."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Während Sie verbunden sind, wird Ihr Traffic durch zwei sichere Orte geleitet: den Eingangspunkt (ein Brückenserver) und den Ausgangspunkt (ein VPN-Server)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "Das Konto hat bereits zu viele Schlüssel"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Schlüsselgenerierung fehlgeschlagen"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Schlüssel können in einem gesperrten Zustand nicht verwaltet werden"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Fehler beim Generieren eines Schlüssels"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Fehler beim Ersetzen des Schlüssels - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Schlüssel ist ungültig"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Schlüsselverifikation fehlgeschlagen"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Schlüssel verwalten"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Kein Schlüssel eingestellt"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Schlüssel neu generieren"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Schlüssel verifizieren"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Schlüssel wird verifiziert"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Schlüssel generiert"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Erweitert"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard-Schlüssel"
 
diff --git a/gui/locales/es/messages.po b/gui/locales/es/messages.po
index c91c85fef4..55531d745c 100644
--- a/gui/locales/es/messages.po
+++ b/gui/locales/es/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:17\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "CONEXIÓN BLOQUEADA"
@@ -18,6 +18,9 @@ msgstr "CONEXIÓN BLOQUEADA"
 msgid "CREATING SECURE CONNECTION"
 msgstr "CREANDO CONEXIÓN SEGURA"
 
+msgid "Invalid account number"
+msgstr "Número de cuenta no válido"
+
 msgid "SECURE CONNECTION"
 msgstr "CONEXIÓN SEGURA"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "Claves de WireGuard"
+msgid "WireGuard key"
+msgstr "Clave de WireGuard"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Error al aplicar las reglas del firewall. Puede que el dispositivo no esté protegido actualmente"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "No se pudo resolver el host del túnel personalizado. Pruebe a cambiar la configuración."
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "No se pudo establecer el servidor DNS del sistema"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "ACTUALIZACIÓN DISPONIBLE"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "La clave de WireGuard no se publicó en nuestros servidores. Puede administrar la clave en Configuración avanzada."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Usa un icono de bandeja monocromático, en lugar de un icono en color."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Entrada"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Salida"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Seleccionar ubicación"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Seleccionar ubicación"
+msgid "Closest to exit server"
+msgstr "Más próxima al servidor de salida"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Mientras esté conectado, su ubicación real permanecerá oculta con una ubicación privada y segura en la región seleccionada"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Mientras esté conectado, su ubicación real permanecerá oculta con una ubicación privada y segura en la región seleccionada."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Mientras esté conectado, su tráfico se enrutará a través de dos ubicaciones seguras: el punto de entrada (un servidor puente) y el punto de salida (un servidor VPN)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "La cuenta tiene demasiadas claves"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "No se pudo generar la clave"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "No se pueden administrar las claves durante un estado de bloqueo"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "No se pudo generar una clave"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "No se pudo reemplazar la clave: %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "La clave no es válida"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Error al verificar la clave"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Administrar claves"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "No se ha configurado ninguna clave"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Volver a generar clave"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Verificar clave"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Verificando clave"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Clave generada"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avanzadas"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "Claves de WireGuard"
+msgid "WireGuard key"
+msgstr "Clave de WireGuard"
 
diff --git a/gui/locales/fr/messages.po b/gui/locales/fr/messages.po
index a599ba1ecc..1adb79c73b 100644
--- a/gui/locales/fr/messages.po
+++ b/gui/locales/fr/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:17\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "CONNEXION BLOQUÉE"
@@ -18,6 +18,9 @@ msgstr "CONNEXION BLOQUÉE"
 msgid "CREATING SECURE CONNECTION"
 msgstr "CRÉATION D'UNE CONNEXION SÉCURISÉE"
 
+msgid "Invalid account number"
+msgstr "Numéro de compte non valide"
+
 msgid "SECURE CONNECTION"
 msgstr "CONNEXION SÉCURISÉE"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "Clés WireGuard"
+msgid "WireGuard key"
+msgstr "Clé WireGuard"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Échec de l'application des règles du pare-feu. L'appareil est potentiellement non sécurisé à l'heure actuelle"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Échec de la résolution de l'hôte du tunnel personnalisé. Pensez à modifier les paramètres"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Échec de la configuration du serveur DNS système"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "MISE À JOUR DISPONIBLE"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "Clé WireGuard non publiée sur nos serveurs. Vous pouvez gérer votre clé depuis les paramètres avancés."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Utiliser l'icône de zone de notification monochrome à la place de celle en couleur."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Entrée"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Sortie"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Sélectionner une localisation"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Sélectionner une localisation"
+msgid "Closest to exit server"
+msgstr "Sortie la plus proche du serveur"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Quand vous êtes connecté, votre vraie localisation est masquée par une localisation privée et sécurisée de la région sélectionnée"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Quand vous êtes connecté, votre vraie localisation est masquée par une localisation privée et sécurisée de la région sélectionnée."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Une fois connecté, votre trafic est acheminé via deux localisations sécurisées : le point d'entrée (un serveur passerelle) et le point de sortie (un serveur VPN)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "Le compte possède déjà trop de clés"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Impossible de générer la clé"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Impossible de gérer les clés dans un état bloqué"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Échec de la génération de clé"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Échec du remplacement de la clé - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "La clé est invalide"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Échec de la vérification de la clé"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Gérer les clés"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Pas de clé définie"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Regénérer la clé"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Vérifier la clé"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Vérification de la clé"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Clé générée"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avancé"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "Clés WireGuard"
+msgid "WireGuard key"
+msgstr "Clé WireGuard"
 
diff --git a/gui/locales/it/messages.po b/gui/locales/it/messages.po
index 8de822aa6f..217e730da2 100644
--- a/gui/locales/it/messages.po
+++ b/gui/locales/it/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "CONNESSIONE BLOCCATA"
@@ -18,6 +18,9 @@ msgstr "CONNESSIONE BLOCCATA"
 msgid "CREATING SECURE CONNECTION"
 msgstr "CREAZIONE CONNESSIONE PROTETTA"
 
+msgid "Invalid account number"
+msgstr "Numero di account non valido"
+
 msgid "SECURE CONNECTION"
 msgstr "CONNESSIONE PROTETTA"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "Chiavi WireGuard"
+msgid "WireGuard key"
+msgstr "Chiave WireGuard"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Impossibile applicare le regole firewall. Il dispositivo potrebbe essere non protetto"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Impossibile risolvere l'host del tunnel personalizzato. È consigliabile modificare le impostazioni"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Impossibile impostare il server DNS di sistema"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "AGGIORNAMENTO DISPONIBILE"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "Chiave WireGuard non pubblicata sui nostri server. Puoi gestire la tua chiave nelle impostazioni avanzate."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Usa un'icona nell'area di notifica monocromatica e non colorata."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Ingresso"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Uscita"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Seleziona posizione"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Seleziona posizione"
+msgid "Closest to exit server"
+msgstr "Più vicino al server di uscita"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Durante la connessione, la tua posizione reale è nascosta da una posizione privata e protetta nell'area selezionata"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Durante la connessione, la tua posizione reale è nascosta da una posizione privata e protetta nell'area selezionata."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Durante la connessione, il tuo traffico sarà instradato attraverso due posizioni protette, il punto di ingresso (un bridge server) e il punto di uscita (un server VPN)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "L'account dispone già di troppe chiavi"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Impossibile generare la chiave"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Impossibile gestire le chiavi in uno stato bloccato"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Impossibile generare una chiave"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Impossibile sostituire la chiave - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "La chiave non è valida"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Verifica chiave non riuscita"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Gestisci chiavi"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Nessun set di chiavi"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Rigenera chiave"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Verifica chiave"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Verifica della chiave"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Chiave generata"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avanzate"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "Chiavi WireGuard"
+msgid "WireGuard key"
+msgstr "Chiave WireGuard"
 
diff --git a/gui/locales/ja/messages.po b/gui/locales/ja/messages.po
index 6b3b2495fd..a2831dee4d 100644
--- a/gui/locales/ja/messages.po
+++ b/gui/locales/ja/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "ブロックされた接続"
@@ -18,6 +18,9 @@ msgstr "ブロックされた接続"
 msgid "CREATING SECURE CONNECTION"
 msgstr "セキュリティ保護接続を確立中"
 
+msgid "Invalid account number"
+msgstr "アカウント番号が正しくありません"
+
 msgid "SECURE CONNECTION"
 msgstr "セキュリティ保護された接続"
 
@@ -171,7 +174,7 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard鍵"
 
 msgctxt "advanced-settings-view"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "ファイヤーウォール規則の適用に失敗しました。現在、デバイスがセキュリティ保護されていない可能性があります。"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "カスタムトンネルのホストを解決できませんでした。設定変更を検討してください。"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "システムの DNS サーバーの設定に失敗しました"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "アップデート可"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "当社のサーバーにWireGuard鍵が発行されていません。鍵は [詳細設定]（Advanced）で管理できます。"
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,19 +500,31 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "多色ではなく単色のトレイアイコンを使います。"
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "入口"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "出口"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "場所を選択する"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "場所を選択する"
+msgid "Closest to exit server"
+msgstr "最寄りの出口サーバー"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
 msgstr "接続中、あなたの実際の場所は、選択した地域内の非公開かつセキュリティ保護された場所で隠蔽されています。"
 
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "接続中、あなたのトラフィックはセキュリティで保護された2つの場所、入口（ブリッジサーバー）および出口（VPNサーバー）経由で転送されます。"
+
 msgctxt "settings-view"
 msgid "Account"
 msgstr "アカウント"
@@ -648,10 +671,18 @@ msgid "Account has too many keys already"
 msgstr "アカウントがすでに所有している鍵が多すぎます"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "ブロックされた状態では鍵を管理できません"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
 msgstr "鍵の生成に失敗しました"
 
 msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "鍵の交換に失敗しました - %(failure)s"
+
+msgctxt "wireguard-key-view"
 msgid "Generate key"
 msgstr "鍵を生成"
 
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "鍵は無効です"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "鍵の検証に失敗しました"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "鍵を管理"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "鍵が設定されていません"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "鍵を生成"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "鍵を検証"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "鍵を検証しています"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "鍵が生成されました"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "詳細"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard鍵"
 
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index b7c2f8a411..afa50736cd 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -164,7 +164,7 @@ msgid "WireGuard"
 msgstr ""
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr ""
 
 msgctxt "advanced-settings-view"
@@ -490,17 +490,29 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr ""
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr ""
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr ""
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr ""
 
 msgctxt "select-location-view"
-msgid "Select location"
+msgid "Closest to exit server"
+msgstr ""
+
+msgctxt "select-location-view"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
 msgstr ""
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
 msgstr ""
 
 msgctxt "settings-view"
@@ -649,7 +661,15 @@ msgid "Account has too many keys already"
 msgstr ""
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr ""
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr ""
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
 msgstr ""
 
 msgctxt "wireguard-key-view"
@@ -665,6 +685,10 @@ msgid "Key is invalid"
 msgstr ""
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr ""
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr ""
 
@@ -673,11 +697,15 @@ msgid "No key set"
 msgstr ""
 
 msgctxt "wireguard-key-view"
-msgid "Verify key"
+msgid "Regenerate key"
 msgstr ""
 
 msgctxt "wireguard-key-view"
-msgid "Verifying key"
+msgid "Verify key"
+msgstr ""
+
+msgctxt "wireguard-keys"
+msgid "Key generated"
 msgstr ""
 
 msgctxt "wireguard-keys"
@@ -690,5 +718,5 @@ msgid "Advanced"
 msgstr ""
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr ""
diff --git a/gui/locales/nl/messages.po b/gui/locales/nl/messages.po
index 593d00f584..d3014dcc11 100644
--- a/gui/locales/nl/messages.po
+++ b/gui/locales/nl/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "GEBLOKKEERDE VERBINDING"
@@ -18,6 +18,9 @@ msgstr "GEBLOKKEERDE VERBINDING"
 msgid "CREATING SECURE CONNECTION"
 msgstr "BEVEILIGDE VERBINDING AANMAKEN"
 
+msgid "Invalid account number"
+msgstr "Ongeldig accountnummer"
+
 msgid "SECURE CONNECTION"
 msgstr "BEVEILIGDE VERBINDING"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "WireGuard-sleutels"
+msgid "WireGuard key"
+msgstr "WireGuard-sleutel"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Toepassen van firewallregels is mislukt. Het toestel is nu mogelijk niet beveiligd"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Omzetten van host van aangepaste tunnel mislukt. Overweeg om de instellingen te wijzigen"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Instellen van DNS-server van systeem is mislukt"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "UPDATE BESCHIKBAAR"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard-sleutel niet gepubliceerd op onze servers. U kunt uw sleutel beheren in Geavanceerde instellingen."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Gebruik een monochroom pictogram op de taakbalk in plaats van een gekleurd."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Ingang"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Uitgang"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Locatie selecteren"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Locatie selecteren"
+msgid "Closest to exit server"
+msgstr "Dichtst bij uitgangsserver"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Wanneer u verbonden bent, wordt uw daadwerkelijke locatie gemaskeerd met een privé- en veilige locatie in de geselecteerde regio"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Wanneer u verbonden bent, wordt uw daadwerkelijke locatie gemaskeerd met een private en veilige locatie in de geselecteerde regio."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Wanneer u verbonden bent, wordt uw verkeer omgeleid via twee veilige locaties, het ingangspunt (een bridge server) en het uitgangspunt (een VPN-server)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,10 +671,18 @@ msgid "Account has too many keys already"
 msgstr "Account heeft al te veel sleutels"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Kan sleutels niet beheren in geblokkeerde staat"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
 msgstr "Sleutel genereren mislukt"
 
 msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Sleutel vervangen mislukt - %(failure)s"
+
+msgctxt "wireguard-key-view"
 msgid "Generate key"
 msgstr "Sleutel genereren"
 
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Sleutel is ongeldig"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Verificatie sleutel mislukt"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Sleutels beheren"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Geen sleutel ingesteld"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Sleutel opnieuw genereren"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Sleutel verifiëren"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Sleutel wordt geverifieerd"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Sleutel gegenereerd"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Geavanceerd"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "WireGuard-sleutels"
+msgid "WireGuard key"
+msgstr "WireGuard-sleutel"
 
diff --git a/gui/locales/no/messages.po b/gui/locales/no/messages.po
index 8ae610fa15..3388ba2efa 100644
--- a/gui/locales/no/messages.po
+++ b/gui/locales/no/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Norwegian\n"
 "Language: no_NO\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "TILKOBLING BLOKKERT"
@@ -18,6 +18,9 @@ msgstr "TILKOBLING BLOKKERT"
 msgid "CREATING SECURE CONNECTION"
 msgstr "OPPRETTER SIKKER TILKOBLING"
 
+msgid "Invalid account number"
+msgstr "Ugyldig kontonummer"
+
 msgid "SECURE CONNECTION"
 msgstr "SIKKER TILKOBLING"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "WireGuard-nøkler"
+msgid "WireGuard key"
+msgstr "WireGuard-nøkkel"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Kunne ikke anvende brannmurregler. Enheten kan være usikker"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Kunne ikke løse problem med vert for tilpasset tunnel. Vurder å endre innstillingene"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Kunne ikke angi systemets DNS-server"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "OPPDATERING TILGJENGELIG"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard-nøkkel ikke publisert til serverne våre. Du kan administrere nøkkelen under avanserte innstillinger."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Bruk ensfarget skuffeikon i stedet for flerfarget."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Inngang"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Utgang"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Velg plassering"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Velg plassering"
+msgid "Closest to exit server"
+msgstr "Nærmest til utgangsserver"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Mens du er tilkoblet vil din egentlige plassering være skjult med en privat og sikker plassering i den valgte regionen"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Mens du er tilkoblet vil din egentlige plassering være skjult med en privat og sikker plassering i den valgte regionen."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Mens du er tilkoblet vil trafikken din videresendes gjennom to sikre plasseringer, inngangspunktet (en broserver) og utgangspunktet (en VPN-server)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "Konto har allerede for mange nøkler"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Generering av nøkkel mislyktes"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Nøkler kan ikke administreres i en blokkert tilstand"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Generering av en nøkkel mislyktes"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Kunne ikke erstatte nøkkel – %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Nøkkel er ugyldig"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Nøkkelverifisering mislyktes"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Behandle nøkler"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Ingen nøkkel angitt"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Generer nøkkel på nytt"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Bekreft nøkkel"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Bekrefter nøkkel"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Nøkkel generert"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avansert"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "WireGuard-nøkler"
+msgid "WireGuard key"
+msgstr "WireGuard-nøkkel"
 
diff --git a/gui/locales/pt/messages.po b/gui/locales/pt/messages.po
index 566797a53a..fce2f6203b 100644
--- a/gui/locales/pt/messages.po
+++ b/gui/locales/pt/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "LIGAÇÃO BLOQUEADA"
@@ -18,6 +18,9 @@ msgstr "LIGAÇÃO BLOQUEADA"
 msgid "CREATING SECURE CONNECTION"
 msgstr "A CRIAR LIGAÇÃO SEGURA"
 
+msgid "Invalid account number"
+msgstr "Número de conta inválido"
+
 msgid "SECURE CONNECTION"
 msgstr "LIGAÇÃO SEGURA"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "Chaves WireGuard"
+msgid "WireGuard key"
+msgstr "Chave WireGuard"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Erro ao aplicar as regras da firewall. O dispositivo pode estar atualmente inseguro"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Não foi possível resolver o anfitrião do túnel personalizado. Considere alterar as definições"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Erro ao definir o servidor de sistema DNS"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "ESTÁ DISPONÍVEL UMA ATUALIZAÇÃO"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "Chave WireGuard não publicada nos nossos servidores. Poderá gerir a sua chave em Definições avançadas."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Utilizar um ícone de bandeja monocromático em vez de um colorido."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Entrada"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Saída"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Selecionar local"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Selecionar local"
+msgid "Closest to exit server"
+msgstr "Mais próximo do servidor de saída"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Enquanto estiver ligado, a sua localização real será mascarada com uma localização privada e segura na região selecionada"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Enquanto estiver ligado, a sua localização real será mascarada com uma localização privada e segura na região selecionada."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Enquanto estiver ligado, o seu tráfego será redirecionado através de duas localizações seguras, o ponto de entrada (um servidor ponte) e o ponto de saída (um servidor VPN)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "A conta já tem demasiadas chaves"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Erro ao gerar chave"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Não é possível gerir as chaves num estado bloqueado"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Não foi possível gerar uma chave"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Não foi possível substitui a chave - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "A chave é inválida"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Não foi possível verificar a chave"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Gerir chaves"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Nenhuma chave definida"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Voltar a gerar chave"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Verificar chave"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "A verificar chave"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Chave gerada"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avançadas"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "Chaves WireGuard"
+msgid "WireGuard key"
+msgstr "Chave WireGuard"
 
diff --git a/gui/locales/ru/messages.po b/gui/locales/ru/messages.po
index be58fc925f..c77d3fbe9e 100644
--- a/gui/locales/ru/messages.po
+++ b/gui/locales/ru/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "ПОДКЛЮЧЕНИЕ ЗАБЛОКИРОВАНО"
@@ -18,6 +18,9 @@ msgstr "ПОДКЛЮЧЕНИЕ ЗАБЛОКИРОВАНО"
 msgid "CREATING SECURE CONNECTION"
 msgstr "СОЗДАНИЕ ЗАЩИЩЕННОГО ПОДКЛЮЧЕНИЯ"
 
+msgid "Invalid account number"
+msgstr "Недействительный номер учетной записи"
+
 msgid "SECURE CONNECTION"
 msgstr "ЗАЩИЩЕННОЕ ПОДКЛЮЧЕНИЕ"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "Ключи WireGuard"
+msgid "WireGuard key"
+msgstr "Ключ WireGuard"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Не удалось применить правила брандмауэра. Сейчас устройство может быть не защищено"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Не удалось преобразовать имя узла пользовательского туннеля. Попробуйте изменить настройки"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Не удалось установить системный DNS-сервер"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "ЕСТЬ ОБНОВЛЕНИЕ"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "Ключ WireGuard не публикуется на наших серверах. Управлять ключом можно в «Дополнительных настройках»."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Использовать в области уведомлений черно-белый значок вместо цветного."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Вход"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Выход"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Выбор местоположения"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Выбор местоположения"
+msgid "Closest to exit server"
+msgstr "Ближайший к выходному серверу"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "При подключении реальное местоположение маскируется защищенным конфиденциальным местоположением в выбранном регионе"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "При подключении реальное местоположение маскируется защищенным конфиденциальным местоположением в выбранном регионе."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "При подключении трафик будет направляться через два безопасных местоположения: точку входа (сервер-мост) и точку выхода (VPN-сервер)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,10 +671,18 @@ msgid "Account has too many keys already"
 msgstr "В учетной записи уже слишком много ключей"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Управлять ключами в заблокированном состоянии нельзя"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
 msgstr "Не удалось сгенерировать ключ"
 
 msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Не удалось заменить ключ. %(failure)s"
+
+msgctxt "wireguard-key-view"
 msgid "Generate key"
 msgstr "Сгенерировать ключ"
 
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Ключ недействителен"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Ошибка проверки ключа"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Управление ключами"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Ключ не задан"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Повторно сгенерировать ключ"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Проверка ключа"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Идет проверка ключа"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Ключ сгенерирован"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Дополнительные"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "Ключи WireGuard"
+msgid "WireGuard key"
+msgstr "Ключ WireGuard"
 
diff --git a/gui/locales/sv/messages.po b/gui/locales/sv/messages.po
index cd81487240..6f1f6c2d51 100644
--- a/gui/locales/sv/messages.po
+++ b/gui/locales/sv/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "ANSLUTNINGEN BLOCKERAD"
@@ -18,6 +18,9 @@ msgstr "ANSLUTNINGEN BLOCKERAD"
 msgid "CREATING SECURE CONNECTION"
 msgstr "SKAPAR SÄKER ANSLUTNING"
 
+msgid "Invalid account number"
+msgstr "Ogiltigt kontonummer"
+
 msgid "SECURE CONNECTION"
 msgstr "SÄKER ANSLUTNING"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "WireGuard-nycklar"
+msgid "WireGuard key"
+msgstr "WireGuard-nyckel"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Det gick inte att tillämpa brandväggsregler. Enheten kan för närvarande vara osäker"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Det gick inte att lösa värd för anpassad tunnel. Överväg att ändra inställningarna"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Det gick inte att ange systemets DNS-server"
 
@@ -311,7 +318,7 @@ msgstr "Installera Mullvad VPN (%(version)s) för att hålla dig uppdaterad"
 
 msgctxt "in-app-notifications"
 msgid "No relay server matches the current settings. You can try changing the location or the relay settings."
-msgstr "Ingen reläserver matchar de nuvarande inställningarna. Du kan prova att ändra plats eller reläinställningarna."
+msgstr "Ingen reläserver matchar de aktuella inställningarna. Du kan prova att ändra plats eller reläinställningarna."
 
 msgctxt "in-app-notifications"
 msgid "This device is offline, no tunnels can be established"
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "UPPDATERING TILLGÄNGLIG"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard-nyckel är inte publicerad på våra servrar. Du kan hantera din nyckel i Avancerade inställningar."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Använd en enfärgad systemfältsikon i stället för en flerfärgad."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Ingång"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Utgång"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Välj plats"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Välj plats"
+msgid "Closest to exit server"
+msgstr "Närmast till slutserver"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Medan du är ansluten maskeras din riktiga plats med en privat och säker plats i den valda regionen"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Medan du är ansluten maskeras din riktiga plats med en privat och säker plats i den valda regionen."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Medan du är ansluten kommer din trafik att dirigeras genom två säkra platser: startpunkten (en broserver) och slutpunkten (en VPN-server)."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,8 +671,16 @@ msgid "Account has too many keys already"
 msgstr "Kontot har redan för många nycklar"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "Det gick inte att generera nyckel"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Det går inte att hantera nycklar i blockerat tillstånd"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
+msgstr "Det gick inte att generera en nyckel"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Det gick inte att ersätta nyckel - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Nyckeln är ogiltig"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Det gick inte att verifiera nyckel"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Hantera nycklar"
 
@@ -672,16 +707,20 @@ msgid "No key set"
 msgstr "Ingen nyckel har angetts"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Generera om nyckel"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Verifiera nyckel"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Verifierar nyckel"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Nyckel har genererats"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
-msgstr "Publik nyckel"
+msgstr "Offentlig nyckel"
 
 #. Back button in navigation bar
 msgctxt "wireguard-keys-nav"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Avancerat"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "WireGuard-nycklar"
+msgid "WireGuard key"
+msgstr "WireGuard-nyckel"
 
diff --git a/gui/locales/tr/messages.po b/gui/locales/tr/messages.po
index 6a6642abf4..39dd7fdce3 100644
--- a/gui/locales/tr/messages.po
+++ b/gui/locales/tr/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "ENGELLENEN BAĞLANTI"
@@ -18,6 +18,9 @@ msgstr "ENGELLENEN BAĞLANTI"
 msgid "CREATING SECURE CONNECTION"
 msgstr "GÜVENLİ BAĞLANTI OLUŞTURULUYOR"
 
+msgid "Invalid account number"
+msgstr "Geçersiz hesap numarası"
+
 msgid "SECURE CONNECTION"
 msgstr "GÜVENLİ BAĞLANTI"
 
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "WireGuard anahtarları"
+msgid "WireGuard key"
+msgstr "WireGuard anahtarı"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "Güvenlik duvarı kuralları uygulanamıyor. Cihaz şu an korumasız olabilir"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "Özel tünel, ana bilgisayarı çözümleyemiyor. Ayarları değiştirmeyi deneyin"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "Sistem DNS sunucusu belirlenemiyor"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "GÜNCELLEME MEVCUT"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard anahtarı sunucularımızda yayınlanmadı. Anahtarınızı, Gelişmiş Ayarlar'dan yönetebilirsiniz."
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "Renkli yerine monokrom bir sistem çubuğu simgesi kullan."
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "Giriş"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "Çıkış"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "Konum seçin"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "Konum seçin"
+msgid "Closest to exit server"
+msgstr "Çıkış sunucusuna en yakın"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "Bağlıyken gerçek konumunuz seçilen bölgedeki özel ve gizli bir konumla maskelenir"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "Bağlıyken gerçek konumunuz seçilen bölgedeki özel ve gizli bir konumla maskelenir."
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "Bağlıyken, İnternet trafiğiniz giriş noktası (bir köprü sunucusu) ve çıkış noktası (bir VPN sunucusu) olmak üzere iki güvenli konum boyunca yönlendirilir."
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,10 +671,18 @@ msgid "Account has too many keys already"
 msgstr "Hesap zaten çok fazla anahtara sahip"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "Anahtarlar engellenmiş durumdayken yönetilemez"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
 msgstr "Anahtar oluşturulamadı"
 
 msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "Anahtar değiştirilemedi - %(failure)s"
+
+msgctxt "wireguard-key-view"
 msgid "Generate key"
 msgstr "Anahtar oluştur"
 
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "Anahtar geçersiz"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "Anahtar doğrulanamadı"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "Anahtarları yönet"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "Anahtar seti yok"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "Yeniden anahtar oluştur"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "Anahtarı doğrula"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "Anahtar doğrulanıyor"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "Anahtar oluşturuldu"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "Gelişmiş"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "WireGuard anahtarları"
+msgid "WireGuard key"
+msgstr "WireGuard anahtarı"
 
diff --git a/gui/locales/zh-CN/messages.po b/gui/locales/zh-CN/messages.po
index 48863f98cf..fe003e2af9 100644
--- a/gui/locales/zh-CN/messages.po
+++ b/gui/locales/zh-CN/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "已屏蔽连接"
@@ -18,6 +18,9 @@ msgstr "已屏蔽连接"
 msgid "CREATING SECURE CONNECTION"
 msgstr "正在创建安全连接"
 
+msgid "Invalid account number"
+msgstr "帐号无效"
+
 msgid "SECURE CONNECTION"
 msgstr "安全连接"
 
@@ -171,7 +174,7 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard 密钥"
 
 msgctxt "advanced-settings-view"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "无法应用防火墙规则。设备当前可能不会受到保护"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "无法解析自定义隧道的主机。请考虑更改设置"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "无法设置系统 DNS 服务器"
 
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "有可用更新"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard 密钥未发布到我们的服务器。您可以在“高级”设置中管理您的密钥。"
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "使用单色托盘图标而不是彩色图标。"
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "入口"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "出口"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "选择位置"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "选择位置"
+msgid "Closest to exit server"
+msgstr "最靠近出口服务器"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "连接时，将使用选定区域中一个私密且安全的位置隐藏您的真实位置"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "连接时，将使用选定区域中一个私密且安全的位置隐藏您的真实位置。"
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "连接时，您的流量将通过两个安全位置路由，即入口点（桥接服务器）和出口点（VPN 服务器）。"
 
 msgctxt "settings-view"
 msgid "Account"
@@ -648,10 +671,18 @@ msgid "Account has too many keys already"
 msgstr "帐户已有过多密钥"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "无法在阻止状态下管理密钥"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to generate a key"
 msgstr "无法生成密钥"
 
 msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "无法替换密钥 - %(failure)s"
+
+msgctxt "wireguard-key-view"
 msgid "Generate key"
 msgstr "生成密钥"
 
@@ -664,6 +695,10 @@ msgid "Key is invalid"
 msgstr "密钥无效"
 
 msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "密钥验证失败"
+
+msgctxt "wireguard-key-view"
 msgid "Manage keys"
 msgstr "管理密钥"
 
@@ -672,12 +707,16 @@ msgid "No key set"
 msgstr "未设置密钥"
 
 msgctxt "wireguard-key-view"
+msgid "Regenerate key"
+msgstr "重新生成密钥"
+
+msgctxt "wireguard-key-view"
 msgid "Verify key"
 msgstr "验证密钥"
 
-msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "正在验证密钥"
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "已生成密钥"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "高级"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
+msgid "WireGuard key"
 msgstr "WireGuard 密钥"
 
diff --git a/gui/locales/zh-TW/messages.po b/gui/locales/zh-TW/messages.po
index f882119410..db1ef984dc 100644
--- a/gui/locales/zh-TW/messages.po
+++ b/gui/locales/zh-TW/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 msgid "BLOCKED CONNECTION"
 msgstr "被封鎖的連線"
@@ -18,6 +18,9 @@ msgstr "被封鎖的連線"
 msgid "CREATING SECURE CONNECTION"
 msgstr "建立安全連線"
 
+msgid "Invalid account number"
+msgstr "帳號無效"
+
 msgid "SECURE CONNECTION"
 msgstr "安全連線"
 
@@ -58,7 +61,7 @@ msgstr "目前不可用"
 
 msgctxt "account-view"
 msgid "Key is valid"
-msgstr "鑰匙有效"
+msgstr "金鑰有效"
 
 msgctxt "account-view"
 msgid "Log out"
@@ -171,8 +174,8 @@ msgid "WireGuard"
 msgstr "WireGuard"
 
 msgctxt "advanced-settings-view"
-msgid "WireGuard keys"
-msgstr "WireGuard 鑰匙"
+msgid "WireGuard key"
+msgstr "WireGuard 金鑰"
 
 msgctxt "advanced-settings-view"
 msgid "WireGuard port"
@@ -283,6 +286,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr "無法套用防火牆規則。裝置目前可能不安全"
 
 msgctxt "in-app-notifications"
+msgid "Failed to resolve host of custom tunnel. Consider changing the settings"
+msgstr "無法解析自訂通道的主機。請考慮變更設定"
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr "無法設定系統 DNS 伺服器"
 
@@ -311,7 +318,7 @@ msgstr "安裝 Mullvad VPN (%(version)s) 以保持最新狀態"
 
 msgctxt "in-app-notifications"
 msgid "No relay server matches the current settings. You can try changing the location or the relay settings."
-msgstr "沒有中繼伺服器與目前的設定相符。您可以嘗試變更位置或中繼設定。"
+msgstr "沒有轉送伺服器與目前的設定相符。您可以嘗試變更位置或轉送設定。"
 
 msgctxt "in-app-notifications"
 msgid "This device is offline, no tunnels can be established"
@@ -333,6 +340,10 @@ msgctxt "in-app-notifications"
 msgid "UPDATE AVAILABLE"
 msgstr "可用的更新"
 
+msgctxt "in-app-notifications"
+msgid "WireGuard key not published to our servers. You can manage your key in Advanced settings."
+msgstr "WireGuard 金鑰未發佈到我們伺服器。您可以在「進階」設定中管理金鑰。"
+
 #. The in-app banner displayed to the user when the running app becomes unsupported.
 #. Available placeholders:
 #. %(version)s - the newest available version of the app
@@ -422,7 +433,7 @@ msgstr "不安全"
 
 msgctxt "notifications"
 msgid "Wireguard key generation failed"
-msgstr "WireGuard 鑰匙產生失敗"
+msgstr "WireGuard 金鑰產生失敗"
 
 #. The system notification displayed to the user when the running app becomes unsupported.
 #. Available placeholder:
@@ -489,18 +500,30 @@ msgctxt "preferences-view"
 msgid "Use a monochromatic tray icon instead of a colored one."
 msgstr "使用單色系統匣圖示，而不是彩色的圖示。"
 
+msgctxt "select-location-nav"
+msgid "Entry"
+msgstr "入口"
+
+msgctxt "select-location-nav"
+msgid "Exit"
+msgstr "出口"
+
 #. Title label in navigation bar
 msgctxt "select-location-nav"
 msgid "Select location"
 msgstr "選擇位置"
 
 msgctxt "select-location-view"
-msgid "Select location"
-msgstr "選擇位置"
+msgid "Closest to exit server"
+msgstr "最靠近出口伺服器"
 
 msgctxt "select-location-view"
-msgid "While connected, your real location is masked with a private and secure location in the selected region"
-msgstr "連線時，會以所選區域中的一個私密安全位置將您的真實位置遮住。"
+msgid "While connected, your real location is masked with a private and secure location in the selected region."
+msgstr "連線時，會以所選區域中的一個私密安全位置，將您的真實位置遮住。"
+
+msgctxt "select-location-view"
+msgid "While connected, your traffic will be routed through two secure locations, the entry point (a bridge server) and the exit point (a VPN server)."
+msgstr "連線時，您的流量將透過兩個安全的位置來進行路由，即入口點 (橋接伺服器) 和出口點 (VPN 伺服器)。"
 
 msgctxt "settings-view"
 msgid "Account"
@@ -645,43 +668,59 @@ msgstr "切換位置"
 
 msgctxt "wireguard-key-view"
 msgid "Account has too many keys already"
-msgstr "帳戶已有過多鑰匙"
+msgstr "帳戶已有過多金鑰"
+
+msgctxt "wireguard-key-view"
+msgid "Can't manage keys whilst in a blocked state"
+msgstr "無法在封鎖狀態下管理金鑰"
 
 msgctxt "wireguard-key-view"
-msgid "Failed to generate key"
-msgstr "無法產生鑰匙"
+msgid "Failed to generate a key"
+msgstr "無法產生金鑰"
+
+msgctxt "wireguard-key-view"
+msgid "Failed to replace key - %(failure)s"
+msgstr "無法替換金鑰 - %(failure)s"
 
 msgctxt "wireguard-key-view"
 msgid "Generate key"
-msgstr "產生鑰匙"
+msgstr "產生金鑰"
 
 msgctxt "wireguard-key-view"
 msgid "Generating key"
-msgstr "正在產生鑰匙"
+msgstr "正在產生金鑰"
 
 msgctxt "wireguard-key-view"
 msgid "Key is invalid"
-msgstr "鑰匙無效"
+msgstr "金鑰無效"
+
+msgctxt "wireguard-key-view"
+msgid "Key verification failed"
+msgstr "金鑰驗證失敗"
 
 msgctxt "wireguard-key-view"
 msgid "Manage keys"
-msgstr "管理鑰匙"
+msgstr "管理金鑰"
 
 msgctxt "wireguard-key-view"
 msgid "No key set"
-msgstr "未設定鑰匙"
+msgstr "未設定金鑰"
 
 msgctxt "wireguard-key-view"
-msgid "Verify key"
-msgstr "驗證鑰匙"
+msgid "Regenerate key"
+msgstr "重新產生金鑰"
 
 msgctxt "wireguard-key-view"
-msgid "Verifying key"
-msgstr "正在驗證鑰匙"
+msgid "Verify key"
+msgstr "驗證金鑰"
+
+msgctxt "wireguard-keys"
+msgid "Key generated"
+msgstr "已產生金鑰"
 
 msgctxt "wireguard-keys"
 msgid "Public key"
-msgstr "公開鑰匙"
+msgstr "公開金鑰"
 
 #. Back button in navigation bar
 msgctxt "wireguard-keys-nav"
@@ -689,6 +728,6 @@ msgid "Advanced"
 msgstr "進階"
 
 msgctxt "wireguard-keys-nav"
-msgid "WireGuard keys"
-msgstr "WireGuard 鑰匙"
+msgid "WireGuard key"
+msgstr "WireGuard 金鑰"
 
diff --git a/gui/locales/zh-TW/relay-locations.po b/gui/locales/zh-TW/relay-locations.po
index 4ea54f5140..9d152a9bc8 100644
--- a/gui/locales/zh-TW/relay-locations.po
+++ b/gui/locales/zh-TW/relay-locations.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: adminmullvad\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2019-08-12 08:53\n"
+"PO-Revision-Date: 2019-09-23 09:18\n"
 
 #. AL TIA
 msgid "Tirana"
@@ -18,7 +18,7 @@ msgstr "地拉那"
 
 #. AU ADL
 msgid "Adelaide"
-msgstr "阿德萊德"
+msgstr "阿得雷德"
 
 #. AU BNE
 msgid "Brisbane"