From c8f754eed56a7937da0eece0b1a5bc4e1d8135e2 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 11 Oct 2013 11:31:34 -0300 Subject: updated strings to 0.3.4 release --- data/bitmask.pro | 10 +- data/ts/en_US.ts | 802 +++++++++++++++++---------- src/leap/bitmask/services/eip/vpnlauncher.py | 2 +- 3 files changed, 531 insertions(+), 283 deletions(-) diff --git a/data/bitmask.pro b/data/bitmask.pro index 0f9aaf90..b9b5dc84 100644 --- a/data/bitmask.pro +++ b/data/bitmask.pro @@ -19,17 +19,19 @@ SOURCES += ../src/leap/bitmask/app.py \ ../src/leap/bitmask/gui/wizard.py \ ../src/leap/bitmask/gui/eip_status.py \ ../src/leap/bitmask/gui/mail_status.py \ - ../src/leap/bitmask/gui/eippreferences.py \ - ../src/leap/bitmask/gui/preferences.py \ + ../src/leap/bitmask/gui/eip_preferenceswindow.py \ + ../src/leap/bitmask/gui/preferenceswindow.py \ ../src/leap/bitmask/platform_init/initializers.py \ ../src/leap/bitmask/platform_init/locks.py \ ../src/leap/bitmask/provider/supportedapis.py \ ../src/leap/bitmask/services/abstractbootstrapper.py \ ../src/leap/bitmask/services/eip/eipbootstrapper.py \ ../src/leap/bitmask/services/eip/eipconfig.py \ - ../src/leap/bitmask/services/eip/providerbootstrapper.py \ + ../src/leap/bitmask/provider/providerbootstrapper.py \ + ../src/leap/bitmask/services/__init__.py \ + ../src/leap/bitmask/services/connections.py \ ../src/leap/bitmask/services/eip/udstelnet.py \ - ../src/leap/bitmask/services/eip/vpnlaunchers.py \ + ../src/leap/bitmask/services/eip/vpnlauncher.py \ ../src/leap/bitmask/services/eip/vpnprocess.py \ ../src/leap/bitmask/services/mail/smtpbootstrapper.py \ ../src/leap/bitmask/services/mail/smtpconfig.py \ diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 224060f4..e0e907f0 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -1,21 +1,194 @@ - DarwinVPNLauncher + EIPPreferences - - No gateway was found! + + EIP Preferences + + + + + Select gateway for provider + + + + + &Select provider: + + + + + <Select provider> + + + + + Save this provider settings + + + + + < Providers Gateway Status > + + + + + Select gateway: + + + + + Automatic + + + + + Automatic EIP start + + + + + <font color='green'><b>Automatic EIP start saved!</b></font> + + + + + Save auto start setting + + + + + Enable Automatic start of EIP - EIPBootstrapper + EIPPreferencesWindow + + + Automatic + + + + + Gateway settings for provider '{0}' saved. + + + + + There was a problem with configuration files. + + - LinuxVPNLauncher + EIPStatus - - No gateway was found! + + Form + + + + + Turn On + + + + + ... + + + + + Traffic is being routed in the clear + + + + + 0.0 KB/s + + + + + EIPStatusWidget + + + All services are OFF + + + + + Encrypted Internet: {0} + + + + + You must login to use Encrypted Internet + + + + + Turn OFF + + + + + Turn ON + + + + + Traffic is being routed in the clear + + + + + Authenticating... + + + + + Retrieving configuration... + + + + + Waiting to start... + + + + + Assigning IP + + + + + Reconnecting... + + + + + Unable to start VPN, it's already running. + + + + + Encrypted Internet: OFF + + + + + Encrypted Internet: Starting... + + + + + Encrypted Internet: ON + + + + + Route traffic through: {0} @@ -75,517 +248,567 @@ LoginWidget - + Form - - Create a new account - - - - + <b>Provider:</b> - + Remember username and password - + <b>Username:</b> - + <b>Password:</b> - + Log In - + Other... - + Cancel + + + ... + + + + + Logout + + + + + Please select a valid provider + + + + + Please provide a valid username + + + + + Please provide a valid password + + + + + Logging in... + + + + + Loggin out... + + - MainWindow + MailStatusWidget - - There are new updates available, please restart. + + Form - - More... + + You must login to use encrypted email. - - Show Log + + Email - - &Session + + All services are OFF - - Help + + There was an unexpected problem with Soledad. - - &Quit + + OFF - - &Help + + Mail is OFF - - &Wizard + + You must be logged in to use encrypted email. - - Show &logs + + Starting.. - - Hide Main Window + + Mail is starting - - The following components will be updated: -%s + + ON - - Updates available + + Mail is ON - - Preferences + + Mail is disabled - - Show Main Window + + Starting... - - Please select a valid provider + + Soledad has started... - - Please provide a valid username + + Soledad is starting, please wait... - - Please provide a valid Password + + Looking for key for this user - - Logging in... + + Found key! Starting mail... - - We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again. + + Generating new key, please wait... - - We could not find <b>pkexec</b> in your system. + + Finished generating key! - - We could not find openvpn binary. + + Starting mail... - - OFF + + SMTP has started... - - Starting... + + SMTP failed to start, check the logs. - - Not supported + + Failed - - Disabled + + IMAP has started... - - Could not load Encrypted Internet Configuration. + + IMAP failed to start, check the logs. - - Encrypted Internet could not be launched because you did not authenticate properly. + + %s Unread Emails - - Encrypted Internet finished in an unexpected manner! + + About to start, please wait... - - Bitmask + + Disabled + + + MainWindow - - Log &out + + There are new updates available, please restart. - - About &Bitmask + + More... - - Mail is OFF + + Help - - The Bitmask app is ready to update, please restart the application. + + &Quit - - Encrypted Internet is OFF + + &Help - - About Bitmask - %s + + &Wizard - - Version: <b>%s</b><br><br>Bitmask 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> + + Hide Main Window - - Unable to login: Problem with provider + + The following components will be updated: +%s - - Log in cancelled by the user. + + Updates available - - Encrypted Internet cannot be started because the tuntap extension is not installed properly in your system. + + Show Main Window - - Another openvpn instance is already running, and could not be stopped. + + We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again. - - Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again. + + We could not find <b>pkexec</b> in your system. - - There was a problem with the provider + + We could not find openvpn binary. - - Something went wrong with the logout. + + Starting... + + + + + Not supported - Unable to connect: Problem with provider + Disabled - - - ProviderBootstrapper - - Provider certificate could not be verified + + Could not load Encrypted Internet Configuration. - - Provider does not support HTTPS + + Encrypted Internet could not be launched because you did not authenticate properly. - - - SRPAuth - - Succeeded + + Encrypted Internet finished in an unexpected manner! - - - StatusPanel - - Form + + Bitmask - - user@domain.org + + About &Bitmask - - Encrypted Internet: + + Mail is OFF - - Off + + The Bitmask app is ready to update, please restart the application. - - Turn On + + About Bitmask - %s - - ... + + Version: <b>%s</b><br><br>Bitmask 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> - - 0 Unread Emails + + Unable to login: Problem with provider - - Disabled + + Log in cancelled by the user. - - Encrypted Mail: + + Encrypted Internet cannot be started because the tuntap extension is not installed properly in your system. - - 0.0 KB/s + + Another openvpn instance is already running, and could not be stopped. - - - StatusPanelWidget - - Turn OFF + + Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again. - - Turn ON + + There was a problem with the provider - - ON + + Something went wrong with the logout. - - Authenticating... + + Unable to connect: Problem with provider - - Retrieving configuration... + + Encrypted Internet - - Waiting to start... + + Login - - Assigning IP + + &Bitmask - - Unable to start VPN, it's already running. + + Preferences... - - All services are OFF + + Show &Log - - Encrypted Internet is {0} + + Create a new account... - - Mail is {0} + + File - - Reconnecting... + + Encrypted Internet: OFF - - Encrypted Internet is OFF + + Network is unreachable - - Encrypted Internet is STARTING + + EIP has stopped + + + Preferences - - Encrypted Internet is ON + + Preferences - - OFF + + Password Change - - Mail is OFF + + &Current password: - - Mail is ON + + &New password: - - Starting... + + &Re-enter new password: - - Soledad has started... + + Change - - Soledad is starting, please wait... + + <Password change status> - - Looking for key for this user + + Enabled services - - Found key! Starting mail... + + Save this provider settings - - Generating new key, please wait... + + Services - - Finished generating key! + + <Select provider> - - Starting mail... + + Select provider: - - SMTP has started... + + < Providers Services Status > + + + PreferencesWindow - - SMTP failed to start, check the logs. + + Automatic - - Failed + + Changing password... - - IMAP has started... + + Password changed successfully. - - IMAP failed to start, check the logs. + + There was a problem changing the password. - - %s Unread Emails + + You did not enter a correct current password. + + + + + Services settings for provider '{0}' saved. - WindowsVPNLauncher + ProviderBootstrapper - - No gateway was found! + + Provider certificate could not be verified + + + + + Provider does not support HTTPS + + + + + SRPAuth + + + Succeeded @@ -622,157 +845,157 @@ - + Check - + https:// - + Checking for a valid provider - + Getting provider information - + Can we reach this provider? - + Provider Information - + Description of services offered by this provider - + Name - + Desc - + <b>Services offered:</b> - + services - + <b>Enrollment policy:</b> - + policy - + <b>URL:</b> - + URL - + <b>Description:</b> - + Provider setup - + Gathering configuration options for this provider - + We are downloading some bits that we need to establish a secure connection with the provider for the first time. - + Setting up provider - + Getting info from the Certificate Authority - + Do we trust this Certificate Authority? - + Establishing a trust relationship with this provider - + Register new user - + Register a new user with provider - + <b>Password:</b> - + <b>Re-enter password:</b> - + Register - + Remember my username and password - + Service selection - + Please select the services you would like to have @@ -787,62 +1010,62 @@ - + Starting registration... - + User %s successfully registered. - + Unknown error - + <font color='red'><b>Non-existent provider</b></font> - + <font color='red'><b>%s</b></font> - + Unable to load provider configuration - + <font color='red'><b>Not a valid provider</b></font> - + Services by %s - + Something went wrong while trying to load service %s - + Gathering configuration options for %s - + Description of services offered by %s - + Register a new user with %s @@ -857,113 +1080,136 @@ - + Can we establish a secure connection? - + <b>Username:</b> + + + Configure or select a provider + + + + + Configure new provider: + + + + + Use existing one: + + __impl - + The server did not send the salt parameter - + The server did not send the B parameter - + The data sent from the server had errors - + Could not connect to the server - + Unknown error (%s) - + Problem getting data from server - + Bad data from server - + Auth verification failed - + Session cookie verification failed - + There was a problem with authentication - + Invalid username or password. + + kls + + + No gateway was found! + + + msg - + Missing up/down scripts - + TAP Driver - + Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges. - + TUN Driver - + 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. - + Problem installing files - + Some of the files could not be copied. - + Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed? diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py index 82d8ea48..2ac4c325 100644 --- a/src/leap/bitmask/services/eip/vpnlauncher.py +++ b/src/leap/bitmask/services/eip/vpnlauncher.py @@ -164,7 +164,7 @@ class VPNLauncher(object): if not gateways: logger.error('No gateway was found!') - raise VPNLauncherException(kls.tr('No gateway was found!')) + raise VPNLauncherException('No gateway was found!') logger.debug("Using gateways ips: {0}".format(', '.join(gateways))) -- cgit v1.2.3