summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorAllan Nordhøy <epost@anotheragency.no>2018-01-16 09:45:44 +0100
committercyBerta <cyberta@riseup.net>2018-01-17 14:25:46 +0100
commit2a354dced3aae7aa5e0ce516bcc3e4589642a587 (patch)
tree60d5dde5c340ba34807b4e62a8ef59dd5ed6e94e /app/src
parentb7e9813f2fb1e79d260ef8aa3bebd47aea70df20 (diff)
Spelling: Marked nouns, whitespace, upgrade, : Bigversal
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/res/values/strings.xml42
1 files changed, 19 insertions, 23 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b9aabef..e05e0afd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,26 +3,26 @@
<string name="retry">Retry</string>
<string name="repository_url_text">Source code available at https://0xacab.org/leap/bitmask_android</string>
- <string name="leap_tracker">Tracker available at https://0xacab.org/leap/bitmask_android/issues</string>
- <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
+ <string name="leap_tracker">Issue tracker available at https://0xacab.org/leap/bitmask_android/issues</string>
+ <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
<string name="switch_provider_menu_option">Switch provider</string>
<string name="info">info</string>
<string name="show_connection_details">Show connection details</string>
<string name="routes_info">Routes: %s</string>
- <string name="routes_info6">Routes IPv6: %s</string>
- <string name="error_empty_username">The username must not be empty.</string>
- <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string>
+ <string name="routes_info6">IPv6 routes: %s</string>
+ <string name="error_empty_username">The username can not be empty.</string>
+ <string name="cert_from_keystore">Got certificate \'%s\' from keystore</string>
<string name="provider_label">Provider:</string>
<string name="provider_label_none">No provider configured</string>
<string name="status_unknown">Status unknown.</string>
- <string name="eip_service_label">VPN Encrypted Internet Access</string>
+ <string name="eip_service_label">Encrypted VPN Internet Access</string>
<string name="configuration_wizard_title">Select a service provider</string>
<string name="new_provider_button">Add new Provider</string>
<string name="introduce_new_provider">Add a new service provider</string>
<string name="save">Save</string>
<string name="new_provider_uri">Domain name</string>
- <string name="valid_url_entered">It seems your URL is well formed</string>
- <string name="not_valid_url_entered">It seems your URL is not well formed</string>
+ <string name="valid_url_entered">The URL is valid</string>
+ <string name="not_valid_url_entered">Malformed URL</string>
<string name="provider_details_title">Provider details</string>
<string name="use_anonymously_button">Use anonymously</string>
<string name="username_hint">username</string>
@@ -32,14 +32,14 @@
<string name="password_match">Passwords match</string>
<string name="password_mismatch">Passwords do not match</string>
<string name="user_message">User message</string>
- <string name="about_fragment_title">About Bitmask</string>
- <string name="error_srp_math_error_user_message">Try again: server math error.</string>
+ <string name="about_fragment_title">About</string>
+ <string name="error_srp_math_error_user_message">Try again: Server math error.</string>
<string name="error_bad_user_password_user_message">Incorrect username or password.</string>
- <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string>
+ <string name="error_not_valid_password_user_message">It must be at least 8 characters long.</string>
<string name="error_client_http_user_message">Try again: Client HTTP error</string>
<string name="error_io_exception_user_message">Try again: I/O error</string>
<string name="error_json_exception_user_message">Try again: Bad response from the server</string>
- <string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please update your OS!</string>
+ <string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please upgrade Android!</string>
<string name="signup_or_login_button">Sign Up/Log In</string>
<string name="login_button">Log In</string>
<string name="logout_button">Log Out</string>
@@ -48,31 +48,31 @@
<string name="setup_error_configure_button">Configure</string>
<string name="setup_error_close_button">Exit</string>
<string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
- <string name="server_unreachable_message">Server is unreachable, please try again.</string>
- <string name="error.security.pinnedcertificate">Security error, update the app or choose another provider.</string>
+ <string name="server_unreachable_message">The server is unreachable, please try again.</string>
+ <string name="error.security.pinnedcertificate">Security error, upgrade the app or choose another provider.</string>
<string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
<string name="certificate_error">This is not a trusted Bitmask provider.</string>
- <string name="service_is_down_error">Service is down.</string>
+ <string name="service_is_down_error">The service is down.</string>
<string name="configuring_provider">Configuring provider</string>
<string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
<string name="downloading_certificate_message">Downloading VPN certificate</string>
<string name="updating_certificate_message">Updating VPN certificate</string>
- <string name="login.riseup.warning">"Riseup users: You need to create a separate account to use the VPN service"</string>
- <string name="succesful_authentication_message">Authentication succeeded.</string>
+ <string name="login.riseup.warning">"Riseup users will need to create a separate account to use the VPN service"</string>
+ <string name="succesful_authentication_message">Authenticated.</string>
<string name="authentication_failed_message">Authentication failed.</string>
<string name="registration_failed_message">Registration failed.</string>
<string name="eip_status_start_pending">Initiating connection</string>
<string name="eip_cancel_connect_title">Cancel connection?</string>
<string name="eip_cancel_connect_text">There is a connection attempt in progress. Do you wish to cancel it?</string>
<string name="eip.warning.browser_inconsistency">In order to avoid leaking your personal information, please close your browser and start a private window after disconnecting the Encrypted VPN Internet Access. Thanks.</string>
- <string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
+ <string name="eip_state_not_connected">"Not running! Insecure connection!"</string>
<string name="eip_state_connected">Connection Secure.</string>
<string name="provider_problem">It seems there is a problem with the provider.</string>
<string name="try_another_provider">Please try another provider, or contact yours.</string>
<string name="default_username">Anonymous</string>
<string name="logged_in_user_status">is logged in.</string>
<string name="logged_out_user_status">logged out.</string>
- <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings</string>
+ <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings.</string>
<string name="not_logged_in_user_status">have not logged in.</string>
<string name="logging_in_user_status">is logging in.</string>
<string name="logging_out_user_status">is logging out.</string>
@@ -82,15 +82,11 @@
<string name="vpn_button_turn_off_blocking">Stop blocking</string>
<string name="bitmask_log">Bitmask Log</string>
<string name="title_activity_main">Bitmask</string>
-
<string name="log_fragment_title">Log</string>
<string name="vpn_fragment_title">VPN</string>
-
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
-
<string name="action_example">Example action</string>
-
<string name="action_settings">Settings</string>
<string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string>
<string name="void_vpn_error_establish">Failed to establish blocking VPN.</string>