From 62e36ee804262be866946ca467f7abeb2746add4 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 25 Feb 2018 13:00:13 +0100
Subject: #8808 add a link to android's vpn settings for API >= 24

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

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71b6d437..03fd4584 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,5 @@
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
+  <string name="always_on_vpn">Always-on VPN</string>
 </resources>
-- 
cgit v1.2.3


From 30244cbf5b7eaf6152bcdc2cb5b6848f6e10798d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 25 Feb 2018 23:04:10 +0100
Subject: #8808 add dialog for always-on vpn infos

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

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03fd4584..4d19758c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,6 @@
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
   <string name="always_on_vpn">Always-on VPN</string>
+  <string name="do_not_show_again">Do not show again.</string>
+  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon and turn the switch on."</string>
 </resources>
-- 
cgit v1.2.3


From b14e4b9a7940adb4580c0f3c7a0edcb339c73ae8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 2 Mar 2018 23:09:08 +0100
Subject: #8808 adds an optional dialog that shows instruction hints for
 always-on vpn

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

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d19758c..a308b5e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,5 +112,5 @@
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="do_not_show_again">Do not show again.</string>
-  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon and turn the switch on."</string>
+  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string>
 </resources>
-- 
cgit v1.2.3