From 6695ff2de6125535bb8416e5b354dca22b89b1fc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 13 Dec 2021 22:22:52 +0100
Subject: add missing error handling strings

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd33ce33..6957a116 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,6 +138,8 @@
   <string name="warning_no_more_gateways_use_pt">%s could not connect. It might be that VPN connections get blocked. Do you want to try to connect using obfuscated connections?</string>
   <string name="warning_no_more_gateways_no_pt">%s could not connect. Do you want to retry?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s could not connect using obfuscated VPN connections. Do you want to try to connect using a standard VPN?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
+  <string name="warning_option_try_best">Try best location</string>
   <string name="warning_option_try_pt">Try obfuscated connection</string>
   <string name="warning_option_try_ovpn">Try standard connection</string>
   <string name="vpn_error_establish">Android failed to establish the VPN service.</string>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 8c3c5944..2459e146 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -45,8 +45,6 @@
     <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string>
 
    <!-- gateway selector, move to strings.xml, once the wording is clear -->
-    <string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
-    <string name="warning_option_try_best" translatable="false">Try best location</string>
     <string name="no_location" translatable="false">---</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 9f2afce439ac78292872b58fdc515adc913f98df Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 13 Dec 2021 22:56:43 +0100
Subject: improve string about failing VoidVPN

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6957a116..b87b842b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,7 +88,7 @@
   <string name="action_example">Example action</string>
   <string name="action_settings">Settings</string>
   <string name="void_vpn_establish">%s blocks all outgoing internet traffic.</string>
-  <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string>
+  <string name="void_vpn_error_establish">Blocking all outgoing internet traffic failed.</string>
   <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
   <string name="void_vpn_title">Blocking traffic</string>
   <string name="update_provider_details">Update provider details</string>
-- 
cgit v1.2.3