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 3a178037..09819809 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 09819809..cef7de1e 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