Merge branch 'release-0.2.1'0.2.1

1 files changed, 16 insertions, 15 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 532d2379..39c82d40 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,8 +2,8 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">LEAP for Android</string>
-    <string name="app_name">LEAP</string>
+    <string name="app">Bitmask for Android</string>
+    <string name="app_name">Bitmask</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
@@ -18,11 +18,11 @@
     <string name="client_pkcs12_title">PKCS12 File</string>
     <string name="ca_title">CA Certificate</string>
     <string name="no_certificate">You must select a certificate</string>
-    <string name="copyright_guicode">Source code and issue tracker available at https://github.com/leapcode/leap_android/</string>
+    <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
     <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
     <string name="about">About</string>
     <string name="switch_provider_menu_option">Switch provider</string>
-    <string name="about_summary">About LEAP for Android</string>
+    <string name="about_summary">About Bitmask for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
     <string name="vpn_list_title">VPN Profiles</string>
     <string name="vpn_type">Type</string>
@@ -113,7 +113,7 @@
     <string name="version_info">%1$s %2$s</string>
     <string name="send_logfile">Send log file</string>
     <string name="send">Send</string>
-    <string name="ics_openvpn_log_file">LEAP OpenVPN log file</string>
+    <string name="ics_openvpn_log_file">Bitmask OpenVPN log file</string>
     <string name="copied_entry">Copied log entry to clip board</string>
     <string name="tap_mode">Tap Mode</string>
     <string name="faq_tap_mode">Tap Mode is not possible with the non root VPN API. Therefore this application cannot provide tap support</string>
@@ -256,13 +256,13 @@
     <string name="state_auth_failed">Authentication failed</string>
     <string name="state_nonetwork">Waiting for usable network</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_dashboard">LEAP Dashboard</string>
+    <string name="title_activity_dashboard">Bitmask Dashboard</string>
     <string name="provider_label">Provider:</string>
     <string name="provider_label_none">No provider configured</string>
     <string name="eip_settings_button_description">Access EIP connection settings</string>
     <string name="eip_status">Status unknown</string>
     <string name="eip_service_label">Encrypted Internet</string>
-    <string name="title_activity_configuration_wizard">Configure LEAP</string>
+    <string name="title_activity_configuration_wizard">Configure Bitmask</string>
     <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
@@ -274,11 +274,12 @@
     <string name="name">Name</string>
     <string name="description">Description</string>
     <string name="use_anonymously_button">Use anonymously</string>
-    <string name="username_ask">Introduce your username</string>
-    <string name="password_ask">Enter your password</string>
+    <string name="username_hint">username</string>
+    <string name="username_ask">Please enter your username</string>
+    <string name="password_hint">password</string>
     <string name="user_message">User message</string>
     <string name="error_bad_user_password_user_message">Not valid username and/or password.</string>
-    <string name="error_not_valid_password_user_message">Your password is not well-formed: it should have at least 8 characters.</string>
+    <string name="error_not_valid_password_user_message">It should have at least 8 characters.</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>
@@ -289,19 +290,19 @@
     <string name="setup_error_title">Configuration Error</string>
     <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 LEAP with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
-    <string name="config_wait_title">Configuring LEAP provider</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="config_wait_title">Configuring Bitmask provider</string>
     <string name="config_connecting_provider">Downloading provider configuration</string>
     <string name="config_downloading_services">Downloading service definitions</string>
     <string name="config_downloading_certificates">Downloading authentication certificates</string>
     <string name="config_error_parsing">Error parsing provider\'s responses!</string>
     <string name="success">Success!</string>
-    <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP provider URL or it is unavailable</string>
+    <string name="incorrectly_downloaded_json_files_message">You have not entered a Bitmask provider URL or it is unavailable</string>
     <string name="correctly_downloaded_json_files_message">Your anon cert has been correctly downloaded</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="server_is_down_message">Server is down.</string>
-    <string name="malformed_url">It doesn\'t seem to be a LEAP provider.</string>
-    <string name="certificate_error">This is not a trusted LEAP 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="authenticating_title">Authenticating</string>
     <string name="authenticating_message">Authenticating with entered login and password.</string>
     <string name="logout_title">Log out</string>