From 6b5f766c9a1643c3c87bd396d1a23e49144ca813 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Tue, 29 Jan 2013 20:22:50 -0700
Subject: Many strings... Resolves #1527 #1580 but opened #1582 #1583

---
 res/values/strings.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a101d02..4b029b2 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,7 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">OpenVPN for Android</string>
+    <string name="app">LEAP for Android</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
@@ -17,10 +17,10 @@
     <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 http://code.google.com/p/ics-openvpn/</string>
+    <string name="copyright_guicode">Source code and issue tracker available at https://github.com/leapcode/leap_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_summary">About OpenVPN for Android</string>
+    <string name="about_summary">About LEAP 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>
@@ -111,7 +111,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">ICS OpenVPN log file</string>
+    <string name="ics_openvpn_log_file">LEAP 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>
@@ -203,7 +203,7 @@
     <string name="using_proxy">Using proxy %1$s %2$d</string>
     <string name="use_system_proxy">Use system proxy</string>
     <string name="use_system_proxy_summary">Use the system wide configuration for HTTP/HTTPS proxies to connect.</string>
-    <string name="donatewithpaypal">You can &lt;a href=\"https://www.paypal.com/cgi-bin/webscr?hosted_button_id=R2M6ZP9AF25LS&amp;amp;cmd=_s-xclick\"&gt;donate with PayPal&lt;/a&gt; </string>
+    <string name="donatewithpaypal"></string>
     <string name="onbootrestartsummary">OpenVPN will reconnect a VPN if it was active on system reboot/shutdown. Please read the Connection warning FAQ before using this option.</string>
     <string name="onbootrestart">Reconnect on reboot</string>
     <string name="ignore">Ignore</string>
@@ -253,5 +253,8 @@
     <string name="state_tcp_connect">Connecting (TCP)</string>
     <string name="state_auth_failed">Authentication failed</string>
     <string name="state_nonetwork">Waiting for usable network</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_dashboard">LEAP Dashboard</string>
 
-</resources>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From c1fc197d48e96a609fb36f93004c981670c0237c Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 22:34:29 -0700
Subject: Goodbye, hello_world

---
 res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b029b2..87b395c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -253,7 +253,6 @@
     <string name="state_tcp_connect">Connecting (TCP)</string>
     <string name="state_auth_failed">Authentication failed</string>
     <string name="state_nonetwork">Waiting for usable network</string>
-    <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_dashboard">LEAP Dashboard</string>
 
-- 
cgit v1.2.3


From c849913fba3f5b692309570415f85e9bdb8cceeb Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 22:54:56 -0700
Subject: Beginnings of a Dashboard Activity Matching layout and menu XML And
 don't forget strings

---
 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 87b395c..606cb3b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -255,5 +255,7 @@
     <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="provider_label">Provider:</string>
+    <string name="provider_label_none">No provider configured</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From b6e47ac59c3e853b23d4392eec33bbeb2f068f17 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 23:35:42 -0700
Subject: Add EIP Service item in Dashboard

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 606cb3b..f18c992 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,5 +257,6 @@
     <string name="title_activity_dashboard">LEAP Dashboard</string>
     <string name="provider_label">Provider:</string>
     <string name="provider_label_none">No provider configured</string>
+    <string name="eip_type_active">EIP</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d21e8390e90437f0d053374f8e304ca3f592beb9 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 23:37:33 -0700
Subject: More fun with EIP item entry. Added parts to expand listing for quick
 info and settings access

---
 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 f18c992..0925235 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,8 @@
     <string name="title_activity_dashboard">LEAP 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_type_active">EIP</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 6e0142a335eafe8a9b0e41b0e968038c0aeabd11 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Thu, 7 Feb 2013 01:33:03 -0700
Subject: Refactor ProviderListActivity.class into ConfigurationWizard.class,
 Moves towards our wizard flow; Addresses #1497 #1500

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0925235..1a453fa 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -260,5 +260,6 @@
     <string name="eip_settings_button_description">Access EIP connection settings</string>
     <string name="eip_status">Status unknown</string>
     <string name="eip_type_active">EIP</string>
+    <string name="title_activity_configuration_wizard">Configure LEAP</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e3acc71aaedfcf97b2adee907b6587e3c1eadf48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 7 Feb 2013 21:25:58 +0100
Subject: Button not working from ConfigurationWizard.

Trying to test cancel button from created new dialog.
---
 res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a453fa..ca73c0d 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,5 +261,8 @@
     <string name="eip_status">Status unknown</string>
     <string name="eip_type_active">EIP</string>
     <string name="title_activity_configuration_wizard">Configure LEAP</string>
+    <string name="new_provider_button">Add new Provider</string>
+    <string name="introduce_new_provider">Introduce new provider</string>
+    <string name="save">Save</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 162afa5bfa6485f3aacb3f60e9c92fa0c3bfa7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 11 Feb 2013 20:28:59 +0100
Subject: Gets provider.json from custom url (assuming the file is at the root
 of the website, just as bitmask.net/provider.json), and writes it to a file
 in ~/leap_android.

Next steps: parse that file and download eip-service and cert.
---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ca73c0d..2deb23f 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -264,5 +264,6 @@
     <string name="new_provider_button">Add new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
+    <string name="new_provider_uri">New provider\'s main URL</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 75728462433b19567710f54a9d4767681b10be95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 18:07:07 +0200
Subject: Coded dialog (now there is a button in the Dashboard), time to test.

I need to implement bypass for dev.bitmask.net, because bitmask.net is
down.
---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2deb23f..6e84bed 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,5 +265,9 @@
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</string>
+    <string name="username_ask">Introduce your username</string>
+    <string name="password_ask">Enter your password</string>
+    <string name="log_in_button">Log in</string>
+    <string name="login_button">Log In</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From bfe2263d6b73159a4f929bc7b1fdeb724c88e8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 20:17:43 +0200
Subject: Added danger mode: we can bypass dev.bitmask.net hostname io
 exception.

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e84bed..eac73bc 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,5 +269,6 @@
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
     <string name="login_button">Log In</string>
+    <string name="danger_checkbox">Trust completely</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 84a11bb1620d2b9080992427c847b58007f2304a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 9 May 2013 17:29:38 +0200
Subject: Log in and Log out options are shown only if allow registration is
 true.

Allow registration is present in provider.json.

Provider.json is downloaded from both preseeded and custom providers.

Authentication success or fail is notified correctly to the user.
---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eac73bc..03de1ee 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,6 +269,7 @@
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
     <string name="login_button">Log In</string>
+    <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d14ae81fe92494a67994d703e1175ef4264adddb Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 21:58:00 -0600
Subject: Refactor ConfigurationWizard for better task handling, completion,
 and return information

---
 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 03de1ee..ed32f61 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,5 +271,7 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
+    <string name="config_error_parsing">Error parsing provider\'s responses!</string>
+    <string name="success">Success!</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 626b32fba7b6b45bead3b79fb7e7aa6cddc5c535 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 22:07:39 -0600
Subject: Add ProgressDialog to ConfigurationWizard while downloading from
 provider

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed32f61..0efa941 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,6 +271,10 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
+    <string name="config_wait_title">Configuring LEAP 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>
 
-- 
cgit v1.2.3


From 769344327d5cb16adbdc04db224ff6902b4a4771 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 22:27:25 -0600
Subject: Better config/partial config handling in Dashboard

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0efa941..4501ac1 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,6 +271,10 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</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>
+    <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="config_connecting_provider">Downloading provider configuration</string>
     <string name="config_downloading_services">Downloading service definitions</string>
-- 
cgit v1.2.3


From f4956bb818fb9ed04760e6de3b53b876272da5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 20 Jun 2013 16:52:43 +0200
Subject: User messages are now in string.xml

Some more constants added to ConfigHelper.

This solves #2908.
---
 res/values/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4501ac1..804964c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,6 +265,8 @@
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</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="username_ask">Introduce your username</string>
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
@@ -281,5 +283,17 @@
     <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="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="incorrectly_updated_provider_dot_json_message">Install a new version of this app.</string>
+    <string name="not_valid_password_message">Your password is not well-formed: it should have 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>
+    <string name="log_out_failed_message">Didn\'t logged out.</string>
+    <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
+    <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 33338d43e0e83329a7c46807e096b8148e19aff7 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 04:09:03 -0600
Subject: Quite basic staring and stopping of VPN

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 804964c..c0ba6eb 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,6 +259,7 @@
     <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">EIP:</string>
     <string name="eip_type_active">EIP</string>
     <string name="title_activity_configuration_wizard">Configure LEAP</string>
     <string name="new_provider_button">Add new Provider</string>
-- 
cgit v1.2.3


From 6ada10858719786e489938b3124d1d6015a70421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 17:55:22 +0200
Subject: The added provider is selected automatically.

I've also removed a lot of finishes when things go wrong (so that it should be returning to the previous activity/fragment).
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0ba6eb..a7c2cdf 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="eip_service_label">EIP:</string>
     <string name="eip_type_active">EIP</string>
     <string name="title_activity_configuration_wizard">Configure LEAP</string>
-    <string name="new_provider_button">Add new Provider</string>
+    <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</string>
@@ -297,4 +297,4 @@
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
     
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From abd581dd08ec50d8b93b244e5e09596b6acb8a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 18:29:08 +0200
Subject: Changed user message when a provider is down.

I was assuming that if the app wasn't able to download provider.json from the web, it meant that the preseeded provider was wrong thus the app needed an upgrade. But it can happen (as right now, with bitmask.net) that the provider is simply down.
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7c2cdf..80dd85b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -287,7 +287,7 @@
     <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP 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="incorrectly_updated_provider_dot_json_message">Install a new version of this app.</string>
+    <string name="incorrectly_updated_provider_dot_json_message">Server is down.</string>
     <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
-- 
cgit v1.2.3


From 9e7693c112a7c85cae998ae538643cda9660ff7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 27 Jun 2013 20:29:33 +0200
Subject: Coded new fragment appearance

Domain, name and description come from provider.json

Next step: code buttons to login or to use anonymously.
---
 res/values/strings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80dd85b..0cc3593 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -268,9 +268,13 @@
     <string name="new_provider_uri">New provider\'s main URL</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>
+    <string name="domain">Domain</string>
+    <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="log_in_button">Log in</string>
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
@@ -295,6 +299,5 @@
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
-    
 
 </resources>
-- 
cgit v1.2.3


From 755633af514c8f425f936bc5185815175397937c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 29 Jun 2013 12:54:15 +0200
Subject: Distinguish non LEAP provider and down provider.

I've set ProviderAPI to show its own toast depending on the exception
that getStringFromProvider issues. If the socket timeout reaches its
end, a toast different from when an IOException or a MalformedException
occur.
---
 res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0cc3593..35b11b6 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -291,7 +291,8 @@
     <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP 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="incorrectly_updated_provider_dot_json_message">Server is down.</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="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
-- 
cgit v1.2.3


From 713078d3348017dd8c229ee52701c2c1b69bd85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 29 Jun 2013 13:01:07 +0200
Subject: Shows certificate error message.

If a download didn't occurr due to an IOException, we assume it was for
an SSL error and notify the user telling him/her that LEAP provider is
not trusted.
---
 res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35b11b6..6f06ab6 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,7 +292,8 @@
     <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="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="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
-- 
cgit v1.2.3


From e3dd09bb37f6727a09a2d5da7c880997555b4d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 29 Jun 2013 17:54:34 +0200
Subject: New menu option to go back to ConfigurationWizard.

It works ok (it simply starts ConfigurationWizard activity for result),
but when entering again to Dashboard a NullPointer happens in
serviceItemEIP(((ViewStub)
findViewById(R.id.eipOverviewStub)).inflate();).

It also adds (I forgot to commit before leaving the retry-login branch)
ProgressDialogs to login and logout operations.
---
 res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f06ab6..83f614f 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="copyright_guicode">Source code and issue tracker available at https://github.com/leapcode/leap_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="vpn_list_summary">List of all configured VPNs</string>
     <string name="vpn_list_title">VPN Profiles</string>
@@ -295,6 +296,10 @@
     <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="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</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>
+    <string name="logout_message">Logging out from this session.</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 99a4d94564635f0223d447bc9bcf081cadd8ff36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 2 Jul 2013 19:20:58 +0200
Subject: User messages are added to the new recovery dialog

When login is not successful, a new recovery dialog is prompted with a
message about the previous error.
---
 res/values/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 83f614f..c7ef6c2 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,6 +276,13 @@
     <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="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_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">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>
@@ -295,7 +302,6 @@
     <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="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</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>
-- 
cgit v1.2.3


From 3e04f2ab44e5e5e33efcfe515088ec3f918ccef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 29 Jun 2013 12:54:15 +0200
Subject: Distinguish non LEAP provider and down provider.

I've set ProviderAPI to show its own toast depending on the exception
that getStringFromProvider issues. If the socket timeout reaches its
end, a toast different from when an IOException or a MalformedException
occur.
---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c7ef6c2..c8f391a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -306,6 +306,7 @@
     <string name="authenticating_message">Authenticating with entered login and password.</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="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 ebacbcad73f86b80c9bac17f737a764ef75647df Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 04:41:21 -0600
Subject: Change the launcher name from "LEAP Dashboard" to "LEAP"

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8f391a..3a17803 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,6 +3,7 @@
 <resources>
 
     <string name="app">LEAP for Android</string>
+    <string name="app_name">LEAP</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
-- 
cgit v1.2.3


From 437183f283e61da878aded001fb78e8e62aa9da6 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 13:15:52 -0600
Subject: Use non-blocking logic for EIP switch Includes AlertDialog if the
 user attempts to stop EIP while a connection is being established

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a17803..0981980 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,5 +314,9 @@
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</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_cancel_connect_cancel">Yes</string>
+    <string name="eip_cancel_connect_false">No</string>
 
 </resources>
-- 
cgit v1.2.3


From b19dc954b381c1e266395fdc1f19a1246096d4ab Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 21:57:43 -0600
Subject: Add a progress bar while VPN connection is being established

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0981980..cef7de1 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,6 +314,7 @@
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</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_cancel_connect_cancel">Yes</string>
-- 
cgit v1.2.3


From 6f9cb39e79ff97bcd5e0635cb67f9a8f23f2b486 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Tue, 2 Jul 2013 22:58:16 -0600
Subject: Change EIP switch label to "Encrypted Internet"

---
 res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cef7de1..532d237 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,8 +261,7 @@
     <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">EIP:</string>
-    <string name="eip_type_active">EIP</string>
+    <string name="eip_service_label">Encrypted Internet</string>
     <string name="title_activity_configuration_wizard">Configure LEAP</string>
     <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
-- 
cgit v1.2.3