From 8dc7bea72416ec3d782df3b510c4836d685a0409 Mon Sep 17 00:00:00 2001 From: JRoberts <8711996+jr-simplex@users.noreply.github.com> Date: Thu, 4 Aug 2022 19:20:00 +0400 Subject: [PATCH] ios: advanced network settings translations (#899) --- .../java/chat/simplex/app/model/SimpleXAPI.kt | 4 +- .../en.xcloc/Localized Contents/en.xliff | 115 +++++++++++++++++- .../ru.xcloc/Localized Contents/ru.xliff | 115 +++++++++++++++++- apps/ios/ru.lproj/Localizable.strings | 69 ++++++++++- 4 files changed, 288 insertions(+), 15 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt index 9418e9a2e..6c9a586d5 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt @@ -368,7 +368,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager suspend fun apiGetNetworkConfig(): NetCfg? { val r = sendCmd(CC.APIGetNetworkConfig()) if (r is CR.NetworkConfig) return r.networkConfig - Log.e(TAG, "getNetworkConfig bad response: ${r.responseType} ${r.details}") + Log.e(TAG, "apiGetNetworkConfig bad response: ${r.responseType} ${r.details}") return null } @@ -377,7 +377,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager return when (r) { is CR.CmdOk -> true else -> { - Log.e(TAG, "setNetworkConfig bad response: ${r.responseType} ${r.details}") + Log.e(TAG, "apiSetNetworkConfig bad response: ${r.responseType} ${r.details}") AlertManager.shared.showAlertMsg( generalGetString(R.string.error_setting_network_config), "${r.responseType}: ${r.details}" 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 b0a53dc2f..2756d8d15 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -35,6 +35,11 @@ %@ No comment provided by engineer. + + %@ %@ + %@ %@ + No comment provided by engineer. + %@ / %@ %@ / %@ @@ -60,6 +65,11 @@ %lld No comment provided by engineer. + + %lld %@ + %lld %@ + No comment provided by engineer. + %lld contact(s) selected %lld contact(s) selected @@ -186,6 +196,11 @@ Add contact to start a new chat No comment provided by engineer. + + Advanced network settings + Advanced network settings + No comment provided by engineer. + All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you. All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you. @@ -206,6 +221,16 @@ Answer call No comment provided by engineer. + + App icon + App icon + No comment provided by engineer. + + + Appearance + Appearance + No comment provided by engineer. + Attach Attach @@ -651,6 +676,11 @@ Enable SimpleX Lock authentication reason + + Enable TCP keep-alive + Enable TCP keep-alive + No comment provided by engineer. + Enable instant notifications? Enable instant notifications? @@ -736,6 +766,11 @@ Error stopping chat No comment provided by engineer. + + Error updating settings + Error updating settings + No comment provided by engineer. + Error: %@ Error: %@ @@ -1106,6 +1141,16 @@ We will be adding server redundancy to prevent lost messages. Most likely this contact has deleted the connection with you. No comment provided by engineer. + + Network & servers + Network & servers + No comment provided by engineer. + + + Network settings + Network settings + No comment provided by engineer. + Network status Network status @@ -1171,6 +1216,11 @@ We will be adding server redundancy to prevent lost messages. Off (Local) No comment provided by engineer. + + Ok + Ok + No comment provided by engineer. + Old database Old database @@ -1206,6 +1256,11 @@ We will be adding server redundancy to prevent lost messages. Or open the link in the browser and tap **Open in mobile**. No comment provided by engineer. + + PING interval + PING interval + No comment provided by engineer. + Paste Paste @@ -1271,6 +1326,11 @@ We will be adding server redundancy to prevent lost messages. Profile image No comment provided by engineer. + + Protocol timeout + Protocol timeout + No comment provided by engineer. + Push notifications Push notifications @@ -1336,6 +1396,11 @@ We will be adding server redundancy to prevent lost messages. Reply No comment provided by engineer. + + Reset to defaults + Reset to defaults + No comment provided by engineer. + Restart the app to create a new chat profile Restart the app to create a new chat profile @@ -1346,6 +1411,11 @@ We will be adding server redundancy to prevent lost messages. Restart the app to use imported chat database No comment provided by engineer. + + Revert + Revert + No comment provided by engineer. + Run chat Run chat @@ -1426,6 +1496,11 @@ We will be adding server redundancy to prevent lost messages. Servers No comment provided by engineer. + + Set timeouts for proxy/VPN + Set timeouts for proxy/VPN + No comment provided by engineer. + Settings Settings @@ -1446,11 +1521,6 @@ We will be adding server redundancy to prevent lost messages. Share link No comment provided by engineer. - - Show pending connections - Show pending connections - No comment provided by engineer. - Show preview Show preview @@ -1516,6 +1586,26 @@ We will be adding server redundancy to prevent lost messages. Stop chat? No comment provided by engineer. + + TCP connection timeout + TCP connection timeout + No comment provided by engineer. + + + TCP_KEEPCNT + TCP_KEEPCNT + No comment provided by engineer. + + + TCP_KEEPIDLE + TCP_KEEPIDLE + No comment provided by engineer. + + + TCP_KEEPINTVL + TCP_KEEPINTVL + No comment provided by engineer. + Take picture Take picture @@ -1690,6 +1780,16 @@ To connect, please ask your contact to create another connection link and check Unlock authentication reason + + Update network settings? + Update network settings? + No comment provided by engineer. + + + Updating settings will re-connect the client to all servers. + Updating settings will re-connect the client to all servers. + No comment provided by engineer. + Use SimpleX Chat servers? Use SimpleX Chat servers? @@ -2229,6 +2329,11 @@ SimpleX servers cannot see your profile. removed you rcv group event chat item + + sec + sec + network option + secret secret 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 d9d3e709f..474183cc2 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -35,6 +35,11 @@ %@ No comment provided by engineer. + + %@ %@ + %@ %@ + No comment provided by engineer. + %@ / %@ %@ / %@ @@ -60,6 +65,11 @@ %lld No comment provided by engineer. + + %lld %@ + %lld %@ + No comment provided by engineer. + %lld contact(s) selected Выбрано контактов: %lld @@ -186,6 +196,11 @@ Добавьте контакт, чтобы начать разговор No comment provided by engineer. + + Advanced network settings + Настройки сети + No comment provided by engineer. + All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you. Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас. @@ -206,6 +221,16 @@ Принять звонок No comment provided by engineer. + + App icon + Иконка + No comment provided by engineer. + + + Appearance + Интерфейс + No comment provided by engineer. + Attach Прикрепить @@ -651,6 +676,11 @@ Включить блокировку SimpleX authentication reason + + Enable TCP keep-alive + Включить TCP keep-alive + No comment provided by engineer. + Enable instant notifications? Включить мгновенные уведомления? @@ -736,6 +766,11 @@ Ошибка при остановке чата No comment provided by engineer. + + Error updating settings + Ошибка при сохранении настроек сети + No comment provided by engineer. + Error: %@ Ошибка: %@ @@ -1106,6 +1141,16 @@ We will be adding server redundancy to prevent lost messages. Скорее всего, этот контакт удалил соединение с вами. No comment provided by engineer. + + Network & servers + Сеть & серверы + No comment provided by engineer. + + + Network settings + Настройки сети + No comment provided by engineer. + Network status Состояние сети @@ -1171,6 +1216,11 @@ We will be adding server redundancy to prevent lost messages. Выключить (Локальные) No comment provided by engineer. + + Ok + Ок + No comment provided by engineer. + Old database Предыдущая версия данных чата @@ -1206,6 +1256,11 @@ We will be adding server redundancy to prevent lost messages. Или откройте ссылку в браузере и нажмите **Open in mobile**. No comment provided by engineer. + + PING interval + Интервал PING + No comment provided by engineer. + Paste Вставить @@ -1271,6 +1326,11 @@ We will be adding server redundancy to prevent lost messages. Аватар No comment provided by engineer. + + Protocol timeout + Таймаут протокола + No comment provided by engineer. + Push notifications Доставка уведомлений @@ -1336,6 +1396,11 @@ We will be adding server redundancy to prevent lost messages. Ответить No comment provided by engineer. + + Reset to defaults + Сбросить настройки + No comment provided by engineer. + Restart the app to create a new chat profile Перезапустите приложение, чтобы создать новый профиль. @@ -1346,6 +1411,11 @@ We will be adding server redundancy to prevent lost messages. Перезапустите приложение, чтобы использовать импортированные данные чата. No comment provided by engineer. + + Revert + Отменить изменения + No comment provided by engineer. + Run chat Запустить chat @@ -1426,6 +1496,11 @@ We will be adding server redundancy to prevent lost messages. Серверы No comment provided by engineer. + + Set timeouts for proxy/VPN + Установить таймауты для прокси/VPN + No comment provided by engineer. + Settings Настройки @@ -1446,11 +1521,6 @@ We will be adding server redundancy to prevent lost messages. Поделиться ссылкой No comment provided by engineer. - - Show pending connections - Показать ожидаемые соединения - No comment provided by engineer. - Show preview Показывать уведомления @@ -1516,6 +1586,26 @@ We will be adding server redundancy to prevent lost messages. Остановить чат? No comment provided by engineer. + + TCP connection timeout + Таймаут TCP соединения + No comment provided by engineer. + + + TCP_KEEPCNT + TCP_KEEPCNT + No comment provided by engineer. + + + TCP_KEEPIDLE + TCP_KEEPIDLE + No comment provided by engineer. + + + TCP_KEEPINTVL + TCP_KEEPINTVL + No comment provided by engineer. + Take picture Сделать фото @@ -1690,6 +1780,16 @@ To connect, please ask your contact to create another connection link and check Разблокировать authentication reason + + Update network settings? + Обновить настройки сети? + No comment provided by engineer. + + + Updating settings will re-connect the client to all servers. + Обновление настроек приведет к переподключению клиента ко всем серверам. + No comment provided by engineer. + Use SimpleX Chat servers? Использовать серверы предосталенные SimpleX Chat? @@ -2229,6 +2329,11 @@ SimpleX серверы не могут получить доступ к ваше удалил(а) вас из группы rcv group event chat item + + sec + сек + network option + secret секрет diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings index 84cebe1a9..6688e09b4 100644 --- a/apps/ios/ru.lproj/Localizable.strings +++ b/apps/ios/ru.lproj/Localizable.strings @@ -67,6 +67,9 @@ /* No comment provided by engineer. */ "%@ / %@" = "%@ / %@"; +/* No comment provided by engineer. */ +"%@ %@" = "%@ %@"; + /* notification title */ "%@ is connected!" = "Установлено соединение с %@!"; @@ -79,6 +82,9 @@ /* No comment provided by engineer. */ "%lld" = "%lld"; +/* No comment provided by engineer. */ +"%lld %@" = "%lld %@"; + /* No comment provided by engineer. */ "%lld contact(s) selected" = "Выбрано контактов: %lld"; @@ -128,6 +134,9 @@ /* No comment provided by engineer. */ "admin" = "админ"; +/* No comment provided by engineer. */ +"Advanced network settings" = "Настройки сети"; + /* No comment provided by engineer. */ "All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас."; @@ -140,6 +149,12 @@ /* No comment provided by engineer. */ "Answer call" = "Принять звонок"; +/* No comment provided by engineer. */ +"App icon" = "Иконка"; + +/* No comment provided by engineer. */ +"Appearance" = "Интерфейс"; + /* No comment provided by engineer. */ "Attach" = "Прикрепить"; @@ -500,6 +515,9 @@ /* authentication reason */ "Enable SimpleX Lock" = "Включить блокировку SimpleX"; +/* No comment provided by engineer. */ +"Enable TCP keep-alive" = "Включить TCP keep-alive"; + /* No comment provided by engineer. */ "ended" = "завершён"; @@ -551,6 +569,9 @@ /* No comment provided by engineer. */ "Error stopping chat" = "Ошибка при остановке чата"; +/* No comment provided by engineer. */ +"Error updating settings" = "Ошибка при сохранении настроек сети"; + /* No comment provided by engineer. */ "Error: %@" = "Ошибка: %@"; @@ -806,6 +827,12 @@ /* No comment provided by engineer. */ "Most likely this contact has deleted the connection with you." = "Скорее всего, этот контакт удалил соединение с вами."; +/* No comment provided by engineer. */ +"Network & servers" = "Сеть & серверы"; + +/* No comment provided by engineer. */ +"Network settings" = "Настройки сети"; + /* No comment provided by engineer. */ "Network status" = "Состояние сети"; @@ -851,6 +878,9 @@ /* No comment provided by engineer. */ "Off (Local)" = "Выключить (Локальные)"; +/* No comment provided by engineer. */ +"Ok" = "Ок"; + /* No comment provided by engineer. */ "Old database" = "Предыдущая версия данных чата"; @@ -902,6 +932,9 @@ /* No comment provided by engineer. */ "Periodically" = "Периодически"; +/* No comment provided by engineer. */ +"PING interval" = "Интервал PING"; + /* No comment provided by engineer. */ "Please check that you used the correct link or ask your contact to send you another one." = "Пожалуйста, проверьте, что вы использовали правильную ссылку или попросите, чтобы ваш контакт отправил вам другую ссылку."; @@ -920,6 +953,9 @@ /* No comment provided by engineer. */ "Profile image" = "Аватар"; +/* No comment provided by engineer. */ +"Protocol timeout" = "Таймаут протокола"; + /* No comment provided by engineer. */ "Push notifications" = "Доставка уведомлений"; @@ -977,12 +1013,18 @@ /* No comment provided by engineer. */ "Reply" = "Ответить"; +/* No comment provided by engineer. */ +"Reset to defaults" = "Сбросить настройки"; + /* No comment provided by engineer. */ "Restart the app to create a new chat profile" = "Перезапустите приложение, чтобы создать новый профиль."; /* No comment provided by engineer. */ "Restart the app to use imported chat database" = "Перезапустите приложение, чтобы использовать импортированные данные чата."; +/* No comment provided by engineer. */ +"Revert" = "Отменить изменения"; + /* No comment provided by engineer. */ "Run chat" = "Запустить chat"; @@ -1007,6 +1049,9 @@ /* No comment provided by engineer. */ "Scan QR code" = "Сканировать QR код"; +/* network option */ +"sec" = "сек"; + /* No comment provided by engineer. */ "secret" = "секрет"; @@ -1028,6 +1073,9 @@ /* No comment provided by engineer. */ "Servers" = "Серверы"; +/* No comment provided by engineer. */ +"Set timeouts for proxy/VPN" = "Установить таймауты для прокси/VPN"; + /* No comment provided by engineer. */ "Settings" = "Настройки"; @@ -1040,9 +1088,6 @@ /* No comment provided by engineer. */ "Share link" = "Поделиться ссылкой"; -/* No comment provided by engineer. */ -"Show pending connections" = "Показать ожидаемые соединения"; - /* No comment provided by engineer. */ "Show preview" = "Показывать уведомления"; @@ -1103,6 +1148,18 @@ /* No comment provided by engineer. */ "Tap to join" = "Нажмите, чтобы вступить"; +/* No comment provided by engineer. */ +"TCP connection timeout" = "Таймаут TCP соединения"; + +/* No comment provided by engineer. */ +"TCP_KEEPCNT" = "TCP_KEEPCNT"; + +/* No comment provided by engineer. */ +"TCP_KEEPIDLE" = "TCP_KEEPIDLE"; + +/* No comment provided by engineer. */ +"TCP_KEEPINTVL" = "TCP_KEEPINTVL"; + /* No comment provided by engineer. */ "Thank you for installing SimpleX Chat!" = "Спасибо, что установили SimpleX Chat!"; @@ -1202,9 +1259,15 @@ /* authentication reason */ "Unlock" = "Разблокировать"; +/* No comment provided by engineer. */ +"Update network settings?" = "Обновить настройки сети?"; + /* rcv group event chat item */ "updated group profile" = "обновил(а) профиль группы"; +/* No comment provided by engineer. */ +"Updating settings will re-connect the client to all servers." = "Обновление настроек приведет к переподключению клиента ко всем серверам."; + /* No comment provided by engineer. */ "Use chat" = "Использовать чат";