Merge branch 'feature/translation-fixes' into develop

3 files changed, 443 insertions, 7 deletions

diff --git a/data/leap_client.pro b/data/leap_client.pro
index 3f76d6af..a9a9a932 100644
--- a/data/leap_client.pro
+++ b/data/leap_client.pro
@@ -3,6 +3,10 @@
 # is not there a f*** way of expanding this? other to template with python I mean...
 
 SOURCES += ../src/leap/base/exceptions.py
+SOURCES += ../src/leap/eip/exceptions.py
+SOURCES += ../src/leap/baseapp/eip.py
+SOURCES += ../src/leap/baseapp/log.py
+SOURCES += ../src/leap/baseapp/systray.py
 SOURCES += ../src/leap/gui/firstrun/intro.py
 SOURCES	+= ../src/leap/gui/firstrun/last.py
 SOURCES	+= ../src/leap/gui/firstrun/login.py
diff --git a/data/translations/de.ts b/data/translations/de.ts
new file mode 100644
index 00000000..f2ab6fa4
--- /dev/null
+++ b/data/translations/de.ts
@@ -0,0 +1,218 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
+<context>
+    <name>IntroPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="14"/>
+        <source>First run wizard.</source>
+        <translation>Assistent für erstmaligen Start</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="24"/>
+        <source>Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;br&gt;&lt;br&gt;If you ever need to modify these options again, you can find the wizard in the &apos;&lt;i&gt;Settings&lt;/i&gt;&apos; menu from the main window.&lt;br&gt;&lt;br&gt;Do you want to &lt;b&gt;sign up&lt;/b&gt; for a new account, or &lt;b&gt;log in&lt;/b&gt; with an already existing username?&lt;br&gt;</source>
+        <translation>Wir werden dich nun durch einige Konfigurationen führen, die du für den ersten Start benötigst.&lt;br&gt;&lt;br&gt;Wenn du diese Konfigurationen jemals ändern musst, findest du den Assistenten im &apos;&lt;i&gt;Einstellungen&lt;/i&gt;&apos;-Menü des Haupfensters.&lt;br&gt;&lt;br&gt;Möchtest du dich für einen neuen Account &lt;b&gt;anmelden&lt;/b&gt; oder mit einem bestehenden Usernamen &lt;b&gt;einloggen&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
+        <source>Sign up for a new account.</source>
+        <translation>Für einen neuen Account anmelden.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
+        <source>Log In with my credentials.</source>
+        <translation>Mit bestehenden Daten einloggen.</translation>
+    </message>
+</context>
+<context>
+    <name>LogInPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="96"/>
+        <source>Username must be in the username@provider form.</source>
+        <translation>Der Username muss in der Form username@provider sein.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="140"/>
+        <source>Resolving domain name</source>
+        <translation>Auflösen des Domain-Namens</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="163"/>
+        <source>Authentication error: %s</source>
+        <translation>Authentifizierungsfehler: %s</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="179"/>
+        <source>Credentials validated.</source>
+        <translation>Anmeldedaten korrekt.</translation>
+    </message>
+</context>
+<context>
+    <name>ProviderInfoPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="18"/>
+        <source>Provider Info</source>
+        <translation>Provider-info</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
+        <source>This is what provider says.</source>
+        <translation>Das ist, was der Provider sagt.</translation>
+    </message>
+</context>
+<context>
+    <name>ProviderSetupValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="26"/>
+        <source>Provider setup</source>
+        <translation>Provider-Setup</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="27"/>
+        <source>Doing autoconfig.</source>
+        <translation>Führe autoconfig durch.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="83"/>
+        <source>Fetching CA certificate</source>
+        <translation>Hole CA-Zertifikat</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="105"/>
+        <source>Checking CA fingerprint</source>
+        <translation>Überprüfe CA-Fingerprint</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="134"/>
+        <source>Validating api certificate</source>
+        <translation>Überprüfe API-Zertifikat</translation>
+    </message>
+</context>
+<context>
+    <name>RegisterUserPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="31"/>
+        <source>Sign Up</source>
+        <translation>Anmelden</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="208"/>
+        <source>Registration succeeded!</source>
+        <translation>Registrierung erfolgreich!</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="238"/>
+        <source>Password does not match..</source>
+        <translation>Passwort stimmt nicht überien.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="242"/>
+        <source>Password too short.</source>
+        <translation>Passwort zu kurz</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="247"/>
+        <source>Password too obvious.</source>
+        <translation>Passwort zu simpel.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="279"/>
+        <source>Error connecting to provider (timeout)</source>
+        <translation>Verbindungsfehler zu Provider (timeout)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="284"/>
+        <source>Error Connecting to provider (connerr).</source>
+        <translation>Verbindungsfehler zu Provider (connerr)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="292"/>
+        <source>Error during registration (%s)</source>
+        <translation>Fehler während der Registrierung (%s)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="302"/>
+        <source>Could not register (bad response)</source>
+        <translation>Konnte nicht registrieren (bad response)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="309"/>
+        <source>Username not available.</source>
+        <translation>Username nicht verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="375"/>
+        <source>Register a new user with provider %s.</source>
+        <translation>Registriere einen neuen User bei Provider %s</translation>
+    </message>
+</context>
+<context>
+    <name>RegisterUserValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="95"/>
+        <source>Fetching provider config...</source>
+        <translation>Hole Provider-Konfiguration...</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="112"/>
+        <source>Authentication error: %s</source>
+        <translation>Authentifizierungsfehler: %s</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="117"/>
+        <source>Fetching eip certificate</source>
+        <translation>Hole EIP-Zertifikat</translation>
+    </message>
+</context>
+<context>
+    <name>SelectProviderPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="32"/>
+        <source>Enter Provider</source>
+        <translation>Gib Provider ein</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="33"/>
+        <source>Please enter the domain of the provider you want to use for your connection.</source>
+        <translation>Bitte gib die Domain des Providers an, den du für deine Verbindung nutzen möchtest.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="87"/>
+        <source>chec&amp;k!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="97"/>
+        <source>Server certificate could not be verified.</source>
+        <translation>Server-Zertifikat konnte nicht bestätigt werden.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="136"/>
+        <source>Certificate validation</source>
+        <translation>Zertifikatsüberprüfung</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="222"/>
+        <source>checking domain name</source>
+        <translation>Prüfe Domain-Name</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
+        <source>checking https connection</source>
+        <translation>Prüfe HTTPS-Verbindung</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="292"/>
+        <source>Could not get info from provider.</source>
+        <translation>Konnte keine Information vom Provider bekommen.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="295"/>
+        <source>Could not download provider info (refused conn.).</source>
+        <translation>Konnte Provider-Info nicht herunterladen (refused conn.).</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="305"/>
+        <source>fetching provider info</source>
+        <translation>Hole Provider-Info</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index a802dd75..3fdb38da 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1,6 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="2.0">
 <context>
+    <name>EIPConductorAppMixin</name>
+    <message>
+        <location filename="../src/leap/baseapp/eip.py" line="198"/>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/eip.py" line="212"/>
+        <source>&amp;Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EIPErrors</name>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="66"/>
+        <source>We could not find any authentication agent in your system.&lt;br/&gt;Make sure you have &lt;b&gt;polkit-gnome-authentication-agent-1&lt;/b&gt; running and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="77"/>
+        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.&lt;br/&gt; Do you want to try &lt;b&gt;setuid workaround&lt;/b&gt;? (&lt;i&gt;DOES NOTHING YET&lt;/i&gt;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="88"/>
+        <source>No suitable openvpn command found. &lt;br/&gt;(Might be a permissions problem)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="97"/>
+        <source>there is a problem with provider certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="104"/>
+        <source>an error occurred during configuratio of leap services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="111"/>
+        <source>Another OpenVPN Process has been detected.Please close it before starting leap-client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="119"/>
+        <source>Server does not allow secure connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="126"/>
+        <source>Server certificate could not be verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/eip/exceptions.py" line="137"/>
+        <source>We could not find your eip certs in the expected path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Errors</name>
     <message>
         <location filename="../src/leap/base/exceptions.py" line="57"/>
@@ -29,7 +90,7 @@
     </message>
     <message>
         <location filename="../src/leap/base/exceptions.py" line="95"/>
-        <source>The Encrypted Connection was lost. Shutting down...</source>
+        <source>The Encrypted Connection was lost.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -57,6 +118,24 @@
     </message>
 </context>
 <context>
+    <name>LastPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/last.py" line="18"/>
+        <source>Connecting to Encrypted Internet Proxy service...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/last.py" line="54"/>
+        <source>You are now using an encrypted connection!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/last.py" line="58"/>
+        <source>Click &apos;&lt;i&gt;%s&lt;/i&gt;&apos; to end the wizard and save your settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LogInPage</name>
     <message>
         <location filename="../src/leap/gui/firstrun/login.py" line="96"/>
@@ -78,16 +157,54 @@
         <source>Credentials validated.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="24"/>
+        <source>Log In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="25"/>
+        <source>Log in with your credentials.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="38"/>
+        <source>User &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="53"/>
+        <source>&amp;Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="80"/>
+        <source>Log in</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LogPaneMixin</name>
+    <message>
+        <location filename="../src/leap/baseapp/log.py" line="24"/>
+        <source>&amp;Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/log.py" line="37"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProviderInfoPage</name>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="18"/>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
         <source>Provider Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="20"/>
         <source>This is what provider says.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,6 +294,26 @@
         <source>Register a new user with provider %s.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="48"/>
+        <source>User &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="60"/>
+        <source>&amp;Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="66"/>
+        <source>Password (again):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="72"/>
+        <source>&amp;Remember username and password.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RegisterUserValidationPage</name>
@@ -195,6 +332,16 @@
         <source>Fetching eip certificate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="34"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="36"/>
+        <source>Checking connection with provider.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectProviderPage</name>
@@ -248,11 +395,78 @@
         <source>fetching provider info</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="103"/>
+        <source>&amp;Trust this provider certificate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="346"/>
+        <source>Do you want to &lt;b&gt;trust this provider certificate?&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="349"/>
+        <source>SHA-256 fingerprint: &lt;i&gt;%s&lt;/i&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>TestyClass</name>
-</context>
-<context>
-    <name>this is a cat</name>
+    <name>StatusAwareTrayIconMixin</name>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="78"/>
+        <source>EIP Connection Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="87"/>
+        <source>&lt;b&gt;disconnected&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="126"/>
+        <source>Encryption ON     turn &amp;off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="131"/>
+        <source>&amp;Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="135"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="138"/>
+        <source>About Q&amp;t</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="141"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="152"/>
+        <source>Encryption ON    turn o&amp;ff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="157"/>
+        <source>Encryption OFF   turn &amp;on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="162"/>
+        <source>connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/systray.py" line="185"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>