Merge branch 'release/0.8.x' into develop

4 files changed, 2284 insertions, 814 deletions

diff --git a/data/translations/es.qm b/data/translations/es.qm
index d75644ba..596af5b3 100644
--- a/data/translations/es.qm
+++ b/data/translations/es.qm
diff --git a/data/translations/es.ts b/data/translations/es.ts
index f6102bfa..02f9083a 100644
--- a/data/translations/es.ts
+++ b/data/translations/es.ts
@@ -1,496 +1,1591 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="1.1">
 <context>
-    <name>MainWindow</name>
+    <name>AdvancedKeyManagement</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="14"/>
+        <source>Advanced Key Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="24"/>
+        <source>My key pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="30"/>
+        <source>User:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="40"/>
+        <source>user_name@provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="53"/>
+        <source>Key ID:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="63"/>
+        <source>key ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="76"/>
+        <source>Key fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="86"/>
+        <source>fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="101"/>
+        <source>Export current key pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="121"/>
+        <source>Import custom key pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="139"/>
+        <source>Stored public keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="164"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="169"/>
+        <source>Key ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="119"/>
+        <source>Open keys file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="237"/>
+        <source>Input/Output error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="158"/>
+        <source>There was an error accessing the file.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="169"/>
+        <source>Data mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="172"/>
+        <source>The public and private key should have the same address and fingerprint.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="183"/>
+        <source>Missing key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="186"/>
+        <source>You need to provide the public AND private key in the same file.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="197"/>
+        <source>Address mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="200"/>
+        <source>The identity for the key needs to be the same as your user address.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="144"/>
+        <source>Import Successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="145"/>
+        <source>The key pair was imported successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="207"/>
+        <source>Save keys file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="224"/>
+        <source>Export Successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="226"/>
+        <source>The key pair was exported successfully.
+Please, store your private key in a safe place.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="239"/>
+        <source>There was an error accessing the file.
+Export canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="59"/>
+        <source>The provider that you are using does not support {0}.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="65"/>
+        <source>To use this, you need to enable/start {0}.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="110"/>
+        <source>&lt;span style=&apos;color:#0000FF;&apos;&gt;NOTE&lt;/span&gt;: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/>
+        <source>Are you sure that you want to replace the current key pair with the imported?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>App</name>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="592"/>
-        <source>Encryption is OFF</source>
-        <translation>Cifrado APAGADO</translation>
+        <location filename="../src/leap/bitmask/gui/app.py" line="63"/>
+        <source>Application error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="155"/>
-        <source>Stop</source>
-        <translation>Detener</translation>
+        <location filename="../src/leap/bitmask/gui/app.py" line="65"/>
+        <source>There is a problem contacting the backend, please restart Bitmask.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ComplainDialog</name>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="257"/>
-        <source>Hide</source>
-        <translation>Ocultar</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="417"/>
+        <source>Ok, thanks</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EIPPreferencesWindow</name>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="259"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="48"/>
+        <source>Automatic</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="288"/>
-        <source>About LEAP</source>
-        <translation>Acerca de LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="159"/>
+        <source>Gateway settings for provider &apos;{0}&apos; saved.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="288"/>
-        <source>LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. &lt;a href=&quot;https://leap.se&quot;&gt;More about LEAP&lt;/a&gt;</source>
-        <translation>LEAP es una empresa sin fines de lucro dedicada a proveer comunicaciones seguras a todos sus usuarios. Nuestro objetivo es la adatación de tecnologías de cifrado para que sean fáciles de utilizar, y estén ampliamente disponibles. &lt;a href=&quot;https://leap.se&quot;&gt;Más acerca de LEAP&lt;/a&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="236"/>
+        <source>There was a problem with configuration files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="433"/>
-        <source>Could not load provider configuration</source>
-        <translation>No fue posible cargar la configuración del proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="125"/>
+        <source> (uninitialized)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="459"/>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="251"/>
+        <source>This is an uninitialized provider, please log in first.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EIPStatus</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="34"/>
+        <source>Turn On</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="79"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="95"/>
+        <source>Traffic is being routed in the clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="213"/>
+        <source>0.0 KB/s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="245"/>
+        <source>Turn Off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="259"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EIPStatusWidget</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="429"/>
+        <source>Turn ON</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="569"/>
+        <source>Authenticating...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="578"/>
+        <source>Retrieving configuration...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="580"/>
+        <source>Waiting to start...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="582"/>
+        <source>Assigning IP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="584"/>
+        <source>Reconnecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="592"/>
+        <source>Unable to start VPN, it&apos;s already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="320"/>
+        <source>disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="614"/>
+        <source>{0}: OFF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="317"/>
+        <source>You must login to use {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="619"/>
+        <source>{0}: Starting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="622"/>
+        <source>{0}: ON</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="576"/>
+        <source>Encrypted Internet is starting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="415"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="478"/>
+        <source>Traffic is being routed in the clear.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="479"/>
+        <source>Network is unreachable.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="481"/>
+        <source>Error connecting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="497"/>
+        <source>Error connecting.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="500"/>
+        <source>Bitmask is blocking unencrypted traffic.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="644"/>
+        <source>Routing traffic through: &lt;b&gt;{0}&lt;/b&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="690"/>
+        <source>Could not load {0} configuration.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="699"/>
+        <source>Another openvpn instance is already running, and could not be stopped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="709"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="717"/>
+        <source>We could not find openvpn binary.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="754"/>
+        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="764"/>
+        <source>{0} cannot be started because the tuntap extension is not installed properly in your system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="784"/>
+        <source>Network is unreachable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="315"/>
+        <source>&lt;font color=red&gt;Disabled: missing helper files&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="731"/>
+        <source>VPN Launcher error. See the logs for more info.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="734"/>
+        <source>Encrypted Internet failed to start</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>Form</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="27"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="50"/>
+        <source>Logout</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoggerWindow</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="14"/>
+        <source>Logs</source>
+        <translation>Logs</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="49"/>
+        <source>Debug</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="69"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="89"/>
+        <source>Warning</source>
+        <translation>Warning</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="109"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="129"/>
+        <source>Critical</source>
+        <translation>Critical</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="149"/>
+        <source>Save to file</source>
+        <translation>Guardar como</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="164"/>
+        <source>Save As</source>
+        <translation>Guardar como</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="24"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/loggerwindow.ui" line="34"/>
+        <source>Case Insensitive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="195"/>
+        <source>Send to Pastebin.com</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="192"/>
+        <source>Sending to pastebin...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="207"/>
+        <source>Your pastebin link &lt;a href=&apos;{0}&apos;&gt;{0}&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="212"/>
+        <source>Pastebin OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="227"/>
+        <source>Sending logs to Pastebin failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="233"/>
+        <source>Pastebin Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="232"/>
+        <source>Maximum posts per day reached</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoginWidget</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="90"/>
+        <source>Remember username and password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="112"/>
+        <source>&lt;b&gt;Username:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="125"/>
+        <source>&lt;b&gt;Password:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="208"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="203"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="214"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="314"/>
+        <source>Logout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/login.py" line="240"/>
         <source>Please select a valid provider</source>
-        <translation>Por favor, selectione un proveedor válido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="463"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="245"/>
         <source>Please provide a valid username</source>
-        <translation>Por favor, provea un nombre de usuario válido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="467"/>
-        <source>Please provide a valid Password</source>
-        <translation>Por favor, provea una contraseña válida</translation>
+        <location filename="../src/leap/bitmask/gui/login.py" line="250"/>
+        <source>Please provide a valid password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="470"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="253"/>
         <source>Logging in...</source>
-        <translation>Ingresando...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="549"/>
-        <source>Stop EIP</source>
-        <translation>Detener EIP</translation>
+        <location filename="../src/leap/bitmask/gui/login.py" line="307"/>
+        <source>Logging out...</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>MailStatusWidget</name>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="558"/>
-        <source>EIP has stopped</source>
-        <translation>EIP se ha detenido</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="560"/>
-        <source>Start EIP</source>
-        <translation>Comenzar EIP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="47"/>
+        <source>You must login to use encrypted email.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="573"/>
-        <source>Checking configuration, please wait...</source>
-        <translation>Corroborando la configuración, por favor espere...</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="79"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="581"/>
-        <source>%s does not support EIP</source>
-        <translation>%s no soporta EIP</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="196"/>
+        <source>There was an unexpected problem with Soledad.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="596"/>
-        <source>Encryption is ON</source>
-        <translation>Cifrado ENCENDIDO</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="432"/>
+        <source>OFF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="614"/>
-        <source>VPN: Authenticating...</source>
-        <translation>VPN: Autorizando...</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="224"/>
+        <source>Mail is OFF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="616"/>
-        <source>VPN: Retrieving configuration...</source>
-        <translation>VPN: Obteniendo configuración...</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="233"/>
+        <source>Mail is starting</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="618"/>
-        <source>VPN: Connected!</source>
-        <translation>VPN: Conectado!</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="455"/>
+        <source>ON</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="672"/>
-        <source>Signing out...</source>
-        <translation>Saliendo...</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="237"/>
+        <source>Mail is ON</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="14"/>
-        <source>LEAP</source>
-        <translation>LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="240"/>
+        <source>Mail is disabled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="80"/>
-        <source>Remember</source>
-        <translation>Recordar</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="441"/>
+        <source>Starting...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="103"/>
-        <source>Login</source>
-        <translation>Acceder</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="270"/>
+        <source>Soledad has started...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="123"/>
-        <source>&lt;b&gt;Provider:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Proveedor:&lt;/b&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="272"/>
+        <source>Soledad is starting, please wait...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="133"/>
-        <source>&lt;b&gt;Password:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Contraseña:&lt;/b&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="312"/>
+        <source>Found key! Starting mail...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="153"/>
-        <source>&lt;b&gt;User:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Usuario:&lt;/b&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="317"/>
+        <source>Finished generating key!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="219"/>
-        <source>0.0 Kb</source>
-        <translation>0.0 Kb</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="319"/>
+        <source>Starting mail...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="272"/>
-        <source>Disconnected</source>
-        <translation>Desconectado</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="352"/>
+        <source>SMTP failed to start, check the logs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="332"/>
-        <source>&amp;Session</source>
-        <translation>&amp;Sesión</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="409"/>
+        <source>About to start, please wait...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="340"/>
-        <source>Help</source>
-        <translation>Ayuda</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="416"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="348"/>
-        <source>S&amp;ettings</source>
-        <translation>C&amp;onfiguración</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="166"/>
+        <source>{0}: OFF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="359"/>
-        <source>&amp;Sign out</source>
-        <translation>&amp;Desconectarse</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="463"/>
+        <source>You must be logged in to use {0}.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="364"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Salir</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="315"/>
+        <source>Generating new key, this may take a few minutes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="392"/>
+        <source>{0} Unread Emails in your Inbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="396"/>
+        <source>1 Unread Email in your Inbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="448"/>
+        <source>Disconnecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="474"/>
+        <source>Invalid auth token, try logging in again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/>
+        <source>Initial sync in progress, please wait...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="237"/>
+        <source>There are new updates available, please restart.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="279"/>
+        <source>More...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="889"/>
+        <source>Help</source>
+        <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="369"/>
-        <source>About &amp;LEAP</source>
-        <translation>Acerca de &amp;LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="345"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="374"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="379"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
         <source>&amp;Wizard</source>
         <translation>&amp;Asistente</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/mainwindow.py" line="620"/>
-        <source>VPN: Waiting to start...</source>
-        <translation>VPN: Esperando para comenzar...</translation>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="744"/>
+        <source> The following components will be updated:
+%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="747"/>
+        <source>Updates available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="236"/>
+        <source>Show Main Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1650"/>
+        <source>Starting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/>
+        <source>Not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1678"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="32"/>
+        <source>Bitmask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/mainwindow.ui" line="176"/>
-        <source>Automatically login</source>
-        <translation>Ingresar automáticamente</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="350"/>
+        <source>About &amp;Bitmask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="230"/>
+        <source>Mail is OFF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="735"/>
+        <source>The Bitmask app is ready to update, please restart the application.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1007"/>
+        <source>About Bitmask - %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1163"/>
+        <source>Unable to login: Problem with provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/>
+        <source>Log in cancelled by the user.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1696"/>
+        <source>There was a problem with the provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1751"/>
+        <source>Something went wrong with the logout.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/>
+        <source>Unable to connect: Problem with provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="314"/>
+        <source>&amp;Bitmask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
+        <source>Show &amp;Log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
+        <source>Create a new account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="223"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="378"/>
+        <source>Advanced Key Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="897"/>
+        <source>OFF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1021"/>
+        <source>Version: &lt;b&gt;%s&lt;/b&gt; (%s)&lt;br&gt;&lt;br&gt;%sBitmask 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"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1068"/>
+        <source>Bitmask Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1080"/>
+        <source>The current client version is not supported by this provider.&lt;br&gt;Please update to latest version.&lt;br&gt;&lt;br&gt;You can get the latest version from &lt;a href=&apos;{0}&apos;&gt;{1}&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1081"/>
+        <source>Update Needed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
+        <source>This provider is not compatible with the client.&lt;br&gt;&lt;br&gt;Error: API version incompatible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
+        <source>Incompatible Provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="307"/>
+        <source>Application error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="309"/>
+        <source>You are trying to do an operation that requires logging in first.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="367"/>
+        <source>Unknown error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="371"/>
+        <source>There was a server problem with authentication.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="375"/>
+        <source>Could not establish a connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="379"/>
+        <source>Invalid username or password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="916"/>
+        <source>Hello!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="917"/>
+        <source>Bitmask has started in the tray.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1376"/>
+        <source>Succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1604"/>
+        <source>The server at {0} can&apos;t be found, because the DNS lookup failed. DNS is the network service that translates a website&apos;s name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1606"/>
+        <source>Connection Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1863"/>
+        <source>Quitting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1864"/>
+        <source>Bitmask is quitting, please wait.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1035"/>
+        <source>bitmask.net/help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1043"/>
+        <source>Email quick reference</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1047"/>
+        <source>For Thunderbird, you can use the Bitmask extension. Search for &quot;Bitmask&quot; in the add-on manager or download it from &lt;a href=&apos;{0}&apos;&gt;addons.mozilla.org&lt;/a&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
+        <source>Alternately, you can manually configure your mail client to use Bitmask Email with these options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
+        <source>IMAP: localhost, port {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1052"/>
+        <source>SMTP: localhost, port {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1054"/>
+        <source>Username: your full email address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1056"/>
+        <source>Password: any non-empty text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1065"/>
+        <source>&lt;p&gt;&lt;strong&gt;{0}&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;&lt;p&gt;{2}&lt;ul&gt;&lt;li&gt;&amp;nbsp;{3}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{4}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{5}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{6}&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
+        <source>Stop services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
+        <source>Do you want to stop all services?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1234"/>
+        <source>In order to change the provider, the running services needs to be stopped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1673"/>
+        <source>Disabled: missing helper files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="340"/>
+        <source>Pr&amp;eferences...</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Wizard</name>
+    <name>PasswordChange</name>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="152"/>
-        <source>Passwords don&apos;t match</source>
-        <translation>Las contraseñas no son iguales</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="20"/>
+        <source>Change Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="155"/>
-        <source>Password too short</source>
-        <translation>Contraseña muy corta</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="28"/>
+        <source>Username:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="158"/>
-        <source>Password too easy</source>
-        <translation>Contraseña demsiado simple</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="35"/>
+        <source>New password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="161"/>
-        <source>Password equal to username</source>
-        <translation>Contraseña es igual al usuario</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="52"/>
+        <source>Re-enter new password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="189"/>
-        <source>Starting registration...</source>
-        <translation>Comenzando el registro...</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="62"/>
+        <source>Current password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="195"/>
-        <source>&lt;font color=&apos;green&apos;&gt;&lt;b&gt;User registration OK&lt;/b&gt;&lt;/font&gt;</source>
-        <translation>&lt;font color=&apos;green&apos;&gt;&lt;b&gt;Registro realizado con éxito!&lt;/b&gt;&lt;/font&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="112"/>
+        <source>&lt;flash_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="202"/>
-        <source>Unknown error</source>
-        <translation>Error desconocido</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="150"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/wizard.py" line="303"/>
-        <source>Unable to load provider configuration</source>
-        <translation>No fue posible carga la configuración del proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="160"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordWindow</name>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="14"/>
-        <source>LEAP First run</source>
-        <translation>Primera ejecución de LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="72"/>
+        <source>Please log in to change your password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="31"/>
-        <source>Welcome</source>
-        <translation>Bienvenido</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="78"/>
+        <source>Please wait for data storage to be ready.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="34"/>
-        <source>This is the LEAP Client first run wizard</source>
-        <translation>Este es el asistente de primera ejecución de LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="107"/>
+        <source>Changing password...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="43"/>
-        <source>Log In with my credentials</source>
-        <translation>Acceder con mis credenciales</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="122"/>
+        <source>Password changed successfully.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="50"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;/p&gt;&lt;p&gt;If you ever need to modify these options again, you can find the wizard in the &lt;span style=&quot; font-style:italic;&quot;&gt;&apos;Settings&apos;&lt;/span&gt; menu from the main window.&lt;/p&gt;&lt;p&gt;Do you want to &lt;span style=&quot; font-weight:600;&quot;&gt;sign up&lt;/span&gt; for a new account, or &lt;span style=&quot; font-weight:600;&quot;&gt;log in&lt;/span&gt; with an already existing username?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ahora le guiaremos para configurar lo necesario para que ud. pueda ingresar por primera vez.&lt;/p&gt;&lt;p&gt;Si necesita alguna vez modificar estas opciones, podrá ejecutar este asistente desde el menú &lt;span style=&quot; font-style:italic;&quot;&gt;&apos;Configuración&apos;&lt;/span&gt; desde la ventana principal.&lt;/p&gt;&lt;p&gt;Desea &lt;span style=&quot; font-weight:600;&quot;&gt;crear&lt;/span&gt; una nueva cuenta, o &lt;span style=&quot; font-weight:600;&quot;&gt;acceder&lt;/span&gt; con un usuario existente?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="167"/>
+        <source>Password is empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="63"/>
-        <source>Sign up for a new account</source>
-        <translation>Crear una nueva cuenta</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="222"/>
+        <source>There was a problem changing the password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="100"/>
-        <source>Provider selection</source>
-        <translation>Selección de proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="235"/>
+        <source>You did not enter a correct current password.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Preferences</name>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="103"/>
-        <source>Please enter the domain of the provider you want to user for your connection</source>
-        <translation>Por favor, ingrese el dominio del proveedor que desea utilizar</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="128"/>
-        <source>https://</source>
-        <translation>https://</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="33"/>
+        <source>user@example.org</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="368"/>
-        <source>Checking provider</source>
-        <translation>Corroborando proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="106"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesAccountPage</name>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="147"/>
-        <source>Download provider information</source>
-        <translation>Descargando información del proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="154"/>
-        <source>HTTPS Connection</source>
-        <translation>Conexión HTTPS</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="20"/>
+        <source>Services</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="209"/>
-        <source>Name resolution</source>
-        <translation>Resolución de nombre</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="32"/>
+        <source>&lt;provider_services_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="232"/>
-        <source>Check</source>
-        <translation>Corroborar</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="61"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="253"/>
-        <source>Provider Information</source>
-        <translation>Información de proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="73"/>
+        <source>Change Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="256"/>
-        <source>Services offered by this provider</source>
-        <translation>Servicios ofrecidos por este proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="80"/>
+        <source>&lt;change_password_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="278"/>
-        <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Política de ingreso:&lt;/b&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/preferences_account_page.py" line="62"/>
+        <source>You must be logged in to change your password.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesEmailPage</name>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="285"/>
-        <source>URL</source>
-        <translation>URL</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesVpnPage</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="292"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="20"/>
+        <source>&lt;flash_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="325"/>
-        <source>policy</source>
-        <translation>política</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="30"/>
+        <source>Default VPN Gateway:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="50"/>
+        <source>You must reconnect for changes to take effect.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="47"/>
+        <source>Automatic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="129"/>
+        <source>Error loading configuration file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="332"/>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="142"/>
+        <source>This is an uninitialized provider, please log in first.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesWindow</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="88"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="99"/>
+        <source>VPN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="109"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ProviderBootstrapper</name>
+    <message>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="154"/>
+        <source>Provider certificate could not be verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="161"/>
+        <source>Provider does not support HTTPS</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Providers</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/providers.py" line="57"/>
+        <source>Other...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Wizard</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="55"/>
+        <source>Log In with my credentials</source>
+        <translation>Acceder con mis credenciales</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="75"/>
+        <source>Sign up for a new account</source>
+        <translation>Crear una nueva cuenta</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="367"/>
+        <source>Check</source>
+        <translation>Corroborar</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="342"/>
+        <source>https://</source>
+        <translation>https://</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="153"/>
+        <source>Checking for a valid provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="266"/>
+        <source>Can we reach this provider?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="392"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="424"/>
         <source>Desc</source>
         <translation>Desc</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="356"/>
-        <source>Provider setup</source>
-        <translation>Configuración de proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="434"/>
+        <source>&lt;b&gt;Services offered:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="359"/>
-        <source>Gathering configuration options for this provider</source>
-        <translation>Obteniendo opciones de configuración para este proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="444"/>
+        <source>services</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="406"/>
-        <source>Download CA Certificate</source>
-        <translation>Descargando certificado de autoridad</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="464"/>
+        <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Política de ingreso:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="413"/>
-        <source>Check CA Certificate Fingerprint</source>
-        <translation>Corroborando el fingerprint del certificado</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="474"/>
+        <source>policy</source>
+        <translation>política</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="420"/>
-        <source>Check API Certificate</source>
-        <translation>Corroborando certificado de API</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="494"/>
+        <source>&lt;b&gt;URL:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="486"/>
-        <source>Register new user</source>
-        <translation>Registrar un nuevo usuario</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="504"/>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="489"/>
-        <source>Register a new user with provider</source>
-        <translation>Registrar un nuevo usuario con el proveedor</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="511"/>
+        <source>&lt;b&gt;Description:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="524"/>
-        <source>&lt;b&gt;User:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Usuario:&lt;/b&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="522"/>
+        <source>Provider setup</source>
+        <translation>Configuración de proveedor</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="534"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="570"/>
+        <source>Setting up provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="720"/>
+        <source>Register new user</source>
+        <translation>Registrar un nuevo usuario</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="738"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contraseña:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="553"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="765"/>
         <source>&lt;b&gt;Re-enter password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Re-introduzca contraseña:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="563"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="775"/>
         <source>Register</source>
         <translation>Registrar</translation>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="584"/>
-        <source>EIP Setup</source>
-        <translation>Configuración de EIP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="821"/>
+        <source>Remember my username and password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="845"/>
+        <source>Service selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="132"/>
+        <source>&amp;Next &gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="134"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="325"/>
+        <source>Starting registration...</source>
+        <translation>Comenzando el registro...</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="370"/>
+        <source>User %s successfully registered.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="539"/>
+        <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Non-existent provider&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="558"/>
+        <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="586"/>
+        <source>Unable to load provider configuration</source>
+        <translation>No fue posible carga la configuración del proveedor</translation>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="592"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="698"/>
+        <source>Something went wrong while trying to load service %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="166"/>
+        <source>Can we establish a secure connection?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="808"/>
+        <source>&lt;b&gt;Username:&lt;/b&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="296"/>
+        <source>Configure or select a provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="302"/>
+        <source>Configure new provider:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="332"/>
+        <source>Use existing one:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="397"/>
+        <source>Something has gone wrong. Please try again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="411"/>
+        <source>The requested username is taken, choose another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="677"/>
+        <source>Services by {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="739"/>
+        <source>Register a new user with {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/>
+        <source>Bitmask Provider Setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/>
+        <source>Welcome to Bitmask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/>
+        <source>Choose a provider</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="587"/>
-        <source>Setting up Encrypted Internet</source>
-        <translation>Configurando Internet Cifrado</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/>
+        <source>Getting provider information.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="609"/>
-        <source>Checking EIP</source>
-        <translation>Corroborando EIP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="380"/>
+        <source>About this provider</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="615"/>
-        <source>Download EIP configuration</source>
-        <translation>Descargando configuración de EIP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="547"/>
+        <source>Bitmask is attempting to establish a secure connection with this provider for the first time.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="622"/>
-        <source>Download client certificate</source>
-        <translation>Descargando certificado de cliente</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="638"/>
+        <source>Fetching provider credentials.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="691"/>
-        <source>Congratulations!</source>
-        <translation>Felicitaciones!</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="645"/>
+        <source>Do we trust these credentials?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/gui/ui/wizard.ui" line="694"/>
-        <source>You have successfully configured the LEAP client.</source>
-        <translation>Ha configurado correctamente el cliente de LEAP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="652"/>
+        <source>Connecting to provider.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>__impl</name>
+    <name>msg</name>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="161"/>
-        <source>Unknown user</source>
-        <translation>Usuario desconocido</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="222"/>
+        <source>TAP Driver</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="167"/>
-        <source>The server did not send the salt parameter</source>
-        <translation>El servidor no ha envíado el parámetro salt</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="229"/>
+        <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"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="171"/>
-        <source>The server did not send the B parameter</source>
-        <translation>El servidor no ha mandado el parámetro B</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/>
+        <source>TUN Driver</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="199"/>
-        <source>The data sent from the server had errors</source>
-        <translation>Los datos enviados por el servidor contanían errores</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="355"/>
+        <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"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="220"/>
-        <source>Could not connect to the server</source>
-        <translation>No se pudo conectar al servidor</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="156"/>
+        <source>Problem installing files</source>
+        <translation>Hubo un problema instalando los archivos</translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="228"/>
-        <source>Wrong password</source>
-        <translation>Password incorrecto</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="157"/>
+        <source>Some of the files could not be copied.</source>
+        <translation>Algunos de los archivos no pudieron ser copiados</translation>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="234"/>
-        <source>Unknown error (%s)</source>
-        <translation>Error desconocido (%s)</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="350"/>
+        <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="243"/>
-        <source>Problem getting data from server</source>
-        <translation>Problemas obteniendo datos desde el servidor</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="102"/>
+        <source>Missing helper files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="264"/>
-        <source>Bad data from server</source>
-        <translation>Datos incorrectos desde el servidor</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="430"/>
+        <source>Missing Bitmask helpers</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>msgstr</name>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="270"/>
-        <source>Auth verification failed</source>
-        <translation>Verificación de autenticación falló</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/>
+        <source>Some essential helper files are missing in your system.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/crypto/srpauth.py" line="400"/>
-        <source>Succeeded</source>
-        <translation>Exitoso!</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="402"/>
+        <source>Reinstall your debian packages, or make sure you place them by hand.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>self._eip_status</name>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="202"/>
+        <source>{0} is restarting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="313"/>
+        <source>{0} could not be launched because you did not authenticate properly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="327"/>
+        <source>{0} finished in an unexpected manner!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/data/translations/vi.qm b/data/translations/vi.qm
index 819654d6..5ccbdc7c 100644
--- a/data/translations/vi.qm
+++ b/data/translations/vi.qm
diff --git a/data/translations/vi.ts b/data/translations/vi.ts
index 4d6d343b..6da859e1 100644
--- a/data/translations/vi.ts
+++ b/data/translations/vi.ts
@@ -1,84 +1,221 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="1.1">
 <context>
-    <name>EIPPreferences</name>
+    <name>AdvancedKeyManagement</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="14"/>
-        <source>EIP Preferences</source>
-        <translation>Tùy biến EIP</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="14"/>
+        <source>Advanced Key Management</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="27"/>
-        <source>Select gateway for provider</source>
-        <translation>Chọn gateway cho nhà cung cấp</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="24"/>
+        <source>My key pair</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="36"/>
-        <source>&amp;Select provider:</source>
-        <translation>&amp;Chọn nhà cung cấp:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="30"/>
+        <source>User:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="140"/>
-        <source>&lt;Select provider&gt;</source>
-        <translation>&lt;Chọn nhà cung cấp&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="40"/>
+        <source>user_name@provider</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="55"/>
-        <source>Save this provider settings</source>
-        <translation>Chọn thiết lập cho nhà cung cấp này</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="53"/>
+        <source>Key ID:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="62"/>
-        <source>&lt; Providers Gateway Status &gt;</source>
-        <translation>&lt;Trạng thái gateway của nhà cung cấp&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="63"/>
+        <source>key ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="72"/>
-        <source>Select gateway:</source>
-        <translation>Chọn gateway:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="76"/>
+        <source>Key fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="80"/>
-        <source>Automatic</source>
-        <translation>Tự động</translation>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="86"/>
+        <source>fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="101"/>
+        <source>Export current key pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="121"/>
+        <source>Import custom key pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="139"/>
+        <source>Stored public keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="164"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/advanced_key_management.ui" line="169"/>
+        <source>Key ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="119"/>
+        <source>Open keys file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="237"/>
+        <source>Input/Output error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="158"/>
+        <source>There was an error accessing the file.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="169"/>
+        <source>Data mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="172"/>
+        <source>The public and private key should have the same address and fingerprint.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="183"/>
+        <source>Missing key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="186"/>
+        <source>You need to provide the public AND private key in the same file.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="197"/>
+        <source>Address mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="200"/>
+        <source>The identity for the key needs to be the same as your user address.
+Import canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="144"/>
+        <source>Import Successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="145"/>
+        <source>The key pair was imported successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="207"/>
+        <source>Save keys file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="224"/>
+        <source>Export Successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="226"/>
+        <source>The key pair was exported successfully.
+Please, store your private key in a safe place.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="239"/>
+        <source>There was an error accessing the file.
+Export canceled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="59"/>
+        <source>The provider that you are using does not support {0}.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="65"/>
+        <source>To use this, you need to enable/start {0}.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="110"/>
+        <source>&lt;span style=&apos;color:#0000FF;&apos;&gt;NOTE&lt;/span&gt;: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="91"/>
-        <source>Automatic EIP start</source>
-        <translation>Tự động khởi động EIP</translation>
+        <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/>
+        <source>Are you sure that you want to replace the current key pair with the imported?</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>App</name>
     <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>&lt;font color=&apos;green&apos;&gt;&lt;b&gt;Đã lưu lại phần tự động khởi động EIP!&lt;/b&gt;&lt;/font&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/app.py" line="63"/>
+        <source>Application error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="119"/>
-        <source>Save auto start setting</source>
-        <translation>Lưu lại thiết lập về tự động khởi động</translation>
+        <location filename="../src/leap/bitmask/gui/app.py" line="65"/>
+        <source>There is a problem contacting the backend, please restart Bitmask.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ComplainDialog</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="129"/>
-        <source>Enable Automatic start of EIP</source>
-        <translation>Tự động cho phép khởi động của EIP</translation>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="417"/>
+        <source>Ok, thanks</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EIPPreferencesWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="47"/>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="48"/>
         <source>Automatic</source>
         <translation>Tự động</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="156"/>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="159"/>
         <source>Gateway settings for provider &apos;{0}&apos; saved.</source>
         <translation>Thiết lập gateway dành cho nhà cung cấp &apos;{0}&apos; đã được lưu lại.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="198"/>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="236"/>
         <source>There was a problem with configuration files.</source>
         <translation>Xảy ra lỗi với tập tin cấu hình.</translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="125"/>
+        <source> (uninitialized)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="251"/>
+        <source>This is an uninitialized provider, please log in first.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EIPStatus</name>
@@ -88,107 +225,210 @@
         <translation>Đơn mẫu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="31"/>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="34"/>
         <source>Turn On</source>
         <translation>Mở lên</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="63"/>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="86"/>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="95"/>
         <source>Traffic is being routed in the clear</source>
         <translation>Lưu lượng mạng đang được điều hướng rỗng</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="253"/>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="213"/>
         <source>0.0 KB/s</source>
         <translation>0.0 KB/giây</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>Tất cả các dịch vụ hiện đang bị TẮT</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="197"/>
-        <source>Encrypted Internet: {0}</source>
-        <translation>Internet đã được mã hóa: {0}</translation>
-    </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="249"/>
-        <source>You must login to use Encrypted Internet</source>
-        <translation>Bạn phải đăng nhập để sử dụng phần mã hóa internet</translation>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="245"/>
+        <source>Turn Off</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="300"/>
-        <source>Turn OFF</source>
-        <translation>Bật TẮT</translation>
+        <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="259"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EIPStatusWidget</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="314"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="429"/>
         <source>Turn ON</source>
         <translation>Bật LÊN</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="321"/>
-        <source>Traffic is being routed in the clear</source>
-        <translation>Lưu lượng mạng đang được điều hướng rỗng</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="378"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="569"/>
         <source>Authenticating...</source>
         <translation>Đang xác nhận...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="380"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="578"/>
         <source>Retrieving configuration...</source>
         <translation>Đang đọc lại cấu hình...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="382"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="580"/>
         <source>Waiting to start...</source>
         <translation>Đang đợi để bắt đầu...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="384"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="582"/>
         <source>Assigning IP</source>
         <translation>Đang gán IP</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="386"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="584"/>
         <source>Reconnecting...</source>
         <translation>Đang thực hiện việc kết nối lại...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="395"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="592"/>
         <source>Unable to start VPN, it&apos;s already running.</source>
         <translation>Không thể khởi động VPN, phần VPN này đã được chạy.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="418"/>
-        <source>Encrypted Internet: OFF</source>
-        <translation>Chức năng mã hóa internet: TẮT</translation>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="320"/>
+        <source>disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="614"/>
+        <source>{0}: OFF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="317"/>
+        <source>You must login to use {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="619"/>
+        <source>{0}: Starting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="622"/>
+        <source>{0}: ON</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="576"/>
+        <source>Encrypted Internet is starting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="415"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="423"/>
-        <source>Encrypted Internet: Starting...</source>
-        <translation>Mã hóa internet: Đang bắt đầu...</translation>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="478"/>
+        <source>Traffic is being routed in the clear.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="425"/>
-        <source>Encrypted Internet: ON</source>
-        <translation>Mã hóa internet: MỞ</translation>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="479"/>
+        <source>Network is unreachable.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="481"/>
+        <source>Error connecting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="497"/>
+        <source>Error connecting.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="500"/>
+        <source>Bitmask is blocking unencrypted traffic.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="644"/>
+        <source>Routing traffic through: &lt;b&gt;{0}&lt;/b&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="690"/>
+        <source>Could not load {0} configuration.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="699"/>
+        <source>Another openvpn instance is already running, and could not be stopped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="709"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="717"/>
+        <source>We could not find openvpn binary.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="754"/>
+        <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="764"/>
+        <source>{0} cannot be started because the tuntap extension is not installed properly in your system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="784"/>
+        <source>Network is unreachable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="435"/>
-        <source>Route traffic through: {0}</source>
-        <translation>Điều hướng lưu lượng mạng qua: {0}</translation>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="315"/>
+        <source>&lt;font color=red&gt;Disabled: missing helper files&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="731"/>
+        <source>VPN Launcher error. See the logs for more info.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="734"/>
+        <source>Encrypted Internet failed to start</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>Form</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="27"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="50"/>
+        <source>Logout</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -229,7 +469,7 @@
         <translation>Lưu vào tập tin</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="148"/>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="164"/>
         <source>Save As</source>
         <translation>Lưu dưới dạng</translation>
     </message>
@@ -243,6 +483,41 @@
         <source>Case Insensitive</source>
         <translation>Phân biệt chữ hoa chữ thường</translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="195"/>
+        <source>Send to Pastebin.com</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="192"/>
+        <source>Sending to pastebin...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="207"/>
+        <source>Your pastebin link &lt;a href=&apos;{0}&apos;&gt;{0}&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="212"/>
+        <source>Pastebin OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="227"/>
+        <source>Sending logs to Pastebin failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="233"/>
+        <source>Pastebin Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="232"/>
+        <source>Maximum posts per day reached</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LoginWidget</name>
@@ -252,74 +527,64 @@
         <translation>Biểu mẫu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="153"/>
-        <source>&lt;b&gt;Provider:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Nhà cung cấp:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="172"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="90"/>
         <source>Remember username and password</source>
         <translation>Ghi nhớ tên người dùng và mật khẩu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="197"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="112"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Tên người dùng:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="210"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="125"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mật khẩu:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="234"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="208"/>
         <source>Log In</source>
         <translation>Đăng nhập</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="121"/>
-        <source>Other...</source>
-        <translation>Các phần khác...</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="229"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="203"/>
         <source>Cancel</source>
         <translation>Hủy bỏ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="63"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="214"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="365"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="314"/>
         <source>Logout</source>
         <translation>Đăng xuất</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="283"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="240"/>
         <source>Please select a valid provider</source>
         <translation>Vui lòng chọn một nhà cung cấp hợp lệ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="288"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="245"/>
         <source>Please provide a valid username</source>
         <translation>Vui lòng cung cấp một tên người dùng hợp lệ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="293"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="250"/>
         <source>Please provide a valid password</source>
         <translation>Xin vui lòng cung cấp một mật khẩu hợp lệ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="296"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="253"/>
         <source>Logging in...</source>
         <translation>Đang đăng nhập...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="358"/>
-        <source>Loggin out...</source>
-        <translation>Đang Đăng xuất...</translation>
+        <location filename="../src/leap/bitmask/gui/login.py" line="307"/>
+        <source>Logging out...</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -330,364 +595,525 @@
         <translation>Biểu mẫu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="31"/>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="47"/>
         <source>You must login to use encrypted email.</source>
         <translation>Bạn phải đăng nhập để sử dụng email được mã hóa.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="44"/>
+        <location filename="../src/leap/bitmask/gui/ui/mail_status.ui" line="79"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="171"/>
-        <source>All services are OFF</source>
-        <translation>Tất cả các dịch vụ hiện đang bị TẮT</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="204"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="196"/>
         <source>There was an unexpected problem with Soledad.</source>
         <translation>Xảy ra lỗi với phần Soledad.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="418"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="432"/>
         <source>OFF</source>
         <translation>TẮT</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="221"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="224"/>
         <source>Mail is OFF</source>
         <translation>Tắt tính năng mail</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="224"/>
-        <source>You must be logged in to use encrypted email.</source>
-        <translation>Bạn phải đăng nhập để sử dụng dịch vụ email mã hóa.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="228"/>
-        <source>Starting..</source>
-        <translation>Đang khởi chạy...</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="229"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="233"/>
         <source>Mail is starting</source>
         <translation>Mail đang được bắt đầu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="383"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="455"/>
         <source>ON</source>
         <translation>MỞ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="233"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="237"/>
         <source>Mail is ON</source>
         <translation>Mail hiện đang MỞ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="236"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="240"/>
         <source>Mail is disabled</source>
         <translation>Mail hiện đang bị vô hiệu hóa</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="298"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="441"/>
         <source>Starting...</source>
         <translation>Đang khởi chạy...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="265"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="270"/>
         <source>Soledad has started...</source>
         <translation>Soledad đã được khởi chạy...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="267"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="272"/>
         <source>Soledad is starting, please wait...</source>
         <translation>Soledad hiện đang khởi động, xin vui lòng chờ trong giây lát..</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="304"/>
-        <source>Looking for key for this user</source>
-        <translation>Đang tìm kiếm phần khóa dữ liệu đối với người dùng này</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="312"/>
         <source>Found key! Starting mail...</source>
         <translation>Đã tìm thấy khóa! Đang khởi động mail...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="310"/>
-        <source>Generating new key, please wait...</source>
-        <translation>Đang tạo các khóa mới, xin vui lòng đợi trong giây lát...</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="312"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="317"/>
         <source>Finished generating key!</source>
         <translation>Đã hoàn tất thao tác tạo các khóa dữ liệu!</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="314"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="319"/>
         <source>Starting mail...</source>
         <translation>Đang khởi động mail...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="344"/>
-        <source>SMTP has started...</source>
-        <translation>Dịch vụ SMTP đã được bắt đầu...</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="350"/>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="352"/>
         <source>SMTP failed to start, check the logs.</source>
         <translation>Không thể khởi động dịch vụ SMTP, kiểm tra nhật trình.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="387"/>
-        <source>Failed</source>
-        <translation>Gặp lỗi</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="409"/>
+        <source>About to start, please wait...</source>
+        <translation>Chuẩn bị khởi chạy, xin vui lòng đợi trong giây lát...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="381"/>
-        <source>IMAP has started...</source>
-        <translation>Dịch vụ IMAP đã được bắt đầu...</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="416"/>
+        <source>Disabled</source>
+        <translation>Vô Hiệu Hóa</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="387"/>
-        <source>IMAP failed to start, check the logs.</source>
-        <translation>Không thể khởi động dịch vụ IMAP, kiểm tra phần nhật trình.</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="166"/>
+        <source>{0}: OFF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="391"/>
-        <source>%s Unread Emails</source>
-        <translation>%s email chưa đọc</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="463"/>
+        <source>You must be logged in to use {0}.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="405"/>
-        <source>About to start, please wait...</source>
-        <translation>Chuẩn bị khởi chạy, xin vui lòng đợi trong giây lát...</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="315"/>
+        <source>Generating new key, this may take a few minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mail_status.py" line="412"/>
-        <source>Disabled</source>
-        <translation>Vô Hiệu Hóa</translation>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="392"/>
+        <source>{0} Unread Emails in your Inbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="396"/>
+        <source>1 Unread Email in your Inbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="448"/>
+        <source>Disconnecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="474"/>
+        <source>Invalid auth token, try logging in again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/>
+        <source>Initial sync in progress, please wait...</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="257"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="237"/>
         <source>There are new updates available, please restart.</source>
         <translation>Hiện có một phiên bản mới vừa được phát hành, xin vui lòng khởi động lại.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="299"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="279"/>
         <source>More...</source>
         <translation>Thêm...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="626"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="889"/>
         <source>Help</source>
         <translation>Trợ giúp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="345"/>
         <source>&amp;Quit</source>
         <translation>&amp;Thoát</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
         <source>&amp;Help</source>
         <translation>&amp;Trợ giúp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="375"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
         <source>&amp;Wizard</source>
         <translation>&amp;Phần hướng dẫn</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="672"/>
-        <source>Hide Main Window</source>
-        <translation>Ẩn cửa sổ chính</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="527"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="744"/>
         <source> The following components will be updated:
 %s</source>
         <translation>Các thành phần sau đây sẽ được cập nhật:
 %s</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="530"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="747"/>
         <source>Updates available</source>
         <translation>Đã có phiên bản mới</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="671"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="236"/>
         <source>Show Main Window</source>
         <translation>Hiện cửa sổ chính</translation>
     </message>
     <message>
-        <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>Chúng tôi không tìm thấy phần trợ lý xác nhận nào trong hệ thống của bạn.&lt;br/&gt;Hãy chắc chắn rằng bạn có&lt;b&gt;phần polkit-gnome-authentication-agent-1&lt;/b&gt; đang được chạy và hãy thử lại lần nữa.</translation>
-    </message>
-    <message>
-        <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>Chúng tôi không tìm thấy &lt;b&gt;pkexec&lt;/b&gt; trong hệ thống của bạn.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1331"/>
-        <source>We could not find openvpn binary.</source>
-        <translation>Không tìm thấy phần nhị phân của openconnect.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1493"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1650"/>
         <source>Starting...</source>
         <translation>Đang khởi chạy...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1501"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/>
         <source>Not supported</source>
         <translation>Không được hỗ trợ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1504"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1678"/>
         <source>Disabled</source>
         <translation>Vô Hiệu Hóa</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1537"/>
-        <source>Could not load Encrypted Internet Configuration.</source>
-        <translation>Không thể nạp mã hóa cấu hình của Internet.</translation>
-    </message>
-    <message>
-        <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>Không thể chạy được phần mã hóa Internet vì bạn đã không được xác thực đúng cách.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1467"/>
-        <source>Encrypted Internet finished in an unexpected manner!</source>
-        <translation>Tiến trình mã hóa Internet đã được hoàn tất một cách bất ngờ!</translation>
-    </message>
-    <message>
         <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="32"/>
         <source>Bitmask</source>
         <translation>Bitmask</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="350"/>
         <source>About &amp;Bitmask</source>
         <translation>Dịch bởi Vietnamesel10n</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="283"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="230"/>
         <source>Mail is OFF</source>
         <translation>Tắt tính năng mail</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="518"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="735"/>
         <source>The Bitmask app is ready to update, please restart the application.</source>
         <translation>Bitmask hiện đã sẵn sàng để cài đặt bản cập nhật mới, vui lòng khởi động khởi động lại ứng dụng.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="734"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1007"/>
         <source>About Bitmask - %s</source>
         <translation>Thông tin về Bitmask - %s</translation>
     </message>
     <message>
-        <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>Phiên bản: &lt;b&gt;%s&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bitmask là một chương trình trên nền desktop dựa trên nền tảng LEAP, hỗ trợ proxy trên internet được mã hóa, bảo mật email, và bảo mật các nội dung chat (tính năng này hiện đang được phát triển và sẽ được phát hành trong phiên bản sắp tới).&lt;br&gt;&lt;br&gt;LEAP là một nền tảng phi lợi nhuận nhằm cung cấp cho người dùng tính năng bảo mật khi giao tiếp trên các hệ thống internet. Mục tiêu của chúng tôi là đưa các kỹ thuật mã hóa đến với người dùng theo cách dễ sử dụng nhất. &lt;br&gt;&lt;br&gt;&lt;a href=&apos;https://leap.se&apos;&gt;Thông tin thêm về LEAP&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="836"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1163"/>
         <source>Unable to login: Problem with provider</source>
         <translation>Không thể đăng nhập: Xảy ra lỗi với nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="874"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/>
         <source>Log in cancelled by the user.</source>
         <translation>Người dùng đã hủy bỏ thao tác đăng nhập.</translation>
     </message>
     <message>
-        <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>Không thể khởi động phần mã hóa dành cho Internet vì phần tiện ích tuntap vẫn chưa được cài đặt trên hệ thống của bạn.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1337"/>
-        <source>Another openvpn instance is already running, and could not be stopped.</source>
-        <translation>Một tiến trình khác thuộc openvpn hiện đang được thực thi, và không thể bị dừng lại</translation>
-    </message>
-    <message>
-        <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>Một tiếng trình khác thuộc openvpn hiện đang được thực thi và không thể được dừng lại vì đây là tiến trình được sử dụng bởi Bitmask. Xin vui lòng thử thao tác dừng lại và thử lại</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1519"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1696"/>
         <source>There was a problem with the provider</source>
         <translation>Xảy ra lỗi với nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1618"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1751"/>
         <source>Something went wrong with the logout.</source>
         <translation>Xảy ra lỗi với thao tác đăng xuất.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1639"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/>
         <source>Unable to connect: Problem with provider</source>
         <translation>Không thể kết nối: Xảy ra lỗi với nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="113"/>
-        <source>Encrypted Internet</source>
-        <translation>Internet đã được mã hóa</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="194"/>
-        <source>Login</source>
-        <translation>Đăng nhập</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="334"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="314"/>
         <source>&amp;Bitmask</source>
         <translation>&amp;Bitmask</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
-        <source>Preferences...</source>
-        <translation>Tùy Biến...</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="380"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
         <source>Show &amp;Log</source>
         <translation>Hiển thị &amp;nhật trình</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="385"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
         <source>Create a new account...</source>
         <translation>Tạo một tài khoản mới...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="272"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="223"/>
         <source>File</source>
         <translation>Tập tin</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="633"/>
-        <source>Encrypted Internet: OFF</source>
-        <translation>Chức năng mã hóa internet: TẮT</translation>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="378"/>
+        <source>Advanced Key Management</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1395"/>
-        <source>Network is unreachable</source>
-        <translation>Không thể truy cập mạng</translation>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="897"/>
+        <source>OFF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1021"/>
+        <source>Version: &lt;b&gt;%s&lt;/b&gt; (%s)&lt;br&gt;&lt;br&gt;%sBitmask 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"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1068"/>
+        <source>Bitmask Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1080"/>
+        <source>The current client version is not supported by this provider.&lt;br&gt;Please update to latest version.&lt;br&gt;&lt;br&gt;You can get the latest version from &lt;a href=&apos;{0}&apos;&gt;{1}&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1081"/>
+        <source>Update Needed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
+        <source>This provider is not compatible with the client.&lt;br&gt;&lt;br&gt;Error: API version incompatible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
+        <source>Incompatible Provider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="307"/>
+        <source>Application error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="309"/>
+        <source>You are trying to do an operation that requires logging in first.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="367"/>
+        <source>Unknown error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="371"/>
+        <source>There was a server problem with authentication.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="375"/>
+        <source>Could not establish a connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="379"/>
+        <source>Invalid username or password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="916"/>
+        <source>Hello!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="917"/>
+        <source>Bitmask has started in the tray.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1376"/>
+        <source>Succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1604"/>
+        <source>The server at {0} can&apos;t be found, because the DNS lookup failed. DNS is the network service that translates a website&apos;s name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1606"/>
+        <source>Connection Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1863"/>
+        <source>Quitting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1864"/>
+        <source>Bitmask is quitting, please wait.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1035"/>
+        <source>bitmask.net/help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1043"/>
+        <source>Email quick reference</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1047"/>
+        <source>For Thunderbird, you can use the Bitmask extension. Search for &quot;Bitmask&quot; in the add-on manager or download it from &lt;a href=&apos;{0}&apos;&gt;addons.mozilla.org&lt;/a&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
+        <source>Alternately, you can manually configure your mail client to use Bitmask Email with these options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
+        <source>IMAP: localhost, port {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1052"/>
+        <source>SMTP: localhost, port {0}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1054"/>
+        <source>Username: your full email address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1056"/>
+        <source>Password: any non-empty text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1065"/>
+        <source>&lt;p&gt;&lt;strong&gt;{0}&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;&lt;p&gt;{2}&lt;ul&gt;&lt;li&gt;&amp;nbsp;{3}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{4}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{5}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{6}&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
+        <source>Stop services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
+        <source>Do you want to stop all services?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1234"/>
+        <source>In order to change the provider, the running services needs to be stopped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1673"/>
+        <source>Disabled: missing helper files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="340"/>
+        <source>Pr&amp;eferences...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordChange</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="20"/>
+        <source>Change Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="28"/>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="35"/>
+        <source>New password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="52"/>
+        <source>Re-enter new password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="62"/>
+        <source>Current password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="112"/>
+        <source>&lt;flash_label&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="150"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="160"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordWindow</name>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="72"/>
+        <source>Please log in to change your password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="78"/>
+        <source>Please wait for data storage to be ready.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="107"/>
+        <source>Changing password...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="122"/>
+        <source>Password changed successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="167"/>
+        <source>Password is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="222"/>
+        <source>There was a problem changing the password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1418"/>
-        <source>EIP has stopped</source>
-        <translation>EIP đã dừng lại</translation>
+        <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="235"/>
+        <source>You did not enter a correct current password.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -698,159 +1124,158 @@
         <translation>Tùy Biến</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="40"/>
-        <source>Password Change</source>
-        <translation>Thay đổi mật khẩu</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="33"/>
+        <source>user@example.org</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="49"/>
-        <source>&amp;Current password:</source>
-        <translation>&amp;Mật khẩu hiện tại:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="106"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesAccountPage</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="66"/>
-        <source>&amp;New password:</source>
-        <translation>&amp;Mật khẩu mới:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="83"/>
-        <source>&amp;Re-enter new password:</source>
-        <translation>&amp;Nhập lại mật khẩu:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="20"/>
+        <source>Services</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="100"/>
-        <source>Change</source>
-        <translation>Thay đổi</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="32"/>
+        <source>&lt;provider_services_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="107"/>
-        <source>&lt;Password change status&gt;</source>
-        <translation>&lt;Trạng thái thay đổi mật khẩu&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="61"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="120"/>
-        <source>Enabled services</source>
-        <translation>Các dịch vụ đã được cho phép</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="73"/>
+        <source>Change Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="126"/>
-        <source>Save this provider settings</source>
-        <translation>Lưu lại thiết lập dành cho nhà cung cấp này</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="80"/>
+        <source>&lt;change_password_label&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="133"/>
-        <source>Services</source>
-        <translation>Dịch vụ</translation>
+        <location filename="../src/leap/bitmask/gui/preferences_account_page.py" line="62"/>
+        <source>You must be logged in to change your password.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesEmailPage</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="149"/>
-        <source>&lt;Select provider&gt;</source>
-        <translation>&lt;Chọn nhà cung cấp&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesVpnPage</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="157"/>
-        <source>Select provider:</source>
-        <translation>Chọn nhà cung cấp:</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="164"/>
-        <source>&lt; Providers Services Status &gt;</source>
-        <translation>&lt;Trạng thái dịch vụ từ nhà cung cấp&gt;</translation>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="20"/>
+        <source>&lt;flash_label&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="30"/>
+        <source>Default VPN Gateway:</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>PreferencesWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="53"/>
+        <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="50"/>
+        <source>You must reconnect for changes to take effect.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="47"/>
         <source>Automatic</source>
-        <translation>Tự động</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="115"/>
-        <source>Changing password...</source>
-        <translation>Đang thay đổi mật khẩu...</translation>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="129"/>
+        <source>Error loading configuration file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="166"/>
-        <source>Password changed successfully.</source>
-        <translation>Đã thay đổi thành công mật khẩu.</translation>
+        <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="142"/>
+        <source>This is an uninitialized provider, please log in first.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesWindow</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="181"/>
-        <source>There was a problem changing the password.</source>
-        <translation>Xảy ra lỗi với tiến trình thay đổi mật khẩu.</translation>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="88"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="184"/>
-        <source>You did not enter a correct current password.</source>
-        <translation>Bjan chưa điền vào chính xác mật khẩu hiện tại.</translation>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="99"/>
+        <source>VPN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="317"/>
-        <source>Services settings for provider &apos;{0}&apos; saved.</source>
-        <translation>Đã lưu lại thông tin về thiết lập của dịch vụ từ nhà cung cấp &apos;{0}&apos;</translation>
+        <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="109"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ProviderBootstrapper</name>
     <message>
-        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="137"/>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="154"/>
         <source>Provider certificate could not be verified</source>
         <translation>Không thể xác nhận nơi cung cấp chứng chỉ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="144"/>
+        <location filename="../src/leap/bitmask/provider/providerbootstrapper.py" line="161"/>
         <source>Provider does not support HTTPS</source>
         <translation>Nhà cung cấp không hỗ trợ HTTPS</translation>
     </message>
 </context>
 <context>
-    <name>SRPAuth</name>
+    <name>Providers</name>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="711"/>
-        <source>Succeeded</source>
-        <translation>Đã thành công</translation>
+        <location filename="../src/leap/bitmask/gui/providers.py" line="57"/>
+        <source>Other...</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Wizard</name>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/>
-        <source>Welcome</source>
-        <translation>Chào mừng bạn</translation>
-    </message>
-    <message>
         <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="55"/>
         <source>Log In with my credentials</source>
         <translation>Đăng nhập với thông tin đăng nhập của tôi</translation>
     </message>
     <message>
-        <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>&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;&lt;p&gt;Bây giờ chúng tôi sẽ hướng dẫn bạn thông qua một số cấu hình đó là cần thiết trước khi bạn có thể kết nối lần đầu tiên.&lt;/p&gt;&lt;p&gt;Nếu bạn đã bao giờ cần phải sửa đổi các tùy chọn này một lần nữa, bạn có thể tìm thấy thuật sĩ trong trình đơn &lt;span style=&quot; font-style:italic;&quot;&gt;&apos;Cài đặt&apos;&lt;/span&gt; từ cửa sổ chính của.&lt;/p&gt;&lt;p&gt;Bạn có muốn &lt;span style=&quot; font-weight:600;&quot;&gt;đăng ký&lt;/span&gt; cho một tài khoản mới, hoặc &lt;span style=&quot; font-weight:600;&quot;&gt;đăng nhập&lt;/span&gt; với tên người dùng đã tồn tại?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="75"/>
         <source>Sign up for a new account</source>
         <translation>Đăng ký một tài khoản mới</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/>
-        <source>Provider selection</source>
-        <translation>Chọn nhà cung cấp</translation>
-    </message>
-    <message>
-        <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>Vui lòng nhập tên miền của các nhà cung cấp bạn muốn sử dụng cho kết nối của bạn</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="305"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="367"/>
         <source>Check</source>
         <translation>Kiểm tra</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="312"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="342"/>
         <source>https://</source>
         <translation>https://</translation>
     </message>
@@ -860,358 +1285,308 @@
         <translation>Đang kiểm tra tính hợp lệ của nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/>
-        <source>Getting provider information</source>
-        <translation>Đang tiếp nhận thông tin từ nhà cung cấp</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="239"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="266"/>
         <source>Can we reach this provider?</source>
         <translation>Bạn có muốn liên lạc với nhà cung cấp hay không?</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="333"/>
-        <source>Provider Information</source>
-        <translation>Thông tin về nhà cung cấp</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="336"/>
-        <source>Description of services offered by this provider</source>
-        <translation>Mô tả về dịch vụ được cung cấp bởi nhà cung cấp này\</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="345"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="392"/>
         <source>Name</source>
         <translation>Tên</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="377"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="424"/>
         <source>Desc</source>
         <translation>Mô tả</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="387"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="434"/>
         <source>&lt;b&gt;Services offered:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dịch vụ cung cấp:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="397"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="444"/>
         <source>services</source>
         <translation>dịch vụ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="417"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="464"/>
         <source>&lt;b&gt;Enrollment policy:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Chính sách đăng ký:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="427"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="474"/>
         <source>policy</source>
         <translation>chính sách</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="447"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="494"/>
         <source>&lt;b&gt;URL:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Đường dẫn liên kết :&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="457"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="504"/>
         <source>URL</source>
         <translation>Đường dẫn liên kết</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="464"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="511"/>
         <source>&lt;b&gt;Description:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mô tả:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="475"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="522"/>
         <source>Provider setup</source>
         <translation>Thiết lập nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="478"/>
-        <source>Gathering configuration options for this provider</source>
-        <translation>Đang thu thập các tùy chọn cấu hình cho nhà cung cấp này</translation>
-    </message>
-    <message>
-        <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>Chúng tôi đang tải xuống một số bit dữ liệu mà chúng ta cần phải thiết lập một kết nối an toàn với các nhà cung cấp cho lần khởi chạy đầu tiên.</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="523"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="570"/>
         <source>Setting up provider</source>
         <translation>Đang thiết lập nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="573"/>
-        <source>Getting info from the Certificate Authority</source>
-        <translation>Đang nhận thông tin từ bộ phận xác nhận chứng chỉ an toàn</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="580"/>
-        <source>Do we trust this Certificate Authority?</source>
-        <translation>Bạn có tin tưởng vào bộ phân xác nhận chứng chỉ an toàn này không?</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="587"/>
-        <source>Establishing a trust relationship with this provider</source>
-        <translation>Đang thiết lập một mối quan hệ tin tưởng dạng dữ liệu với nhà cung cấp này</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="646"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="720"/>
         <source>Register new user</source>
         <translation>Đăng ký người dùng mới</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="649"/>
-        <source>Register a new user with provider</source>
-        <translation>Đăng ký một người dùng mới với nhà cung cấp</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="664"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="738"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mật khẩu:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="691"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="765"/>
         <source>&lt;b&gt;Re-enter password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Nhập lại mật khẩu:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="701"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="775"/>
         <source>Register</source>
         <translation>Đăng ký</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="747"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="821"/>
         <source>Remember my username and password</source>
         <translation>Ghi nhớ tên người dùng và mật khẩu</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="771"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="845"/>
         <source>Service selection</source>
         <translation>Lựa chọn dịch vụ</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="774"/>
-        <source>Please select the services you would like to have</source>
-        <translation>Vui lòng chọn dịch vụ bạn muốn sử dụng</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="141"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="132"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Tiếp theo &gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="143"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="134"/>
         <source>Connect</source>
         <translation>Kết nối</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="238"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="325"/>
         <source>Starting registration...</source>
         <translation>Đang bắt đầu đăng ký...</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="269"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="370"/>
         <source>User %s successfully registered.</source>
         <translation>Người dùng %s đã đăng ký thành công.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="289"/>
-        <source>Unknown error</source>
-        <translation>Lỗi không rõ nguyên nhân</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="539"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Non-existent provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Nhà cung cấp không tồn tại&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="432"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="558"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="460"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="586"/>
         <source>Unable to load provider configuration</source>
         <translation>Không thể tải cấu hình của nhà cung cấp.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="466"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="592"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Not a valid provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Không phải là một nhà cung cấp hợp lệ&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="532"/>
-        <source>Services by %s</source>
-        <translation>Dịch vụ của %s</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="552"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="698"/>
         <source>Something went wrong while trying to load service %s</source>
         <translation>Xảy ra lỗi khi cố tải dịch vụ %s</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="569"/>
-        <source>Gathering configuration options for %s</source>
-        <translation>Đang thu thập các tùy chọn cấu hình cho nhà cung cấp %s</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="578"/>
-        <source>Description of services offered by %s</source>
-        <translation>Mô tả về dịch vụ được cung cấp bởi nhà cung cấp %s</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="599"/>
-        <source>Register a new user with %s</source>
-        <translation>Đăng ký một người dùng mới với %s</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/>
-        <source>Bitmask first run</source>
-        <translation>Bitmask được ưu tiên chạy trước</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="46"/>
-        <source>This is the Bitmask first run wizard</source>
-        <translation>Đây là phần hướng dẫn khởi chạy Bitmask</translation>
-    </message>
-    <message>
         <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="166"/>
         <source>Can we establish a secure connection?</source>
         <translation>Liệu chúng ta có thể thiết lập một kết nối an toàn không?</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="734"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="808"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Tên tài khoản:&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="269"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="296"/>
         <source>Configure or select a provider</source>
         <translation>Cấu hình hoặc lựa chọn một nhà cung cấp</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="275"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="302"/>
         <source>Configure new provider:</source>
         <translation>Cấu hình một nhà cung cấp mới:</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="285"/>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="332"/>
         <source>Use existing one:</source>
         <translation>Sử dụng phần đã tồn tại:</translation>
     </message>
-</context>
-<context>
-    <name>__impl</name>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="288"/>
-        <source>The server did not send the salt parameter</source>
-        <translation>Các máy chủ đã không gửi tham số salt</translation>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="397"/>
+        <source>Something has gone wrong. Please try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="292"/>
-        <source>The server did not send the B parameter</source>
-        <translation>Các máy chủ đã không gửi tham số B</translation>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="411"/>
+        <source>The requested username is taken, choose another.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="324"/>
-        <source>The data sent from the server had errors</source>
-        <translation>Dữ liệu được gửi từ các máy chủ chứa lỗi</translation>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="677"/>
+        <source>Services by {0}</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="346"/>
-        <source>Could not connect to the server</source>
-        <translation>Không thể kết nối tới máy chủ</translation>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="739"/>
+        <source>Register a new user with {0}</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="372"/>
-        <source>Unknown error (%s)</source>
-        <translation>Lỗi không rõ nguyên nhân (%s)</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/>
+        <source>Bitmask Provider Setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="403"/>
-        <source>Problem getting data from server</source>
-        <translation>Xảy ra lỗi khi nhận dữ liệu từ máy chủ</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/>
+        <source>Welcome to Bitmask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="429"/>
-        <source>Bad data from server</source>
-        <translation>Dữ liệu không chuẩn từ máy chủ</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/>
+        <source>Choose a provider</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="436"/>
-        <source>Auth verification failed</source>
-        <translation>Xác nhận thất bại</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/>
+        <source>Getting provider information.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="444"/>
-        <source>Session cookie verification failed</source>
-        <translation>Xác nhận phiên làm việc cookie gặp lỗi</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="380"/>
+        <source>About this provider</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="279"/>
-        <source>There was a problem with authentication</source>
-        <translation>Xảy ra lỗi với tiến trình xác nhận</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="547"/>
+        <source>Bitmask is attempting to establish a secure connection with this provider for the first time.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/crypto/srpauth.py" line="174"/>
-        <source>Invalid username or password.</source>
-        <translation>Tên tài khoản hoặc mật khẩu không đúng.</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="638"/>
+        <source>Fetching provider credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="645"/>
+        <source>Do we trust these credentials?</source>
+        <translation type="unfinished"/>
     </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>Không tìm thấ gateway nào hết!</translation>
+        <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="652"/>
+        <source>Connecting to provider.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>msg</name>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="93"/>
-        <source>Missing up/down scripts</source>
-        <translation>Thiếu phần mã lên/xuống</translation>
-    </message>
-    <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="184"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="222"/>
         <source>TAP Driver</source>
         <translation>Trình điều khiển TAP</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="191"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="229"/>
         <source>Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges.</source>
         <translation>Internet được mã hóa sử dụng VPN, cần một thiết bị TAP được cài đặt và hiện không tìm thấy đối tượng nào về phần này. Tiến trình này yêu cầu quyền quản trị.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="310"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/>
         <source>TUN Driver</source>
         <translation>Trình điều khiển TUN</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="318"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="355"/>
         <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>Internet được mã hóa sử dụng VPN, cần một thiết bị TUN được cài đặt và hiện không tìm thấy đối tượng nào về phần này. Tiến trình này yêu cầu quyền quản trị.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="132"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="156"/>
         <source>Problem installing files</source>
         <translation>Xảy ra lỗi khi đang thực hiện thao tác cài đặt tập tin</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="133"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="157"/>
         <source>Some of the files could not be copied.</source>
         <translation>Một số tập tin không thể được sao chép.</translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="313"/>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="350"/>
         <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
         <translation>Bitmask cần cài đặt một vài driver thiết yếu để tiến trình mã hóa Internet hoạt động. Bạn có muốn tiếp tục hay không?</translation>
     </message>
+    <message>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="102"/>
+        <source>Missing helper files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="430"/>
+        <source>Missing Bitmask helpers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>msgstr</name>
+    <message>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/>
+        <source>Some essential helper files are missing in your system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/platform_init/initializers.py" line="402"/>
+        <source>Reinstall your debian packages, or make sure you place them by hand.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>self._eip_status</name>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="202"/>
+        <source>{0} is restarting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="313"/>
+        <source>{0} could not be launched because you did not authenticate properly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/leap/bitmask/services/eip/conductor.py" line="327"/>
+        <source>{0} finished in an unexpected manner!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file