Merge remote-tracking branch 'kali/feature/new-translations' into develop

1 files changed, 64 insertions, 69 deletions

diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index e0e907f0..0cf4683b 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -187,7 +187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/eip_status.py" line="435"/>
+        <location filename="../src/leap/bitmask/gui/eip_status.py" line="437"/>
         <source>Route traffic through: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,22 +253,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="153"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="75"/>
         <source>&lt;b&gt;Provider:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="172"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="94"/>
         <source>Remember username and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="197"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="119"/>
         <source>&lt;b&gt;Username:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="210"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="132"/>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,12 +288,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="63"/>
+        <location filename="../src/leap/bitmask/gui/ui/login.ui" line="250"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="365"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="366"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -318,7 +318,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/login.py" line="358"/>
+        <location filename="../src/leap/bitmask/gui/login.py" line="359"/>
         <source>Loggin out...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -331,12 +331,12 @@
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
@@ -474,98 +474,98 @@
 <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="287"/>
         <source>There are new updates available, please restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="299"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="329"/>
         <source>More...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="626"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="637"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="390"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="400"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="375"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="405"/>
         <source>&amp;Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="672"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="683"/>
         <source>Hide Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="527"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="537"/>
         <source> The following components will be updated:
 %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="530"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="540"/>
         <source>Updates available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="671"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="682"/>
         <source>Show Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1314"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1326"/>
         <source>We could not find any authentication agent in your system.&lt;br/&gt;Make sure you have &lt;b&gt;polkit-gnome-authentication-agent-1&lt;/b&gt; running and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1326"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1338"/>
         <source>We could not find &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1331"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1343"/>
         <source>We could not find openvpn binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1493"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1505"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1501"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1513"/>
         <source>Not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1504"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1516"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1537"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1549"/>
         <source>Could not load Encrypted Internet Configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1459"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1471"/>
         <source>Encrypted Internet could not be launched because you did not authenticate properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1467"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1479"/>
         <source>Encrypted Internet finished in an unexpected manner!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -575,7 +575,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="395"/>
         <source>About &amp;Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
@@ -585,87 +585,87 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="518"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="528"/>
         <source>The Bitmask app is ready to update, please restart the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="734"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="745"/>
         <source>About Bitmask - %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="748"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="759"/>
         <source>Version: &lt;b&gt;%s&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).&lt;br&gt;&lt;br&gt;LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. &lt;br&gt;&lt;br&gt;&lt;a href=&apos;https://leap.se&apos;&gt;More about LEAP&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="836"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="847"/>
         <source>Unable to login: Problem with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="874"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="885"/>
         <source>Log in cancelled by the user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1321"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1333"/>
         <source>Encrypted Internet cannot be started because the tuntap extension is not installed properly in your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1337"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1349"/>
         <source>Another openvpn instance is already running, and could not be stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1344"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1356"/>
         <source>Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1519"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1531"/>
         <source>There was a problem with the provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1618"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1631"/>
         <source>Something went wrong with the logout.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1639"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1652"/>
         <source>Unable to connect: Problem with provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="113"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="119"/>
         <source>Encrypted Internet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="194"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1622"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="334"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="364"/>
         <source>&amp;Bitmask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="385"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="380"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="410"/>
         <source>Show &amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="385"/>
+        <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="415"/>
         <source>Create a new account...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -675,17 +675,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="633"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="644"/>
         <source>Encrypted Internet: OFF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1395"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1407"/>
         <source>Network is unreachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1418"/>
+        <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1430"/>
         <source>EIP has stopped</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1000,72 +1000,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="141"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="138"/>
         <source>&amp;Next &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="143"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="140"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="238"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="235"/>
         <source>Starting registration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="269"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="266"/>
         <source>User %s successfully registered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="289"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="286"/>
         <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="411"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Non-existent provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="432"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="429"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="460"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="457"/>
         <source>Unable to load provider configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="466"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="463"/>
         <source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Not a valid provider&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="532"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="529"/>
         <source>Services by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="552"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="549"/>
         <source>Something went wrong while trying to load service %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="569"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="566"/>
         <source>Gathering configuration options for %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="578"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="575"/>
         <source>Description of services offered by %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/leap/bitmask/gui/wizard.py" line="599"/>
+        <location filename="../src/leap/bitmask/gui/wizard.py" line="596"/>
         <source>Register a new user with %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1165,11 +1165,6 @@
 </context>
 <context>
     <name>kls</name>
-    <message>
-        <location filename="../src/leap/bitmask/services/eip/vpnlauncher.py" line="167"/>
-        <source>No gateway was found!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>msg</name>