From 6f87a3bdb152b44499b794c66fef36a5aea0f792 Mon Sep 17 00:00:00 2001 From: JRoberts <8711996+jr-simplex@users.noreply.github.com> Date: Thu, 21 Jul 2022 18:16:04 +0400 Subject: [PATCH] ios: groups ui translations (#828) --- .../app/src/main/res/values-ru/strings.xml | 2 +- .../en.xcloc/Localized Contents/en.xliff | 148 ++++++++++++++++-- .../en.xcloc/contents.json | 4 +- .../ru.xcloc/Localized Contents/ru.xliff | 148 ++++++++++++++++-- .../ru.xcloc/contents.json | 4 +- apps/ios/SimpleXChat/ChatTypes.swift | 2 +- apps/ios/en.lproj/Localizable.strings | 16 +- apps/ios/ru.lproj/Localizable.strings | 82 +++++++++- 8 files changed, 374 insertions(+), 32 deletions(-) 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 bfcd7606f..25e6e7ebf 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -492,7 +492,7 @@ Вы приглашены в группу. Вступите, чтобы соединиться с членами группы. Вступить Вступление в группу - Вы вступили в эту группу. Устанавливается соединение с пригласившем членом группы. + Вы вступили в эту группу. Устанавливается соединение с пригласившим членом группы. Выйти Выйти из группы Вы перестанете получать сообщения от этой группы. История чата будет сохранена. 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 06630b751..ea6acc71b 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -2,7 +2,7 @@
- +
@@ -231,6 +231,11 @@ Cancel No comment provided by engineer. + + Chat and all messages will be deleted - this cannot be undone! + Chat and all messages will be deleted - this cannot be undone! + No comment provided by engineer. + Chat archive Chat archive @@ -431,6 +436,11 @@ Create address No comment provided by engineer. + + Create group + Create group + No comment provided by engineer. + Create link / QR code Create link / QR code @@ -501,6 +511,11 @@ Delete chat profile? No comment provided by engineer. + + Delete chat? + Delete chat? + No comment provided by engineer. + Delete contact Delete contact @@ -526,9 +541,9 @@ Delete for me No comment provided by engineer. - - Delete group - Delete group + + Delete invitation + Delete invitation No comment provided by engineer. @@ -726,9 +741,14 @@ Full name (optional) No comment provided by engineer. - - Group deletion is not supported - Group deletion is not supported + + Group invitation + Group invitation + No comment provided by engineer. + + + Group invitation expired + Group invitation expired No comment provided by engineer. @@ -881,11 +901,36 @@ We will be adding server redundancy to prevent lost messages. It's secure to share - only one contact can use it. No comment provided by engineer. + + Join + Join + No comment provided by engineer. + + + Join group + Join group + No comment provided by engineer. + + + Joining group + Joining group + No comment provided by engineer. + Large file! Large file! No comment provided by engineer. + + Leave + Leave + No comment provided by engineer. + + + Leave group? + Leave group? + No comment provided by engineer. + Limitations Limitations @@ -1306,6 +1351,11 @@ We will be adding server redundancy to prevent lost messages. Tap button No comment provided by engineer. + + Tap to join + Tap to join + No comment provided by engineer. + Thank you for installing SimpleX Chat! Thank you for installing SimpleX Chat! @@ -1505,6 +1555,11 @@ To connect, please ask your contact to create another connection link and check You are connected to the server used to receive messages from this contact. No comment provided by engineer. + + You are invited to group + You are invited to group + No comment provided by engineer. + You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button @@ -1550,11 +1605,31 @@ To connect, please ask your contact to create another connection link and check You invited your contact No comment provided by engineer. + + You joined this group + You joined this group + No comment provided by engineer. + + + You joined this group. Connecting to inviting group member. + You joined this group. Connecting to inviting group member. + No comment provided by engineer. + You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts. You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts. No comment provided by engineer. + + You rejected group invitation + You rejected group invitation + No comment provided by engineer. + + + You sent group invitation + You sent group invitation + No comment provided by engineer. + You will be connected when your connection request is accepted, please wait or check later! You will be connected when your connection request is accepted, please wait or check later! @@ -1570,6 +1645,11 @@ To connect, please ask your contact to create another connection link and check You will be required to authenticate when you start or resume the app after 30 seconds in background. No comment provided by engineer. + + You will stop receiving messages from this group. Chat history will be preserved. + You will stop receiving messages from this group. Chat history will be preserved. + No comment provided by engineer. + Your SMP servers Your SMP servers @@ -1664,6 +1744,11 @@ SimpleX servers cannot see your profile. [Send us email](mailto:chat@simplex.chat) No comment provided by engineer. + + [left] + [left] + group left description + \_italic_ \_italic_ @@ -1769,6 +1854,11 @@ SimpleX servers cannot see your profile. deleted deleted chat item + + deleted group + deleted group + rcv group event chat item + duplicate message duplicate message @@ -1789,6 +1879,16 @@ SimpleX servers cannot see your profile. ended call %@ call status + + invitation to group %@ + invitation to group %@ + group name + + + invited %@ + invited %@ + rcv group event chat item + invited to connect invited to connect @@ -1799,6 +1899,16 @@ SimpleX servers cannot see your profile. italic No comment provided by engineer. + + left + left + rcv group event chat item + + + member connected + connected + rcv group event chat item + message received message received @@ -1844,6 +1954,16 @@ SimpleX servers cannot see your profile. rejected call call status + + removed %@ + removed %@ + rcv group event chat item + + + removed you + removed you + rcv group event chat item + secret secret @@ -1909,6 +2029,16 @@ SimpleX servers cannot see your profile. wants to connect to you! No comment provided by engineer. + + you left + you left + snd group event chat item + + + you removed %@ + you removed %@ + snd group event chat item + you shared one-time link you shared one-time link @@ -1923,7 +2053,7 @@ SimpleX servers cannot see your profile.
- +
@@ -1955,7 +2085,7 @@ SimpleX servers cannot see your profile.
- +
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/contents.json b/apps/ios/SimpleX Localizations/en.xcloc/contents.json index 4429d3639..3e0830ec0 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/contents.json +++ b/apps/ios/SimpleX Localizations/en.xcloc/contents.json @@ -3,10 +3,10 @@ "project" : "SimpleX.xcodeproj", "targetLocale" : "en", "toolInfo" : { - "toolBuildNumber" : "13F100", + "toolBuildNumber" : "13E113", "toolID" : "com.apple.dt.xcode", "toolName" : "Xcode", - "toolVersion" : "13.4.1" + "toolVersion" : "13.3" }, "version" : "1.0" } \ No newline at end of file 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 7f9beb6e7..bc445746a 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -2,7 +2,7 @@
- +
@@ -231,6 +231,11 @@ Отменить No comment provided by engineer. + + Chat and all messages will be deleted - this cannot be undone! + Чат и все сообщения будут удалены - это действие нельзя отменить! + No comment provided by engineer. + Chat archive Архив чата @@ -431,6 +436,11 @@ Создать адрес No comment provided by engineer. + + Create group + Создать группу + No comment provided by engineer. + Create link / QR code Создать ссылку / QR код @@ -501,6 +511,11 @@ Удалить профиль? No comment provided by engineer. + + Delete chat? + Удалить чат? + No comment provided by engineer. + Delete contact Удалить контакт @@ -526,9 +541,9 @@ Удалить для меня No comment provided by engineer. - - Delete group - Удалить группу + + Delete invitation + Удалить приглашение No comment provided by engineer. @@ -726,9 +741,14 @@ Полное имя (не обязательно) No comment provided by engineer. - - Group deletion is not supported - Удаление групп не поддерживается + + Group invitation + Приглашение в группу + No comment provided by engineer. + + + Group invitation expired + Приглашение в группу истекло No comment provided by engineer. @@ -881,11 +901,36 @@ We will be adding server redundancy to prevent lost messages. Ей безопасно поделиться - только один контакт может использовать её. No comment provided by engineer. + + Join + Вступить + No comment provided by engineer. + + + Join group + Вступить в группу + No comment provided by engineer. + + + Joining group + Вступление в группу + No comment provided by engineer. + Large file! Большой файл! No comment provided by engineer. + + Leave + Выйти + No comment provided by engineer. + + + Leave group? + Выйти из группы? + No comment provided by engineer. + Limitations Ограничения @@ -1306,6 +1351,11 @@ We will be adding server redundancy to prevent lost messages. Нажмите кнопку No comment provided by engineer. + + Tap to join + Нажмите, чтобы вступить + No comment provided by engineer. + Thank you for installing SimpleX Chat! Спасибо, что установили SimpleX Chat! @@ -1505,6 +1555,11 @@ To connect, please ask your contact to create another connection link and check Установлено соединение с сервером, через который вы получаете сообщения от этого контакта. No comment provided by engineer. + + You are invited to group + Вы приглашены в группу + No comment provided by engineer. + You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button Вы также можете соединиться, открыв ссылку. Если ссылка откроется в браузере, нажмите кнопку **Open in mobile app**. @@ -1550,11 +1605,31 @@ To connect, please ask your contact to create another connection link and check Вы пригласили ваш контакт No comment provided by engineer. + + You joined this group + Вы вступили в эту группу + No comment provided by engineer. + + + You joined this group. Connecting to inviting group member. + Вы вступили в эту группу. Устанавливается соединение с пригласившим членом группы. + No comment provided by engineer. + You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts. Вы должны всегда использовать самую новую версию данных чата, ТОЛЬКО на одном устройстве, инача вы можете перестать получать сообщения от каких то контактов. No comment provided by engineer. + + You rejected group invitation + Вы отклонили приглашение в группу + No comment provided by engineer. + + + You sent group invitation + Вы отправили приглашение в группу + No comment provided by engineer. + You will be connected when your connection request is accepted, please wait or check later! Соединение будет установлено, когда ваш запрос будет принят. Пожалуйста, подождите или проверьте позже! @@ -1570,6 +1645,11 @@ To connect, please ask your contact to create another connection link and check Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме. No comment provided by engineer. + + You will stop receiving messages from this group. Chat history will be preserved. + Вы перестанете получать сообщения от этой группы. История чата будет сохранена. + No comment provided by engineer. + Your SMP servers Ваши SMP серверы @@ -1664,6 +1744,11 @@ SimpleX серверы не могут получить доступ к ваше [Отправить email](mailto:chat@simplex.chat) No comment provided by engineer. + + [left] + [покинута] + group left description + \_italic_ \_курсив_ @@ -1769,6 +1854,11 @@ SimpleX серверы не могут получить доступ к ваше удалено deleted chat item + + deleted group + удалил(а) группу + rcv group event chat item + duplicate message повторное сообщение @@ -1789,6 +1879,16 @@ SimpleX серверы не могут получить доступ к ваше завершённый звонок %@ call status + + invitation to group %@ + приглашение в группу %@ + group name + + + invited %@ + пригласил(а) %@ + rcv group event chat item + invited to connect приглашение @@ -1799,6 +1899,16 @@ SimpleX серверы не могут получить доступ к ваше курсив No comment provided by engineer. + + left + покинул(а) группу + rcv group event chat item + + + member connected + соединен(а) + rcv group event chat item + message received получено сообщение @@ -1844,6 +1954,16 @@ SimpleX серверы не могут получить доступ к ваше отклонённый звонок call status + + removed %@ + удалил(а) %@ + rcv group event chat item + + + removed you + удалил(а) вас из группы + rcv group event chat item + secret секрет @@ -1909,6 +2029,16 @@ SimpleX серверы не могут получить доступ к ваше хочет соединиться с вами! No comment provided by engineer. + + you left + вы покинули группу + snd group event chat item + + + you removed %@ + вы удалили %@ + snd group event chat item + you shared one-time link вы создали ссылку @@ -1923,7 +2053,7 @@ SimpleX серверы не могут получить доступ к ваше
- +
@@ -1955,7 +2085,7 @@ SimpleX серверы не могут получить доступ к ваше
- +
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/contents.json b/apps/ios/SimpleX Localizations/ru.xcloc/contents.json index ab6a47f15..50ec87db4 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/contents.json +++ b/apps/ios/SimpleX Localizations/ru.xcloc/contents.json @@ -3,10 +3,10 @@ "project" : "SimpleX.xcodeproj", "targetLocale" : "ru", "toolInfo" : { - "toolBuildNumber" : "13F100", + "toolBuildNumber" : "13E113", "toolID" : "com.apple.dt.xcode", "toolName" : "Xcode", - "toolVersion" : "13.4.1" + "toolVersion" : "13.3" }, "version" : "1.0" } \ No newline at end of file diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index 6f740008b..1fe55e69c 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -1180,7 +1180,7 @@ public enum RcvGroupEvent: Decodable { switch self { case let .memberAdded(_, profile): return String.localizedStringWithFormat(NSLocalizedString("invited %@", comment: "rcv group event chat item"), profile.displayNameWithOptionalFullName) - case .memberConnected: return NSLocalizedString("connected", comment: "rcv group event chat item") + case .memberConnected: return NSLocalizedString("member connected", comment: "rcv group event chat item") case .memberLeft: return NSLocalizedString("left", comment: "rcv group event chat item") case let .memberDeleted(_, profile): return String.localizedStringWithFormat(NSLocalizedString("removed %@", comment: "rcv group event chat item"), profile.displayNameWithOptionalFullName) diff --git a/apps/ios/en.lproj/Localizable.strings b/apps/ios/en.lproj/Localizable.strings index 813c6f598..ecba9a752 100644 --- a/apps/ios/en.lproj/Localizable.strings +++ b/apps/ios/en.lproj/Localizable.strings @@ -1,8 +1,5 @@ /* No comment provided by engineer. */ -"Connecting server…" = "Connecting to server…"; - -/* No comment provided by engineer. */ -"Connecting server… (error: %@)" = "Connecting to server… (error: %@)"; +"_italic_" = "\\_italic_"; /* No comment provided by engineer. */ "**Add new contact**: to create your one-time QR Code for your contact." = "**Add new contact**: to create your one-time QR Code or link for your contact."; @@ -11,10 +8,17 @@ "*bold*" = "\\*bold*"; /* No comment provided by engineer. */ -"_italic_" = "\\_italic_"; +"`a + b`" = "\\`a + b`"; /* No comment provided by engineer. */ "~strike~" = "\\~strike~"; /* No comment provided by engineer. */ -"`a + b`" = "\\`a + b`"; +"Connecting server…" = "Connecting to server…"; + +/* No comment provided by engineer. */ +"Connecting server… (error: %@)" = "Connecting to server… (error: %@)"; + +/* rcv group event chat item */ +"member connected" = "connected"; + diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings index b44ef5fb8..1582490d8 100644 --- a/apps/ios/ru.lproj/Localizable.strings +++ b/apps/ios/ru.lproj/Localizable.strings @@ -25,6 +25,9 @@ /* No comment provided by engineer. */ ")" = ")"; +/* group left description */ +"[left]" = "[покинута]"; + /* No comment provided by engineer. */ "[Send us email](mailto:chat@simplex.chat)" = "[Отправить email](mailto:chat@simplex.chat)"; @@ -173,6 +176,9 @@ /* No comment provided by engineer. */ "Cancel" = "Отменить"; +/* No comment provided by engineer. */ +"Chat and all messages will be deleted - this cannot be undone!" = "Чат и все сообщения будут удалены - это действие нельзя отменить!"; + /* No comment provided by engineer. */ "Chat archive" = "Архив чата"; @@ -320,6 +326,9 @@ /* No comment provided by engineer. */ "Create address" = "Создать адрес"; +/* No comment provided by engineer. */ +"Create group" = "Создать группу"; + /* No comment provided by engineer. */ "Create link / QR code" = "Создать ссылку / QR код"; @@ -359,6 +368,9 @@ /* No comment provided by engineer. */ "Delete chat profile?" = "Удалить профиль?"; +/* No comment provided by engineer. */ +"Delete chat?" = "Удалить чат?"; + /* No comment provided by engineer. */ "Delete contact" = "Удалить контакт"; @@ -378,7 +390,7 @@ "Delete for me" = "Удалить для меня"; /* No comment provided by engineer. */ -"Delete group" = "Удалить группу"; +"Delete invitation" = "Удалить приглашение"; /* No comment provided by engineer. */ "Delete message?" = "Удалить сообщение?"; @@ -398,6 +410,9 @@ /* deleted chat item */ "deleted" = "удалено"; +/* rcv group event chat item */ +"deleted group" = "удалил(а) группу"; + /* No comment provided by engineer. */ "Develop" = "Для разработчиков"; @@ -513,7 +528,10 @@ "Full name (optional)" = "Полное имя (не обязательно)"; /* No comment provided by engineer. */ -"Group deletion is not supported" = "Удаление групп не поддерживается"; +"Group invitation" = "Приглашение в группу"; + +/* No comment provided by engineer. */ +"Group invitation expired" = "Приглашение в группу истекло"; /* notification */ "Group message:" = "Групповое сообщение:"; @@ -590,6 +608,12 @@ /* No comment provided by engineer. */ "Invalid connection link" = "Ошибка в ссылке контакта"; +/* group name */ +"invitation to group %@" = "приглашение в группу %@"; + +/* rcv group event chat item */ +"invited %@" = "пригласил(а) %@"; + /* chat list item title */ "invited to connect" = "приглашение"; @@ -605,9 +629,27 @@ /* No comment provided by engineer. */ "italic" = "курсив"; +/* No comment provided by engineer. */ +"Join" = "Вступить"; + +/* No comment provided by engineer. */ +"Join group" = "Вступить в группу"; + +/* No comment provided by engineer. */ +"Joining group" = "Вступление в группу"; + /* No comment provided by engineer. */ "Large file!" = "Большой файл!"; +/* No comment provided by engineer. */ +"Leave" = "Выйти"; + +/* No comment provided by engineer. */ +"Leave group?" = "Выйти из группы?"; + +/* rcv group event chat item */ +"left" = "покинул(а) группу"; + /* No comment provided by engineer. */ "Limitations" = "Ограничения"; @@ -623,6 +665,9 @@ /* No comment provided by engineer. */ "Markdown in messages" = "Форматирование сообщений"; +/* rcv group event chat item */ +"member connected" = "соединен(а)"; + /* No comment provided by engineer. */ "Message delivery error" = "Ошибка доставки сообщения"; @@ -779,6 +824,12 @@ /* call status */ "rejected call" = "отклонённый звонок"; +/* rcv group event chat item */ +"removed %@" = "удалил(а) %@"; + +/* rcv group event chat item */ +"removed you" = "удалил(а) вас из группы"; + /* No comment provided by engineer. */ "Reply" = "Ответить"; @@ -896,6 +947,9 @@ /* No comment provided by engineer. */ "Tap button " = "Нажмите кнопку"; +/* No comment provided by engineer. */ +"Tap to join" = "Нажмите, чтобы вступить"; + /* No comment provided by engineer. */ "Thank you for installing SimpleX Chat!" = "Спасибо, что установили SimpleX Chat!"; @@ -1043,6 +1097,9 @@ /* No comment provided by engineer. */ "You are connected to the server used to receive messages from this contact." = "Установлено соединение с сервером, через который вы получаете сообщения от этого контакта."; +/* No comment provided by engineer. */ +"You are invited to group" = "Вы приглашены в группу"; + /* No comment provided by engineer. */ "You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button" = "Вы также можете соединиться, открыв ссылку. Если ссылка откроется в браузере, нажмите кнопку **Open in mobile app**."; @@ -1070,9 +1127,27 @@ /* No comment provided by engineer. */ "You invited your contact" = "Вы пригласили ваш контакт"; +/* No comment provided by engineer. */ +"You joined this group" = "Вы вступили в эту группу"; + +/* No comment provided by engineer. */ +"You joined this group. Connecting to inviting group member." = "Вы вступили в эту группу. Устанавливается соединение с пригласившим членом группы."; + +/* snd group event chat item */ +"you left" = "вы покинули группу"; + /* No comment provided by engineer. */ "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Вы должны всегда использовать самую новую версию данных чата, ТОЛЬКО на одном устройстве, инача вы можете перестать получать сообщения от каких то контактов."; +/* No comment provided by engineer. */ +"You rejected group invitation" = "Вы отклонили приглашение в группу"; + +/* snd group event chat item */ +"you removed %@" = "вы удалили %@"; + +/* No comment provided by engineer. */ +"You sent group invitation" = "Вы отправили приглашение в группу"; + /* chat list item description */ "you shared one-time link" = "вы создали ссылку"; @@ -1085,6 +1160,9 @@ /* No comment provided by engineer. */ "You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме."; +/* No comment provided by engineer. */ +"You will stop receiving messages from this group. Chat history will be preserved." = "Вы перестанете получать сообщения от этой группы. История чата будет сохранена."; + /* No comment provided by engineer. */ "Your calls" = "Ваши звонки";