From 38e3ec8d500e3d22c286932a065f2a0c0b8f0e1c Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 3 Sep 2014 10:38:22 -0500 Subject: add /es/ locale to resources --- data/resources/locale.qrc | 1 + 1 file changed, 1 insertion(+) (limited to 'data') 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 @@ ../translations/vi.qm ../translations/en_GB.qm +../translations/es.qm -- cgit v1.2.3 From 3655f2d5651e7cff47cf0f869e7b794bae247aed Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 3 Sep 2014 10:38:40 -0500 Subject: update en_US translation file --- data/ts/en_US.ts | 626 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 322 insertions(+), 304 deletions(-) (limited to 'data') 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. ComplainDialog - + Ok, thanks @@ -228,22 +228,22 @@ Export canceled. - + Gateway settings for provider '{0}' saved. - + There was a problem with configuration files. - + (uninitialized) - + This is an uninitialized provider, please log in first. @@ -261,12 +261,12 @@ Export canceled. - + ... - + Traffic is being routed in the clear @@ -280,149 +280,187 @@ Export canceled. Turn Off + + + Cancel + + EIPStatusWidget - + Turn ON - + Authenticating... - + Retrieving configuration... - + Waiting to start... - + Assigning IP - + Reconnecting... - + Unable to start VPN, it's already running. - + disabled - + {0}: OFF - + You must login to use {0} - + {0}: Starting... - + {0}: ON - + Encrypted Internet is starting - + Retry - + Traffic is being routed in the clear. - + Network is unreachable. - + Error connecting - + Error connecting. - + Bitmask is blocking unencrypted traffic. - + Routing traffic through: <b>{0}</b> - + Could not load {0} configuration. - + Another openvpn instance is already running, and could not be stopped. - + 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 openvpn binary. - + 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. - + We could not find <b>pkexec</b> in your system. - + {0} cannot be started because the tuntap extension is not installed properly in your system. - + Network is unreachable + + + <font color=red>Disabled: missing helper files</font> + + + + + VPN Launcher error. See the logs for more info. + + + + + Encrypted Internet failed to start + + + + + Form + + + Form + + + + + ... + + + + + Logout + + LoggerWindow @@ -462,7 +500,7 @@ Export canceled. - + Save As @@ -477,37 +515,37 @@ Export canceled. - + Send to Pastebin.com - + Sending to pastebin... - + Your pastebin link <a href='{0}'>{0}</a> - + Pastebin OK - + Sending logs to Pastebin failed! - + Pastebin Error - + Maximum posts per day reached @@ -520,72 +558,62 @@ Export canceled. - - <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... - + Logging out... @@ -657,11 +685,6 @@ Export canceled. Soledad is starting, please wait... - - - Looking for key for this user - - Found key! Starting mail... @@ -732,72 +755,72 @@ Export canceled. Starting… + + + Initial sync in progress, please wait... + + MainWindow - + There are new updates available, please restart. - + More... - + Help - + &Quit - + &Help - + &Wizard - - Hide Main Window - - - - + The following components will be updated: %s - + Updates available - + Show Main Window - + Starting... - + Not supported - + Disabled @@ -807,205 +830,255 @@ 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 - - Login - - - - + &Bitmask - + Show &Log - + Create a new account... - + File - - Please Log In - - - - + Account Preferences... - + Internet Preferences... - + Advanced Key Management - - (offline mode) - - - - + 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> - - <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> - - - - + 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 + + Preferences @@ -1078,47 +1151,47 @@ Export canceled. PreferencesWindow - + Automatic - + Changing password... - + Password changed successfully. - + There was a problem changing the password. - + You did not enter a correct current password. - + Services settings for provider '{0}' saved. - + You need to enable {0} in order to change the password. - + You need to wait until {0} is ready in order to change the password. - + In order to change your password you need to be logged in. @@ -1137,12 +1210,15 @@ Export canceled. - Wizard + Providers - - Welcome + + Other... + + + Wizard Log In with my credentials @@ -1154,22 +1230,12 @@ Export canceled. - - Provider selection - - - - - Please enter the domain of the provider you want to use for your connection - - - - + Check - + https:// @@ -1179,310 +1245,275 @@ Export canceled. - - 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 - - - - + &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 - - - Bitmask first run - - - - - This is the Bitmask first run wizard - - Can we establish a secure connection? - + <b>Username:</b> - + Configure or select a provider - + Configure new provider: - + Use existing one: - - <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> + + Something has gone wrong. Please try again. - - Something has gone wrong. Please try again. + + The requested username is taken, choose another. - - Gathering configuration options for {0} + + Services by {0} - - The requested username is taken, choose another. + + Register a new user with {0} - - Services by {0} + + Bitmask Provider Setup - - Description of services offered by {0} + + Welcome to Bitmask - - Register a new user with {0} + + Choose a provider + + + + + Getting provider information. + + + + + About this provider + + + + + Bitmask is attempting to establish a secure connection with this provider for the first time. + + + + + Fetching provider credentials. + + + + + Do we trust these credentials? + + + + + Connecting to provider. 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? - + Missing helper files - - Missing resolvconf framework - - - - + Missing Bitmask helpers @@ -1490,25 +1521,12 @@ Export canceled. msgstr - - Could not find <b>resolvconf</b> installed in your system. -Do you want to quit Bitmask now? - - - - - Encrypted Internet needs resolvconf installed to work properly. -Please use your package manager to install it. - - - - - + Some essential helper files are missing in your system. - + Reinstall your debian packages, or make sure you place them by hand. @@ -1516,17 +1534,17 @@ Please use your package manager to install it. 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 From c7304e54e40cd9151e6d00a8441aaf48b68c9bcc Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 3 Sep 2014 15:50:08 -0700 Subject: single pref win: move eip preferences to new combined preference window. --- data/resources/flags.qrc | 1 + 1 file changed, 1 insertion(+) (limited to 'data') 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 @@ ../images/countries/us.png ../images/countries/ve.png ../images/countries/vn.png + ../images/countries/xx.png ../images/countries/za.png \ No newline at end of file -- cgit v1.2.3 From 668a9f9aa327c3c055b9e0f641f8c33d59e1c452 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 22 Sep 2014 09:56:48 -0700 Subject: country flags: add default fallback xx.png flag. --- data/images/countries/xx.png | Bin 0 -> 254 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/images/countries/xx.png (limited to 'data') diff --git a/data/images/countries/xx.png b/data/images/countries/xx.png new file mode 100644 index 00000000..abd36d39 Binary files /dev/null and b/data/images/countries/xx.png differ -- cgit v1.2.3