From b63ad39efddecdc6fb41a096eb8b289db44338fa Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:41:58 +0400
Subject: [PATCH] aligned texts

---
 .../networkAndServers/NetworkAndServers.kt    |  2 +-
 .../networkAndServers/OperatorView.kt         |  4 ++--
 .../commonMain/resources/MR/base/strings.xml  | 24 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
index 50ebc376e3..04ebdfd695 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
@@ -191,7 +191,7 @@ fun ModalData.NetworkAndServersView(close: () -> Unit) {
         ConditionsButton(conditionsAction, rhId = currentRemoteHost?.remoteHostId)
       }
       val footerText = if (conditionsAction is UsageConditionsAction.Review && conditionsAction.deadline != null && anyOperatorEnabled.value) {
-        String.format(generalGetString(MR.strings.operator_conditions_accepted_for_enabled_operators_on), localDate(conditionsAction.deadline))
+        String.format(generalGetString(MR.strings.operator_conditions_will_be_accepted_on), localDate(conditionsAction.deadline))
       } else null
 
       if (footerText != null) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt
index 7855afc97b..c405ed0991 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/OperatorView.kt
@@ -166,7 +166,7 @@ fun OperatorViewLayout(
           String.format(generalGetString(MR.strings.operator_conditions_accepted_on), localTimestamp(c.acceptedAt))
         } else null
         is ConditionsAcceptance.Required -> if (operator.enabled && c.deadline != null) {
-          String.format(generalGetString(MR.strings.operator_conditions_accepted_after), localTimestamp(c.deadline))
+          String.format(generalGetString(MR.strings.operator_conditions_will_be_accepted_on), localTimestamp(c.deadline))
         } else null
       }
       if (footerText != null) {
@@ -551,7 +551,7 @@ private fun SingleOperatorUsageConditionsView(
   }
 
   ColumnWithScrollBar(modifier = Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING)) {
-    AppBarTitle(String.format(stringResource(MR.strings.use_operator_x), operator.tradeName), enableAlphaChanges = false, withPadding = false)
+    AppBarTitle(String.format(stringResource(MR.strings.use_servers_of_operator_x), operator.tradeName), enableAlphaChanges = false, withPadding = false)
     if (operator.conditionsAcceptance is ConditionsAcceptance.Accepted) {
       // In current UI implementation this branch doesn't get shown - as conditions can't be opened from inside operator once accepted
       Column(modifier = Modifier.weight(1f).padding(end = DEFAULT_PADDING, start = DEFAULT_PADDING, bottom = DEFAULT_PADDING)) {
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index b9348a3dc4..f838050987 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -110,12 +110,12 @@
   <string name="failed_to_create_user_invalid_desc">This display name is invalid. Please choose another name.</string>
   <string name="failed_to_active_user_title">Error switching profile!</string>
   <string name="failed_to_save_servers">Error saving servers</string>
-  <string name="no_message_servers_configured">No message servers configured.</string>
-  <string name="no_message_servers_configured_for_receiving">No message servers configured for receiving.</string>
-  <string name="no_message_servers_configured_for_private_routing">No message servers configured for private routing.</string>
-  <string name="no_media_servers_configured">No media &amp; file servers configured.</string>
-  <string name="no_media_servers_configured_for_sending">No media &amp; file servers configured for sending.</string>
-  <string name="no_media_servers_configured_for_private_routing">No media &amp; file servers configured for private routing.</string>
+  <string name="no_message_servers_configured">No message servers.</string>
+  <string name="no_message_servers_configured_for_receiving">No servers to receive messages.</string>
+  <string name="no_message_servers_configured_for_private_routing">No servers for private message routing.</string>
+  <string name="no_media_servers_configured">No media &amp; file servers.</string>
+  <string name="no_media_servers_configured_for_sending">No servers to send files.</string>
+  <string name="no_media_servers_configured_for_private_routing">No servers to receive files.</string>
   <string name="for_chat_profile">For chat profile %s:</string>
   <string name="errors_in_servers_configuration">Errors in servers configuration.</string>
   <string name="error_accepting_operator_conditions">Error accepting conditions</string>
@@ -1707,10 +1707,10 @@
   <string name="operator_description">Description</string>
   <string name="operator_website">Website</string>
   <string name="operator_conditions_accepted_on">Conditions accepted on: %s.</string>
-  <string name="operator_conditions_accepted_after"> Conditions will be considered accepted after: %s.</string>
+  <string name="operator_conditions_will_be_accepted_on">Conditions will be accepted on: %s.</string>
   <string name="operator">Operator</string>
-  <string name="operator_use_operator_toggle_description">Use operator</string>
-  <string name="use_operator_x">Use operator %s</string>
+  <string name="operator_use_operator_toggle_description">Use servers</string>
+  <string name="use_servers_of_operator_x">Use servers of %s</string>
   <string name="operator_conditions_failed_to_load">Current conditions text couldn\'t be loaded, you can review conditions via this link:</string>
   <string name="operator_conditions_accepted_for_some"><![CDATA[Conditions are already accepted for following operator(s): <b>%s</b>.]]></string>
   <string name="operator_same_conditions_will_be_applied"><![CDATA[Same conditions will apply to operator <b>%s</b>.]]></string>
@@ -1719,17 +1719,17 @@
   <string name="operator_conditions_will_be_applied"><![CDATA[These conditions will also apply for: <b>%s</b>.]]></string>
   <string name="operator_same_conditions_will_be_applied"><![CDATA[Same conditions will apply to operator: <b>%s</b>.]]></string>
   <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Conditions will be accepted for operator(s): <b>%s</b>.]]></string>
-  <string name="operators_conditions_will_also_apply"><![CDATA[Conditions will also apply for following operator(s) you use: <b>%s</b>.]]></string>
+  <string name="operators_conditions_will_also_apply"><![CDATA[These conditions will also apply for: <b>%s</b>.]]></string>
   <string name="view_conditions">View conditions</string>
   <string name="accept_conditions">Accept conditions</string>
   <string name="operator_conditions_of_use">Conditions of use</string>
   <string name="operator_in_order_to_use_accept_conditions"><![CDATA[To use the servers of <b>%s</b>, accept conditions of use.]]></string>
   <string name="operator_use_for_messages">Use for messages</string>
-  <string name="operator_use_for_messages_receiving">For receiving</string>
+  <string name="operator_use_for_messages_receiving">To receive</string>
   <string name="operator_use_for_messages_private_routing">For private routing</string>
   <string name="operator_added_message_servers">Added message servers</string>
   <string name="operator_use_for_files">Use for files</string>
-  <string name="operator_use_for_sending">For sending</string>
+  <string name="operator_use_for_sending">To send</string>
   <string name="xftp_servers_per_user">The servers for new files of your current chat profile</string>
   <string name="operator_added_xftp_servers">Added media &amp; file servers</string>