diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/images/countries/xx.png | bin | 0 -> 254 bytes | |||
| -rw-r--r-- | data/resources/flags.qrc | 1 | ||||
| -rw-r--r-- | data/resources/locale.qrc | 1 | ||||
| -rw-r--r-- | data/ts/en_US.ts | 626 |
4 files changed, 324 insertions, 304 deletions
diff --git a/data/images/countries/xx.png b/data/images/countries/xx.png Binary files differnew file mode 100644 index 00000000..abd36d39 --- /dev/null +++ b/data/images/countries/xx.png diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc index 8bdc9c4c..aeecc54f 100644 --- a/data/resources/flags.qrc +++ b/data/resources/flags.qrc @@ -58,6 +58,7 @@ <file>../images/countries/us.png</file> <file>../images/countries/ve.png</file> <file>../images/countries/vn.png</file> + <file>../images/countries/xx.png</file> <file>../images/countries/za.png</file> </qresource> </RCC>
\ No newline at end of file diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc index ba466c36..787b0025 100644 --- a/data/resources/locale.qrc +++ b/data/resources/locale.qrc @@ -2,5 +2,6 @@ <qresource> <file>../translations/vi.qm</file> <file>../translations/en_GB.qm</file> +<file>../translations/es.qm</file> </qresource> </RCC> diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index cf74d7b6..041cdc44 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -172,7 +172,7 @@ Export canceled.</source> <context> <name>ComplainDialog</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="419"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="414"/> <source>Ok, thanks</source> <translation type="unfinished"></translation> </message> @@ -228,22 +228,22 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="153"/> + <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="159"/> <source>Gateway settings for provider '{0}' saved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="230"/> + <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="236"/> <source>There was a problem with configuration files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="122"/> + <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="125"/> <source> (uninitialized)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_preferenceswindow.py" line="245"/> + <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"></translation> </message> @@ -261,12 +261,12 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="66"/> + <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="79"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="82"/> + <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="95"/> <source>Traffic is being routed in the clear</source> <translation type="unfinished"></translation> </message> @@ -280,149 +280,187 @@ Export canceled.</source> <source>Turn Off</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/eip_status.ui" line="259"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EIPStatusWidget</name> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="411"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="429"/> <source>Turn ON</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="521"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="569"/> <source>Authenticating...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="529"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="578"/> <source>Retrieving configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="531"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="580"/> <source>Waiting to start...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="533"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="582"/> <source>Assigning IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="535"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="584"/> <source>Reconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="543"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="592"/> <source>Unable to start VPN, it's already running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="304"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="320"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="565"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="614"/> <source>{0}: OFF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="301"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="317"/> <source>You must login to use {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="570"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="619"/> <source>{0}: Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="573"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="622"/> <source>{0}: ON</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="525"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="576"/> <source>Encrypted Internet is starting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="397"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="415"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="433"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="478"/> <source>Traffic is being routed in the clear.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="434"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="479"/> <source>Network is unreachable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="436"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="481"/> <source>Error connecting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="451"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="497"/> <source>Error connecting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="454"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="500"/> <source>Bitmask is blocking unencrypted traffic.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="587"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="644"/> <source>Routing traffic through: <b>{0}</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="634"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="690"/> <source>Could not load {0} configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="643"/> + <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"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="653"/> + <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"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="661"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="717"/> <source>We could not find openvpn binary.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="682"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/> <source>We could not find any authentication agent in your system.<br/>Make sure you have<b>polkit-gnome-authentication-agent-1</b> running andtry again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="690"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="754"/> <source>We could not find <b>pkexec</b> in your system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="700"/> + <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"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="720"/> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="784"/> <source>Network is unreachable</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="315"/> + <source><font color=red>Disabled: missing helper files</font></source> + <translation type="unfinished"></translation> + </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"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="734"/> + <source>Encrypted Internet failed to start</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Form</name> + <message> + <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="27"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/logout.ui" line="50"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LoggerWindow</name> @@ -462,7 +500,7 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="162"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="164"/> <source>Save As</source> <translation type="unfinished"></translation> </message> @@ -477,37 +515,37 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="193"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="195"/> <source>Send to Pastebin.com</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="190"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="192"/> <source>Sending to pastebin...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="225"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="207"/> <source>Your pastebin link <a href='{0}'>{0}</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="230"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="212"/> <source>Pastebin OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="245"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="227"/> <source>Sending logs to Pastebin failed!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="251"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="233"/> <source>Pastebin Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="250"/> + <location filename="../src/leap/bitmask/gui/loggerwindow.py" line="232"/> <source>Maximum posts per day reached</source> <translation type="unfinished"></translation> </message> @@ -520,72 +558,62 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/login.ui" line="75"/> - <source><b>Provider:</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/login.ui" line="94"/> + <location filename="../src/leap/bitmask/gui/ui/login.ui" line="90"/> <source>Remember username and password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/login.ui" line="119"/> + <location filename="../src/leap/bitmask/gui/ui/login.ui" line="112"/> <source><b>Username:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/login.ui" line="132"/> + <location filename="../src/leap/bitmask/gui/ui/login.ui" line="125"/> <source><b>Password:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="246"/> + <location filename="../src/leap/bitmask/gui/login.py" line="208"/> <source>Log In</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="124"/> - <source>Other...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/login.py" line="241"/> + <location filename="../src/leap/bitmask/gui/login.py" line="203"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/login.ui" line="230"/> + <location filename="../src/leap/bitmask/gui/ui/login.ui" line="214"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="371"/> + <location filename="../src/leap/bitmask/gui/login.py" line="314"/> <source>Logout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="299"/> + <location filename="../src/leap/bitmask/gui/login.py" line="240"/> <source>Please select a valid provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="304"/> + <location filename="../src/leap/bitmask/gui/login.py" line="245"/> <source>Please provide a valid username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="309"/> + <location filename="../src/leap/bitmask/gui/login.py" line="250"/> <source>Please provide a valid password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="312"/> + <location filename="../src/leap/bitmask/gui/login.py" line="253"/> <source>Logging in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/login.py" line="364"/> + <location filename="../src/leap/bitmask/gui/login.py" line="307"/> <source>Logging out...</source> <translation type="unfinished"></translation> </message> @@ -658,11 +686,6 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/> - <source>Looking for key for this user</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/mail_status.py" line="312"/> <source>Found key! Starting mail...</source> <translation type="unfinished"></translation> @@ -732,72 +755,72 @@ Export canceled.</source> <source>Starting…</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/> + <source>Initial sync in progress, please wait...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MainWindow</name> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="228"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="237"/> <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="270"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="279"/> <source>More...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="870"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="932"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="342"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="351"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="352"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="361"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="357"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="366"/> <source>&Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="930"/> - <source>Hide Main Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="728"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="787"/> <source> The following components will be updated: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="731"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="790"/> <source>Updates available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="929"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="244"/> <source>Show Main Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1548"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1563"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1742"/> <source>Not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1567"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1746"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -807,205 +830,255 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="347"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="356"/> <source>About &Bitmask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="211"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="238"/> <source>Mail is OFF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="719"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="778"/> <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="996"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1050"/> <source>About Bitmask - %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1138"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1206"/> <source>Unable to login: Problem with provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1219"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1385"/> <source>Log in cancelled by the user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1584"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1764"/> <source>There was a problem with the provider</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="1819"/> <source>Something went wrong with the logout.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1606"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1786"/> <source>Unable to connect: Problem with provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1651"/> - <source>Login</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="305"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="314"/> <source>&Bitmask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="362"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="371"/> <source>Show &Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="367"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="376"/> <source>Create a new account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="201"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="228"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="121"/> - <source>Please Log In</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="332"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="341"/> <source>Account Preferences...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="337"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="346"/> <source>Internet Preferences...</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="384"/> <source>Advanced Key Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="854"/> - <source> (offline mode)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="878"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="940"/> <source>OFF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1010"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1064"/> <source>Version: <b>%s</b> (%s)<br><br>%sBitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).<br><br>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. <br><br><a href='https://leap.se'>More about LEAP</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1038"/> - <source><strong>Instructions to use mail:</strong><br>If you use Thunderbird you can use the Bitmask extension helper. Search for 'Bitmask' in the add-on manager or download it from: {0}.<br><br>You can configure Bitmask manually with these options:<br><em> Incoming -> IMAP, port: {1}<br> Outgoing -> SMTP, port: {2}<br> Username -> your bitmask username.<br> Password -> does not matter, use any text. Just don't leave it empty and don't use your account's password.</em></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1039"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1111"/> <source>Bitmask Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1123"/> <source>The current client version is not supported by this provider.<br>Please update to latest version.<br><br>You can get the latest version from <a href='{0}'>{1}</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1052"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1124"/> <source>Update Needed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1062"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/> <source>This provider is not compatible with the client.<br><br>Error: API version incompatible.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1062"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/> <source>Incompatible Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="302"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="359"/> <source>Application error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="304"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="323"/> <source>You are trying to do an operation that requires logging in first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="362"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="398"/> <source>Unknown error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="366"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="402"/> <source>There was a server problem with authentication.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="370"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="406"/> <source>Could not establish a connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="374"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="410"/> <source>Invalid username or password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="897"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="959"/> <source>Hello!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="898"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="960"/> <source>Bitmask has started in the tray.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1252"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1419"/> <source>Succeeded</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="1672"/> <source>The server at {0} can't be found, because the DNS lookup failed. DNS is the network service that translates a website'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"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1504"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1748"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1932"/> <source>Quitting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1749"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1933"/> <source>Bitmask is quitting, please wait.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="361"/> + <source>There is a problem contacting the backend, please restart Bitmask.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1078"/> + <source>bitmask.net/help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1086"/> + <source>Email quick reference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1090"/> + <source>For Thunderbird, you can use the Bitmask extension. Search for "Bitmask" in the add-on manager or download it from <a href='{0}'>addons.mozilla.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/> + <source>Alternately, you can manually configure your mail client to use Bitmask Email with these options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/> + <source>IMAP: localhost, port {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1095"/> + <source>SMTP: localhost, port {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1097"/> + <source>Username: your full email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1099"/> + <source>Password: any non-empty text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1108"/> + <source><p><strong>{0}</strong></p><p>{1}</p><p>{2}<ul><li>&nbsp;{3}</li><li>&nbsp;{4}</li><li>&nbsp;{5}</li><li>&nbsp;{6}</li></ul></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/> + <source>Stop services</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/> + <source>Do you want to stop all services?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1277"/> + <source>In order to change the provider, the running services needs to be stopped.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1741"/> + <source>Disabled: missing helper files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Preferences</name> @@ -1078,47 +1151,47 @@ Export canceled.</source> <context> <name>PreferencesWindow</name> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="59"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="60"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="168"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="170"/> <source>Changing password...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="249"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="252"/> <source>Password changed successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="433"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="436"/> <source>There was a problem changing the password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="437"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="440"/> <source>You did not enter a correct current password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="417"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="420"/> <source>Services settings for provider '{0}' saved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="114"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="116"/> <source>You need to enable {0} in order to change the password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="122"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="124"/> <source>You need to wait until {0} is ready in order to change the password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="101"/> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="103"/> <source>In order to change your password you need to be logged in.</source> <translation type="unfinished"></translation> </message> @@ -1137,12 +1210,15 @@ Export canceled.</source> </message> </context> <context> - <name>Wizard</name> + <name>Providers</name> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/> - <source>Welcome</source> + <location filename="../src/leap/bitmask/gui/providers.py" line="57"/> + <source>Other...</source> <translation type="unfinished"></translation> </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> @@ -1154,22 +1230,12 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/> - <source>Provider selection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="115"/> - <source>Please enter the domain of the provider you want to use for your connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="340"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="367"/> <source>Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="315"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="342"/> <source>https://</source> <translation type="unfinished"></translation> </message> @@ -1179,310 +1245,275 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/> - <source>Getting provider information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="239"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="266"/> <source>Can we reach this provider?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="353"/> - <source>Provider Information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="356"/> - <source>Description of services offered by this provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="365"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="392"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="397"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="424"/> <source>Desc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="407"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="434"/> <source><b>Services offered:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="417"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="444"/> <source>services</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="437"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="464"/> <source><b>Enrollment policy:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="447"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="474"/> <source>policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="467"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="494"/> <source><b>URL:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="477"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="504"/> <source>URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="484"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="511"/> <source><b>Description:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="495"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="522"/> <source>Provider setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="498"/> - <source>Gathering configuration options for this provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="520"/> - <source>We are downloading some bits that we need to establish a secure connection with the provider for the first time.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="543"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="570"/> <source>Setting up provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="593"/> - <source>Getting info from the Certificate Authority</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="600"/> - <source>Do we trust this Certificate Authority?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="607"/> - <source>Establishing a trust relationship with this provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="666"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="720"/> <source>Register new user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="669"/> - <source>Register a new user with provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="684"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="738"/> <source><b>Password:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="711"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="765"/> <source><b>Re-enter password:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="721"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="775"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="767"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="821"/> <source>Remember my username and password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="791"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="845"/> <source>Service selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="794"/> - <source>Please select the services you would like to have</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="131"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="136"/> <source>&Next ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="133"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="138"/> <source>Connect</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="328"/> <source>Starting registration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="333"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="373"/> <source>User %s successfully registered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="503"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="543"/> <source><font color='red'><b>Non-existent provider</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="522"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="562"/> <source><font color='red'><b>%s</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="551"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="590"/> <source>Unable to load provider configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="557"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="596"/> <source><font color='red'><b>Not a valid provider</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="662"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="701"/> <source>Something went wrong while trying to load service %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/> - <source>Bitmask first run</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="46"/> - <source>This is the Bitmask first run wizard</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="166"/> <source>Can we establish a secure connection?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="754"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="808"/> <source><b>Username:</b></source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="305"/> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="332"/> <source>Use existing one:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="62"/> - <source><html><head/><body><p>Now we will guide you through some configuration that is needed before you can connect for the first time.</p><p>If you ever need to modify these options again, you can find the wizard in the <span style=" font-style:italic;">'Bitmask -&gt; Create new account...'</span> menu from the main window.</p><p>Do you want to <span style=" font-weight:600;">sign up</span> for a new account, or <span style=" font-weight:600;">log in</span> with an already existing username?</p></body></html></source> + <location filename="../src/leap/bitmask/gui/wizard.py" line="400"/> + <source>Something has gone wrong. Please try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="360"/> - <source>Something has gone wrong. Please try again.</source> + <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/> + <source>The requested username is taken, choose another.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="688"/> - <source>Gathering configuration options for {0}</source> + <location filename="../src/leap/bitmask/gui/wizard.py" line="682"/> + <source>Services by {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="374"/> - <source>The requested username is taken, choose another.</source> + <location filename="../src/leap/bitmask/gui/wizard.py" line="743"/> + <source>Register a new user with {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="643"/> - <source>Services by {0}</source> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="26"/> + <source>Bitmask Provider Setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="696"/> - <source>Description of services offered by {0}</source> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="43"/> + <source>Welcome to Bitmask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="711"/> - <source>Register a new user with {0}</source> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="112"/> + <source>Choose a provider</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="159"/> + <source>Getting provider information.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="380"/> + <source>About this provider</source> + <translation type="unfinished"></translation> + </message> + <message> + <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"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="638"/> + <source>Fetching provider credentials.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="645"/> + <source>Do we trust these credentials?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/wizard.ui" line="652"/> + <source>Connecting to provider.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>msg</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="200"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="219"/> <source>TAP Driver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="207"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="226"/> <source>Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="325"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="344"/> <source>TUN Driver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="333"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="352"/> <source>Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="142"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="153"/> <source>Problem installing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="143"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="154"/> <source>Some of the files could not be copied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="328"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/> <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="92"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="102"/> <source>Missing helper files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="380"/> - <source>Missing resolvconf framework</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="432"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="427"/> <source>Missing Bitmask helpers</source> <translation type="unfinished"></translation> </message> @@ -1490,25 +1521,12 @@ Export canceled.</source> <context> <name>msgstr</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="375"/> - <source>Could not find <b>resolvconf</b> installed in your system. -Do you want to quit Bitmask now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="379"/> - <source>Encrypted Internet needs resolvconf installed to work properly. -Please use your package manager to install it. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="401"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="396"/> <source>Some essential helper files are missing in your system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="404"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/> <source>Reinstall your debian packages, or make sure you place them by hand.</source> <translation type="unfinished"></translation> </message> @@ -1516,17 +1534,17 @@ Please use your package manager to install it. <context> <name>self._eip_status</name> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="184"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="196"/> <source>{0} is restarting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="295"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="307"/> <source>{0} could not be launched because you did not authenticate properly.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="307"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="321"/> <source>{0} finished in an unexpected manner!</source> <translation type="unfinished"></translation> </message> |
