Skip to content

Commit

Permalink
Merge branch 'integrate-translations' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
faern committed Jul 10, 2019
2 parents 273b521 + 479504b commit 671f3f1
Show file tree
Hide file tree
Showing 28 changed files with 718 additions and 345 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Line wrap the file at 100 chars. Th


## [Unreleased]
### Added
- Add simplified Chinese translations.


## [2019.6-beta1] - 2019-07-08
Expand Down Expand Up @@ -51,7 +53,7 @@ Line wrap the file at 100 chars. Th

## [2019.5] - 2019-06-17
### Added
- Add Norwegian translations
- Add Norwegian translations.


## [2019.5-beta1] - 2019-06-13
Expand Down
7 changes: 7 additions & 0 deletions gui/locales/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,15 @@ After updating the translations template (POT) locally, make sure to upload it t
CROWDIN_API_KEY=$YOUR_CROWDIN_KEY ./gui/scripts/crowdin.sh upload
```

Triggering Crowdin to start translating has to be done manually. Speak to the project owner

## Downloading translations from Crowdin

Before downloading from Crowdin the project must be "built" through their web interface. When you
later download you will receive the translations from the last point in time when it was built:

Go to the Crowdin project > Settings > "Build & Download" dropdown button > "Build project"

In order to download and integrate the new translations from Crowdin into the app, use the following
command:

Expand Down
44 changes: 36 additions & 8 deletions gui/locales/de/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: adminmullvad\n"
"Language-Team: German\n"
"Language: de_DE\n"
"PO-Revision-Date: 2019-06-17 09:23\n"
"PO-Revision-Date: 2019-07-10 05:10\n"

msgid "BLOCKED CONNECTION"
msgstr "GESPERRTE VERBINDUNG"
Expand Down Expand Up @@ -42,7 +42,7 @@ msgstr "Konto"

msgctxt "account-view"
msgid "Account number"
msgstr "Konto-ID"
msgstr "Kontonummer"

msgctxt "account-view"
msgid "Buy more credit"
Expand Down Expand Up @@ -147,8 +147,12 @@ msgid "UDP"
msgstr "UDP"

msgctxt "advanced-settings-view"
msgid "Unless connected, always block all network traffic, even when you've disconnected or quit the app."
msgstr "Wenn keine Verbindung besteht, allen Netzwerkdatenverkehr sperren, selbst wenn Sie die App getrennt oder beendet haben."
msgid "Unless connected to Mullvad, this setting will completely block your internet, even when you've disconnected or quit the app."
msgstr "Wenn keine Verbindung zu Mullvad besteht, sperrt diese Einstellungen Ihren Internetzugang, selbst wenn Sie die App getrennt oder beendet haben."

msgctxt "advanced-settings-view"
msgid "Warning: Your internet won't work without a VPN connection, even when you've quit the app."
msgstr "Warnung: Ohne eine VPN-Verbindung wird Ihr Internet nicht funktionieren, selbst wenn Sie die App beenden."

msgctxt "auth-failure"
msgid "Account authentication failed."
Expand Down Expand Up @@ -199,6 +203,22 @@ msgctxt "connect-view"
msgid "You have no more VPN time left on this account. To buy more credit on our website, you will need to access the Internet with an unsecured connection."
msgstr "Sie haben keine VPN-Zeit mehr auf diesem Konto. Um auf unserer Website mehr Guthaben kaufen zu können, müssen Sie mit einer ungesicherten Verbindung ins Internet gehen."

#. The hostname line displayed below the country on the main screen
#. Available placeholders:
#. %(relay)s - the relay hostname
#. %(bridge)s - the bridge hostname
msgctxt "connection-info"
msgid "%(relay)s via %(bridge)s"
msgstr "%(relay)s über %(bridge)s"

#. The tunnel type line displayed below the hostname line on the main screen
#. Available placeholders:
#. %(tunnelType)s - the tunnel type, i.e OpenVPN
#. %(bridgeType)s - the bridge type, i.e Shadowsocks
msgctxt "connection-info"
msgid "%(tunnelType)s via %(bridgeType)s"
msgstr "%(tunnelType)s über %(bridgeType)s"

msgctxt "connection-info"
msgid "In"
msgstr "Eingehend"
Expand Down Expand Up @@ -238,10 +258,6 @@ msgctxt "in-app-notifications"
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 "Your kernel may be outdated"
msgstr ""

msgctxt "in-app-notifications"
msgid "Failed to set system DNS server"
msgstr "Fehler beim Festlegen des System-DNS-Servers"
Expand Down Expand Up @@ -296,6 +312,10 @@ msgctxt "in-app-notifications"
msgid "You are running an unsupported app version. Please upgrade to %(version)s now to ensure your security"
msgstr "Sie führen eine nicht unterstützte App-Version aus. Bitte führen Sie jetzt ein Upgrade auf %(version)s durch, um Ihre Sicherheit zu gewährleisten"

msgctxt "in-app-notifications"
msgid "Your kernel may be outdated"
msgstr "Möglicherweise ist Ihr Kernel veraltet"

msgctxt "launch-view"
msgid "Connecting to Mullvad system service..."
msgstr "Verbindung zum Mullvad-Systemdienst wird hergestellt..."
Expand Down Expand Up @@ -401,6 +421,10 @@ msgctxt "preferences-view"
msgid "Automatically connect to a server when the app launches."
msgstr "Stellt automatisch eine Verbindung zum Server her, wenn die App startet."

msgctxt "preferences-view"
msgid "Enable or disable system notifications. The critical notifications will always be displayed."
msgstr "Aktivieren oder deaktivieren Sie Systembenachrichtigungen. Kritische Benachrichtigungen werden immer angezeigt."

msgctxt "preferences-view"
msgid "Launch app on start-up"
msgstr "App beim Hochfahren starten"
Expand All @@ -413,6 +437,10 @@ msgctxt "preferences-view"
msgid "Monochromatic tray icon"
msgstr "Monochromatisches Leistensymbol"

msgctxt "preferences-view"
msgid "Notifications"
msgstr "Benachrichtigungen"

msgctxt "preferences-view"
msgid "Preferences"
msgstr "Präferenzen"
Expand Down
6 changes: 3 additions & 3 deletions gui/locales/de/relay-locations.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ msgstr ""
"Last-Translator: adminmullvad\n"
"Language-Team: German\n"
"Language: de_DE\n"
"PO-Revision-Date: 2019-06-17 09:23\n"
"PO-Revision-Date: 2019-07-10 05:10\n"

#. AL TIA
msgid "Tirana"
msgstr ""
msgstr "Tirana"

#. AU BNE
msgid "Brisbane"
Expand Down Expand Up @@ -110,7 +110,7 @@ msgstr "Petach Tikwa"

#. IL TLV
msgid "Tel Aviv"
msgstr ""
msgstr "Tel Aviv"

#. IT MIL
msgid "Milan"
Expand Down
44 changes: 36 additions & 8 deletions gui/locales/es/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: adminmullvad\n"
"Language-Team: Spanish\n"
"Language: es_ES\n"
"PO-Revision-Date: 2019-06-17 09:23\n"
"PO-Revision-Date: 2019-07-10 05:10\n"

msgid "BLOCKED CONNECTION"
msgstr "CONEXIÓN BLOQUEADA"
Expand Down Expand Up @@ -42,7 +42,7 @@ msgstr "Cuenta"

msgctxt "account-view"
msgid "Account number"
msgstr "Id. de cuenta"
msgstr "Número de cuenta"

msgctxt "account-view"
msgid "Buy more credit"
Expand Down Expand Up @@ -147,8 +147,12 @@ msgid "UDP"
msgstr "UDP"

msgctxt "advanced-settings-view"
msgid "Unless connected, always block all network traffic, even when you've disconnected or quit the app."
msgstr "Si no está conectado, bloquea siempre todo el tráfico de red, incluso al desconectar o cerrar la aplicación."
msgid "Unless connected to Mullvad, this setting will completely block your internet, even when you've disconnected or quit the app."
msgstr "Si no está conectado a Mullvad, este ajuste bloqueará completamente Internet, incluso al desconectar o cerrar la aplicación."

msgctxt "advanced-settings-view"
msgid "Warning: Your internet won't work without a VPN connection, even when you've quit the app."
msgstr "Advertencia: Su conexión a Internet no funcionará sin una conexión VPN, incluso aunque haya salido de la aplicación."

msgctxt "auth-failure"
msgid "Account authentication failed."
Expand Down Expand Up @@ -199,6 +203,22 @@ msgctxt "connect-view"
msgid "You have no more VPN time left on this account. To buy more credit on our website, you will need to access the Internet with an unsecured connection."
msgstr "Ya no le queda más tiempo de VPN en esta cuenta. Para comprar más crédito en nuestro sitio web, necesita acceder a Internet con una conexión no segura."

#. The hostname line displayed below the country on the main screen
#. Available placeholders:
#. %(relay)s - the relay hostname
#. %(bridge)s - the bridge hostname
msgctxt "connection-info"
msgid "%(relay)s via %(bridge)s"
msgstr "%(relay)s a través de %(bridge)s"

#. The tunnel type line displayed below the hostname line on the main screen
#. Available placeholders:
#. %(tunnelType)s - the tunnel type, i.e OpenVPN
#. %(bridgeType)s - the bridge type, i.e Shadowsocks
msgctxt "connection-info"
msgid "%(tunnelType)s via %(bridgeType)s"
msgstr "%(tunnelType)s a través de %(bridgeType)s"

msgctxt "connection-info"
msgid "In"
msgstr "Entrada"
Expand Down Expand Up @@ -238,10 +258,6 @@ msgctxt "in-app-notifications"
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 "Your kernel may be outdated"
msgstr ""

msgctxt "in-app-notifications"
msgid "Failed to set system DNS server"
msgstr "No se pudo establecer el servidor DNS del sistema"
Expand Down Expand Up @@ -296,6 +312,10 @@ msgctxt "in-app-notifications"
msgid "You are running an unsupported app version. Please upgrade to %(version)s now to ensure your security"
msgstr "Ejecuta una versión no admitida de la aplicación. Actualice a %(version)s ahora para garantizar su seguridad"

msgctxt "in-app-notifications"
msgid "Your kernel may be outdated"
msgstr "Puede que su kernel esté obsoleto"

msgctxt "launch-view"
msgid "Connecting to Mullvad system service..."
msgstr "Conectando al servicio del sistema Mullvad…"
Expand Down Expand Up @@ -401,6 +421,10 @@ msgctxt "preferences-view"
msgid "Automatically connect to a server when the app launches."
msgstr "Al iniciarse la aplicación, se conecta automáticamente a un servidor."

msgctxt "preferences-view"
msgid "Enable or disable system notifications. The critical notifications will always be displayed."
msgstr "Activar o desactivar notificaciones del sistema. Las notificaciones críticas se mostrarán siempre."

msgctxt "preferences-view"
msgid "Launch app on start-up"
msgstr "Ejecutar la aplicación al iniciar"
Expand All @@ -413,6 +437,10 @@ msgctxt "preferences-view"
msgid "Monochromatic tray icon"
msgstr "Icono de la bandeja monocromático"

msgctxt "preferences-view"
msgid "Notifications"
msgstr "Notificaciones"

msgctxt "preferences-view"
msgid "Preferences"
msgstr "Preferencias"
Expand Down
6 changes: 3 additions & 3 deletions gui/locales/es/relay-locations.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ msgstr ""
"Last-Translator: adminmullvad\n"
"Language-Team: Spanish\n"
"Language: es_ES\n"
"PO-Revision-Date: 2019-06-17 09:23\n"
"PO-Revision-Date: 2019-07-10 05:10\n"

#. AL TIA
msgid "Tirana"
msgstr ""
msgstr "Tirana"

#. AU BNE
msgid "Brisbane"
Expand Down Expand Up @@ -110,7 +110,7 @@ msgstr "Petaj Tikva"

#. IL TLV
msgid "Tel Aviv"
msgstr ""
msgstr "Tel Aviv"

#. IT MIL
msgid "Milan"
Expand Down
44 changes: 36 additions & 8 deletions gui/locales/fr/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: adminmullvad\n"
"Language-Team: French\n"
"Language: fr_FR\n"
"PO-Revision-Date: 2019-06-17 09:23\n"
"PO-Revision-Date: 2019-07-10 05:10\n"

msgid "BLOCKED CONNECTION"
msgstr "CONNEXION BLOQUÉE"
Expand Down Expand Up @@ -42,7 +42,7 @@ msgstr "Compte"

msgctxt "account-view"
msgid "Account number"
msgstr "ID de compte"
msgstr "Numéro de compte"

msgctxt "account-view"
msgid "Buy more credit"
Expand Down Expand Up @@ -147,8 +147,12 @@ msgid "UDP"
msgstr "UDP"

msgctxt "advanced-settings-view"
msgid "Unless connected, always block all network traffic, even when you've disconnected or quit the app."
msgstr "À moins d'être connecté, toujours bloquer le trafic réseau, même quand vous êtes déconnecté ou quand vous quittez l'application."
msgid "Unless connected to Mullvad, this setting will completely block your internet, even when you've disconnected or quit the app."
msgstr "À moins d'être connecté(e) à Mullvad, ce paramètre bloquera complètement votre connexion Internet, même si vous vous êtes déconnecté ou avez quitté l'application."

msgctxt "advanced-settings-view"
msgid "Warning: Your internet won't work without a VPN connection, even when you've quit the app."
msgstr "Attention : votre connexion Internet ne fonctionnera pas sans connexion VPN, même si vous quittez l'application."

msgctxt "auth-failure"
msgid "Account authentication failed."
Expand Down Expand Up @@ -199,6 +203,22 @@ msgctxt "connect-view"
msgid "You have no more VPN time left on this account. To buy more credit on our website, you will need to access the Internet with an unsecured connection."
msgstr "Il ne vous reste plus de temps VPN sur ce compte. Pour acheter plus de crédits sur notre site, vous devez accéder à internet avec une connexion non sécurisée."

#. The hostname line displayed below the country on the main screen
#. Available placeholders:
#. %(relay)s - the relay hostname
#. %(bridge)s - the bridge hostname
msgctxt "connection-info"
msgid "%(relay)s via %(bridge)s"
msgstr "%(relay)s via %(bridge)s"

#. The tunnel type line displayed below the hostname line on the main screen
#. Available placeholders:
#. %(tunnelType)s - the tunnel type, i.e OpenVPN
#. %(bridgeType)s - the bridge type, i.e Shadowsocks
msgctxt "connection-info"
msgid "%(tunnelType)s via %(bridgeType)s"
msgstr "%(tunnelType)s via %(bridgeType)s"

msgctxt "connection-info"
msgid "In"
msgstr "Entrante"
Expand Down Expand Up @@ -238,10 +258,6 @@ msgctxt "in-app-notifications"
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 "Your kernel may be outdated"
msgstr ""

msgctxt "in-app-notifications"
msgid "Failed to set system DNS server"
msgstr "Échec de la configuration du serveur DNS système"
Expand Down Expand Up @@ -296,6 +312,10 @@ msgctxt "in-app-notifications"
msgid "You are running an unsupported app version. Please upgrade to %(version)s now to ensure your security"
msgstr "Vous utilisez une version d'application non prise en charge. Veuillez passer maintenant à la version %(version)s pour assurer votre sécurité"

msgctxt "in-app-notifications"
msgid "Your kernel may be outdated"
msgstr "Votre noyau peut être obsolète"

msgctxt "launch-view"
msgid "Connecting to Mullvad system service..."
msgstr "Connexion au service système Mullvad..."
Expand Down Expand Up @@ -401,6 +421,10 @@ msgctxt "preferences-view"
msgid "Automatically connect to a server when the app launches."
msgstr "Connexion automatique à un serveur dès le démarrage de l'application."

msgctxt "preferences-view"
msgid "Enable or disable system notifications. The critical notifications will always be displayed."
msgstr "Activer ou désactiver les notifications système. Les notifications critiques seront toujours affichées."

msgctxt "preferences-view"
msgid "Launch app on start-up"
msgstr "Lancement de l'application au démarrage"
Expand All @@ -413,6 +437,10 @@ msgctxt "preferences-view"
msgid "Monochromatic tray icon"
msgstr "Icône de zone de notification monochrome"

msgctxt "preferences-view"
msgid "Notifications"
msgstr "Notifications"

msgctxt "preferences-view"
msgid "Preferences"
msgstr "Préférences"
Expand Down
Loading

0 comments on commit 671f3f1

Please sign in to comment.