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 @@
This display name is invalid. Please choose another name.
Error switching profile!
Error saving servers
- No message servers configured.
- No message servers configured for receiving.
- No message servers configured for private routing.
- No media & file servers configured.
- No media & file servers configured for sending.
- No media & file servers configured for private routing.
+ No message servers.
+ No servers to receive messages.
+ No servers for private message routing.
+ No media & file servers.
+ No servers to send files.
+ No servers to receive files.
For chat profile %s:
Errors in servers configuration.
Error accepting conditions
@@ -1707,10 +1707,10 @@
Description
Website
Conditions accepted on: %s.
- Conditions will be considered accepted after: %s.
+ Conditions will be accepted on: %s.
Operator
- Use operator
- Use operator %s
+ Use servers
+ Use servers of %s
Current conditions text couldn\'t be loaded, you can review conditions via this link:
%s.]]>
%s.]]>
@@ -1719,17 +1719,17 @@
%s.]]>
%s.]]>
%s.]]>
- %s.]]>
+ %s.]]>
View conditions
Accept conditions
Conditions of use
%s, accept conditions of use.]]>
Use for messages
- For receiving
+ To receive
For private routing
Added message servers
Use for files
- For sending
+ To send
The servers for new files of your current chat profile
Added media & file servers