From d6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 19 Feb 2018 13:05:49 +0100
Subject: fix invalid vpn user message

---
 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 fa8fcd6c..2ea4670a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,5 +106,5 @@
   <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
   <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
-  <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to do download a new one.</string>
+  <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
 </resources>
-- 
cgit v1.2.3


From 06eb4014837704e04d6ea8e9d7a69475a58c3c65 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Feb 2018 02:22:25 +0100
Subject: #8754 enable pause openvpn on device inactivity feature

---
 app/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 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 2ea4670a..a69c2420 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,4 +107,7 @@
   <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <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="experimental_feature_title">Save Battery Warning</string>
+  <string name="experimental_feature_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
 </resources>
-- 
cgit v1.2.3


From ad086ab192b9094278b27f94120566a7ca21dccc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Feb 2018 02:34:55 +0100
Subject: #8754 fix dialog cancellation handling and change dialog title

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

(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 a69c2420..a0ca00c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,6 +108,5 @@
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <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="experimental_feature_title">Save Battery Warning</string>
-  <string name="experimental_feature_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
+  <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
 </resources>
-- 
cgit v1.2.3


From 2324de2a0bbcdd6befe4bbe1fea70731d538b664 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Sun, 25 Feb 2018 10:24:49 +0100
Subject: 8865 - resolve discussions

---
 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 2ea4670a..2c191afa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
   <string name="vpn.button.turn.off">Turn off</string>
   <string name="vpn_button_turn_off_blocking">Stop blocking</string>
   <string name="vpn_securely_routed">Your traffic is securely routed through:</string>
+  <string name="vpn_securely_routed_no_internet">No internet connection. Your traffic will be securely routed through:</string>
   <string name="bitmask_log">Bitmask Log</string>
   <string name="title_activity_main">Bitmask</string>
   <string name="log_fragment_title">Log</string>
-- 
cgit v1.2.3


From 5f19f3786147a4b28ac1b5dbe2c8c1f0c6e3f77f Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 27 Feb 2018 13:23:43 +0100
Subject: 8871 - rename sign up/log in

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

(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 2ea4670a..f4a5e6a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,12 +39,11 @@
   <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">Encryption algorithm not found. Please upgrade Android!</string>
-  <string name="signup_or_login_button">Sign Up/Log In</string>
   <string name="login_button">Log In</string>
-  <string name="login_to_profile">Log in to profile</string>
+  <string name="login_to_profile">Log In</string>
   <string name="logout_button">Log Out</string>
   <string name="signup_button">Sign Up</string>
-  <string name="create_profile">Create profile</string>
+  <string name="create_profile">Sign Up</string>
   <string name="setup_provider">Set up provider</string>
   <string name="setup_error_title">Configuration Error</string>
   <string name="setup_error_configure_button">Configure</string>
-- 
cgit v1.2.3


From ebfd6b38aaf5a375aaa4d27d696e22dd432e642a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 27 Feb 2018 19:36:02 +0100
Subject: #8873 add new translations

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

(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 122800ce..a0ca00c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,11 +39,12 @@
   <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">Encryption algorithm not found. Please upgrade Android!</string>
+  <string name="signup_or_login_button">Sign Up/Log In</string>
   <string name="login_button">Log In</string>
-  <string name="login_to_profile">Log In</string>
+  <string name="login_to_profile">Log in to profile</string>
   <string name="logout_button">Log Out</string>
   <string name="signup_button">Sign Up</string>
-  <string name="create_profile">Sign Up</string>
+  <string name="create_profile">Create profile</string>
   <string name="setup_provider">Set up provider</string>
   <string name="setup_error_title">Configuration Error</string>
   <string name="setup_error_configure_button">Configure</string>
-- 
cgit v1.2.3