Merge branch 'release-0.3.4'0.3.4

33 files changed, 428 insertions, 268 deletions

diff --git a/data/bitmask.pro b/data/bitmask.pro
index e117668b..0f9aaf90 100644
--- a/data/bitmask.pro
+++ b/data/bitmask.pro
@@ -14,10 +14,13 @@ SOURCES += ../src/leap/bitmask/app.py \
            ../src/leap/bitmask/gui/loggerwindow.py \
            ../src/leap/bitmask/gui/login.py \
            ../src/leap/bitmask/gui/mainwindow.py \
-           ../src/leap/bitmask/gui/statuspanel.py \
            ../src/leap/bitmask/gui/twisted_main.py \
            ../src/leap/bitmask/gui/wizardpage.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/platform_init/initializers.py \
            ../src/leap/bitmask/platform_init/locks.py \
            ../src/leap/bitmask/provider/supportedapis.py \
@@ -45,8 +48,11 @@ SOURCES += ../src/leap/bitmask/app.py \
 FORMS += ../src/leap/bitmask/gui/ui/loggerwindow.ui \
          ../src/leap/bitmask/gui/ui/login.ui \
          ../src/leap/bitmask/gui/ui/mainwindow.ui \
-         ../src/leap/bitmask/gui/ui/statuspanel.ui \
          ../src/leap/bitmask/gui/ui/wizard.ui \
+         ../src/leap/bitmask/gui/ui/eip_status.ui \
+         ../src/leap/bitmask/gui/ui/mail_status.ui \
+         ../src/leap/bitmask/gui/ui/eippreferences.ui \
+         ../src/leap/bitmask/gui/ui/preferences.ui \
 
 # where to generate ts files -- tx will pick from here
 
diff --git a/data/images/black/32/arrow-down.png b/data/images/black/32/arrow-down.png
new file mode 100644
index 00000000..328eb08d
--- /dev/null
+++ b/data/images/black/32/arrow-down.png
diff --git a/data/images/black/32/arrow-up.png b/data/images/black/32/arrow-up.png
new file mode 100644
index 00000000..5eea5108
--- /dev/null
+++ b/data/images/black/32/arrow-up.png
diff --git a/data/images/black/32/cloud.png b/data/images/black/32/cloud.png
new file mode 100644
index 00000000..10cbd62d
--- /dev/null
+++ b/data/images/black/32/cloud.png
diff --git a/data/images/black/32/contract.png b/data/images/black/32/contract.png
new file mode 100644
index 00000000..9f0ee605
--- /dev/null
+++ b/data/images/black/32/contract.png
diff --git a/data/images/black/32/earth-square.png b/data/images/black/32/earth-square.png
new file mode 100644
index 00000000..da7bf2cf
--- /dev/null
+++ b/data/images/black/32/earth-square.png
diff --git a/data/images/black/32/earth.png b/data/images/black/32/earth.png
new file mode 100644
index 00000000..64919edc
--- /dev/null
+++ b/data/images/black/32/earth.png
diff --git a/data/images/black/32/email-square.png b/data/images/black/32/email-square.png
new file mode 100644
index 00000000..499d7a8f
--- /dev/null
+++ b/data/images/black/32/email-square.png
diff --git a/data/images/black/32/email.png b/data/images/black/32/email.png
new file mode 100644
index 00000000..a6f40297
--- /dev/null
+++ b/data/images/black/32/email.png
diff --git a/data/images/black/32/expand.png b/data/images/black/32/expand.png
new file mode 100644
index 00000000..c581503d
--- /dev/null
+++ b/data/images/black/32/expand.png
diff --git a/data/images/black/32/gear.png b/data/images/black/32/gear.png
new file mode 100644
index 00000000..93c8742d
--- /dev/null
+++ b/data/images/black/32/gear.png
diff --git a/data/images/black/32/off.png b/data/images/black/32/off.png
new file mode 100644
index 00000000..6ddde746
--- /dev/null
+++ b/data/images/black/32/off.png
diff --git a/data/images/black/32/on.png b/data/images/black/32/on.png
new file mode 100644
index 00000000..bbd28bad
--- /dev/null
+++ b/data/images/black/32/on.png
diff --git a/data/images/black/32/refresh.png b/data/images/black/32/refresh.png
new file mode 100644
index 00000000..ad67f563
--- /dev/null
+++ b/data/images/black/32/refresh.png
diff --git a/data/images/black/32/user.png b/data/images/black/32/user.png
new file mode 100644
index 00000000..7ea0f43a
--- /dev/null
+++ b/data/images/black/32/user.png
diff --git a/data/images/black/32/wait.png b/data/images/black/32/wait.png
new file mode 100644
index 00000000..a01ce923
--- /dev/null
+++ b/data/images/black/32/wait.png
diff --git a/data/images/white/32/arrow-down.png b/data/images/white/32/arrow-down.png
new file mode 100644
index 00000000..02ccc540
--- /dev/null
+++ b/data/images/white/32/arrow-down.png
diff --git a/data/images/white/32/arrow-up.png b/data/images/white/32/arrow-up.png
new file mode 100644
index 00000000..fbe1f816
--- /dev/null
+++ b/data/images/white/32/arrow-up.png
diff --git a/data/images/white/32/cloud.png b/data/images/white/32/cloud.png
new file mode 100644
index 00000000..39d589ef
--- /dev/null
+++ b/data/images/white/32/cloud.png
diff --git a/data/images/white/32/contract.png b/data/images/white/32/contract.png
new file mode 100644
index 00000000..262ff3c0
--- /dev/null
+++ b/data/images/white/32/contract.png
diff --git a/data/images/white/32/earth-square.png b/data/images/white/32/earth-square.png
new file mode 100644
index 00000000..da7bf2cf
--- /dev/null
+++ b/data/images/white/32/earth-square.png
diff --git a/data/images/white/32/earth.png b/data/images/white/32/earth.png
new file mode 100644
index 00000000..efca7ccb
--- /dev/null
+++ b/data/images/white/32/earth.png
diff --git a/data/images/white/32/email-square.png b/data/images/white/32/email-square.png
new file mode 100644
index 00000000..499d7a8f
--- /dev/null
+++ b/data/images/white/32/email-square.png
diff --git a/data/images/white/32/email.png b/data/images/white/32/email.png
new file mode 100644
index 00000000..abb36035
--- /dev/null
+++ b/data/images/white/32/email.png
diff --git a/data/images/white/32/expand.png b/data/images/white/32/expand.png
new file mode 100644
index 00000000..0ec28dcc
--- /dev/null
+++ b/data/images/white/32/expand.png
diff --git a/data/images/white/32/gear.png b/data/images/white/32/gear.png
new file mode 100644
index 00000000..83f8d5ff
--- /dev/null
+++ b/data/images/white/32/gear.png
diff --git a/data/images/white/32/off.png b/data/images/white/32/off.png
new file mode 100644
index 00000000..22621594
--- /dev/null
+++ b/data/images/white/32/off.png
diff --git a/data/images/white/32/on.png b/data/images/white/32/on.png
new file mode 100644
index 00000000..8946f763
--- /dev/null
+++ b/data/images/white/32/on.png
diff --git a/data/images/white/32/refresh.png b/data/images/white/32/refresh.png
new file mode 100644
index 00000000..36a89da9
--- /dev/null
+++ b/data/images/white/32/refresh.png
diff --git a/data/images/white/32/user.png b/data/images/white/32/user.png
new file mode 100644
index 00000000..ff8edd00
--- /dev/null
+++ b/data/images/white/32/user.png
diff --git a/data/images/white/32/wait.png b/data/images/white/32/wait.png
new file mode 100644
index 00000000..8562d636
--- /dev/null
+++ b/data/images/white/32/wait.png
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 1e4159b8..0a917d5a 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -1,5 +1,23 @@
 <RCC>
   <qresource prefix="/">
+    <file>../images/white/32/off.png</file>
+    <file>../images/white/32/on.png</file>
+    <file>../images/white/32/wait.png</file>
+    <file>../images/black/32/arrow-down.png</file>
+    <file>../images/black/32/arrow-up.png</file>
+    <file>../images/black/32/cloud.png</file>
+    <file>../images/black/32/contract.png</file>
+    <file>../images/black/32/earth-square.png</file>
+    <file>../images/black/32/earth.png</file>
+    <file>../images/black/32/email-square.png</file>
+    <file>../images/black/32/email.png</file>
+    <file>../images/black/32/expand.png</file>
+    <file>../images/black/32/gear.png</file>
+    <file>../images/black/32/off.png</file>
+    <file>../images/black/32/on.png</file>
+    <file>../images/black/32/refresh.png</file>
+    <file>../images/black/32/user.png</file>
+    <file>../images/black/32/wait.png</file>
     <file>../images/mask-launcher.png</file>
     <file>../images/mask-icon.png</file>
     <file>../images/leap-gray-big.png</file>
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index 250b58ce..224060f4 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1">
 <context>
-    <name>EIPBootstrapper</name>
+    <name>DarwinVPNLauncher</name>
     <message>
-        <location filename="../src/leap/services/eip/eipbootstrapper.py" line="151"/>
-        <source>The downloaded certificate is not a valid PEM file</source>
+        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="691"/>
+        <source>No gateway was found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>EIPBootstrapper</name>
+</context>
+<context>
     <name>LinuxVPNLauncher</name>
     <message>
-        <location filename="../src/leap/services/eip/vpnlaunchers.py" line="380"/>
+        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="435"/>
         <source>No gateway was found!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19,292 +22,337 @@
 <context>
     <name>LoggerWindow</name>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="14"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="14"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="29"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="49"/>
         <source>Debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="49"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="69"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="69"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="89"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="89"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="109"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="109"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="129"/>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/loggerwindow.ui" line="129"/>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="149"/>
         <source>Save to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/loggerwindow.py" line="113"/>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="148"/>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="24"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="34"/>
+        <source>Case Insensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LoginWidget</name>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="14"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="49"/>
+        <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/gui/ui/login.ui" line="56"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="56"/>
         <source>&lt;b&gt;Provider:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="76"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="76"/>
         <source>Remember username and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="83"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="83"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="93"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="93"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/login.ui" line="103"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="217"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="14"/>
-        <source>LEAP</source>
+        <location filename="../src/leap/bitmask/gui/login.py" line="107"/>
+        <source>Other...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="213"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="62"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="62"/>
         <source>There are new updates available, please restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="78"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="78"/>
         <source>More...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="233"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="243"/>
         <source>Show Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="261"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="271"/>
         <source>&amp;Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="521"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="617"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="281"/>
-        <source>&amp;Sign out</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="296"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="286"/>
-        <source>&amp;Quit</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="306"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="291"/>
-        <source>About &amp;LEAP</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="311"/>
+        <source>&amp;Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="296"/>
-        <source>&amp;Help</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="316"/>
+        <source>Show &amp;logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="301"/>
-        <source>&amp;Wizard</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="667"/>
+        <source>Hide Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="306"/>
-        <source>Show &amp;logs</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="493"/>
+        <source> The following components will be updated:
+%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="230"/>
-        <source>No default provider</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="496"/>
+        <source>Updates available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="233"/>
-        <source>Encrypted internet is OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="262"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1051"/>
-        <source>Turn ON</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="666"/>
+        <source>Show Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="553"/>
-        <source>Hide Main Window</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="856"/>
+        <source>Please select a valid provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="391"/>
-        <source>The LEAPClient app is ready to update, please restart the application.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="861"/>
+        <source>Please provide a valid username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="400"/>
-        <source> The following components will be updated:
-%s</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="866"/>
+        <source>Please provide a valid Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="403"/>
-        <source>Updates available</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="869"/>
+        <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="519"/>
-        <source>Preferences</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="552"/>
-        <source>Show Main Window</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="606"/>
-        <source>About LEAP - %s</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1282"/>
+        <source>We could not find openvpn binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="614"/>
-        <source>version: &lt;b&gt;%s&lt;/b&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;a href=&quot;https://leap.se&quot;&gt;More about LEAP&lt;/a&gt;</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/>
+        <source>OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="716"/>
-        <source>Could not load provider configuration.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1359"/>
+        <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="746"/>
-        <source>Please select a valid provider</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1367"/>
+        <source>Not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="751"/>
-        <source>Please provide a valid username</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1370"/>
+        <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="756"/>
-        <source>Please provide a valid Password</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1407"/>
+        <source>Could not load Encrypted Internet Configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="759"/>
-        <source>Logging in...</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1540"/>
+        <source>Encrypted Internet could not be launched because you did not authenticate properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="995"/>
-        <source>Turn OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1546"/>
+        <source>Encrypted Internet finished in an unexpected manner!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1009"/>
-        <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/ui/mainwindow.ui" line="14"/>
+        <source>Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1015"/>
-        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="291"/>
+        <source>Log &amp;out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1020"/>
-        <source>We could not find openvpn binary.</source>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="301"/>
+        <source>About &amp;Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1048"/>
-        <source>OFF</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="255"/>
+        <source>Mail is OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1100"/>
-        <source>Starting...</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="484"/>
+        <source>The Bitmask app is ready to update, please restart the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1108"/>
-        <source>Not supported</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="624"/>
+        <source>Encrypted Internet is OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1111"/>
-        <source>Disabled</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="729"/>
+        <source>About Bitmask - %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1139"/>
-        <source>Could not load Encrypted Internet Configuration.</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1239"/>
-        <source>Encrypted Internet could not be launched because you did not authenticate properly.</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="830"/>
+        <source>Unable to login: Problem with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="1245"/>
-        <source>Encrypted Internet finished in an unexpected manner!</source>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="907"/>
+        <source>Log in cancelled by the user.</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>
+        <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>
+        <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>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1469"/>
+        <source>Something went wrong with the logout.</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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProviderBootstrapper</name>
     <message>
-        <location filename="../src/leap/services/eip/providerbootstrapper.py" line="113"/>
+        <location filename="../src/leap/bitmask/services/eip/providerbootstrapper.py" line="121"/>
         <source>Provider certificate could not be verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/services/eip/providerbootstrapper.py" line="116"/>
+        <location filename="../src/leap/bitmask/services/eip/providerbootstrapper.py" line="124"/>
         <source>Provider does not support HTTPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -312,7 +360,7 @@
 <context>
     <name>SRPAuth</name>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="598"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="690"/>
         <source>Succeeded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -320,516 +368,604 @@
 <context>
     <name>StatusPanel</name>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="14"/>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="23"/>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="23"/>
         <source>user@domain.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="44"/>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="326"/>
         <source>Encrypted Internet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="54"/>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="336"/>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="83"/>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="365"/>
         <source>Turn On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="178"/>
-        <source>0.0 Kb</source>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="311"/>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/statuspanel.ui" line="209"/>
-        <source>...</source>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="44"/>
+        <source>0 Unread Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="54"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="67"/>
+        <source>Encrypted Mail:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/statuspanel.ui" line="198"/>
+        <source>0.0 KB/s</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusPanelWidget</name>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="180"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="389"/>
         <source>Turn OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="190"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="403"/>
         <source>Turn ON</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="232"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="699"/>
         <source>ON</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="236"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="461"/>
         <source>Authenticating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="238"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="463"/>
         <source>Retrieving configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="240"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="465"/>
         <source>Waiting to start...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="242"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="467"/>
         <source>Assigning IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="250"/>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="478"/>
         <source>Unable to start VPN, it&apos;s already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="264"/>
-        <source>Encryption is OFF</source>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="270"/>
+        <source>All services are OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="269"/>
-        <source>Turning ON</source>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="276"/>
+        <source>Encrypted Internet is {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/statuspanel.py" line="271"/>
-        <source>Encryption is ON</source>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="278"/>
+        <source>Mail is {0}</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Wizard</name>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="14"/>
-        <source>LEAP First run</source>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="469"/>
+        <source>Reconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="31"/>
-        <source>Welcome</source>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="501"/>
+        <source>Encrypted Internet is OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="506"/>
+        <source>Encrypted Internet is STARTING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="508"/>
+        <source>Encrypted Internet is ON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="534"/>
+        <source>OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="536"/>
+        <source>Mail is OFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="542"/>
+        <source>Mail is ON</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>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="604"/>
+        <source>Starting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="571"/>
+        <source>Soledad has started...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="573"/>
+        <source>Soledad is starting, please wait...</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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="614"/>
+        <source>Found key! Starting mail...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="616"/>
+        <source>Generating new key, please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="618"/>
+        <source>Finished generating key!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="620"/>
+        <source>Starting mail...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="650"/>
+        <source>SMTP has started...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="656"/>
+        <source>SMTP failed to start, check the logs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="693"/>
+        <source>Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="687"/>
+        <source>IMAP has started...</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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/statuspanel.py" line="697"/>
+        <source>%s Unread Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WindowsVPNLauncher</name>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/vpnlaunchers.py" line="871"/>
+        <source>No gateway was found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/>
+        <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="43"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="55"/>
         <source>Log In with my credentials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="50"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="62"/>
         <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/ui/wizard.ui" line="63"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="75"/>
         <source>Sign up for a new account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="100"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/>
         <source>Provider selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="103"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="115"/>
         <source>Please enter the domain of the provider you want to use for your connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="131"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="143"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="151"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="163"/>
         <source>https://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="161"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="173"/>
         <source>Checking for a valid provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="167"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="179"/>
         <source>Getting provider information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="174"/>
-        <source>Can we stablish a secure connection?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="247"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="259"/>
         <source>Can we reach this provider?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="278"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="290"/>
         <source>Provider Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="281"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="293"/>
         <source>Description of services offered by this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="290"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="302"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="322"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="334"/>
         <source>Desc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="332"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="344"/>
         <source>&lt;b&gt;Services offered:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="342"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="354"/>
         <source>services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="362"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="374"/>
         <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="372"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="384"/>
         <source>policy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="392"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="404"/>
         <source>&lt;b&gt;URL:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="402"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="414"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="409"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="421"/>
         <source>&lt;b&gt;Description:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="420"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="432"/>
         <source>Provider setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="423"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="435"/>
         <source>Gathering configuration options for this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="445"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="457"/>
         <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/gui/ui/wizard.ui" line="468"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="480"/>
         <source>Setting up provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="518"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="530"/>
         <source>Getting info from the Certificate Authority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="525"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="537"/>
         <source>Do we trust this Certificate Authority?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="532"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="544"/>
         <source>Establishing a trust relationship with this provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="591"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="603"/>
         <source>Register new user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="594"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="606"/>
         <source>Register a new user with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="609"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="621"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="628"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="640"/>
         <source>&lt;b&gt;Re-enter password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="638"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="650"/>
         <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="671"/>
-        <source>&lt;b&gt;User:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="684"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="696"/>
         <source>Remember my username and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="708"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="720"/>
         <source>Service selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="711"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="723"/>
         <source>Please select the services you would like to have</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="733"/>
-        <source>Congratulations!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="736"/>
-        <source>You have successfully configured the LEAP Client.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="86"/>
-        <source>Encrypted Internet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="88"/>
-        <source>Encrypted Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="92"/>
-        <source>(will need admin password to start)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="155"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="141"/>
         <source>&amp;Next &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="157"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="143"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="214"/>
-        <source>Passwords don&apos;t match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="217"/>
-        <source>Password too short</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="220"/>
-        <source>Password too easy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="223"/>
-        <source>Password equal to username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/gui/wizard.py" line="252"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="204"/>
         <source>Starting registration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="281"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="235"/>
         <source>User %s successfully registered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="301"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="255"/>
         <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="407"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="361"/>
         <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/gui/wizard.py" line="425"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="379"/>
         <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/gui/wizard.py" line="453"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="407"/>
         <source>Unable to load provider configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="459"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="413"/>
         <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/gui/wizard.py" line="525"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="479"/>
         <source>Services by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="544"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="499"/>
         <source>Something went wrong while trying to load service %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="561"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="516"/>
         <source>Gathering configuration options for %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="570"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="525"/>
         <source>Description of services offered by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="591"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="546"/>
         <source>Register a new user with %s</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>__impl</name>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="259"/>
-        <source>Unknown user</source>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/>
+        <source>Bitmask first run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="46"/>
+        <source>This is the Bitmask first run wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="186"/>
+        <source>Can we establish a secure connection?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="271"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="683"/>
+        <source>&lt;b&gt;Username:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>__impl</name>
+    <message>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="281"/>
         <source>The server did not send the salt parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="275"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="285"/>
         <source>The server did not send the B parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="307"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="317"/>
         <source>The data sent from the server had errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="329"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="339"/>
         <source>Could not connect to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="348"/>
-        <source>Wrong password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="355"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="365"/>
         <source>Unknown error (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="386"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="396"/>
         <source>Problem getting data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="410"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="422"/>
         <source>Bad data from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="417"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="429"/>
         <source>Auth verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="425"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="437"/>
         <source>Session cookie verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="262"/>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="272"/>
         <source>There was a problem with authentication</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="178"/>
+        <source>Invalid username or password.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>msg</name>
     <message>
-        <location filename="../src/leap/platform_init/initializers.py" line="89"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="91"/>
         <source>Missing up/down scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/platform_init/initializers.py" line="175"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="182"/>
         <source>TAP Driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/platform_init/initializers.py" line="299"/>
-        <source>LEAPClient needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/leap/platform_init/initializers.py" line="182"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="189"/>
         <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/platform_init/initializers.py" line="296"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="308"/>
         <source>TUN Driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/platform_init/initializers.py" line="304"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="316"/>
         <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"/>
+        <source>Problem installing files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="131"/>
+        <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"/>
+        <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>