From 5fd522c79c73a1680835233d971e97f159a66d38 Mon Sep 17 00:00:00 2001
From: JRoberts <8711996+jr-simplex@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:20:09 +0400
Subject: [PATCH] mobile: change ttl setting text (#1184)
---
apps/android/app/src/main/res/values-de/strings.xml | 2 +-
apps/android/app/src/main/res/values-ru/strings.xml | 2 +-
apps/android/app/src/main/res/values/strings.xml | 2 +-
.../de.xcloc/Localized Contents/de.xliff | 10 +++++-----
.../en.xcloc/Localized Contents/en.xliff | 10 +++++-----
.../ru.xcloc/Localized Contents/ru.xliff | 10 +++++-----
apps/ios/SimpleXChat/ChatTypes.swift | 2 +-
apps/ios/de.lproj/Localizable.strings | 6 +++---
apps/ios/ru.lproj/Localizable.strings | 6 +++---
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml
index 4d08fe1a64..d0894bfe7b 100644
--- a/apps/android/app/src/main/res/values-de/strings.xml
+++ b/apps/android/app/src/main/res/values-de/strings.xml
@@ -599,7 +599,7 @@
Diese Aktion kann nicht rückgängig gemacht werden - alle empfangenen und gesendeten Dateien und Medien werden gelöscht. Bilder mit niedriger Auflösung bleiben erhalten.Keine empfangenen oder gesendeten Dateien%d Datei(en) mit einem Gesamtspeicherverbrauch von %s
- no
+ never1 day1 week1 month
diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml
index cc195623ee..ce3a257a97 100644
--- a/apps/android/app/src/main/res/values-ru/strings.xml
+++ b/apps/android/app/src/main/res/values-ru/strings.xml
@@ -599,7 +599,7 @@
Это действие нельзя отменить — все полученные и отправленные файлы будут удалены. Изображения останутся в низком разрешении.Нет полученных или отправленных файлов%d файл(ов) общим размером %s
- нет
+ никогда1 день1 неделю1 месяц
diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml
index f3236f0dda..706e86e0e6 100644
--- a/apps/android/app/src/main/res/values/strings.xml
+++ b/apps/android/app/src/main/res/values/strings.xml
@@ -599,7 +599,7 @@
This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.No received or sent files%d file(s) with total size of %s
- no
+ never1 day1 week1 month
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
index 608ce90185..846726db6e 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
+++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
@@ -3062,16 +3062,16 @@ SimpleX-Server können Ihr Profil nicht einsehen.
Anruf verpasstcall status
+
+ never
+ *** never
+ No comment provided by engineer.
+ new messageNeue Nachrichtnotification
-
- no
- *** nein
- No comment provided by engineer.
- no e2e encryptionKeine E2E-Verschlüsselung
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
index 6864c9435f..703250df87 100644
--- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
+++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
@@ -3062,16 +3062,16 @@ SimpleX servers cannot see your profile.
missed callcall status
+
+ never
+ never
+ No comment provided by engineer.
+ new messagenew messagenotification
-
- no
- no
- No comment provided by engineer.
- no e2e encryptionno e2e encryption
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
index bb7ab7a06e..7d9faae75a 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
@@ -3062,16 +3062,16 @@ SimpleX серверы не могут получить доступ к ваше
пропущенный звонокcall status
+
+ never
+ никогда
+ No comment provided by engineer.
+ new messageновое сообщениеnotification
-
- no
- нет
- No comment provided by engineer.
- no e2e encryptionнет e2e шифрования
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index 58c4fc6f2f..7e818155de 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -1512,7 +1512,7 @@ public enum ChatItemTTL: Hashable, Identifiable, Comparable {
case .week: return "1 week"
case .month: return "1 month"
case let .seconds(seconds): return "\(seconds) second(s)"
- case .none: return "no"
+ case .none: return "never"
}
}
diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings
index e7b35f5d99..13ba9a1b0b 100644
--- a/apps/ios/de.lproj/Localizable.strings
+++ b/apps/ios/de.lproj/Localizable.strings
@@ -1116,6 +1116,9 @@
/* No comment provided by engineer. */
"Network status" = "Netzwerkstatus";
+/* No comment provided by engineer. */
+"never" = "*** never";
+
/* notification */
"New contact request" = "Neue Kontaktanfrage";
@@ -1137,9 +1140,6 @@
/* No comment provided by engineer. */
"New passphrase…" = "Neues Passwort…";
-/* No comment provided by engineer. */
-"no" = "*** nein";
-
/* No comment provided by engineer. */
"No" = "Nein";
diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings
index cfac100095..b913ecdfa3 100644
--- a/apps/ios/ru.lproj/Localizable.strings
+++ b/apps/ios/ru.lproj/Localizable.strings
@@ -1116,6 +1116,9 @@
/* No comment provided by engineer. */
"Network status" = "Состояние сети";
+/* No comment provided by engineer. */
+"never" = "никогда";
+
/* notification */
"New contact request" = "Новый запрос на соединение";
@@ -1137,9 +1140,6 @@
/* No comment provided by engineer. */
"New passphrase…" = "Новый пароль…";
-/* No comment provided by engineer. */
-"no" = "нет";
-
/* No comment provided by engineer. */
"No" = "Нет";