Merge remote-tracking branch 'kali/update-translations' into develop

3 files changed, 531 insertions, 283 deletions

diff --git a/data/bitmask.pro b/data/bitmask.pro
index 0f9aaf90..b9b5dc84 100644
--- a/data/bitmask.pro
+++ b/data/bitmask.pro
@@ -19,17 +19,19 @@ SOURCES += ../src/leap/bitmask/app.py \
            ../src/leap/bitmask/gui/wizard.py \
            ../src/leap/bitmask/gui/eip_status.py \
            ../src/leap/bitmask/gui/mail_status.py \
-           ../src/leap/bitmask/gui/eippreferences.py \
-           ../src/leap/bitmask/gui/preferences.py \
+           ../src/leap/bitmask/gui/eip_preferenceswindow.py \
+           ../src/leap/bitmask/gui/preferenceswindow.py \
            ../src/leap/bitmask/platform_init/initializers.py \
            ../src/leap/bitmask/platform_init/locks.py \
            ../src/leap/bitmask/provider/supportedapis.py \
            ../src/leap/bitmask/services/abstractbootstrapper.py \
            ../src/leap/bitmask/services/eip/eipbootstrapper.py \
            ../src/leap/bitmask/services/eip/eipconfig.py \
-           ../src/leap/bitmask/services/eip/providerbootstrapper.py \
+           ../src/leap/bitmask/provider/providerbootstrapper.py \
+           ../src/leap/bitmask/services/__init__.py \
+           ../src/leap/bitmask/services/connections.py \
            ../src/leap/bitmask/services/eip/udstelnet.py \
-           ../src/leap/bitmask/services/eip/vpnlaunchers.py \
+           ../src/leap/bitmask/services/eip/vpnlauncher.py \
            ../src/leap/bitmask/services/eip/vpnprocess.py \
            ../src/leap/bitmask/services/mail/smtpbootstrapper.py \
            ../src/leap/bitmask/services/mail/smtpconfig.py \
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index 224060f4..e0e907f0 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1,21 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1">
 <context>
-    <name>DarwinVPNLauncher</name>
+    <name>EIPPreferences</name>
     <message>
-        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="691"/>
-        <source>No gateway was found!</source>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="14"/>
+        <source>EIP Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="27"/>
+        <source>Select gateway for provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="36"/>
+        <source>&amp;Select provider:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="140"/>
+        <source>&lt;Select provider&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="55"/>
+        <source>Save this provider settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="62"/>
+        <source>&lt; Providers Gateway Status &gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="72"/>
+        <source>Select gateway:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="80"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="91"/>
+        <source>Automatic EIP start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="109"/>
+        <source>&lt;font color=&apos;green&apos;&gt;&lt;b&gt;Automatic EIP start saved!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="119"/>
+        <source>Save auto start setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="129"/>
+        <source>Enable Automatic start of EIP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EIPBootstrapper</name>
+    <name>EIPPreferencesWindow</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="47"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="156"/>
+        <source>Gateway settings for provider &apos;{0}&apos; saved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="198"/>
+        <source>There was a problem with configuration files.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>LinuxVPNLauncher</name>
+    <name>EIPStatus</name>
     <message>
-        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="435"/>
-        <source>No gateway was found!</source>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="31"/>
+        <source>Turn On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="63"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="86"/>
+        <source>Traffic is being routed in the clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="253"/>
+        <source>0.0 KB/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EIPStatusWidget</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="191"/>
+        <source>All services are OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="197"/>
+        <source>Encrypted Internet: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="249"/>
+        <source>You must login to use Encrypted Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="300"/>
+        <source>Turn OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="314"/>
+        <source>Turn ON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="321"/>
+        <source>Traffic is being routed in the clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="378"/>
+        <source>Authenticating...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="380"/>
+        <source>Retrieving configuration...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="382"/>
+        <source>Waiting to start...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="384"/>
+        <source>Assigning IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="386"/>
+        <source>Reconnecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="395"/>
+        <source>Unable to start VPN, it&apos;s already running.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="418"/>
+        <source>Encrypted Internet: OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="423"/>
+        <source>Encrypted Internet: Starting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="425"/>
+        <source>Encrypted Internet: ON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="435"/>
+        <source>Route traffic through: {0}</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75,517 +248,567 @@
 <context>
     <name>LoginWidget</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="14"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="26"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="49"/>
-        <source>Create a new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="56"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="153"/>
         <source>&lt;b&gt;Provider:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="76"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="172"/>
         <source>Remember username and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="83"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="197"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="93"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="210"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="217"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="234"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="107"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="121"/>
         <source>Other...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="213"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="229"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="63"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="365"/>
+        <source>Logout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="283"/>
+        <source>Please select a valid provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="288"/>
+        <source>Please provide a valid username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="293"/>
+        <source>Please provide a valid password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="296"/>
+        <source>Logging in...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="358"/>
+        <source>Loggin out...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>MailStatusWidget</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="62"/>
-        <source>There are new updates available, please restart.</source>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="20"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="78"/>
-        <source>More...</source>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="31"/>
+        <source>You must login to use encrypted email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="243"/>
-        <source>Show Log</source>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="44"/>
+        <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="271"/>
-        <source>&amp;Session</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="171"/>
+        <source>All services are OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="617"/>
-        <source>Help</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="204"/>
+        <source>There was an unexpected problem with Soledad.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="296"/>
-        <source>&amp;Quit</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="418"/>
+        <source>OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="306"/>
-        <source>&amp;Help</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="221"/>
+        <source>Mail is OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="311"/>
-        <source>&amp;Wizard</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="224"/>
+        <source>You must be logged in to use encrypted email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="316"/>
-        <source>Show &amp;logs</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="228"/>
+        <source>Starting..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="667"/>
-        <source>Hide Main Window</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="229"/>
+        <source>Mail is starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="493"/>
-        <source> The following components will be updated:
-%s</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="383"/>
+        <source>ON</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="496"/>
-        <source>Updates available</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="233"/>
+        <source>Mail is ON</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="262"/>
-        <source>Preferences</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="236"/>
+        <source>Mail is disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="666"/>
-        <source>Show Main Window</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="298"/>
+        <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="856"/>
-        <source>Please select a valid provider</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="265"/>
+        <source>Soledad has started...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="861"/>
-        <source>Please provide a valid username</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="267"/>
+        <source>Soledad is starting, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="866"/>
-        <source>Please provide a valid Password</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="304"/>
+        <source>Looking for key for this user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="869"/>
-        <source>Logging in...</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/>
+        <source>Found key! Starting mail...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1265"/>
-        <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/bitmask/gui/mail_status.py" line="310"/>
+        <source>Generating new key, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1277"/>
-        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="312"/>
+        <source>Finished generating key!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1282"/>
-        <source>We could not find openvpn binary.</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="314"/>
+        <source>Starting mail...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/>
-        <source>OFF</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="344"/>
+        <source>SMTP has started...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1359"/>
-        <source>Starting...</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="350"/>
+        <source>SMTP failed to start, check the logs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1367"/>
-        <source>Not supported</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="387"/>
+        <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1370"/>
-        <source>Disabled</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="381"/>
+        <source>IMAP has started...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1407"/>
-        <source>Could not load Encrypted Internet Configuration.</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="387"/>
+        <source>IMAP failed to start, check the logs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1540"/>
-        <source>Encrypted Internet could not be launched because you did not authenticate properly.</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="391"/>
+        <source>%s Unread Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1546"/>
-        <source>Encrypted Internet finished in an unexpected manner!</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="405"/>
+        <source>About to start, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="14"/>
-        <source>Bitmask</source>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="412"/>
+        <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="291"/>
-        <source>Log &amp;out</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="257"/>
+        <source>There are new updates available, please restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="301"/>
-        <source>About &amp;Bitmask</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="299"/>
+        <source>More...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="255"/>
-        <source>Mail is OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="626"/>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="484"/>
-        <source>The Bitmask app is ready to update, please restart the application.</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="624"/>
-        <source>Encrypted Internet is OFF</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="729"/>
-        <source>About Bitmask - %s</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="375"/>
+        <source>&amp;Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="743"/>
-        <source>Version: &lt;b&gt;%s&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).&lt;br&gt;&lt;br&gt;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;br&gt;&lt;br&gt;&lt;a href=&apos;https://leap.se&apos;&gt;More about LEAP&lt;/a&gt;</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="672"/>
+        <source>Hide Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="830"/>
-        <source>Unable to login: Problem with provider</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="527"/>
+        <source> The following components will be updated:
+%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="907"/>
-        <source>Log in cancelled by the user.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="530"/>
+        <source>Updates available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1272"/>
-        <source>Encrypted Internet cannot be started because the tuntap extension is not installed properly in your system.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="671"/>
+        <source>Show Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1288"/>
-        <source>Another openvpn instance is already running, and could not be stopped.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1314"/>
+        <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/bitmask/gui/mainwindow.py" line="1295"/>
-        <source>Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1326"/>
+        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1385"/>
-        <source>There was a problem with the provider</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1331"/>
+        <source>We could not find openvpn binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1469"/>
-        <source>Something went wrong with the logout.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1493"/>
+        <source>Starting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1501"/>
+        <source>Not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1504"/>
-        <source>Unable to connect: Problem with provider</source>
+        <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ProviderBootstrapper</name>
     <message>
-        <location filename="../src/leap/bitmask/services/eip/providerbootstrapper.py" line="121"/>
-        <source>Provider certificate could not be verified</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1537"/>
+        <source>Could not load Encrypted Internet Configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/services/eip/providerbootstrapper.py" line="124"/>
-        <source>Provider does not support HTTPS</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1459"/>
+        <source>Encrypted Internet could not be launched because you did not authenticate properly.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SRPAuth</name>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="690"/>
-        <source>Succeeded</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1467"/>
+        <source>Encrypted Internet finished in an unexpected manner!</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusPanel</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="32"/>
+        <source>Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="23"/>
-        <source>user@domain.org</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
+        <source>About &amp;Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="326"/>
-        <source>Encrypted Internet: </source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="283"/>
+        <source>Mail is OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="336"/>
-        <source>Off</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="518"/>
+        <source>The Bitmask app is ready to update, please restart the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="365"/>
-        <source>Turn On</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="734"/>
+        <source>About Bitmask - %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="311"/>
-        <source>...</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="748"/>
+        <source>Version: &lt;b&gt;%s&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).&lt;br&gt;&lt;br&gt;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;br&gt;&lt;br&gt;&lt;a href=&apos;https://leap.se&apos;&gt;More about LEAP&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="44"/>
-        <source>0 Unread Emails</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="836"/>
+        <source>Unable to login: Problem with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="54"/>
-        <source>Disabled</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="874"/>
+        <source>Log in cancelled by the user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="67"/>
-        <source>Encrypted Mail:</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1321"/>
+        <source>Encrypted Internet cannot be started because the tuntap extension is not installed properly in your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="198"/>
-        <source>0.0 KB/s</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1337"/>
+        <source>Another openvpn instance is already running, and could not be stopped.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusPanelWidget</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="389"/>
-        <source>Turn OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1344"/>
+        <source>Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="403"/>
-        <source>Turn ON</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1519"/>
+        <source>There was a problem with the provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="699"/>
-        <source>ON</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1618"/>
+        <source>Something went wrong with the logout.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="461"/>
-        <source>Authenticating...</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1639"/>
+        <source>Unable to connect: Problem with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="463"/>
-        <source>Retrieving configuration...</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="113"/>
+        <source>Encrypted Internet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="465"/>
-        <source>Waiting to start...</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="194"/>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="467"/>
-        <source>Assigning IP</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="334"/>
+        <source>&amp;Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="478"/>
-        <source>Unable to start VPN, it&apos;s already running.</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
+        <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="270"/>
-        <source>All services are OFF</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="380"/>
+        <source>Show &amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="276"/>
-        <source>Encrypted Internet is {0}</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="385"/>
+        <source>Create a new account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="278"/>
-        <source>Mail is {0}</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="272"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="469"/>
-        <source>Reconnecting...</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="633"/>
+        <source>Encrypted Internet: OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="501"/>
-        <source>Encrypted Internet is OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1395"/>
+        <source>Network is unreachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="506"/>
-        <source>Encrypted Internet is STARTING</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1418"/>
+        <source>EIP has stopped</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Preferences</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="508"/>
-        <source>Encrypted Internet is ON</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="534"/>
-        <source>OFF</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="40"/>
+        <source>Password Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="536"/>
-        <source>Mail is OFF</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="49"/>
+        <source>&amp;Current password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="542"/>
-        <source>Mail is ON</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="66"/>
+        <source>&amp;New password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="604"/>
-        <source>Starting...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="83"/>
+        <source>&amp;Re-enter new password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="571"/>
-        <source>Soledad has started...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="100"/>
+        <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="573"/>
-        <source>Soledad is starting, please wait...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="107"/>
+        <source>&lt;Password change status&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="610"/>
-        <source>Looking for key for this user</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="120"/>
+        <source>Enabled services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="614"/>
-        <source>Found key! Starting mail...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="126"/>
+        <source>Save this provider settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="616"/>
-        <source>Generating new key, please wait...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="133"/>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="618"/>
-        <source>Finished generating key!</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="149"/>
+        <source>&lt;Select provider&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="620"/>
-        <source>Starting mail...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="157"/>
+        <source>Select provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="650"/>
-        <source>SMTP has started...</source>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="164"/>
+        <source>&lt; Providers Services Status &gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PreferencesWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="656"/>
-        <source>SMTP failed to start, check the logs.</source>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="53"/>
+        <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="693"/>
-        <source>Failed</source>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="115"/>
+        <source>Changing password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="687"/>
-        <source>IMAP has started...</source>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="166"/>
+        <source>Password changed successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="693"/>
-        <source>IMAP failed to start, check the logs.</source>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="181"/>
+        <source>There was a problem changing the password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="697"/>
-        <source>%s Unread Emails</source>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="184"/>
+        <source>You did not enter a correct current password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="317"/>
+        <source>Services settings for provider &apos;{0}&apos; saved.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WindowsVPNLauncher</name>
+    <name>ProviderBootstrapper</name>
     <message>
-        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="871"/>
-        <source>No gateway was found!</source>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="137"/>
+        <source>Provider certificate could not be verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="144"/>
+        <source>Provider does not support HTTPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SRPAuth</name>
+    <message>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="711"/>
+        <source>Succeeded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -622,157 +845,157 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="143"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="305"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="163"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="312"/>
         <source>https://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="173"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="153"/>
         <source>Checking for a valid provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="179"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/>
         <source>Getting provider information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="259"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="239"/>
         <source>Can we reach this provider?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="290"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="333"/>
         <source>Provider Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="293"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="336"/>
         <source>Description of services offered by this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="302"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="345"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="334"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="377"/>
         <source>Desc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="344"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="387"/>
         <source>&lt;b&gt;Services offered:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="354"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="397"/>
         <source>services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="374"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="417"/>
         <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="384"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="427"/>
         <source>policy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="404"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="447"/>
         <source>&lt;b&gt;URL:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="414"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="457"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="421"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="464"/>
         <source>&lt;b&gt;Description:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="432"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="475"/>
         <source>Provider setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="435"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="478"/>
         <source>Gathering configuration options for this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="457"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="500"/>
         <source>We are downloading some bits that we need to establish a secure connection with the provider for the first time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="480"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="523"/>
         <source>Setting up provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="530"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="573"/>
         <source>Getting info from the Certificate Authority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="537"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="580"/>
         <source>Do we trust this Certificate Authority?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="544"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="587"/>
         <source>Establishing a trust relationship with this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="603"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="646"/>
         <source>Register new user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="606"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="649"/>
         <source>Register a new user with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="621"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="664"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="640"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="691"/>
         <source>&lt;b&gt;Re-enter password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="650"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="701"/>
         <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="696"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="747"/>
         <source>Remember my username and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="720"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="771"/>
         <source>Service selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="723"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="774"/>
         <source>Please select the services you would like to have</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,62 +1010,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="204"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="238"/>
         <source>Starting registration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="235"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="269"/>
         <source>User %s successfully registered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="255"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="289"/>
         <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="361"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Non-existent provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="379"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="432"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="407"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="460"/>
         <source>Unable to load provider configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="413"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="466"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Not a valid provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="479"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="532"/>
         <source>Services by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="499"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="552"/>
         <source>Something went wrong while trying to load service %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="516"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="569"/>
         <source>Gathering configuration options for %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="525"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="578"/>
         <source>Description of services offered by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="546"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="599"/>
         <source>Register a new user with %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -857,113 +1080,136 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="186"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="166"/>
         <source>Can we establish a secure connection?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="683"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="734"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="269"/>
+        <source>Configure or select a provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="275"/>
+        <source>Configure new provider:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="285"/>
+        <source>Use existing one:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>__impl</name>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="281"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="288"/>
         <source>The server did not send the salt parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="285"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="292"/>
         <source>The server did not send the B parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="317"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="324"/>
         <source>The data sent from the server had errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="339"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="346"/>
         <source>Could not connect to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="365"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="372"/>
         <source>Unknown error (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="396"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="403"/>
         <source>Problem getting data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="422"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="429"/>
         <source>Bad data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="429"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="436"/>
         <source>Auth verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="437"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="444"/>
         <source>Session cookie verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="272"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="279"/>
         <source>There was a problem with authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="178"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="174"/>
         <source>Invalid username or password.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>kls</name>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/vpnlauncher.py" line="167"/>
+        <source>No gateway was found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>msg</name>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="91"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="93"/>
         <source>Missing up/down scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="182"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="184"/>
         <source>TAP Driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="189"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="191"/>
         <source>Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="308"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="310"/>
         <source>TUN Driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="316"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="318"/>
         <source>Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="130"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="132"/>
         <source>Problem installing files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="131"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="133"/>
         <source>Some of the files could not be copied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="311"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="313"/>
         <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py
index 82d8ea48..2ac4c325 100644
--- a/src/leap/bitmask/services/eip/vpnlauncher.py
+++ b/src/leap/bitmask/services/eip/vpnlauncher.py
@@ -164,7 +164,7 @@ class VPNLauncher(object):
 
         if not gateways:
             logger.error('No gateway was found!')
-            raise VPNLauncherException(kls.tr('No gateway was found!'))
+            raise VPNLauncherException('No gateway was found!')
 
         logger.debug("Using gateways ips: {0}".format(', '.join(gateways)))