From 551ee22aafae99c1f0802ec48f43d448cc77db37 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 22 Jul 2021 15:31:08 +0200
Subject: first implementation of the gateway button, started to remove labels
 from EipFragment, implement method to get the avearage load of a location as
 an enum value

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 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 22696c12..b6bdafa8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,7 +155,8 @@
   <string name="gateway_selection_best_location">Location with best connection</string>
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
-
+  <string name="finding_best_connection">Finding best connection…</string>
+  <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
   <string name="tor_stopping">Stopping bridges.</string>
   <string name="tor_started">Using bridges for censorship circumvention.</string>
@@ -181,5 +182,4 @@
   <string name="hide_connection_details">Hide connection details</string>
   <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
 
-
 </resources>
-- 
cgit v1.2.3


From 5c4c3cde26fafbd763e4a879dc46ca959b1a7d27 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 30 Jul 2021 15:46:40 +0200
Subject: draft gateway selection UI according to simlpy secure's proposals

---
 app/src/main/res/values/strings.xml | 7 +++++--
 1 file changed, 5 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 b6bdafa8..7c0c46f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,9 +152,12 @@
   <string name="version_update_error_permissions">No permissions to install app.</string>
   <string name="gateway_selection_title">Select location</string>
   <string name="gateway_selection_warning">%s will find the best connection for you.</string>
-  <string name="gateway_selection_best_location">Location with best connection</string>
+  <string name="gateway_selection_recommended_location">Use recommended location</string>
   <string name="gateway_selection_automatic">Automatic</string>
-  <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
+  <string name="gateway_selection_manual_location">Your traffic is currently routed through: </string>
+  <string name="gateway_selection_manual_not_connected">Your traffic will be routed through: </string>
+  <string name="gateway_selection_automatic_location">Your traffic is automatically routed through the best location:</string>
+  <string name="gateway_selection_automatic_not_connected">Your traffic will be automatically routed through the best location.</string>
   <string name="finding_best_connection">Finding best connection…</string>
   <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
-- 
cgit v1.2.3


From a6cd31ae8624f830454adc627ac3a6be323a5333 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 21 Nov 2021 19:36:46 +0100
Subject: implement new gateway selection UI, using same UX principles as for
 desktop

---
 app/src/main/res/values/strings.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 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 7c0c46f0..9d62cc3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,11 +153,10 @@
   <string name="gateway_selection_title">Select location</string>
   <string name="gateway_selection_warning">%s will find the best connection for you.</string>
   <string name="gateway_selection_recommended_location">Use recommended location</string>
+  <string name="gateway_selection_recommended">Recommended</string>
+  <string name="gateway_selection_manually">Manually select</string>
+  <string name="gateway_selection_automatic_location">Automatically use best connection.</string>
   <string name="gateway_selection_automatic">Automatic</string>
-  <string name="gateway_selection_manual_location">Your traffic is currently routed through: </string>
-  <string name="gateway_selection_manual_not_connected">Your traffic will be routed through: </string>
-  <string name="gateway_selection_automatic_location">Your traffic is automatically routed through the best location:</string>
-  <string name="gateway_selection_automatic_not_connected">Your traffic will be automatically routed through the best location.</string>
   <string name="finding_best_connection">Finding best connection…</string>
   <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
-- 
cgit v1.2.3