diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt index f189cb5617..0411843d2d 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt @@ -95,24 +95,37 @@ fun AddGroupMembersLayout( } SectionSpacer() - SectionView { - SectionItemView { - RoleSelectionRow(groupInfo, selectedRole) + if (contactsToAdd.isEmpty()) { + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + Text( + stringResource(R.string.no_contacts_to_add), + Modifier.padding(), + color = HighOrLowlight + ) } - SectionDivider() - SectionItemView { - InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty()) + } else { + SectionView { + SectionItemView { + RoleSelectionRow(groupInfo, selectedRole) + } + SectionDivider() + SectionItemView { + InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty()) + } } - } - SectionCustomFooter { - InviteSectionFooter(selectedContactsCount = selectedContacts.count(), clearSelection) - } - SectionSpacer() + SectionCustomFooter { + InviteSectionFooter(selectedContactsCount = selectedContacts.count(), clearSelection) + } + SectionSpacer() - SectionView { - ContactList(contacts = contactsToAdd, selectedContacts, addContact, removeContact) + SectionView { + ContactList(contacts = contactsToAdd, selectedContacts, addContact, removeContact) + } + SectionSpacer() } - SectionSpacer() } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt index 660975f610..c998e99940 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt @@ -147,7 +147,9 @@ fun GroupChatInfoLayout( SectionItemView(height = 50.dp) { MemberRow(groupInfo.membership, user = true) } - SectionDivider() + if (members.isNotEmpty()) { + SectionDivider() + } MembersList(members, showMemberInfo) } SectionSpacer() 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 6aa9b2cd01..076bd4849c 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -510,7 +510,7 @@ Выйти Выйти из группы Вы перестанете получать сообщения от этой группы. История чата будет сохранена. - Пригласить участников + Пригласить членов группы Группа неактивна Приглашение истекло! Приглашение в группу больше не действительно, оно было удалено отправителем. @@ -539,8 +539,8 @@ профиль группы обновлен - участник - администратор + член группы + админ владелец @@ -559,34 +559,35 @@ соединяется - Роль участника + Нет контактов для добавления + Роль члена группы Развернуть выбор роли Пригласить в группу Контакт выбран Очистить - Контактов выбрано: %1$s + Выбрано контактов: %1$s Контакты не выбраны - Пригласить участников - УЧАСТНИКОВ: %1$s + Пригласить членов группы + ЧЛЕНОВ ГРУППЫ: %1$s вы: %1$s Удалить группу Удалить группу? - Группа будет удалена для всех участников - это действие нельзя отменить! + Группа будет удалена для всех членов - это действие нельзя отменить! Выйти из группы Редактировать профиль группы ДЛЯ КОНСОЛИ - Локальное название - ID в базе данных + Локальное имя + ID базы данных - Удалить участника - Участник будет удален из группы - это действие нельзя отменить! + Удалить члена группы + Член группы будет удален - это действие нельзя отменить! Удалить - УЧАСТНИК + ЧЛЕН ГРУППЫ Группа Соединение прямое @@ -599,13 +600,13 @@ Состояние сети - Создать секретную группу - Группа полностью децентрализована — она видна только участникам. + Создать скрытую группу + Группа полностью децентрализована — она видна только членам. Имя группы: Полное имя: - Профиль группы хранится на устройствах участников, а не на серверах. + Профиль группы хранится на устройствах членов, а не на серверах. Сохранить профиль группы Ошибка при сохранении профиля группы diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml index 87aaceec13..538ff3476f 100644 --- a/apps/android/app/src/main/res/values/strings.xml +++ b/apps/android/app/src/main/res/values/strings.xml @@ -561,6 +561,7 @@ connecting + No contacts to add New member role Expand role selection Invite to group diff --git a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift index 3ace3a9788..6476a483e5 100644 --- a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift +++ b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift @@ -36,7 +36,7 @@ struct GroupMemberInfoView: View { // localizedInfoRow("Role", member.memberRole.text) // TODO invited by - need to get contact by contact id if let conn = member.activeConn { - let connLevelDesc = conn.connLevel == 0 ? "direct" : "indirect (\(conn.connLevel))" + let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel) infoRow("Connection", connLevelDesc) } } diff --git a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift index 486a1824da..efda4c2341 100644 --- a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift +++ b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift @@ -121,12 +121,12 @@ struct ChatPreviewView: View { switch (chat.chatInfo) { case let .direct(contact): if !contact.ready { - chatPreviewInfoText("connecting...") + chatPreviewInfoText("connecting…") } case let .group(groupInfo): switch (groupInfo.membership.memberStatus) { case .memInvited: chatPreviewInfoText("you are invited to group") - case .memAccepted: chatPreviewInfoText("connecting...") + case .memAccepted: chatPreviewInfoText("connecting…") default: EmptyView() } default: EmptyView() 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 ea6acc71b1..b0a53dc2f3 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -60,6 +60,16 @@ %lld No comment provided by engineer. + + %lld contact(s) selected + %lld contact(s) selected + No comment provided by engineer. + + + %lld members + %lld members + No comment provided by engineer. + %lldk %lldk @@ -231,11 +241,6 @@ 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 @@ -356,9 +361,9 @@ Connecting to server… (error: %@) No comment provided by engineer. - - Connecting... - Connecting... + + Connection + Connection No comment provided by engineer. @@ -436,16 +441,16 @@ Create address No comment provided by engineer. - - Create group - Create group - No comment provided by engineer. - Create link / QR code Create link / QR code No comment provided by engineer. + + Create secret group + Create secret group + No comment provided by engineer. + Create your profile Create your profile @@ -461,6 +466,11 @@ Currently maximum supported file size is %@. No comment provided by engineer. + + Database ID + Database ID + No comment provided by engineer. + Database export & import Database export & import @@ -511,11 +521,6 @@ Delete chat profile? No comment provided by engineer. - - Delete chat? - Delete chat? - No comment provided by engineer. - Delete contact Delete contact @@ -541,6 +546,16 @@ Delete for me No comment provided by engineer. + + Delete group + Delete group + No comment provided by engineer. + + + Delete group? + Delete group? + No comment provided by engineer. + Delete invitation Delete invitation @@ -576,6 +591,11 @@ Develop No comment provided by engineer. + + Developer tools + Developer tools + No comment provided by engineer. + Device Device @@ -616,6 +636,11 @@ Edit No comment provided by engineer. + + Edit group profile + Edit group profile + No comment provided by engineer. + Enable Enable @@ -646,6 +671,11 @@ Error accessing database file No comment provided by engineer. + + Error creating group + Error creating group + No comment provided by engineer. + Error deleting chat database Error deleting chat database @@ -681,11 +711,21 @@ Error importing chat database No comment provided by engineer. + + Error joining group + Error joining group + No comment provided by engineer. + Error saving SMP servers Error saving SMP servers No comment provided by engineer. + + Error saving group profile + Error saving group profile + No comment provided by engineer. + Error starting chat Error starting chat @@ -736,11 +776,36 @@ File will be received when your contact is online, please wait or check later! No comment provided by engineer. + + For console + For console + No comment provided by engineer. + Full name (optional) Full name (optional) No comment provided by engineer. + + Group + Group + No comment provided by engineer. + + + Group display name + Group display name + No comment provided by engineer. + + + Group full name (optional) + Group full name (optional) + No comment provided by engineer. + + + Group image + Group image + No comment provided by engineer. + Group invitation Group invitation @@ -751,11 +816,26 @@ Group invitation expired No comment provided by engineer. + + Group invitation is no longer valid, it was removed by sender. + Group invitation is no longer valid, it was removed by sender. + No comment provided by engineer. + Group message: Group message: notification + + Group profile is stored on members' devices, not on the servers. + Group profile is stored on members' devices, not on the servers. + No comment provided by engineer. + + + Group will be deleted for all members - this cannot be undone! + Group will be deleted for all members - this cannot be undone! + No comment provided by engineer. + Help Help @@ -876,6 +956,21 @@ Invalid connection link No comment provided by engineer. + + Invitation expired! + Invitation expired! + No comment provided by engineer. + + + Invite members + Invite members + No comment provided by engineer. + + + Invite to group + Invite to group + No comment provided by engineer. + It can happen when: 1. The messages expire on the server if they were not received for 30 days, @@ -926,6 +1021,11 @@ We will be adding server redundancy to prevent lost messages. Leave No comment provided by engineer. + + Leave group + Leave group + No comment provided by engineer. + Leave group? Leave group? @@ -936,6 +1036,11 @@ We will be adding server redundancy to prevent lost messages. Limitations No comment provided by engineer. + + Local name + Local name + No comment provided by engineer. + Make a private connection Make a private connection @@ -956,6 +1061,16 @@ We will be adding server redundancy to prevent lost messages. Markdown in messages No comment provided by engineer. + + Member + Member + No comment provided by engineer. + + + Member will be removed from group - this cannot be undone! + Member will be removed from group - this cannot be undone! + No comment provided by engineer. + Message delivery error Message delivery error @@ -991,6 +1106,11 @@ 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 status + Network status + No comment provided by engineer. + New contact request New contact request @@ -1006,16 +1126,36 @@ We will be adding server redundancy to prevent lost messages. New database archive No comment provided by engineer. + + New member role + New member role + No comment provided by engineer. + New message New message notification + + No contacts selected + No contacts selected + No comment provided by engineer. + + + No contacts to add + No contacts to add + No comment provided by engineer. + No device token! No device token! No comment provided by engineer. + + Group not found! + Group not found! + No comment provided by engineer. + Notifications Notifications @@ -1156,6 +1296,11 @@ We will be adding server redundancy to prevent lost messages. Received file event notification + + Receiving via + Receiving via + No comment provided by engineer. + Reject Reject @@ -1171,6 +1316,21 @@ We will be adding server redundancy to prevent lost messages. Reject contact request No comment provided by engineer. + + Remove + Remove + No comment provided by engineer. + + + Remove member + Remove member + No comment provided by engineer. + + + Remove member? + Remove member? + No comment provided by engineer. + Reply Reply @@ -1216,6 +1376,11 @@ We will be adding server redundancy to prevent lost messages. Save archive No comment provided by engineer. + + Save group profile + Save group profile + No comment provided by engineer. + Saved SMP servers will be removed Saved SMP servers will be removed @@ -1246,14 +1411,19 @@ We will be adding server redundancy to prevent lost messages. Send notifications: No comment provided by engineer. + + Sending via + Sending via + No comment provided by engineer. + Sent file event Sent file event notification - - Server connected - Server connected + + Servers + Servers No comment provided by engineer. @@ -1301,6 +1471,11 @@ We will be adding server redundancy to prevent lost messages. SimpleX encrypted message or connection event notification + + Skip + Skip + No comment provided by engineer. + Skipped messages Skipped messages @@ -1386,6 +1561,11 @@ We will be adding server redundancy to prevent lost messages. The created archive is available via app Settings / Database / Old database archive. No comment provided by engineer. + + The group is fully decentralized – it is visible only to the members. + The group is fully decentralized – it is visible only to the members. + No comment provided by engineer. + The microphone does not work when the app is in the background. The microphone does not work when the app is in the background. @@ -1416,6 +1596,11 @@ We will be adding server redundancy to prevent lost messages. This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost. No comment provided by engineer. + + This group no longer exists. + This group no longer exists. + No comment provided by engineer. + To ask any questions and to receive SimpleX Chat updates. To ask any questions and to receive SimpleX Chat updates. @@ -1744,11 +1929,6 @@ 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 +1949,11 @@ SimpleX servers cannot see your profile. accepted call call status + + admin + admin + No comment provided by engineer. + audio call (not e2e encrypted) audio call (not e2e encrypted) @@ -1809,6 +1994,11 @@ SimpleX servers cannot see your profile. colored No comment provided by engineer. + + complete + complete + No comment provided by engineer. + connect to SimpleX Chat developers. connect to SimpleX Chat developers. @@ -1819,6 +2009,31 @@ SimpleX servers cannot see your profile. connected No comment provided by engineer. + + connecting + connecting + No comment provided by engineer. + + + connecting (accepted) + connecting (accepted) + No comment provided by engineer. + + + connecting (announced) + connecting (announced) + No comment provided by engineer. + + + connecting (introduced) + connecting (introduced) + No comment provided by engineer. + + + connecting (introduction invitation) + connecting (introduction invitation) + No comment provided by engineer. + connecting call… connecting call… @@ -1849,6 +2064,11 @@ SimpleX servers cannot see your profile. contact has no e2e encryption No comment provided by engineer. + + creator + creator + No comment provided by engineer. + deleted deleted @@ -1859,6 +2079,11 @@ SimpleX servers cannot see your profile. deleted group rcv group event chat item + + direct + direct + connection level description + duplicate message duplicate message @@ -1879,11 +2104,36 @@ SimpleX servers cannot see your profile. ended call %@ call status + + error + error + No comment provided by engineer. + + + group deleted + group deleted + No comment provided by engineer. + + + group profile updated + group profile updated + snd group event chat item + + + indirect (%d) + indirect (%d) + connection level description + invitation to group %@ invitation to group %@ group name + + invited + invited + No comment provided by engineer. + invited %@ invited %@ @@ -1904,8 +2154,13 @@ SimpleX servers cannot see your profile. left rcv group event chat item + + member + member + No comment provided by engineer. + - member connected + connected connected rcv group event chat item @@ -1934,6 +2189,11 @@ SimpleX servers cannot see your profile. or No comment provided by engineer. + + owner + owner + No comment provided by engineer. + peer-to-peer peer-to-peer @@ -1954,6 +2214,11 @@ SimpleX servers cannot see your profile. rejected call call status + + removed + removed + No comment provided by engineer. + removed %@ removed %@ @@ -1989,6 +2254,11 @@ SimpleX servers cannot see your profile. unknown connection info + + updated group profile + updated group profile + rcv group event chat item + v%@ (%@) v%@ (%@) @@ -2029,6 +2299,11 @@ SimpleX servers cannot see your profile. wants to connect to you! No comment provided by engineer. + + you are invited to group + you are invited to group + No comment provided by engineer. + you left you left @@ -2044,6 +2319,11 @@ SimpleX servers cannot see your profile. you shared one-time link chat list item description + + you: + you: + No comment provided by engineer. + \~strike~ \~strike~ diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/en.lproj/Localizable.strings b/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/en.lproj/Localizable.strings index 813c6f5981..dc52cfe6fa 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/en.lproj/Localizable.strings +++ b/apps/ios/SimpleX Localizations/en.xcloc/Source Contents/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,20 @@ "*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"; + +/* No comment provided by engineer. */ +"No group!" = "Group not found!"; + 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 bc445746a0..d9d3e709f8 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -60,6 +60,16 @@ %lld No comment provided by engineer. + + %lld contact(s) selected + Выбрано контактов: %lld + No comment provided by engineer. + + + %lld members + Членов группы: %lld + No comment provided by engineer. + %lldk %lldk @@ -231,11 +241,6 @@ Отменить No comment provided by engineer. - - Chat and all messages will be deleted - this cannot be undone! - Чат и все сообщения будут удалены - это действие нельзя отменить! - No comment provided by engineer. - Chat archive Архив чата @@ -356,9 +361,9 @@ Устанавливается соединение с сервером… (ошибка: %@) No comment provided by engineer. - - Connecting... - Устанавливается соединение… + + Connection + Соединение No comment provided by engineer. @@ -436,16 +441,16 @@ Создать адрес No comment provided by engineer. - - Create group - Создать группу - No comment provided by engineer. - Create link / QR code Создать ссылку / QR код No comment provided by engineer. + + Create secret group + Создать скрытую группу + No comment provided by engineer. + Create your profile Создать профиль @@ -461,6 +466,11 @@ Максимальный размер файла - %@. No comment provided by engineer. + + Database ID + ID базы данных + No comment provided by engineer. + Database export & import Экспорт и импорт архива чата @@ -511,11 +521,6 @@ Удалить профиль? No comment provided by engineer. - - Delete chat? - Удалить чат? - No comment provided by engineer. - Delete contact Удалить контакт @@ -541,6 +546,16 @@ Удалить для меня No comment provided by engineer. + + Delete group + Удалить группу + No comment provided by engineer. + + + Delete group? + Удалить группу? + No comment provided by engineer. + Delete invitation Удалить приглашение @@ -576,6 +591,11 @@ Для разработчиков No comment provided by engineer. + + Developer tools + Инструменты разработчика + No comment provided by engineer. + Device Устройство @@ -616,6 +636,11 @@ Редактировать No comment provided by engineer. + + Edit group profile + Редактировать профиль группы + No comment provided by engineer. + Enable Включить @@ -646,6 +671,11 @@ Ошибка при доступе к данным чата No comment provided by engineer. + + Error creating group + Ошибка при создании группы + No comment provided by engineer. + Error deleting chat database Ошибка при удалении данных чата @@ -681,11 +711,21 @@ Ошибка при импорте архива чата No comment provided by engineer. + + Error joining group + Ошибка приглашения + No comment provided by engineer. + Error saving SMP servers Ошибка при сохранении SMP серверов No comment provided by engineer. + + Error saving group profile + Ошибка при сохранении профиля группы + No comment provided by engineer. + Error starting chat Ошибка при запуске чата @@ -736,11 +776,36 @@ Файл будет принят, когда ваш контакт будет в сети, подождите или проверьте позже! No comment provided by engineer. + + For console + Для консоли + No comment provided by engineer. + Full name (optional) Полное имя (не обязательно) No comment provided by engineer. + + Group + Группа + No comment provided by engineer. + + + Group display name + Имя группы + No comment provided by engineer. + + + Group full name (optional) + Полное имя (необязательно) + No comment provided by engineer. + + + Group image + Аватар группы + No comment provided by engineer. + Group invitation Приглашение в группу @@ -751,11 +816,26 @@ Приглашение в группу истекло No comment provided by engineer. + + Group invitation is no longer valid, it was removed by sender. + Приглашение в группу больше не действительно, оно было удалено отправителем. + No comment provided by engineer. + Group message: Групповое сообщение: notification + + Group profile is stored on members' devices, not on the servers. + Профиль группы хранится на устройствах членов, а не на серверах. + No comment provided by engineer. + + + Group will be deleted for all members - this cannot be undone! + Группа будет удалена для всех членов - это действие нельзя отменить! + No comment provided by engineer. + Help Помощь @@ -876,6 +956,21 @@ Ошибка в ссылке контакта No comment provided by engineer. + + Invitation expired! + Приглашение истекло! + No comment provided by engineer. + + + Invite members + Пригласить членов группы + No comment provided by engineer. + + + Invite to group + Пригласить в группу + No comment provided by engineer. + It can happen when: 1. The messages expire on the server if they were not received for 30 days, @@ -926,6 +1021,11 @@ We will be adding server redundancy to prevent lost messages. Выйти No comment provided by engineer. + + Leave group + Выйти из группы + No comment provided by engineer. + Leave group? Выйти из группы? @@ -936,6 +1036,11 @@ We will be adding server redundancy to prevent lost messages. Ограничения No comment provided by engineer. + + Local name + Локальное имя + No comment provided by engineer. + Make a private connection Добавьте контакт @@ -956,6 +1061,16 @@ We will be adding server redundancy to prevent lost messages. Форматирование сообщений No comment provided by engineer. + + Member + Член группы + No comment provided by engineer. + + + Member will be removed from group - this cannot be undone! + Член группы будет удален - это действие нельзя отменить! + No comment provided by engineer. + Message delivery error Ошибка доставки сообщения @@ -991,6 +1106,11 @@ We will be adding server redundancy to prevent lost messages. Скорее всего, этот контакт удалил соединение с вами. No comment provided by engineer. + + Network status + Состояние сети + No comment provided by engineer. + New contact request Новый запрос на соединение @@ -1006,16 +1126,36 @@ We will be adding server redundancy to prevent lost messages. Новый архив чата No comment provided by engineer. + + New member role + Роль члена группы + No comment provided by engineer. + New message Новое сообщение notification + + No contacts selected + Контакты не выбраны + No comment provided by engineer. + + + No contacts to add + Нет контактов для добавления + No comment provided by engineer. + No device token! Отсутствует токен устройства! No comment provided by engineer. + + Group not found! + Группа не найдена! + No comment provided by engineer. + Notifications Уведомления @@ -1156,6 +1296,11 @@ We will be adding server redundancy to prevent lost messages. Загрузка файла notification + + Receiving via + Получение через + No comment provided by engineer. + Reject Отклонить @@ -1171,6 +1316,21 @@ We will be adding server redundancy to prevent lost messages. Отклонить запрос No comment provided by engineer. + + Remove + Удалить + No comment provided by engineer. + + + Remove member + Удалить члена группы + No comment provided by engineer. + + + Remove member? + Удалить члена группы? + No comment provided by engineer. + Reply Ответить @@ -1216,6 +1376,11 @@ We will be adding server redundancy to prevent lost messages. Сохранить архив No comment provided by engineer. + + Save group profile + Сохранить профиль группы + No comment provided by engineer. + Saved SMP servers will be removed Сохраненные SMP серверы будут удалены @@ -1246,14 +1411,19 @@ We will be adding server redundancy to prevent lost messages. Отправлять уведомления: No comment provided by engineer. + + Sending via + Отправка через + No comment provided by engineer. + Sent file event Отправка файла notification - - Server connected - Установлено соединение с сервером + + Servers + Серверы No comment provided by engineer. @@ -1301,6 +1471,11 @@ We will be adding server redundancy to prevent lost messages. SimpleX: зашифрованное сообщение или соединение контакта notification + + Skip + Пропустить + No comment provided by engineer. + Skipped messages Пропущенные сообщения @@ -1386,6 +1561,11 @@ We will be adding server redundancy to prevent lost messages. Созданный архив доступен через Настройки приложения. No comment provided by engineer. + + The group is fully decentralized – it is visible only to the members. + Группа полностью децентрализована — она видна только членам. + No comment provided by engineer. + The microphone does not work when the app is in the background. Микрофон не работает, когда приложение в фоновом режиме. @@ -1416,6 +1596,11 @@ We will be adding server redundancy to prevent lost messages. Это действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны. No comment provided by engineer. + + This group no longer exists. + Эта группа больше не существует. + No comment provided by engineer. + To ask any questions and to receive SimpleX Chat updates. Чтобы задать вопросы и получать уведомления о SimpleX Chat. @@ -1744,11 +1929,6 @@ SimpleX серверы не могут получить доступ к ваше [Отправить email](mailto:chat@simplex.chat) No comment provided by engineer. - - [left] - [покинута] - group left description - \_italic_ \_курсив_ @@ -1769,6 +1949,11 @@ SimpleX серверы не могут получить доступ к ваше принятый звонок call status + + admin + админ + No comment provided by engineer. + audio call (not e2e encrypted) аудиозвонок (не e2e зашифрованный) @@ -1809,6 +1994,11 @@ SimpleX серверы не могут получить доступ к ваше цвет No comment provided by engineer. + + complete + соединение завершено + No comment provided by engineer. + connect to SimpleX Chat developers. соединитесь с разработчиками. @@ -1819,6 +2009,31 @@ SimpleX серверы не могут получить доступ к ваше соединение установлено No comment provided by engineer. + + connecting + соединяется + No comment provided by engineer. + + + connecting (accepted) + соединяется (приглашение принято) + No comment provided by engineer. + + + connecting (announced) + соединяется (объявлен(а)) + No comment provided by engineer. + + + connecting (introduced) + соединяется (представлен(а)) + No comment provided by engineer. + + + connecting (introduction invitation) + соединяется (приглашение по представлению) + No comment provided by engineer. + connecting call… звонок соединяется… @@ -1849,6 +2064,11 @@ SimpleX серверы не могут получить доступ к ваше у контакта нет e2e шифрования No comment provided by engineer. + + creator + создатель + No comment provided by engineer. + deleted удалено @@ -1859,6 +2079,11 @@ SimpleX серверы не могут получить доступ к ваше удалил(а) группу rcv group event chat item + + direct + прямое + connection level description + duplicate message повторное сообщение @@ -1879,11 +2104,36 @@ SimpleX серверы не могут получить доступ к ваше завершённый звонок %@ call status + + error + ошибка + No comment provided by engineer. + + + group deleted + группа удалена + No comment provided by engineer. + + + group profile updated + профиль группы обновлен + snd group event chat item + + + indirect (%d) + непрямое (%d) + connection level description + invitation to group %@ приглашение в группу %@ group name + + invited + приглашен(а) + No comment provided by engineer. + invited %@ пригласил(а) %@ @@ -1904,8 +2154,13 @@ SimpleX серверы не могут получить доступ к ваше покинул(а) группу rcv group event chat item + + member + член группы + No comment provided by engineer. + - member connected + connected соединен(а) rcv group event chat item @@ -1934,6 +2189,11 @@ SimpleX серверы не могут получить доступ к ваше или No comment provided by engineer. + + owner + владелец + No comment provided by engineer. + peer-to-peer peer-to-peer @@ -1954,6 +2214,11 @@ SimpleX серверы не могут получить доступ к ваше отклонённый звонок call status + + removed + удален(а) + No comment provided by engineer. + removed %@ удалил(а) %@ @@ -1989,6 +2254,11 @@ SimpleX серверы не могут получить доступ к ваше неизвестно connection info + + updated group profile + обновил(а) профиль группы + rcv group event chat item + v%@ (%@) v%@ (%@) @@ -2029,6 +2299,11 @@ SimpleX серверы не могут получить доступ к ваше хочет соединиться с вами! No comment provided by engineer. + + you are invited to group + вы приглашены в группу + No comment provided by engineer. + you left вы покинули группу @@ -2044,6 +2319,11 @@ SimpleX серверы не могут получить доступ к ваше вы создали ссылку chat list item description + + you: + вы: + No comment provided by engineer. + \~strike~ \~зачеркнуть~ diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/en.lproj/Localizable.strings b/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/en.lproj/Localizable.strings index 813c6f5981..dc52cfe6fa 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/en.lproj/Localizable.strings +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/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,20 @@ "*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"; + +/* No comment provided by engineer. */ +"No group!" = "Group not found!"; + diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index a88e81b254..fcb886bf85 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -630,7 +630,7 @@ public enum GroupMemberStatus: String, Decodable { case .memIntroInvited: return "connecting (introduction invitation)" case .memAccepted: return "connecting (accepted)" case .memAnnounced: return "connecting (announced)" - case .memConnected: return "connected" + case .memConnected: return "member connected" case .memComplete: return "complete" case .memCreator: return "creator" } @@ -646,7 +646,7 @@ public enum GroupMemberStatus: String, Decodable { case .memIntroInvited: return "connecting" case .memAccepted: return "connecting" case .memAnnounced: return "connecting" - case .memConnected: return "connected" + case .memConnected: return "member connected" case .memComplete: return "complete" case .memCreator: return "creator" } diff --git a/apps/ios/en.lproj/Localizable.strings b/apps/ios/en.lproj/Localizable.strings index ecba9a7527..dc52cfe6fa 100644 --- a/apps/ios/en.lproj/Localizable.strings +++ b/apps/ios/en.lproj/Localizable.strings @@ -22,3 +22,6 @@ /* rcv group event chat item */ "member connected" = "connected"; +/* No comment provided by engineer. */ +"No group!" = "Group not found!"; + diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings index 1582490d89..84cebe1a97 100644 --- a/apps/ios/ru.lproj/Localizable.strings +++ b/apps/ios/ru.lproj/Localizable.strings @@ -25,9 +25,6 @@ /* 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)"; @@ -82,6 +79,12 @@ /* No comment provided by engineer. */ "%lld" = "%lld"; +/* No comment provided by engineer. */ +"%lld contact(s) selected" = "Выбрано контактов: %lld"; + +/* No comment provided by engineer. */ +"%lld members" = "Членов группы: %lld"; + /* No comment provided by engineer. */ "%lldk" = "%lldk"; @@ -122,6 +125,9 @@ /* No comment provided by engineer. */ "Add contact to start a new chat" = "Добавьте контакт, чтобы начать разговор"; +/* No comment provided by engineer. */ +"admin" = "админ"; + /* No comment provided by engineer. */ "All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас."; @@ -176,9 +182,6 @@ /* 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" = "Архив чата"; @@ -224,6 +227,9 @@ /* No comment provided by engineer. */ "colored" = "цвет"; +/* No comment provided by engineer. */ +"complete" = "соединение завершено"; + /* No comment provided by engineer. */ "Configure SMP servers" = "Настройка SMP серверов"; @@ -254,6 +260,21 @@ /* No comment provided by engineer. */ "connected" = "соединение установлено"; +/* No comment provided by engineer. */ +"connecting" = "соединяется"; + +/* No comment provided by engineer. */ +"connecting (accepted)" = "соединяется (приглашение принято)"; + +/* No comment provided by engineer. */ +"connecting (announced)" = "соединяется (объявлен(а))"; + +/* No comment provided by engineer. */ +"connecting (introduced)" = "соединяется (представлен(а))"; + +/* No comment provided by engineer. */ +"connecting (introduction invitation)" = "соединяется (приглашение по представлению)"; + /* call status */ "connecting call…" = "звонок соединяется…"; @@ -267,7 +288,7 @@ "connecting…" = "соединяется…"; /* No comment provided by engineer. */ -"Connecting..." = "Устанавливается соединение…"; +"Connection" = "Соединение"; /* No comment provided by engineer. */ "Connection error" = "Ошибка соединения"; @@ -327,10 +348,10 @@ "Create address" = "Создать адрес"; /* No comment provided by engineer. */ -"Create group" = "Создать группу"; +"Create link / QR code" = "Создать ссылку / QR код"; /* No comment provided by engineer. */ -"Create link / QR code" = "Создать ссылку / QR код"; +"Create secret group" = "Создать скрытую группу"; /* No comment provided by engineer. */ "Create your profile" = "Создать профиль"; @@ -338,12 +359,18 @@ /* No comment provided by engineer. */ "Created on %@" = "Дата создания %@"; +/* No comment provided by engineer. */ +"creator" = "создатель"; + /* No comment provided by engineer. */ "Currently maximum supported file size is %@." = "Максимальный размер файла - %@."; /* No comment provided by engineer. */ "Database export & import" = "Экспорт и импорт архива чата"; +/* No comment provided by engineer. */ +"Database ID" = "ID базы данных"; + /* No comment provided by engineer. */ "Database will be migrated when the app restarts" = "Данные чата будут мигрированы при перезапуске"; @@ -368,9 +395,6 @@ /* No comment provided by engineer. */ "Delete chat profile?" = "Удалить профиль?"; -/* No comment provided by engineer. */ -"Delete chat?" = "Удалить чат?"; - /* No comment provided by engineer. */ "Delete contact" = "Удалить контакт"; @@ -389,6 +413,12 @@ /* No comment provided by engineer. */ "Delete for me" = "Удалить для меня"; +/* No comment provided by engineer. */ +"Delete group" = "Удалить группу"; + +/* No comment provided by engineer. */ +"Delete group?" = "Удалить группу?"; + /* No comment provided by engineer. */ "Delete invitation" = "Удалить приглашение"; @@ -416,6 +446,9 @@ /* No comment provided by engineer. */ "Develop" = "Для разработчиков"; +/* No comment provided by engineer. */ +"Developer tools" = "Инструменты разработчика"; + /* No comment provided by engineer. */ "Device" = "Устройство"; @@ -425,6 +458,9 @@ /* No comment provided by engineer. */ "Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации."; +/* connection level description */ +"direct" = "прямое"; + /* authentication reason */ "Disable SimpleX Lock" = "Отключить блокировку SimpleX"; @@ -446,6 +482,9 @@ /* No comment provided by engineer. */ "Edit" = "Редактировать"; +/* No comment provided by engineer. */ +"Edit group profile" = "Редактировать профиль группы"; + /* No comment provided by engineer. */ "Enable" = "Включить"; @@ -467,9 +506,15 @@ /* call status */ "ended call %@" = "завершённый звонок %@"; +/* No comment provided by engineer. */ +"error" = "ошибка"; + /* No comment provided by engineer. */ "Error accessing database file" = "Ошибка при доступе к данным чата"; +/* No comment provided by engineer. */ +"Error creating group" = "Ошибка при создании группы"; + /* No comment provided by engineer. */ "Error deleting chat database" = "Ошибка при удалении данных чата"; @@ -491,6 +536,12 @@ /* No comment provided by engineer. */ "Error importing chat database" = "Ошибка при импорте архива чата"; +/* No comment provided by engineer. */ +"Error joining group" = "Ошибка приглашения"; + +/* No comment provided by engineer. */ +"Error saving group profile" = "Ошибка при сохранении профиля группы"; + /* No comment provided by engineer. */ "Error saving SMP servers" = "Ошибка при сохранении SMP серверов"; @@ -524,18 +575,48 @@ /* No comment provided by engineer. */ "File will be received when your contact is online, please wait or check later!" = "Файл будет принят, когда ваш контакт будет в сети, подождите или проверьте позже!"; +/* No comment provided by engineer. */ +"For console" = "Для консоли"; + /* No comment provided by engineer. */ "Full name (optional)" = "Полное имя (не обязательно)"; +/* No comment provided by engineer. */ +"Group" = "Группа"; + +/* No comment provided by engineer. */ +"group deleted" = "группа удалена"; + +/* No comment provided by engineer. */ +"Group display name" = "Имя группы"; + +/* No comment provided by engineer. */ +"Group full name (optional)" = "Полное имя (необязательно)"; + +/* No comment provided by engineer. */ +"Group image" = "Аватар группы"; + /* No comment provided by engineer. */ "Group invitation" = "Приглашение в группу"; /* No comment provided by engineer. */ "Group invitation expired" = "Приглашение в группу истекло"; +/* No comment provided by engineer. */ +"Group invitation is no longer valid, it was removed by sender." = "Приглашение в группу больше не действительно, оно было удалено отправителем."; + /* notification */ "Group message:" = "Групповое сообщение:"; +/* No comment provided by engineer. */ +"Group profile is stored on members' devices, not on the servers." = "Профиль группы хранится на устройствах членов, а не на серверах."; + +/* snd group event chat item */ +"group profile updated" = "профиль группы обновлен"; + +/* No comment provided by engineer. */ +"Group will be deleted for all members - this cannot be undone!" = "Группа будет удалена для всех членов - это действие нельзя отменить!"; + /* No comment provided by engineer. */ "Help" = "Помощь"; @@ -599,6 +680,9 @@ /* notification */ "Incoming video call" = "Входящий видеозвонок"; +/* connection level description */ +"indirect (%d)" = "непрямое (%d)"; + /* No comment provided by engineer. */ "Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)" = "[SimpleX Chat для терминала](https://github.com/simplex-chat/simplex-chat)"; @@ -608,9 +692,21 @@ /* No comment provided by engineer. */ "Invalid connection link" = "Ошибка в ссылке контакта"; +/* No comment provided by engineer. */ +"Invitation expired!" = "Приглашение истекло!"; + /* group name */ "invitation to group %@" = "приглашение в группу %@"; +/* No comment provided by engineer. */ +"Invite members" = "Пригласить членов группы"; + +/* No comment provided by engineer. */ +"Invite to group" = "Пригласить в группу"; + +/* No comment provided by engineer. */ +"invited" = "приглашен(а)"; + /* rcv group event chat item */ "invited %@" = "пригласил(а) %@"; @@ -644,6 +740,9 @@ /* No comment provided by engineer. */ "Leave" = "Выйти"; +/* No comment provided by engineer. */ +"Leave group" = "Выйти из группы"; + /* No comment provided by engineer. */ "Leave group?" = "Выйти из группы?"; @@ -653,6 +752,9 @@ /* No comment provided by engineer. */ "Limitations" = "Ограничения"; +/* No comment provided by engineer. */ +"Local name" = "Локальное имя"; + /* No comment provided by engineer. */ "Make a private connection" = "Добавьте контакт"; @@ -665,9 +767,18 @@ /* No comment provided by engineer. */ "Markdown in messages" = "Форматирование сообщений"; +/* No comment provided by engineer. */ +"member" = "член группы"; + +/* No comment provided by engineer. */ +"Member" = "Член группы"; + /* rcv group event chat item */ "member connected" = "соединен(а)"; +/* No comment provided by engineer. */ +"Member will be removed from group - this cannot be undone!" = "Член группы будет удален - это действие нельзя отменить!"; + /* No comment provided by engineer. */ "Message delivery error" = "Ошибка доставки сообщения"; @@ -695,6 +806,9 @@ /* No comment provided by engineer. */ "Most likely this contact has deleted the connection with you." = "Скорее всего, этот контакт удалил соединение с вами."; +/* No comment provided by engineer. */ +"Network status" = "Состояние сети"; + /* notification */ "New contact request" = "Новый запрос на соединение"; @@ -704,18 +818,30 @@ /* No comment provided by engineer. */ "New database archive" = "Новый архив чата"; +/* No comment provided by engineer. */ +"New member role" = "Роль члена группы"; + /* notification */ "new message" = "новое сообщение"; /* notification */ "New message" = "Новое сообщение"; +/* No comment provided by engineer. */ +"No contacts selected" = "Контакты не выбраны"; + +/* No comment provided by engineer. */ +"No contacts to add" = "Нет контактов для добавления"; + /* No comment provided by engineer. */ "No device token!" = "Отсутствует токен устройства!"; /* No comment provided by engineer. */ "no e2e encryption" = "нет e2e шифрования"; +/* No comment provided by engineer. */ +"No group!" = "Группа не найдена!"; + /* No comment provided by engineer. */ "Notifications" = "Уведомления"; @@ -749,6 +875,9 @@ /* No comment provided by engineer. */ "Or open the link in the browser and tap **Open in mobile**." = "Или откройте ссылку в браузере и нажмите **Open in mobile**."; +/* No comment provided by engineer. */ +"owner" = "владелец"; + /* No comment provided by engineer. */ "Paste" = "Вставить"; @@ -812,6 +941,9 @@ /* notification */ "Received file event" = "Загрузка файла"; +/* No comment provided by engineer. */ +"Receiving via" = "Получение через"; + /* reject incoming call via notification */ "Reject" = "Отклонить"; @@ -824,6 +956,18 @@ /* call status */ "rejected call" = "отклонённый звонок"; +/* No comment provided by engineer. */ +"Remove" = "Удалить"; + +/* No comment provided by engineer. */ +"Remove member" = "Удалить члена группы"; + +/* No comment provided by engineer. */ +"Remove member?" = "Удалить члена группы?"; + +/* No comment provided by engineer. */ +"removed" = "удален(а)"; + /* rcv group event chat item */ "removed %@" = "удалил(а) %@"; @@ -851,6 +995,9 @@ /* No comment provided by engineer. */ "Save archive" = "Сохранить архив"; +/* No comment provided by engineer. */ +"Save group profile" = "Сохранить профиль группы"; + /* No comment provided by engineer. */ "Saved SMP servers will be removed" = "Сохраненные SMP серверы будут удалены"; @@ -872,11 +1019,14 @@ /* No comment provided by engineer. */ "Send notifications:" = "Отправлять уведомления:"; +/* No comment provided by engineer. */ +"Sending via" = "Отправка через"; + /* notification */ "Sent file event" = "Отправка файла"; /* No comment provided by engineer. */ -"Server connected" = "Установлено соединение с сервером"; +"Servers" = "Серверы"; /* No comment provided by engineer. */ "Settings" = "Настройки"; @@ -905,6 +1055,9 @@ /* No comment provided by engineer. */ "SimpleX Lock turned on" = "Блокировка SimpleX включена"; +/* No comment provided by engineer. */ +"Skip" = "Пропустить"; + /* No comment provided by engineer. */ "Skipped messages" = "Пропущенные сообщения"; @@ -968,6 +1121,9 @@ /* No comment provided by engineer. */ "The created archive is available via app Settings / Database / Old database archive." = "Созданный архив доступен через Настройки приложения."; +/* No comment provided by engineer. */ +"The group is fully decentralized – it is visible only to the members." = "Группа полностью децентрализована — она видна только членам."; + /* No comment provided by engineer. */ "The microphone does not work when the app is in the background." = "Микрофон не работает, когда приложение в фоновом режиме."; @@ -989,6 +1145,9 @@ /* notification title */ "this contact" = "этот контакт"; +/* No comment provided by engineer. */ +"This group no longer exists." = "Эта группа больше не существует."; + /* No comment provided by engineer. */ "To ask any questions and to receive SimpleX Chat updates." = "Чтобы задать вопросы и получать уведомления о SimpleX Chat."; @@ -1043,6 +1202,9 @@ /* authentication reason */ "Unlock" = "Разблокировать"; +/* rcv group event chat item */ +"updated group profile" = "обновил(а) профиль группы"; + /* No comment provided by engineer. */ "Use chat" = "Использовать чат"; @@ -1097,6 +1259,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 are invited to group" = "Вы приглашены в группу"; @@ -1163,6 +1328,9 @@ /* No comment provided by engineer. */ "You will stop receiving messages from this group. Chat history will be preserved." = "Вы перестанете получать сообщения от этой группы. История чата будет сохранена."; +/* No comment provided by engineer. */ +"you: " = "вы: "; + /* No comment provided by engineer. */ "Your calls" = "Ваши звонки";