From ee49de021bab8838ed44897f1046cb7d0f8f5921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 16 Jun 2014 22:31:50 +0200
Subject: Check if there is an active gateway selected.

The active gateway cannot be null.
---
 app/src/main/res/values/untranslatable.xml | 78 +++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 50e598ac..4212cec2 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -777,4 +777,80 @@
 
 
 
-</resources>
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</resources>
-- 
cgit v1.2.3


From 6ac43e5e95046308815581abf3189f12df841923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 19 Jun 2014 16:39:27 +0200
Subject: Provider name in Dashboard is ellipsized correctly

---
 app/src/main/res/values/untranslatable.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 4212cec2..de355720 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -853,4 +853,5 @@
 
 
 
-</resources>
+
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 0bf036dae1cc8d2be7129cd8f39474af8cdb9f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 20 Jun 2014 12:29:56 +0200
Subject: Service is down message correctly shown.

I've also fixed another message: if a file to be downloaded is not
found, we say the entered provider isn't a LEAP provider. This is based
on the fact that if provider.json doesn't exist/contain valid
information, then the url isn't pointing to a LEAP provider.
---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7114b73..62d54981 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,6 +52,7 @@
     <string name="server_unreachable_message">Server is unreachable, please try again.</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="configuring_provider">Configuring provider</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="authenticating_message">Logging in</string>
-- 
cgit v1.2.3


From e53c1b281014e584e6ad92593863870afe26499a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 20 Jun 2014 13:55:54 +0200
Subject: Updated ics-openvpn-upstream: less patches of ours.

---
 app/src/main/res/values/untranslatable.xml | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index de355720..cc39df3d 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -833,6 +833,44 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-- 
cgit v1.2.3


From 49aee8dd5fe884eabdc291d758bb8a635f9d1271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 24 Jun 2014 09:32:06 +0200
Subject: LEAP copyright updated until 2014.

---
 app/src/main/res/values/untranslatable.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index cc39df3d..6bffb192 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -3,7 +3,7 @@
 	<string name="app" translatable="false">Bitmask</string>
 	<string name="app_name" translatable="false">Bitmask</string>
 	
-    <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
+    <string name="copyright_leapgui" translatable="false">Copyright 2012-2014\nLEAP Encryption Access Project &lt;info@leap.se></string>
     <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
 
 	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
@@ -892,4 +892,4 @@
 
 
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From c228f481090a468106b57593117d95d9e3dda3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 24 Jun 2014 10:00:31 +0200
Subject: Tracker link pointing to chili

---
 app/src/main/res/values/strings.xml        | 3 ++-
 app/src/main/res/values/untranslatable.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62d54981..bb68b942 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <string name="retry">Retry</string>
-    <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
+    <string name="repository_url_text">Source code available at https://github.com/leapcode/bitmask_android/</string>
+    <string name="leap_tracker">Tracker available at https://leap.se/code</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>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 6bffb192..f956b6bd 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -892,4 +892,5 @@
 
 
 
-</resources>
+
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 55e9c0c60b94c09f8321dccd2971b32d92ec72a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 24 Jun 2014 10:29:09 +0200
Subject: We don't predict future certificate.

---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb68b942..6db6962f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,9 +17,7 @@
     <string name="provider_label_none">No provider configured</string>
     <string name="eip_settings_button_description">Access EIP connection settings</string>
     <string name="status_unknown">Status unknown.</string>
-    <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string>
     <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string>
-    <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">Select a service provider</string>
-- 
cgit v1.2.3


From b5c84602ebb9bf2f593d4352dfe51029f44731b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 25 Jun 2014 19:44:14 +0200
Subject: Show "Logged out." message.

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

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6db6962f..c928f001 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="authenticating_message">Logging in</string>
     <string name="signingup_message">Signing up</string>
     <string name="logout_message">Logging out from this session.</string>
+    <string name="logged_out_message">Logged out.</string>
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
-- 
cgit v1.2.3