From 11d02a74973806098aa2ab9fd70a22cdb87b95a7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 5 Dec 2021 15:09:22 +0100
Subject: fix some of the existing strings

---
 app/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 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 4458b095..eb6c22df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,7 +155,7 @@
   <string name="gateway_selection_recommended_location">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_location">Automatically use best connection</string>
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
@@ -167,8 +167,8 @@
   <string name="log_handshake">Handshaking with a relay</string>
   <string name="log_handshake_done">Handshake with a relay done</string>
   <string name="log_onehop_create">Establishing an encrypted directory connection</string>
-  <string name="log_requesting_status">Asking for networkstatus consensus</string>
-  <string name="log_loading_status">Loading networkstatus consensus</string>
+  <string name="log_requesting_status">Asking for network status consensus</string>
+  <string name="log_loading_status">Loading network status consensus</string>
   <string name="log_loading_keys">Loading authority key certs</string>
   <string name="log_requesting_descriptors">Asking for relay descriptors</string>
   <string name="log_loading_descriptors">Loading relay descriptors</string>
-- 
cgit v1.2.3


From 9db9ceeaafe5f0852d63dcf736b5290272cf6afc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 10 Dec 2021 11:27:53 +0100
Subject: add strings from ics-openvpn

---
 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 eb6c22df..60bfc4b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,4 +196,7 @@
   <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
   <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string>
   <string name="disabled_while_udp_on">Disabled while UDP is on.</string>
+  <string name="advanced_settings">Advanced Settings</string>
+  <string name="cancel_connection">Disconnect</string>
+
 </resources>
-- 
cgit v1.2.3


From 88f52dab88ef99b2560e698112a91db86da1203d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 10 Dec 2021 11:55:50 +0100
Subject: strings improvement: use less technical word negotiating instead of
 handshaking

---
 app/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 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 60bfc4b3..eed5bc1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,8 +164,8 @@
   <string name="log_conn_done_pt">Connected to pluggable transport</string>
   <string name="log_conn_pt">Connecting to pluggable transport</string>
   <string name="log_conn_done">Connected to a relay</string>
-  <string name="log_handshake">Handshaking with a relay</string>
-  <string name="log_handshake_done">Handshake with a relay done</string>
+  <string name="log_handshake">Negotiating connection with a relay</string>
+  <string name="log_handshake_done">Connection negotiation with a relay done</string>
   <string name="log_onehop_create">Establishing an encrypted directory connection</string>
   <string name="log_requesting_status">Asking for network status consensus</string>
   <string name="log_loading_status">Loading network status consensus</string>
@@ -173,7 +173,7 @@
   <string name="log_requesting_descriptors">Asking for relay descriptors</string>
   <string name="log_loading_descriptors">Loading relay descriptors</string>
   <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
-  <string name="log_ap_handshake_done">Handshake finished with a relay to build circuits</string>
+  <string name="log_ap_handshake_done">Negotiation finished with a relay to build circuits</string>
   <string name="log_circuit_create">Establishing a Tor circuit</string>
   <string name="log_done">Running</string>
   <string name="channel_name_tor_service">%s Bridges Service</string>
-- 
cgit v1.2.3


From dcf5b2ebd1103b842651adb77d11ccc5c20bf962 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 10 Dec 2021 15:51:59 +0100
Subject: improve log string

---
 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 eed5bc1e..b1ab2511 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,7 +169,7 @@
   <string name="log_onehop_create">Establishing an encrypted directory connection</string>
   <string name="log_requesting_status">Asking for network status consensus</string>
   <string name="log_loading_status">Loading network status consensus</string>
-  <string name="log_loading_keys">Loading authority key certs</string>
+  <string name="log_loading_keys">Loading authority certificates</string>
   <string name="log_requesting_descriptors">Asking for relay descriptors</string>
   <string name="log_loading_descriptors">Loading relay descriptors</string>
   <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
-- 
cgit v1.2.3


From 26fe791beffdd1aa8ff524933ac4e3a0b3d6658c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 10 Dec 2021 15:52:29 +0100
Subject: remove full stops from tor status strings

---
 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 b1ab2511..5dcf4947 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -159,8 +159,8 @@
   <string name="gateway_selection_automatic">Automatic</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>
+  <string name="tor_stopping">Stopping bridges</string>
+  <string name="tor_started">Using bridges for censorship circumvention</string>
   <string name="log_conn_done_pt">Connected to pluggable transport</string>
   <string name="log_conn_pt">Connecting to pluggable transport</string>
   <string name="log_conn_done">Connected to a relay</string>
-- 
cgit v1.2.3


From 31766986b80148dfaa9b7bcc7e565daf005e0cd0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 13 Dec 2021 10:14:24 +0100
Subject: fix 'Advanced settings' string

---
 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 5dcf4947..94b304f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,7 +196,7 @@
   <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
   <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string>
   <string name="disabled_while_udp_on">Disabled while UDP is on.</string>
-  <string name="advanced_settings">Advanced Settings</string>
+  <string name="advanced_settings">Advanced settings</string>
   <string name="cancel_connection">Disconnect</string>
 
 </resources>
-- 
cgit v1.2.3


From cf0cf6964accada6482722b52554978174ef2da2 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 13 Dec 2021 10:18:32 +0100
Subject: improve string log_handshake_done

---
 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 94b304f0..dd33ce33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -165,7 +165,7 @@
   <string name="log_conn_pt">Connecting to pluggable transport</string>
   <string name="log_conn_done">Connected to a relay</string>
   <string name="log_handshake">Negotiating connection with a relay</string>
-  <string name="log_handshake_done">Connection negotiation with a relay done</string>
+  <string name="log_handshake_done">Connection with relay negotiated</string>
   <string name="log_onehop_create">Establishing an encrypted directory connection</string>
   <string name="log_requesting_status">Asking for network status consensus</string>
   <string name="log_loading_status">Loading network status consensus</string>
-- 
cgit v1.2.3