Merge branch 'pre-release-0.2.0' into release-0.2.0

This merge contains today's state of develop branch,
minus soledad and email components.

2 files changed, 491 insertions, 0 deletions

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..d2cba837
--- /dev/null
+++ b/data/ts/en_US.ts
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0">
+<context>
+    <name>ConnectionPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/connect.py" line="26"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/connect.py" line="27"/>
+        <source>Setting up a encrypted connection with the provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/connect.py" line="85"/>
+        <source>Getting EIP configuration files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/connect.py" line="101"/>
+        <source>Authentication error: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/connect.py" line="109"/>
+        <source>Getting EIP certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EIPConductorAppMixin</name>
+    <message>
+        <location filename="../src/leap/baseapp/eip.py" line="221"/>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/eip.py" line="235"/>
+        <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="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>
+    <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>
+</context>
+<context>
+    <name>Errors</name>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="57"/>
+        <source>Interface not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="64"/>
+        <source>Looks like your computer is not connected to the internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="72"/>
+        <source>Looks like there are problems with your internet connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="80"/>
+        <source>It looks like there is no internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="88"/>
+        <source>Domain cannot be found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/base/exceptions.py" line="95"/>
+        <source>The Encrypted Connection was lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<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="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>
+    <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>
+</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="66"/>
+        <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>
+    <message>
+        <location filename="../src/leap/gui/firstrun/last.py" line="62"/>
+        <source>You are now using an encrypted connection!</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>
+    <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="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>
+    <message>
+        <location filename="../src/leap/gui/firstrun/login.py" line="25"/>
+        <source>Log in with your credentials</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LogPaneMixin</name>
+    <message>
+        <location filename="../src/leap/baseapp/log.py" line="25"/>
+        <source>&amp;Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/baseapp/log.py" line="38"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProviderInfoPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
+        <source>Provider Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="20"/>
+        <source>Services offered by this provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="95"/>
+        <source>enrollment policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProviderSetupValidationPage</name>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="28"/>
+        <source>Provider setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="85"/>
+        <source>Fetching CA certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="107"/>
+        <source>Checking CA fingerprint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="125"/>
+        <source>Validating api certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providersetup.py" line="29"/>
+        <source>Gathering configuration options for this provider</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="244"/>
+        <source>Password does not match..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="248"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="253"/>
+        <source>Password too obvious.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="282"/>
+        <source>Error connecting to provider (timeout)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="287"/>
+        <source>Error Connecting to provider (connerr).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="295"/>
+        <source>Error during registration (%s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="305"/>
+        <source>Could not register (bad response)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="312"/>
+        <source>Username not available.</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>
+    <message>
+        <location filename="../src/leap/gui/firstrun/register.py" line="378"/>
+        <source>Register a new user with provider &lt;em&gt;%s&lt;/em&gt;</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="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="290"/>
+        <source>Could not get info from provider.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="293"/>
+        <source>Could not download provider info (refused conn.).</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="344"/>
+        <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="347"/>
+        <source>SHA-256 fingerprint: &lt;i&gt;%s&lt;/i&gt;&lt;br&gt;</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="222"/>
+        <source>Checking if it is a valid provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
+        <source>Checking for a secure connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/firstrun/providerselect.py" line="303"/>
+        <source>Getting info from the provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <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>