Merge branch 'master' of ssh://leap.se/leap_client

1 files changed, 227 insertions, 207 deletions

diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index d2cba837..426acfbc 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1,476 +1,496 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="2.0">
 <context>
-    <name>ConnectionPage</name>
+    <name>MainWindow</name>
     <message>
-        <location filename="../src/leap/gui/firstrun/connect.py" line="26"/>
-        <source>Connecting...</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="592"/>
+        <source>Encryption is OFF</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="155"/>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/connect.py" line="85"/>
-        <source>Getting EIP configuration files</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="257"/>
+        <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/connect.py" line="101"/>
-        <source>Authentication error: %s</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="259"/>
+        <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/connect.py" line="109"/>
-        <source>Getting EIP certificate</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="288"/>
+        <source>About LEAP</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="288"/>
+        <source>LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. &lt;a href=&quot;https://leap.se&quot;&gt;More about LEAP&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/eip.py" line="235"/>
-        <source>&amp;Connect</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="433"/>
+        <source>Could not load provider configuration</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="459"/>
+        <source>Please select a valid provider</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="463"/>
+        <source>Please provide a valid username</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="467"/>
+        <source>Please provide a valid Password</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="470"/>
+        <source>Logging in...</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="549"/>
+        <source>Stop EIP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/eip/exceptions.py" line="119"/>
-        <source>Server does not allow secure connections</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="558"/>
+        <source>EIP has stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/eip/exceptions.py" line="126"/>
-        <source>Server certificate could not be verified</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="560"/>
+        <source>Start EIP</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="573"/>
+        <source>Checking configuration, please wait...</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="581"/>
+        <source>%s does not support EIP</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="596"/>
+        <source>Encryption is ON</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="614"/>
+        <source>VPN: Authenticating...</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="616"/>
+        <source>VPN: Retrieving configuration...</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>
+        <location filename="../src/leap/gui/mainwindow.py" line="618"/>
+        <source>VPN: Connected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/base/exceptions.py" line="88"/>
-        <source>Domain cannot be found</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="672"/>
+        <source>Signing out...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/base/exceptions.py" line="95"/>
-        <source>The Encrypted Connection was lost.</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="14"/>
+        <source>LEAP</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="80"/>
+        <source>Remember</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="103"/>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
-        <source>Log In with my credentials</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="123"/>
+        <source>&lt;b&gt;Provider:&lt;/b&gt;</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="133"/>
+        <source>&lt;b&gt;Password:&lt;/b&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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="153"/>
+        <source>&lt;b&gt;User:&lt;/b&gt;</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="219"/>
+        <source>0.0 Kb</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="272"/>
+        <source>Disconnected</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>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="332"/>
+        <source>&amp;Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="140"/>
-        <source>Resolving domain name</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="340"/>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="163"/>
-        <source>Authentication error: %s</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="348"/>
+        <source>S&amp;ettings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="179"/>
-        <source>Credentials validated.</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="359"/>
+        <source>&amp;Sign out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="24"/>
-        <source>Log In</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="364"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="38"/>
-        <source>User &amp;name:</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="369"/>
+        <source>About &amp;LEAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="53"/>
-        <source>&amp;Password:</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="374"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="80"/>
-        <source>Log in</source>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="379"/>
+        <source>&amp;Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/login.py" line="25"/>
-        <source>Log in with your credentials</source>
+        <location filename="../src/leap/gui/mainwindow.py" line="620"/>
+        <source>VPN: Waiting to start...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/mainwindow.ui" line="176"/>
+        <source>Automatically login</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LogPaneMixin</name>
+    <name>Wizard</name>
     <message>
-        <location filename="../src/leap/baseapp/log.py" line="25"/>
-        <source>&amp;Connect</source>
+        <location filename="../src/leap/gui/wizard.py" line="152"/>
+        <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/log.py" line="38"/>
-        <source>Disconnected</source>
+        <location filename="../src/leap/gui/wizard.py" line="155"/>
+        <source>Password too short</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>
+        <location filename="../src/leap/gui/wizard.py" line="158"/>
+        <source>Password too easy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="20"/>
-        <source>Services offered by this provider</source>
+        <location filename="../src/leap/gui/wizard.py" line="161"/>
+        <source>Password equal to username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerinfo.py" line="95"/>
-        <source>enrollment policy</source>
+        <location filename="../src/leap/gui/wizard.py" line="189"/>
+        <source>Starting registration...</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>
+        <location filename="../src/leap/gui/wizard.py" line="195"/>
+        <source>&lt;font color=&apos;green&apos;&gt;&lt;b&gt;User registration OK&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providersetup.py" line="85"/>
-        <source>Fetching CA certificate</source>
+        <location filename="../src/leap/gui/wizard.py" line="202"/>
+        <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providersetup.py" line="107"/>
-        <source>Checking CA fingerprint</source>
+        <location filename="../src/leap/gui/wizard.py" line="303"/>
+        <source>Unable to load provider configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providersetup.py" line="125"/>
-        <source>Validating api certificate</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="14"/>
+        <source>LEAP First run</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="31"/>
+        <source>Welcome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="34"/>
+        <source>This is the LEAP Client first run wizard</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="43"/>
+        <source>Log In with my credentials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="208"/>
-        <source>Registration succeeded!</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="50"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;/p&gt;&lt;p&gt;If you ever need to modify these options again, you can find the wizard in the &lt;span style=&quot; font-style:italic;&quot;&gt;&apos;Settings&apos;&lt;/span&gt; menu from the main window.&lt;/p&gt;&lt;p&gt;Do you want to &lt;span style=&quot; font-weight:600;&quot;&gt;sign up&lt;/span&gt; for a new account, or &lt;span style=&quot; font-weight:600;&quot;&gt;log in&lt;/span&gt; with an already existing username?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="244"/>
-        <source>Password does not match..</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="63"/>
+        <source>Sign up for a new account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="248"/>
-        <source>Password too short.</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="100"/>
+        <source>Provider selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="253"/>
-        <source>Password too obvious.</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="103"/>
+        <source>Please enter the domain of the provider you want to user for your connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="282"/>
-        <source>Error connecting to provider (timeout)</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="128"/>
+        <source>https://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="287"/>
-        <source>Error Connecting to provider (connerr).</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="368"/>
+        <source>Checking provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="295"/>
-        <source>Error during registration (%s)</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="147"/>
+        <source>Download provider information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="305"/>
-        <source>Could not register (bad response)</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="154"/>
+        <source>HTTPS Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="312"/>
-        <source>Username not available.</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="209"/>
+        <source>Name resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="48"/>
-        <source>User &amp;name:</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="232"/>
+        <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="60"/>
-        <source>&amp;Password:</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="253"/>
+        <source>Provider Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="66"/>
-        <source>Password (again):</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="256"/>
+        <source>Services offered by this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/register.py" line="72"/>
-        <source>&amp;Remember username and password.</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="278"/>
+        <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="285"/>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="292"/>
+        <source>Name</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="325"/>
+        <source>policy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerselect.py" line="87"/>
-        <source>chec&amp;k!</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="332"/>
+        <source>Desc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="356"/>
+        <source>Provider setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="359"/>
+        <source>Gathering configuration options for this provider</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="406"/>
+        <source>Download CA Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerselect.py" line="136"/>
-        <source>Certificate validation</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="413"/>
+        <source>Check CA Certificate Fingerprint</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="420"/>
+        <source>Check API Certificate</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="486"/>
+        <source>Register new user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerselect.py" line="103"/>
-        <source>&amp;Trust this provider certificate.</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="489"/>
+        <source>Register a new user with provider</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="524"/>
+        <source>&lt;b&gt;User:&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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="534"/>
+        <source>&lt;b&gt;Password:&lt;/b&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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="553"/>
+        <source>&lt;b&gt;Re-enter password:&lt;/b&gt;</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>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="563"/>
+        <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
-        <source>Checking for a secure connection</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="584"/>
+        <source>EIP Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/firstrun/providerselect.py" line="303"/>
-        <source>Getting info from the provider</source>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="587"/>
+        <source>Setting up Encrypted Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="609"/>
+        <source>Checking EIP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="615"/>
+        <source>Download EIP configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="622"/>
+        <source>Download client certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="691"/>
+        <source>Congratulations!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/gui/ui/wizard.ui" line="694"/>
+        <source>You have successfully configured the LEAP client.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>StatusAwareTrayIconMixin</name>
+    <name>__impl</name>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="78"/>
-        <source>EIP Connection Status</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="161"/>
+        <source>Unknown user</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>
+        <location filename="../src/leap/crypto/srpauth.py" line="167"/>
+        <source>The server did not send the salt parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="126"/>
-        <source>Encryption ON     turn &amp;off</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="171"/>
+        <source>The server did not send the B parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="131"/>
-        <source>&amp;Details...</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="199"/>
+        <source>The data sent from the server had errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="135"/>
-        <source>&amp;About</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="220"/>
+        <source>Could not connect to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="138"/>
-        <source>About Q&amp;t</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="228"/>
+        <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="141"/>
-        <source>&amp;Quit</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="234"/>
+        <source>Unknown error (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="152"/>
-        <source>Encryption ON    turn o&amp;ff</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="243"/>
+        <source>Problem getting data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="157"/>
-        <source>Encryption OFF   turn &amp;on</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="264"/>
+        <source>Bad data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="162"/>
-        <source>connecting...</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="270"/>
+        <source>Auth verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/baseapp/systray.py" line="185"/>
-        <source>About</source>
+        <location filename="../src/leap/crypto/srpauth.py" line="400"/>
+        <source>Succeeded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>