From d6699ffb0348abce2036195062c44de10a7f1af6 Mon Sep 17 00:00:00 2001 From: JRoberts <8711996+jr-simplex@users.noreply.github.com> Date: Sat, 21 May 2022 19:43:04 +0400 Subject: [PATCH] mobile: translations (#682) Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> --- .../java/chat/simplex/app/model/SimpleXAPI.kt | 2 +- .../app/src/main/res/values-ru/strings.xml | 59 +++-- .../app/src/main/res/values/strings.xml | 1 - .../Shared/Views/ChatList/ChatListView.swift | 3 +- .../en.xcloc/Localized Contents/en.xliff | 209 +++++++++++++++--- .../SimpleX NSE/en.lproj/Localizable.strings | Bin 2686 -> 2794 bytes .../en.lproj/Localizable.strings | 12 + .../ru.xcloc/Localized Contents/ru.xliff | 203 ++++++++++++++--- .../SimpleX NSE/en.lproj/Localizable.strings | Bin 2686 -> 2794 bytes .../en.lproj/Localizable.strings | 12 + .../SimpleX NSE/ru.lproj/Localizable.strings | 27 ++- apps/ios/ru.lproj/Localizable.strings | 80 ++++++- 12 files changed, 503 insertions(+), 105 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 b5fb74cc80..93f18e0609 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 @@ -513,7 +513,7 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt ntfManager.notifyCallInvitation(r.contact, invitation) AlertManager.shared.showAlertDialog( title = invitation.callTitle, - text = String.format(generalGetString(R.string.contact_wants_to_connect_via_call), r.contact.displayName) + " " + invitation.callTypeText + ".\n" + generalGetString(R.string.if_you_accept_this_call_your_ip_address_visible), + text = String.format(generalGetString(R.string.contact_wants_to_connect_via_call), r.contact.displayName) + " " + invitation.callTypeText + ".", confirmText = generalGetString(R.string.answer), onConfirm = { if (chatModel.activeCallInvitation.value == null) { 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 ad219eef1c..a5079561ba 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -341,39 +341,38 @@ Чтобы задать вопросы и получать уведомления о SimpleX Chat. - Incoming video call - Incoming audio call - %1$s wants to connect with you via - video call (not e2e encrypted) - e2e encrypted video call - audio call (not e2e encrypted) - e2e encrypted audio call - If you accept this call and you don\'t use relay, your IP address might be visible to your contact. - Answer - Call already ended! - video call - audio call + Входящий видеозвонок + Входящий аудиозвонок + %1$s хочет связаться с вами через + видеозвонок (не e2e зашифрованный) + e2e зашифрованный видеозвонок + аудиозвонок (не e2e зашифрованный) + e2e зашифрованный аудиозвонок + Принять + Звонок уже завершен! + видеозвонок + аудиозвонок - e2e encrypted - no e2e encryption - contact has e2e encryption - contact has no e2e encryption + e2e зашифровано + нет e2e шифрования + у контакта есть e2e шифрование + у контакта нет e2e шифрования peer-to-peer - via relay - Hang up - Video off - Video on - Audio off - Audio on - Flip camera + через relay сервер + Закончить звонок + Выключить видео + Включить видео + Выключить звук + Включить звук + Перевернуть камеру - Pending call - Missed call - Rejected call - Connecting call - Call in progress - Call ended - Answer call + Входящий звонок + Пропущенный звонок + Отклоненный звонок + Соединяющийся звонок + Текущий звонок + Звонок завершен + Принять звонок diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml index 2915b56851..868e7f72b5 100644 --- a/apps/android/app/src/main/res/values/strings.xml +++ b/apps/android/app/src/main/res/values/strings.xml @@ -349,7 +349,6 @@ e2e encrypted video call audio call (not e2e encrypted) e2e encrypted audio call - If you accept this call and you don\'t use relay, your IP address might be visible to your contact. Answer Call already ended! video call diff --git a/apps/ios/Shared/Views/ChatList/ChatListView.swift b/apps/ios/Shared/Views/ChatList/ChatListView.swift index 13f511610d..9f6da6c6d2 100644 --- a/apps/ios/Shared/Views/ChatList/ChatListView.swift +++ b/apps/ios/Shared/Views/ChatList/ChatListView.swift @@ -101,8 +101,7 @@ struct ChatListView: View { title: Text(invitation.callTitle), message: Text(contact.profile.displayName).bold() + Text(" wants to connect with you via ") + - Text(invitation.callTypeText) + - Text("\nIf you accept this call and you don't use relay, your IP address might be visible to your contact."), + Text(invitation.callTypeText), primaryButton: .default(Text("Answer")) { if let activeCallInvitation = chatModel.activeCallInvitation { chatModel.callInvitations.removeValue(forKey: activeCallInvitation.id) 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 06cf5fea4e..4bdf3d3203 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -20,6 +20,11 @@ (can be copied) No comment provided by engineer. + + wants to connect with you via + wants to connect with you via + No comment provided by engineer. + !1 colored! !1 colored! @@ -30,6 +35,11 @@ #secret# No comment provided by engineer. + + %@ / %@ + %@ / %@ + No comment provided by engineer. + %@ is connected! %@ is connected! @@ -50,6 +60,11 @@ %lldk No comment provided by engineer. + + ( + ( + No comment provided by engineer. + ) ) @@ -75,8 +90,18 @@ **Scan QR code**: to connect to your contact in person or via video call. No comment provided by engineer. + + **e2e encrypted** audio call. + **e2e encrypted** audio call. + No comment provided by engineer. + + + **e2e encrypted** video call. + **e2e encrypted** video call. + No comment provided by engineer. + - *bold* + \*bold* \*bold* No comment provided by engineer. @@ -95,11 +120,6 @@ : No comment provided by engineer. - - : %@ - : %@ - No comment provided by engineer. - About SimpleX About SimpleX @@ -130,6 +150,11 @@ Add contact to start a new chat 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. + No comment provided by engineer. + All your contacts will remain connected All your contacts will remain connected @@ -145,6 +170,11 @@ Answer accept incoming call via notification + + Answer call + Answer call + No comment provided by engineer. + Attach Attach @@ -160,6 +190,11 @@ Cancel No comment provided by engineer. + + Capabilities + Capabilities + No comment provided by engineer. + Chat console Chat console @@ -200,6 +235,16 @@ Clear No comment provided by engineer. + + Clear conversation + Clear conversation + No comment provided by engineer. + + + Clear conversation? + Clear conversation? + No comment provided by engineer. + Configure SMP servers Configure SMP servers @@ -415,6 +460,11 @@ Enable notifications? (BETA) No comment provided by engineer. + + End + End + No comment provided by engineer. + Enter one SMP server per line: Enter one SMP server per line: @@ -490,6 +540,11 @@ How to use markdown No comment provided by engineer. + + ICE + ICE + No comment provided by engineer. + If you can't meet in person, **show QR code in the video call**, or share the link. If you can't meet in person, **show QR code in the video call**, or share the link. @@ -520,16 +575,21 @@ In person or via a video call – the most secure way to connect. No comment provided by engineer. - - Incoming %@ call - Incoming %@ call - notification body + + Incoming audio call + Incoming audio call + notification Incoming call Incoming call notification + + Incoming video call + Incoming video call + notification + Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat) Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat) @@ -615,9 +675,9 @@ Open Settings No comment provided by engineer. - - Open-source protocol – anybody can run the servers. - Open-source protocol – anybody can run the servers. + + Open-source protocol and code – anybody can run the servers. + Open-source protocol and code – anybody can run the servers. No comment provided by engineer. @@ -735,6 +795,11 @@ Scan contact's QR code No comment provided by engineer. + + Send + Send + No comment provided by engineer. + Server connected Server connected @@ -765,6 +830,11 @@ Show pending connections No comment provided by engineer. + + Start + Start + No comment provided by engineer. + Take picture Take picture @@ -1029,12 +1099,12 @@ SimpleX servers cannot see your profile. No comment provided by engineer. - _italic_ + \_italic_ \_italic_ No comment provided by engineer. - `a + b` + \`a + b` \`a + b` No comment provided by engineer. @@ -1048,6 +1118,11 @@ SimpleX servers cannot see your profile. accepted call status + + audio call (not e2e encrypted). + audio call (not e2e encrypted). + No comment provided by engineer. + bold bold @@ -1089,19 +1164,29 @@ SimpleX servers cannot see your profile. connection:%@ connection information + + contact has e2e encryption + contact has e2e encryption + No comment provided by engineer. + + + contact has no e2e encryption + contact has no e2e encryption + No comment provided by engineer. + deleted deleted deleted chat item - - end-to-end encrypted - end-to-end encrypted + + e2e encrypted + e2e encrypted No comment provided by engineer. - - ended %1$d:%2$d - ended %1$d:%2$d + + ended %@ + ended %@ call status @@ -1129,9 +1214,9 @@ SimpleX servers cannot see your profile. missed call status - - no end-to-end encryption - no end-to-end encryption + + no e2e encryption + no e2e encryption No comment provided by engineer. @@ -1139,6 +1224,11 @@ SimpleX servers cannot see your profile. or No comment provided by engineer. + + peer-to-peer + peer-to-peer + No comment provided by engineer. + received answer… received answer… @@ -1164,6 +1254,11 @@ SimpleX servers cannot see your profile. strike No comment provided by engineer. + + unknown + unknown + connection info + v%@ (%@) v%@ (%@) @@ -1179,6 +1274,16 @@ SimpleX servers cannot see your profile. via one-time link chat list item description + + via relay + via relay + No comment provided by engineer. + + + video call (not e2e encrypted). + video call (not e2e encrypted). + No comment provided by engineer. + waiting for answer… waiting for answer… @@ -1194,13 +1299,18 @@ SimpleX servers cannot see your profile. wants to connect to you! No comment provided by engineer. + + with e2e encryption + with e2e encryption + No comment provided by engineer. + you shared one-time link you shared one-time link chat list item description - ~strike~ + \~strike~ \~strike~ No comment provided by engineer. @@ -1270,15 +1380,30 @@ SimpleX servers cannot see your profile. %@ wants to connect! notification title + + **e2e encrypted** audio call. + **e2e encrypted** audio call. + No comment provided by engineer. + + + **e2e encrypted** video call. + **e2e encrypted** video call. + No comment provided by engineer. + Accept contact request from %@? Accept contact request from %@? notification body - - Incoming %@ call - Incoming %@ call - notification body + + Incoming audio call + Incoming audio call + notification + + + Incoming video call + Incoming video call + notification You can now send messages to %@ @@ -1290,6 +1415,11 @@ SimpleX servers cannot see your profile. accepted call status + + audio call (not e2e encrypted). + audio call (not e2e encrypted). + No comment provided by engineer. + calling… calling… @@ -1316,9 +1446,9 @@ SimpleX servers cannot see your profile. deleted deleted chat item - - ended %1$d:%2$d - ended %1$d:%2$d + + ended %@ + ended %@ call status @@ -1341,6 +1471,11 @@ SimpleX servers cannot see your profile. missed call status + + no e2e encryption + no e2e encryption + No comment provided by engineer. + rejected rejected @@ -1356,6 +1491,16 @@ SimpleX servers cannot see your profile. via one-time link chat list item description + + video call (not e2e encrypted). + video call (not e2e encrypted). + No comment provided by engineer. + + + with e2e encryption + with e2e encryption + No comment provided by engineer. + you shared one-time link you shared one-time link diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings b/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings index 7a817163129dde4c113706b83d4d2009a2ea0f2f..d4c7fc1677b12c90f9e166798496597c70d48fce 100644 GIT binary patch delta 107 zcmew-@=A0A7pt@bgA#)RgDns%F{Co&F{A*=6d+HP!C|r^>&?k3Y*L(w45dJ^Oosf) fj%?~kylghfNo-PJC1pTqkXDEiIB#<{n=lIi-&+?{ delta 78 zcmaDQ`cGs77c0L3gAqdtgB61+1DG|Ln^lt6kU<41X2hT}`5?RD (можно скопировать) No comment provided by engineer. + + wants to connect with you via + хочет связаться с вами через + No comment provided by engineer. + !1 colored! !1 цвет! @@ -30,6 +35,11 @@ #секрет# No comment provided by engineer. + + %@ / %@ + %@ / %@ + No comment provided by engineer. + %@ is connected! Установлено соединение с %@! @@ -50,6 +60,11 @@ %lldk No comment provided by engineer. + + ( + ( + No comment provided by engineer. + ) ) @@ -75,8 +90,18 @@ **Сканировать QR код**: соединиться с вашим контактом при встрече или во время видеозвонка. No comment provided by engineer. + + **e2e encrypted** audio call. + **e2e зашифрованный** аудиозвонок. + No comment provided by engineer. + + + **e2e encrypted** video call. + **e2e зашифрованный** видеозвонок. + No comment provided by engineer. + - *bold* + \*bold* \*жирный* No comment provided by engineer. @@ -95,11 +120,6 @@ : No comment provided by engineer. - - : %@ - : %@ - No comment provided by engineer. - About SimpleX О SimpleX @@ -130,6 +150,11 @@ Добавьте контакт, чтобы начать разговор No comment provided by engineer. + + All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you. + Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас. + No comment provided by engineer. + All your contacts will remain connected Все контакты, которые соединились через этот адрес, сохранятся. @@ -145,6 +170,11 @@ Ответить accept incoming call via notification + + Answer call + Принять звонок + No comment provided by engineer. + Attach Прикрепить @@ -160,6 +190,11 @@ Отменить No comment provided by engineer. + + Capabilities + Возможности + No comment provided by engineer. + Chat console Консоль @@ -200,6 +235,16 @@ Очистить No comment provided by engineer. + + Clear conversation + Очистить разговор + No comment provided by engineer. + + + Clear conversation? + Очистить разговор? + No comment provided by engineer. + Configure SMP servers Настройка SMP серверов @@ -415,6 +460,11 @@ Включить уведомления? (БЕТА) No comment provided by engineer. + + End + Завершить + No comment provided by engineer. + Enter one SMP server per line: Введите SMP серверы, каждый на отдельной строке: @@ -490,6 +540,11 @@ Как форматировать No comment provided by engineer. + + ICE + ICE + No comment provided by engineer. + If you can't meet in person, **show QR code in the video call**, or share the link. Если вы не можете встретиться лично, вы можете **показать QR код во время видеозвонка**, или поделиться ссылкой. @@ -520,16 +575,21 @@ При встрече или в видеозвонке – самый безопасный способ установить соединение No comment provided by engineer. - - Incoming %@ call - Входящий звонок - notification body + + Incoming audio call + Входящий аудиозвонок + notification Incoming call Входящий звонок notification + + Incoming video call + Входящий видеозвонок + notification + Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat) [SimpleX Chat для терминала](https://github.com/simplex-chat/simplex-chat) @@ -735,6 +795,11 @@ Сосканировать QR код контакта No comment provided by engineer. + + Send + Отправить + No comment provided by engineer. + Server connected Установлено соединение с сервером @@ -765,6 +830,11 @@ Показать ожидаемые соединения No comment provided by engineer. + + Start + Начать + No comment provided by engineer. + Take picture Сделать фото @@ -1029,12 +1099,12 @@ SimpleX серверы не могут получить доступ к ваше No comment provided by engineer. - _italic_ + \_italic_ \_курсив_ No comment provided by engineer. - `a + b` + \`a + b` \`a + b` No comment provided by engineer. @@ -1048,6 +1118,11 @@ SimpleX серверы не могут получить доступ к ваше принятый звонок call status + + audio call (not e2e encrypted). + аудиозвонок (не e2e зашифрованный). + No comment provided by engineer. + bold жирный @@ -1089,19 +1164,29 @@ SimpleX серверы не могут получить доступ к ваше connection:%@ connection information + + contact has e2e encryption + у контакта есть e2e шифрование + No comment provided by engineer. + + + contact has no e2e encryption + у контакта нет e2e шифрования + No comment provided by engineer. + deleted удалено deleted chat item - - end-to-end encrypted - end-to-end зашифрованный звонок + + e2e encrypted + e2e зашифровано No comment provided by engineer. - - ended %1$d:%2$d - звонок завершён %1$d:%2$d + + ended %@ + завершен %@ call status @@ -1129,9 +1214,9 @@ SimpleX серверы не могут получить доступ к ваше пропущенный звонок call status - - no end-to-end encryption - end-to-end шифрование не поддерживается + + no e2e encryption + нет e2e шифрования No comment provided by engineer. @@ -1139,6 +1224,11 @@ SimpleX серверы не могут получить доступ к ваше или No comment provided by engineer. + + peer-to-peer + peer-to-peer + No comment provided by engineer. + received answer… получен ответ… @@ -1164,6 +1254,11 @@ SimpleX серверы не могут получить доступ к ваше зачеркнуть No comment provided by engineer. + + unknown + неизвестно + connection info + v%@ (%@) v%@ (%@) @@ -1179,6 +1274,16 @@ SimpleX серверы не могут получить доступ к ваше через одноразовую ссылку chat list item description + + via relay + через relay сервер + No comment provided by engineer. + + + video call (not e2e encrypted). + видеозвонок (не e2e зашифрованный). + No comment provided by engineer. + waiting for answer… ожидается ответ… @@ -1194,13 +1299,18 @@ SimpleX серверы не могут получить доступ к ваше хочет соединиться с вами! No comment provided by engineer. + + with e2e encryption + e2e зашифровано + No comment provided by engineer. + you shared one-time link вы создали ссылку chat list item description - ~strike~ + \~strike~ \~зачеркнуть~ No comment provided by engineer. @@ -1270,15 +1380,30 @@ SimpleX серверы не могут получить доступ к ваше %@ хочет соединиться! notification title + + **e2e encrypted** audio call. + **e2e зашифрованный** аудиозвонок. + No comment provided by engineer. + + + **e2e encrypted** video call. + **e2e зашифрованный** видеозвонок. + No comment provided by engineer. + Accept contact request from %@? Принять запрос на соединение от %@? notification body - - Incoming %@ call - Входящий звонок - notification body + + Incoming audio call + Входящий аудиозвонок + notification + + + Incoming video call + Входящий видеозвонок + notification You can now send messages to %@ @@ -1290,6 +1415,11 @@ SimpleX серверы не могут получить доступ к ваше принятый звонок call status + + audio call (not e2e encrypted). + аудиозвонок (не e2e зашифрованный). + No comment provided by engineer. + calling… входящий звонок… @@ -1316,9 +1446,9 @@ SimpleX серверы не могут получить доступ к ваше удалено deleted chat item - - ended %1$d:%2$d - звонок завершён %1$d:%2$d + + ended %@ + завершен %@ call status @@ -1341,6 +1471,11 @@ SimpleX серверы не могут получить доступ к ваше пропущенный звонок call status + + no e2e encryption + нет e2e шифрования + No comment provided by engineer. + rejected отклоненный звонок @@ -1356,6 +1491,16 @@ SimpleX серверы не могут получить доступ к ваше через одноразовую ссылку chat list item description + + video call (not e2e encrypted). + видеозвонок (не e2e зашифрованный). + No comment provided by engineer. + + + with e2e encryption + e2e зашифровано + No comment provided by engineer. + you shared one-time link вы создали одноразовую ссылку diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings b/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings index 7a817163129dde4c113706b83d4d2009a2ea0f2f..d4c7fc1677b12c90f9e166798496597c70d48fce 100644 GIT binary patch delta 107 zcmew-@=A0A7pt@bgA#)RgDns%F{Co&F{A*=6d+HP!C|r^>&?k3Y*L(w45dJ^Oosf) fj%?~kylghfNo-PJC1pTqkXDEiIB#<{n=lIi-&+?{ delta 78 zcmaDQ`cGs77c0L3gAqdtgB61+1DG|Ln^lt6kU<41X2hT}`5?RD