From 8dfb508965f4c321ac5d511ced8dcbd0df9f515b Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 3 Oct 2014 16:45:13 -0300 Subject: Update i18n strings. Exclude pinned providers and tests from the bitmask.pro generator since there is no strings to translate in there. --- data/make_project_file.py | 3 +- data/ts/en_US.ts | 414 ++++++++++++++++++++++++++-------------------- 2 files changed, 234 insertions(+), 183 deletions(-) diff --git a/data/make_project_file.py b/data/make_project_file.py index d1567837..5519e128 100755 --- a/data/make_project_file.py +++ b/data/make_project_file.py @@ -52,7 +52,8 @@ if __name__ == '__main__': # Source files includes = ["*.py"] - excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py'] + excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py', + 'pinned*.py', 'tests'] sources = list_files(includes, excludes, SOURCE_ROOT) sources = " \\\n".join(["../{0}".format(f) for f in sources]) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 041cdc44..7ab39646 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -170,53 +170,23 @@ Export canceled. - ComplainDialog - - - Ok, thanks - - - - - EIPPreferences - - - Select gateway for provider - - - - - <Select provider> - - - - - < Providers Gateway Status > - - + App - - Automatic - - - - - Encrypted Internet Preferences - - - - - Select &provider: + + Application error - - &Save this provider settings + + There is a problem contacting the backend, please restart Bitmask. + + + ComplainDialog - - Select &gateway: + + Ok, thanks @@ -774,53 +744,53 @@ Export canceled. - + Help - + &Quit - + &Help - + &Wizard - + The following components will be updated: %s - + Updates available - + Show Main Window - + Starting... - + Not supported - + Disabled @@ -830,47 +800,47 @@ Export canceled. - + About &Bitmask - + Mail is OFF - + The Bitmask app is ready to update, please restart the application. - + About Bitmask - %s - + Unable to login: Problem with provider - + Log in cancelled by the user. - + There was a problem with the provider - + Something went wrong with the logout. - + Unable to connect: Problem with provider @@ -880,319 +850,399 @@ Export canceled. - + Show &Log - + Create a new account... - + File - - Account Preferences... - - - - - Internet Preferences... - - - - + Advanced Key Management - + OFF - + 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> - + Bitmask Help - + 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> - + Update Needed - + This provider is not compatible with the client.<br><br>Error: API version incompatible. - + Incompatible Provider - + Application error - + You are trying to do an operation that requires logging in first. - + Unknown error. - + There was a server problem with authentication. - + Could not establish a connection. - + Invalid username or password. - + Hello! - + Bitmask has started in the tray. - + Succeeded - + 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. - + Connection Error - + Quitting... - + Bitmask is quitting, please wait. - - There is a problem contacting the backend, please restart Bitmask. - - - - + bitmask.net/help - + Email quick reference - + 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>. - + Alternately, you can manually configure your mail client to use Bitmask Email with these options: - + IMAP: localhost, port {0} - + SMTP: localhost, port {0} - + Username: your full email address - + Password: any non-empty text - + <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> - + Stop services - + Do you want to stop all services? - + In order to change the provider, the running services needs to be stopped. - + Disabled: missing helper files + + + Pr&eferences... + + - Preferences + PasswordChange - - Preferences + + Change Password + + + + + Username: + + + + + New password: + + + + + Re-enter new password: + + + + + Current password: + + + + + <flash_label> - - Password Change + + Close - - &Current password: + + OK + + + + + PasswordWindow + + + Please log in to change your password. + + + + + Please wait for data storage to be ready. + + + + + Changing password... + + + + + Password changed successfully. - - &New password: + + Password is empty. - - &Re-enter new password: + + There was a problem changing the password. + + + + + You did not enter a correct current password. + + + Preferences - - Change + + Preferences - - <Password change status> + + user@example.org - - Enabled services + + Close + + + PreferencesAccountPage - - Save this provider settings + + Form - + Services - - <Select provider> + + <provider_services_label> + + + + + Password - - Select provider: + + Change Password - - < Providers Services Status > + + <change_password_label> + + + + + You must be logged in to change your password. - PreferencesWindow + PreferencesEmailPage - - Automatic + + Form - - Changing password... + + PushButton + + + + + PreferencesVpnPage + + + Form - - Password changed successfully. + + <flash_label> - - There was a problem changing the password. + + Default VPN Gateway: - - You did not enter a correct current password. + + You must reconnect for changes to take effect. - - Services settings for provider '{0}' saved. + + Automatic + + + + + Error loading configuration file. + + + + + This is an uninitialized provider, please log in first. + + + PreferencesWindow - - You need to enable {0} in order to change the password. + + Account - - You need to wait until {0} is ready in order to change the password. + + VPN - - In order to change your password you need to be logged in. + + Email @@ -1335,47 +1385,47 @@ Export canceled. - + &Next > - + Connect - + Starting registration... - + User %s successfully registered. - + <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> - + Something went wrong while trying to load service %s @@ -1405,22 +1455,22 @@ Export canceled. - + Something has gone wrong. Please try again. - + The requested username is taken, choose another. - + Services by {0} - + Register a new user with {0} @@ -1473,37 +1523,37 @@ Export canceled. msg - + 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? @@ -1513,7 +1563,7 @@ Export canceled. - + Missing Bitmask helpers @@ -1521,12 +1571,12 @@ Export canceled. msgstr - + Some essential helper files are missing in your system. - + Reinstall your debian packages, or make sure you place them by hand. @@ -1534,17 +1584,17 @@ Export canceled. self._eip_status - + {0} is restarting - + {0} could not be launched because you did not authenticate properly. - + {0} finished in an unexpected manner! -- cgit v1.2.3