working transifex workflow

Closes #666

9 files changed, 479 insertions, 28 deletions

diff --git a/data/leap_client.pro b/data/leap_client.pro
index 01fbafcd..4c559029 100644
--- a/data/leap_client.pro
+++ b/data/leap_client.pro
@@ -1,2 +1,20 @@
+# qmake file
+
+# is not there a f*** way of expanding this? other to template with python I mean...
+
 SOURCES 	+= ../src/leap/gui/firstrun/intro.py
-TRANSLATIONS    += translations/leap_client_es_ES.ts
+SOURCES 	+= ../src/leap/gui/firstrun/last.py
+SOURCES		+= ../src/leap/gui/firstrun/login.py
+SOURCES		+= ../src/leap/gui/firstrun/providerinfo.py
+SOURCES		+= ../src/leap/gui/firstrun/providerselect.py
+SOURCES		+= ../src/leap/gui/firstrun/providersetup.py
+SOURCES		+= ../src/leap/gui/firstrun/register.py
+SOURCES		+= ../src/leap/gui/firstrun/regvalidation.py
+SOURCES		+= ../src/leap/gui/firstrun/wizard.py
+
+# where to generate ts files -- tx will pick from here
+
+# original file, english
+
+TRANSLATIONS    += ts/en_US.ts
+
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc
index a2fda78d..53576b49 100644
--- a/data/resources/locale.qrc
+++ b/data/resources/locale.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-<file>../translations/leap_client_es_ES.qm</file>
+<file>../translations/leap_client_es.qm</file>
 </qresource>
 </RCC>
diff --git a/data/translations/README.rst b/data/translations/README.rst
new file mode 100644
index 00000000..1f3dd0b3
--- /dev/null
+++ b/data/translations/README.rst
@@ -0,0 +1,8 @@
+data/translations
+=================
+
+We expect finished translations (i.e., those downloaded from ``transifex``) to live here. 
+
+Translator object will pick them from here.
+
+(Actually, from the embedded locale_rc)
diff --git a/data/translations/es.qm b/data/translations/es.qm
new file mode 100644
index 00000000..8daa2037
--- /dev/null
+++ b/data/translations/es.qm
diff --git a/data/translations/es.ts b/data/translations/es.ts
new file mode 100644
index 00000000..84aa6f0a
--- /dev/null
+++ b/data/translations/es.ts
@@ -0,0 +1,218 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
+<context>
+    <name>IntroPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="14"/>
+        <source>First run wizard.</source>
+        <translation>Primera Conexion.</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>Vamos a configurar algunas cosas antes de que te puedas conectar por primera vez.&lt;br&gt;&lt;br&gt;Si necesitas modificar estas opciones de nuevo, puedes encontrar este asistente en el menu de &apos;&lt;i&gt;Opciones&lt;/i&gt;&apos; en la ventana principal.&lt;br&gt;&lt;br&gt;Quieres &lt;b&gt;registrar&lt;/b&gt; una nueva cuenta, o &lt;b&gt;loguearte&lt;/b&gt; con tu usuario?&lt;br&gt; </translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
+        <source>Sign up for a new account.</source>
+        <translation>Registrar una cuenta nueva.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
+        <source>Log In with my credentials.</source>
+        <translation>Loguearme con un usuario que ya tengo.</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>El usuario tiene que ser usuario@tu.proveedor</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="140"/>
+        <source>Resolving domain name</source>
+        <translation>Resolviendo nombre de dominio</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="163"/>
+        <source>Authentication error: %s</source>
+        <translation>Error de autenticacion: %s</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="179"/>
+        <source>Credentials validated.</source>
+        <translation>Credenciales validadas.</translation>
+    </message>
+</context>
+<context>
+    <name>ProviderInfoPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="18"/>
+        <source>Provider Info</source>
+        <translation>Info del Proveedor</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
+        <source>This is what provider says.</source>
+        <translation>Esto es lo que dice el proveedor.</translation>
+    </message>
+</context>
+<context>
+    <name>ProviderSetupValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="26"/>
+        <source>Provider setup</source>
+        <translation>Configuracion del Proveedor</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="27"/>
+        <source>Doing autoconfig.</source>
+        <translation>Autoconfigurando.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="83"/>
+        <source>Fetching CA certificate</source>
+        <translation>Obteniendo certificado de la CA</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="105"/>
+        <source>Checking CA fingerprint</source>
+        <translation>Comprobando el fingerprint de la CA</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="134"/>
+        <source>Validating api certificate</source>
+        <translation>Validando certificado de la api</translation>
+    </message>
+</context>
+<context>
+    <name>RegisterUserPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="31"/>
+        <source>Sign Up</source>
+        <translation>Nueva Cuenta</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="208"/>
+        <source>Registration succeeded!</source>
+        <translation>Cuenta creada con exito!</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="238"/>
+        <source>Password does not match..</source>
+        <translation>Las contrasenas no son iguales..</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="242"/>
+        <source>Password too short.</source>
+        <translation>Contrasena demasiado corta.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="247"/>
+        <source>Password too obvious.</source>
+        <translation>Contrasena demasiado obvia.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="279"/>
+        <source>Error connecting to provider (timeout)</source>
+        <translation>Error conectandose al proveedor (timeout)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="284"/>
+        <source>Error Connecting to provider (connerr).</source>
+        <translation>Error conectandose al proveedor (connerr).</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="292"/>
+        <source>Error during registration (%s)</source>
+        <translation>Error durante el registro (%s)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="302"/>
+        <source>Could not register (bad response)</source>
+        <translation>No se pudo registrar (bad response)</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="309"/>
+        <source>Username not available.</source>
+        <translation>Usuario no disponible.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="375"/>
+        <source>Register a new user with provider %s.</source>
+        <translation>Registrar un nuevo usuario con el proveedor %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>Obteniendo configuracion del proveedor...</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="112"/>
+        <source>Authentication error: %s</source>
+        <translation>Error de autenticacion: %s</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="117"/>
+        <source>Fetching eip certificate</source>
+        <translation>Obteniendo certificado eip</translation>
+    </message>
+</context>
+<context>
+    <name>SelectProviderPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="32"/>
+        <source>Enter Provider</source>
+        <translation>Entra tu Proveedor</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>Por favor, rellena el dominio del proveedor que quieras usar para tu conexion.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="87"/>
+        <source>chec&amp;k!</source>
+        <translation>compro&amp;bar!</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="97"/>
+        <source>Server certificate could not be verified.</source>
+        <translation>No se pudo verificar el certificado del servidor.</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="136"/>
+        <source>Certificate validation</source>
+        <translation>Validacion del certificado</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="222"/>
+        <source>checking domain name</source>
+        <translation>comprobando nombre de dominio</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
+        <source>checking https connection</source>
+        <translation>comprobando conexion https</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="292"/>
+        <source>Could not get info from provider.</source>
+        <translation>no se pudo obtener info del proveedor</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="295"/>
+        <source>Could not download provider info (refused conn.).</source>
+        <translation>no se pudo obtener info del proveedor (refused conn.).</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="305"/>
+        <source>fetching provider info</source>
+        <translation>obteniendo info del preveedor</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/data/translations/leap_client_es_ES.qm b/data/translations/leap_client_es_ES.qm
deleted file mode 100644
index 002237e9..00000000
--- a/data/translations/leap_client_es_ES.qm
+++ /dev/null
diff --git a/data/translations/leap_client_es_ES.ts b/data/translations/leap_client_es_ES.ts
deleted file mode 100644
index 86eee980..00000000
--- a/data/translations/leap_client_es_ES.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="es_ES" sourcelanguage="en_US">
-<context>
-    <name>IntroPage</name>
-    <message>
-        <location filename="../src/leap/gui/firstrun/intro.py" line="14"/>
-        <source>First run wizard.</source>
-        <translation>Primera conexion.</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>Vamos a reunir la informacion que necesitas antes de la primera conexion.&lt;br&gt;&lt;br&gt;Si alguna vez necesitas modificar estas opciones de nuevo, puedes encontrar este asistente en el menu &lt;i&gt;Opciones&lt;/i&gt; en la ventana principal.&lt;br&gt;&lt;br&gt;Que deseas hacer ahora? Puedes &lt;b&gt;registrar&lt;/b&gt; una nueva cuenta o &lt;b&gt;loguearte&lt;/b&gt; con una que ya tienes?&lt;br&gt;</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
-        <source>Sign up for a new account.</source>
-        <translation>Registrar una cuenta nueva.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
-        <source>Log In with my credentials.</source>
-        <translation>Loguearme con mi usuario y contrasena.</translation>
-    </message>
-</context>
-</TS>
diff --git a/data/ts/README.rst b/data/ts/README.rst
new file mode 100644
index 00000000..3db2d104
--- /dev/null
+++ b/data/ts/README.rst
@@ -0,0 +1,14 @@
+data/ts
+=======
+
+Here we expect the .ts files generated by typing::
+
+        $ make translations
+
+Which will generate the sources (en_US)
+
+For uploading a source::
+
+        $ tx push -s
+
+Translator should pick finished ``.qm`` files from ``data/translations`` instead of this folder.
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
new file mode 100644
index 00000000..f6aadc5c
--- /dev/null
+++ b/data/ts/en_US.ts
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0">
+<context>
+    <name>IntroPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="14"/>
+        <source>First run wizard.</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
+        <source>Sign up for a new account.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
+        <source>Log In with my credentials.</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="140"/>
+        <source>Resolving domain name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="163"/>
+        <source>Authentication error: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="179"/>
+        <source>Credentials validated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProviderInfoPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="18"/>
+        <source>Provider Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
+        <source>This is what provider says.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProviderSetupValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="26"/>
+        <source>Provider setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="27"/>
+        <source>Doing autoconfig.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="83"/>
+        <source>Fetching CA certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="105"/>
+        <source>Checking CA fingerprint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="134"/>
+        <source>Validating api certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RegisterUserPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="31"/>
+        <source>Sign Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="208"/>
+        <source>Registration succeeded!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="238"/>
+        <source>Password does not match..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="242"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="247"/>
+        <source>Password too obvious.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="279"/>
+        <source>Error connecting to provider (timeout)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="284"/>
+        <source>Error Connecting to provider (connerr).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="292"/>
+        <source>Error during registration (%s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="302"/>
+        <source>Could not register (bad response)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="309"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="375"/>
+        <source>Register a new user with provider %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RegisterUserValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="95"/>
+        <source>Fetching provider config...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="112"/>
+        <source>Authentication error: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/regvalidation.py" line="117"/>
+        <source>Fetching eip certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectProviderPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="32"/>
+        <source>Enter Provider</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="87"/>
+        <source>chec&amp;k!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="97"/>
+        <source>Server certificate could not be verified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="136"/>
+        <source>Certificate validation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="222"/>
+        <source>checking domain name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
+        <source>checking https connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="292"/>
+        <source>Could not get info from provider.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="295"/>
+        <source>Could not download provider info (refused conn.).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="305"/>
+        <source>fetching provider info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>