From 5ac110f5963a7118f953bf264cf5bf9abed303b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 12 Nov 2013 19:56:37 +0100
Subject: Trivial changes in strings.xml

---
 res/values/strings.xml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b4839763..9885952f 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,7 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">Bitmask for Android</string>
+    <string name="app">Bitmask</string>
     <string name="app_name">Bitmask</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
@@ -21,7 +21,7 @@
     <string name="no_certificate">You must select a certificate</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="about">About LEAP</string>
     <string name="switch_provider_menu_option">Switch provider</string>
     <string name="about_summary">About Bitmask for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
@@ -257,7 +257,7 @@
     <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">Bitmask Dashboard</string>
+    <string name="title_activity_dashboard">Bitmask</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>
@@ -268,13 +268,11 @@
     <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string>
     <string name="authed_secured_status">Connection secure using your own certificate.</string>
     <string name="eip_service_label">Encrypted Internet</string>
-    <string name="title_activity_configuration_wizard">Configure Bitmask</string>
-    <string name="provider_list_fragment_tag">Provider list fragment</string>
-    <string name="top_padding">Top padding</string>
-    <string name="new_provider_button">Select new Provider</string>
-    <string name="introduce_new_provider">Introduce new provider</string>
+    <string name="title_activity_configuration_wizard">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">New provider\'s main URL</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="provider_details_fragment_title">Provider details</string>
@@ -286,8 +284,7 @@
     <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_srp_math_error_user_message">Try again: server math error.</string>
-    <string name="error_bad_user_password_user_message">Not valid username and/or password.</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_client_http_user_message">Try again: Client HTTP error</string>
     <string name="error_io_exception_user_message">Try again: I/O error</string>
@@ -295,7 +292,7 @@
     <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
-    <string name="danger_checkbox">Trust completely</string>
+    <string name="danger_checkbox">Skip security check</string>
     <string name="setup_error_title">Configuration Error</string>
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
@@ -314,10 +311,10 @@
     <string name="certificate_error">This is not a trusted Bitmask provider.</string>
     <string name="configuring_provider">Configuring provider</string>
     <string name="authenticating_title">Authenticating</string>
-    <string name="authenticating_message">Authenticating with entered login and password.</string>
+    <string name="authenticating_message">Logging in</string>
     <string name="logout_title">Log out</string>
     <string name="logout_message">Logging out from this session.</string>
-    <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
+    <string name="not_valid_password_message">Invalid password: must be at least 8 characters.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
     <string name="successful_log_out_message">Logged out.</string>
-- 
cgit v1.2.3


From f9f69298e7d0b5e4258ea27095f50f9da7c6ff9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 21 Nov 2013 21:41:58 +0100
Subject: OpenVPN notification contains location.

Instead of plain domain, we're printing a new variable stored in vpnprofile (parsed in ConfigParser): location.

I'm substituing "__" by ", ", but I'm not uppercasing anything. We rely on the raw data from eip-service.json.
---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9885952f..2598d452 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,6 +269,7 @@
     <string name="authed_secured_status">Connection secure using your own certificate.</string>
     <string name="eip_service_label">Encrypted Internet</string>
     <string name="title_activity_configuration_wizard">Select a service provider</string>
+    <string name="top_padding">Top padding</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>
@@ -284,6 +285,7 @@
     <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_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_client_http_user_message">Try again: Client HTTP error</string>
-- 
cgit v1.2.3