IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mobile: show skipped messages in the UI (#707)

Browse Source 
* mobile: show skipped messages in the UI

* ios: skipped messages alert and translations

* android: skipped messages alert

* android translation keys

* more keys

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>
This commit is contained in:
Evgeny Poberezkin
2022-05-29 08:06:56 +01:00
committed by GitHub
parent 89908ef5dc
commit 7c1d573a17
24 changed files with 658 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
View File

@@ -159,7 +159,7 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver {
private fun enableLA() {
val m = vm.chatModel
authenticate(
generalGetString(R.string.auth_enable),
generalGetString(R.string.auth_enable_simplex_lock),
generalGetString(R.string.auth_confirm_credential),
this@MainActivity,
completed = { laResult ->
@@ -193,7 +193,7 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver {
private fun disableLA() {
val m = vm.chatModel
authenticate(
generalGetString(R.string.auth_disable),
generalGetString(R.string.auth_disable_simplex_lock),
generalGetString(R.string.auth_confirm_credential),
this@MainActivity,
completed = { laResult ->

25
apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
View File

@@ -843,10 +843,11 @@ sealed class CIContent: ItemContent {
@Serializable @SerialName("sndMsgContent") class SndMsgContent(override val msgContent: MsgContent): CIContent()
@Serializable @SerialName("rcvMsgContent") class RcvMsgContent(override val msgContent: MsgContent): CIContent()
@Serializable @SerialName("sndDeleted") class SndDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent get() = null }
@Serializable @SerialName("rcvDeleted") class RcvDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent get() = null }
@Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent get() = null }
@Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent get() = null }
@Serializable @SerialName("sndDeleted") class SndDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent: MsgContent? get() = null }
@Serializable @SerialName("rcvDeleted") class RcvDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent: MsgContent? get() = null }
@Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
@Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
@Serializable @SerialName("rcvIntegrityError") class RcvIntegrityError(val msgError: MsgErrorType): CIContent() { override val msgContent: MsgContent? get() = null }
override val text: String get() = when(this) {
is SndMsgContent -> msgContent.text
@@ -855,6 +856,7 @@ sealed class CIContent: ItemContent {
is RcvDeleted -> generalGetString(R.string.deleted_description)
is SndCall -> status.text(duration)
is RcvCall -> status.text(duration)
is RcvIntegrityError -> msgError.text
}
}
@@ -1118,3 +1120,18 @@ enum class CICallStatus {
fun duration(sec: Int): String = "%02d:%02d".format(sec / 60, sec % 60)
}
@Serializable
sealed class MsgErrorType() {
@Serializable @SerialName("msgSkipped") class MsgSkipped(val fromMsgId: Long, val toMsgId: Long): MsgErrorType()
@Serializable @SerialName("msgBadId") class MsgBadId(val msgId: Long): MsgErrorType()
@Serializable @SerialName("msgBadHash") class MsgBadHash(): MsgErrorType()
@Serializable @SerialName("msgDuplicate") class MsgDuplicate(): MsgErrorType()
val text: String get() = when (this) {
is MsgSkipped -> String.format(generalGetString(R.string.integrity_msg_skipped), toMsgId - fromMsgId + 1)
is MsgBadHash -> generalGetString(R.string.integrity_msg_bad_hash) // not used now
is MsgBadId -> generalGetString(R.string.integrity_msg_bad_id) // not used now
is MsgDuplicate -> generalGetString(R.string.integrity_msg_duplicate) // not used now
}
}

6
apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
View File

@@ -762,12 +762,12 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
if (!appPrefs.laNoticeShown.get()) {
appPrefs.laNoticeShown.set(true)
AlertManager.shared.showAlertDialog(
title = generalGetString(R.string.la_notice_title),
text = generalGetString(R.string.la_notice_text),
title = generalGetString(R.string.la_notice_title_simplex_lock),
text = generalGetString(R.string.la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled),
confirmText = generalGetString(R.string.la_notice_turn_on),
onConfirm = {
authenticate(
generalGetString(R.string.auth_enable),
generalGetString(R.string.auth_enable_simplex_lock),
generalGetString(R.string.auth_confirm_credential),
activity,
completed = { laResult ->

1
apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt
View File

@@ -144,6 +144,7 @@ fun ChatItemView(
is CIContent.RcvDeleted -> DeletedItem()
is CIContent.SndCall -> CallItem(c.status, c.duration)
is CIContent.RcvCall -> CallItem(c.status, c.duration)
is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, showMember = showMember)
}
}
}

67
apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt Normal file
View File

@@ -0,0 +1,67 @@
package chat.simplex.app.views.chat.item
import android.content.res.Configuration
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.*
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import chat.simplex.app.R
import chat.simplex.app.model.ChatItem
import chat.simplex.app.ui.theme.HighOrLowlight
import chat.simplex.app.ui.theme.SimpleXTheme
import chat.simplex.app.views.helpers.AlertManager
import chat.simplex.app.views.helpers.generalGetString
@Composable
fun IntegrityErrorItemView(ci: ChatItem, showMember: Boolean = false) {
Surface(
Modifier.clickable(onClick = {
AlertManager.shared.showAlertMsg(
title = generalGetString(R.string.alert_title_skipped_messages),
text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
)
}),
shape = RoundedCornerShape(18.dp),
color = ReceivedColorLight,
) {
Row(
Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
verticalAlignment = Alignment.Bottom
) {
Text(
buildAnnotatedString {
appendSender(this, if (showMember) ci.memberDisplayName else null, true)
withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
},
style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
modifier = Modifier.padding(end = 8.dp)
)
CIMetaView(ci)
}
}
}
@Preview(showBackground = true)
@Preview(
uiMode = Configuration.UI_MODE_NIGHT_YES,
name = "Dark Mode"
)
@Composable
fun IntegrityErrorItemViewView() {
SimpleXTheme {
IntegrityErrorItemView(
ChatItem.getDeletedContentSampleData()
)
}
}

8
apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt
View File

@@ -85,8 +85,8 @@ private fun authenticateWithBiometricManager(
}
fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
generalGetString(R.string.auth_turned_on),
generalGetString(R.string.auth_turned_on_desc)
generalGetString(R.string.auth_simplex_lock_turned_on),
generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
)
fun laErrorToast(context: Context, errString: CharSequence) = Toast.makeText(
@@ -103,10 +103,10 @@ fun laFailedToast(context: Context) = Toast.makeText(
fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
generalGetString(R.string.auth_unavailable),
generalGetString(R.string.auth_unavailable_instruction_desc)
generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)
)
fun laUnavailableTurningOffAlert() = AlertManager.shared.showAlertMsg(
generalGetString(R.string.auth_unavailable),
generalGetString(R.string.auth_unavailable_turning_off_desc)
generalGetString(R.string.auth_device_authentication_is_disabled_turning_off)
)

24
apps/android/app/src/main/res/values-ru/strings.xml
View File

@@ -65,24 +65,24 @@
<string name="simplex_service_notification_text">Приём сообщений…</string>
<!-- local authentication notice - SimpleXAPI.kt -->
<string name="la_notice_title">Блокировка SimpleX</string>
<string name="la_notice_text">Чтобы защитить вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
<string name="la_notice_title_simplex_lock">Блокировка SimpleX</string>
<string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Чтобы защитить вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
<string name="la_notice_turn_on">Включить</string>
<!-- LocalAuthentication.kt -->
<string name="auth_turned_on">Блокировка SimpleX включена</string>
<string name="auth_turned_on_desc">Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</string>
<string name="auth_simplex_lock_turned_on">Блокировка SimpleX включена</string>
<string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</string>
<string name="auth_unlock">Разблокировать</string>
<string name="auth_log_in_using_credential">Пройдите аутентификацию</string>
<string name="auth_enable">Включить блокировку SimpleX</string>
<string name="auth_disable">Отключить блокировку SimpleX</string>
<string name="auth_enable_simplex_lock">Включить блокировку SimpleX</string>
<string name="auth_disable_simplex_lock">Отключить блокировку SimpleX</string>
<string name="auth_confirm_credential">Пройдите аутентификацию</string>
<string name="auth_error">Ошибка аутентификации</string>
<string name="auth_error_w_desc">Ошибка аутентификации: <xliff:g id="desc">%1$s</xliff:g></string>
<string name="auth_failed">Ошибка аутентификации</string>
<string name="auth_unavailable">Аутентификация недоступна</string>
<string name="auth_unavailable_instruction_desc">На устройстве не включена аутентификация. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</string>
<string name="auth_unavailable_turning_off_desc">На устройстве выключена аутентификация. Отключение блокировки SimpleX Chat.</string>
<string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</string>
<string name="auth_device_authentication_is_disabled_turning_off">Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.</string>
<string name="auth_retry">Повторить</string>
<!-- Chat Actions - ChatItemView.kt (and general) -->
@@ -413,4 +413,12 @@
<string name="icon_descr_call_progress">Текущий звонок</string>
<string name="icon_descr_call_ended">Звонок завершен</string>
<string name="answer_call">Принять звонок</string>
<!-- Message integrity -->
<string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> пропущенных сообщений"</string>
<string name="integrity_msg_bad_hash">ошибка хэш сообщения</string>
<string name="integrity_msg_bad_id">ошибка ID сообщения</string>
<string name="integrity_msg_duplicate">повторное сообщение</string>
<string name="alert_title_skipped_messages">Пропущенные сообщения</string>
<string name="alert_text_skipped_messages_it_can_happen_when">Это может случится, когда:\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.\n2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.\n3. Соединение компроментировано.\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</string>
</resources>

24
apps/android/app/src/main/res/values/strings.xml
View File

@@ -65,24 +65,24 @@
<string name="simplex_service_notification_text">Receiving messages…</string>
<!-- local authentication notice - SimpleXAPI.kt -->
<string name="la_notice_title">SimpleX Lock</string>
<string name="la_notice_text">To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled.</string>
<string name="la_notice_title_simplex_lock">SimpleX Lock</string>
<string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled.</string>
<string name="la_notice_turn_on">Turn on</string>
<!-- LocalAuthentication.kt -->
<string name="auth_turned_on">SimpleX Lock turned on</string>
<string name="auth_turned_on_desc">You will be required to authenticate when you start or resume the app after 30 seconds in background.</string>
<string name="auth_simplex_lock_turned_on">SimpleX Lock turned on</string>
<string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">You will be required to authenticate when you start or resume the app after 30 seconds in background.</string>
<string name="auth_unlock">Unlock</string>
<string name="auth_log_in_using_credential">Log in using your credential</string>
<string name="auth_enable">Enable SimpleX Lock</string>
<string name="auth_disable">Disable SimpleX Lock</string>
<string name="auth_enable_simplex_lock">Enable SimpleX Lock</string>
<string name="auth_disable_simplex_lock">Disable SimpleX Lock</string>
<string name="auth_confirm_credential">Confirm your credential</string>
<string name="auth_error">Authentication error</string>
<string name="auth_error_w_desc">Authentication error: <xliff:g id="desc">%1$s</xliff:g></string>
<string name="auth_failed">Authentication failed</string>
<string name="auth_unavailable">Authentication unavailable</string>
<string name="auth_unavailable_instruction_desc">Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</string>
<string name="auth_unavailable_turning_off_desc">Device authentication is disabled. Turning off SimpleX Lock.</string>
<string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</string>
<string name="auth_device_authentication_is_disabled_turning_off">Device authentication is disabled. Turning off SimpleX Lock.</string>
<string name="auth_retry">Retry</string>
<!-- Chat Actions - ChatItemView.kt (and general) -->
@@ -415,4 +415,12 @@
<string name="icon_descr_call_progress">Call in progress</string>
<string name="icon_descr_call_ended">Call ended</string>
<string name="answer_call">Answer call</string>
<!-- Message integrity -->
<string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> skipped message(s)"</string>
<string name="integrity_msg_bad_hash">bad message hash</string>
<string name="integrity_msg_bad_id">bad message ID</string>
<string name="integrity_msg_duplicate">duplicate message</string>
<string name="alert_title_skipped_messages">Skipped messages</string>
<string name="alert_text_skipped_messages_it_can_happen_when">It can happen when:\n1. The messages expire on the server if they were not received for 30 days,\n2. The server you use to receive the messages from this contact was updated and restarted.\n3. The connection is compromised.\nPlease connect to the developers via Settings to receive the updates about the servers.\nWe will be adding server redundancy to prevent lost messages.</string>
</resources>

4
apps/ios/Shared/ContentView.swift
View File

@@ -71,7 +71,7 @@ struct ContentView: View {
userAuthorized = true
} else {
userAuthorized = false
authenticate(reason: "Unlock") { laResult in
authenticate(reason: NSLocalizedString("Unlock", comment: "authentication reason")) { laResult in
switch (laResult) {
case .success:
userAuthorized = true
@@ -100,7 +100,7 @@ struct ContentView: View {
title: Text("SimpleX Lock"),
message: Text("To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled."),
primaryButton: .default(Text("Turn on")) {
authenticate(reason: "Enable SimpleX Lock") { laResult in
authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
switch laResult {
case .success:
prefPerformLA = true

29
apps/ios/Shared/Model/Shared/ChatTypes.swift
View File

@@ -520,6 +520,16 @@ struct ChatItem: Identifiable, Decodable {
file: nil
)
}
static func getIntegrityErrorSample (_ status: CIStatus = .rcvRead, fromMsgId: Int64 = 1, toMsgId: Int64 = 2) -> ChatItem {
ChatItem(
chatDir: .directRcv,
meta: CIMeta.getSample(1, .now, "1 skipped message", status, false, false, false),
content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: fromMsgId, toMsgId: toMsgId)),
quotedItem: nil,
file: nil
)
}
}
enum CIDirection: Decodable {
@@ -601,6 +611,7 @@ enum CIContent: Decodable, ItemContent {
case rcvDeleted(deleteMode: CIDeleteMode)
case sndCall(status: CICallStatus, duration: Int)
case rcvCall(status: CICallStatus, duration: Int)
case rcvIntegrityError(msgError: MsgErrorType)
var text: String {
get {
@@ -611,6 +622,7 @@ enum CIContent: Decodable, ItemContent {
case .rcvDeleted: return NSLocalizedString("deleted", comment: "deleted chat item")
case let .sndCall(status, duration): return status.text(duration)
case let .rcvCall(status, duration): return status.text(duration)
case let .rcvIntegrityError(msgError): return msgError.text
}
}
}
@@ -893,3 +905,20 @@ enum CICallStatus: String, Decodable {
String(format: "%02d:%02d", sec / 60, sec % 60)
}
}
enum MsgErrorType: Decodable {
case msgSkipped(fromMsgId: Int64, toMsgId: Int64)
case msgBadId(msgId: Int64)
case msgBadHash
case msgDuplicate
var text: String {
switch self {
case let .msgSkipped(fromMsgId, toMsgId):
return String.localizedStringWithFormat(NSLocalizedString("%d skipped message(s)", comment: "integrity error chat item"), toMsgId - fromMsgId + 1)
case .msgBadHash: return NSLocalizedString("bad message hash", comment: "integrity error chat item") // not used now
case .msgBadId: return NSLocalizedString("bad message ID", comment: "integrity error chat item") // not used now
case .msgDuplicate: return NSLocalizedString("duplicate message", comment: "integrity error chat item") // not used now
}
}
}

6
apps/ios/Shared/Views/Chat/ChatItem/DeletedItemView.swift
View File

@@ -9,7 +9,6 @@
import SwiftUI
struct DeletedItemView: View {
@Environment(\.colorScheme) var colorScheme
var chatItem: ChatItem
var showMember = false
@@ -29,11 +28,6 @@ struct DeletedItemView: View {
.background(Color(uiColor: .tertiarySystemGroupedBackground))
.cornerRadius(18)
.textSelection(.disabled)
// .background(Color(uiColor: .systemBackground))
// .overlay(
// RoundedRectangle(cornerRadius: 18)
// .stroke(.quaternary, lineWidth: 1)
// )
}
}

53
apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift Normal file
View File

@@ -0,0 +1,53 @@
//
// IntegrityErrorItemView.swift
// SimpleX (iOS)
//
// Created by Evgeny on 28/05/2022.
// Copyright © 2022 SimpleX Chat. All rights reserved.
//
import SwiftUI
struct IntegrityErrorItemView: View {
var chatItem: ChatItem
var showMember = false
var body: some View {
HStack(alignment: .bottom, spacing: 0) {
if showMember, let member = chatItem.memberDisplayName {
Text(member).fontWeight(.medium) + Text(": ")
}
Text(chatItem.content.text)
.foregroundColor(.red)
.italic()
CIMetaView(chatItem: chatItem)
.padding(.horizontal, 12)
}
.padding(.leading, 12)
.padding(.vertical, 6)
.background(Color(uiColor: .tertiarySystemGroupedBackground))
.cornerRadius(18)
.textSelection(.disabled)
.onTapGesture { skippedMessagesAlert() }
}
private func skippedMessagesAlert() {
AlertManager.shared.showAlertMsg(
title: "Skipped messages",
message: """
It can happen when:
1. The messages expire on the server if they were not received for 30 days,
2. The server you use to receive the messages from this contact was updated and restarted.
3. The connection is compromised.
Please connect to the developers via Settings to receive the updates about the servers.
We will be adding server redundancy to prevent lost messages.
"""
)
}
}
struct IntegrityErrorItemView_Previews: PreviewProvider {
static var previews: some View {
IntegrityErrorItemView(chatItem: ChatItem.getIntegrityErrorSample())
}
}

1
apps/ios/Shared/Views/Chat/ChatItemView.swift
View File

@@ -22,6 +22,7 @@ struct ChatItemView: View {
case .rcvDeleted: deletedItemView()
case let .sndCall(status, duration): callItemView(status, duration)
case let .rcvCall(status, duration): callItemView(status, duration)
case .rcvIntegrityError: IntegrityErrorItemView(chatItem: chatItem, showMember: showMember)
}
}

16
apps/ios/Shared/Views/UserSettings/SettingsView.swift
View File

@@ -77,6 +77,12 @@ struct SettingsView: View {
}
Section("Settings") {
NavigationLink {
CallSettings()
.navigationTitle("Call settings")
} label: {
settingsRow("video") { Text("Call settings") }
}
settingsRow("lock") {
Toggle("SimpleX Lock", isOn: $performLA)
}
@@ -89,12 +95,6 @@ struct SettingsView: View {
} label: {
settingsRow("server.rack") { Text("SMP servers") }
}
NavigationLink {
CallSettings()
.navigationTitle("Call settings")
} label: {
settingsRow("video") { Text("Call settings") }
}
}
Section("Help") {
@@ -180,7 +180,7 @@ struct SettingsView: View {
}
private func enableLA() {
authenticate(reason: "Enable SimpleX Lock") { laResult in
authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
switch laResult {
case .success:
prefPerformLA = true
@@ -204,7 +204,7 @@ struct SettingsView: View {
}
private func disableLA() {
authenticate(reason: "Disable SimpleX Lock") { laResult in
authenticate(reason: NSLocalizedString("Disable SimpleX Lock", comment: "authentication reason")) { laResult in
switch (laResult) {
case .success:
prefPerformLA = false

167
apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
View File

@@ -45,6 +45,11 @@
<target>%@ wants to connect!</target>
<note>notification title</note>
</trans-unit>
<trans-unit id="%d skipped message(s)" xml:space="preserve">
<source>%d skipped message(s)</source>
<target>%d skipped message(s)</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="%lld" xml:space="preserve">
<source>%lld</source>
<target>%lld</target>
@@ -171,6 +176,16 @@
<target>Attach</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Authentication failed" xml:space="preserve">
<source>Authentication failed</source>
<target>Authentication failed</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Authentication unavailable" xml:space="preserve">
<source>Authentication unavailable</source>
<target>Authentication unavailable</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Call already ended!" xml:space="preserve">
<source>Call already ended!</source>
<target>Call already ended!</target>
@@ -441,16 +456,41 @@
<target>Develop</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
<source>Device authentication is disabled. Turning off SimpleX Lock.</source>
<target>Device authentication is disabled. Turning off SimpleX Lock.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
<source>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</source>
<target>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Disable SimpleX Lock" xml:space="preserve">
<source>Disable SimpleX Lock</source>
<target>Disable SimpleX Lock</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Display name" xml:space="preserve">
<source>Display name</source>
<target>Display name</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
<source>Do NOT use SimpleX for emergency calls.</source>
<target>Do NOT use SimpleX for emergency calls.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Edit" xml:space="preserve">
<source>Edit</source>
<target>Edit</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Enable SimpleX Lock" xml:space="preserve">
<source>Enable SimpleX Lock</source>
<target>Enable SimpleX Lock</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Enable notifications? (BETA)" xml:space="preserve">
<source>Enable notifications? (BETA)</source>
<target>Enable notifications? (BETA)</target>
@@ -531,6 +571,11 @@
<target>How to use markdown</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="If the video fails to connect, flip the camera to resolve it." xml:space="preserve">
<source>If the video fails to connect, flip the camera to resolve it.</source>
<target>If the video fails to connect, flip the camera to resolve it.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="If you can't meet in person, **show QR code in the video call**, or share the link." xml:space="preserve">
<source>If you can't meet in person, **show QR code in the video call**, or share the link.</source>
<target>If you can't meet in person, **show QR code in the video call**, or share the link.</target>
@@ -586,6 +631,21 @@
<target>Invalid connection link</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="It can happen when:&#10;1. The messages expire on the server if they were not received for 30 days,&#10;2. The server you use to receive the messages from this contact was updated and restarted.&#10;3. The connection is compromised.&#10;Please connect to the developers via Settings to receive the updates about the servers.&#10;We will be adding server redundancy to prevent lost messages." xml:space="preserve">
<source>It can happen when:
1. The messages expire on the server if they were not received for 30 days,
2. The server you use to receive the messages from this contact was updated and restarted.
3. The connection is compromised.
Please connect to the developers via Settings to receive the updates about the servers.
We will be adding server redundancy to prevent lost messages.</source>
<target>It can happen when:
1. The messages expire on the server if they were not received for 30 days,
2. The server you use to receive the messages from this contact was updated and restarted.
3. The connection is compromised.
Please connect to the developers via Settings to receive the updates about the servers.
We will be adding server redundancy to prevent lost messages.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
<source>It seems like you are already connected via this link. If it is not the case, there was an error (%@).</source>
<target>It seems like you are already connected via this link. If it is not the case, there was an error (%@).</target>
@@ -601,6 +661,11 @@
<target>Large file!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Limitations" xml:space="preserve">
<source>Limitations</source>
<target>Limitations</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Make a private connection" xml:space="preserve">
<source>Make a private connection</source>
<target>Make a private connection</target>
@@ -706,6 +771,11 @@
<target>Please check your network connection and try again.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Pre-arrange the calls, as notifications arrive with a delay (we are improving it)." xml:space="preserve">
<source>Pre-arrange the calls, as notifications arrive with a delay (we are improving it).</source>
<target>Pre-arrange the calls, as notifications arrive with a delay (we are improving it).</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Privacy redefined" xml:space="preserve">
<source>Privacy redefined</source>
<target>Privacy redefined</target>
@@ -751,6 +821,11 @@
<target>Reply</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Retry" xml:space="preserve">
<source>Retry</source>
<target>Retry</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SMP servers" xml:space="preserve">
<source>SMP servers</source>
<target>SMP servers</target>
@@ -811,6 +886,21 @@
<target>Show pending connections</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SimpleX Lock" xml:space="preserve">
<source>SimpleX Lock</source>
<target>SimpleX Lock</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SimpleX Lock turned on" xml:space="preserve">
<source>SimpleX Lock turned on</source>
<target>SimpleX Lock turned on</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Skipped messages" xml:space="preserve">
<source>Skipped messages</source>
<target>Skipped messages</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Take picture" xml:space="preserve">
<source>Take picture</source>
<target>Take picture</target>
@@ -853,6 +943,11 @@
<target>The contact you shared this link with will NOT be able to connect!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="The microphone does not work when the app is in the background." xml:space="preserve">
<source>The microphone does not work when the app is in the background.</source>
<target>The microphone does not work when the app is in the background.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="The next generation of private messaging" xml:space="preserve">
<source>The next generation of private messaging</source>
<target>The next generation of private messaging</target>
@@ -888,11 +983,23 @@
<target>To make your first private connection, choose **one of the following**:</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To prevent the call interruption, enable Do Not Disturb mode." xml:space="preserve">
<source>To prevent the call interruption, enable Do Not Disturb mode.</source>
<target>To prevent the call interruption, enable Do Not Disturb mode.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." xml:space="preserve">
<source>To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts.</source>
<target>To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To protect your information, turn on SimpleX Lock.&#10;You will be prompted to complete authentication before this feature is enabled." xml:space="preserve">
<source>To protect your information, turn on SimpleX Lock.
You will be prompted to complete authentication before this feature is enabled.</source>
<target>To protect your information, turn on SimpleX Lock.
You will be prompted to complete authentication before this feature is enabled.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
<source>Trying to connect to the server used to receive messages from this contact (error: %@).</source>
<target>Trying to connect to the server used to receive messages from this contact (error: %@).</target>
@@ -903,6 +1010,11 @@
<target>Trying to connect to the server used to receive messages from this contact.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Turn on" xml:space="preserve">
<source>Turn on</source>
<target>Turn on</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Unexpected error: %@" xml:space="preserve">
<source>Unexpected error: %@</source>
<target>Unexpected error: %@</target>
@@ -915,6 +1027,11 @@ To connect, please ask your contact to create another connection link and check
To connect, please ask your contact to create another connection link and check that you have a stable network connection.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Unlock" xml:space="preserve">
<source>Unlock</source>
<target>Unlock</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
<source>Use SimpleX Chat servers?</source>
<target>Use SimpleX Chat servers?</target>
@@ -985,6 +1102,11 @@ To connect, please ask your contact to create another connection link and check
<target>You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You could not be verified; please try again." xml:space="preserve">
<source>You could not be verified; please try again.</source>
<target>You could not be verified; please try again.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You invited your contact" xml:space="preserve">
<source>You invited your contact</source>
<target>You invited your contact</target>
@@ -1000,6 +1122,11 @@ To connect, please ask your contact to create another connection link and check
<target>You will be connected when your contact's device is online, please wait or check later!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You will be required to authenticate when you start or resume the app after 30 seconds in background." xml:space="preserve">
<source>You will be required to authenticate when you start or resume the app after 30 seconds in background.</source>
<target>You will be required to authenticate when you start or resume the app after 30 seconds in background.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Your SMP servers" xml:space="preserve">
<source>Your SMP servers</source>
<target>Your SMP servers</target>
@@ -1099,6 +1226,16 @@ SimpleX servers cannot see your profile.</target>
<target>audio call (not e2e encrypted)</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="bad message ID" xml:space="preserve">
<source>bad message ID</source>
<target>bad message ID</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bad message hash" xml:space="preserve">
<source>bad message hash</source>
<target>bad message hash</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bold" xml:space="preserve">
<source>bold</source>
<target>bold</target>
@@ -1169,6 +1306,11 @@ SimpleX servers cannot see your profile.</target>
<target>deleted</target>
<note>deleted chat item</note>
</trans-unit>
<trans-unit id="duplicate message" xml:space="preserve">
<source>duplicate message</source>
<target>duplicate message</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="e2e encrypted" xml:space="preserve">
<source>e2e encrypted</source>
<target>e2e encrypted</target>
@@ -1316,6 +1458,11 @@ SimpleX servers cannot see your profile.</target>
<target>SimpleX needs camera access to scan QR codes to connect to other users and for video calls.</target>
<note>Privacy - Camera Usage Description</note>
</trans-unit>
<trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
<source>SimpleX uses Face ID for local authentication</source>
<target>SimpleX uses Face ID for local authentication</target>
<note>Privacy - Face ID Usage Description</note>
</trans-unit>
<trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
<source>SimpleX needs microphone access for audio and video calls.</source>
<target>SimpleX needs microphone access for audio and video calls.</target>
@@ -1365,6 +1512,11 @@ SimpleX servers cannot see your profile.</target>
<target>%@ wants to connect!</target>
<note>notification title</note>
</trans-unit>
<trans-unit id="%d skipped message(s)" xml:space="preserve">
<source>%d skipped message(s)</source>
<target>%d skipped message(s)</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
<source>**e2e encrypted** audio call</source>
<target>**e2e encrypted** audio call</target>
@@ -1405,6 +1557,16 @@ SimpleX servers cannot see your profile.</target>
<target>audio call (not e2e encrypted)</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="bad message ID" xml:space="preserve">
<source>bad message ID</source>
<target>bad message ID</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bad message hash" xml:space="preserve">
<source>bad message hash</source>
<target>bad message hash</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="call error" xml:space="preserve">
<source>call error</source>
<target>call error</target>
@@ -1445,6 +1607,11 @@ SimpleX servers cannot see your profile.</target>
<target>deleted</target>
<note>deleted chat item</note>
</trans-unit>
<trans-unit id="duplicate message" xml:space="preserve">
<source>duplicate message</source>
<target>duplicate message</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="ended call %@" xml:space="preserve">
<source>ended call %@</source>
<target>ended call %@</target>

BIN
apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings
View File

Binary file not shown.

2
apps/ios/SimpleX Localizations/en.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings
View File

@@ -2,6 +2,8 @@
"CFBundleName" = "SimpleX";
/* Privacy - Camera Usage Description */
"NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
/* Privacy - Face ID Usage Description */
"NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
/* Privacy - Microphone Usage Description */
"NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls.";
/* Privacy - Photo Library Additions Usage Description */

167
apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
View File

@@ -45,6 +45,11 @@
<target>%@ хочет соединиться!</target>
<note>notification title</note>
</trans-unit>
<trans-unit id="%d skipped message(s)" xml:space="preserve">
<source>%d skipped message(s)</source>
<target>%d пропущенных сообщение(й)</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="%lld" xml:space="preserve">
<source>%lld</source>
<target>%lld</target>
@@ -171,6 +176,16 @@
<target>Прикрепить</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Authentication failed" xml:space="preserve">
<source>Authentication failed</source>
<target>Ошибка аутентификации</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Authentication unavailable" xml:space="preserve">
<source>Authentication unavailable</source>
<target>Аутентификация недоступна</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Call already ended!" xml:space="preserve">
<source>Call already ended!</source>
<target>Звонок уже завершен!</target>
@@ -441,16 +456,41 @@
<target>Для разработчиков</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
<source>Device authentication is disabled. Turning off SimpleX Lock.</source>
<target>Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
<source>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</source>
<target>Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Disable SimpleX Lock" xml:space="preserve">
<source>Disable SimpleX Lock</source>
<target>Отключить блокировку SimpleX</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Display name" xml:space="preserve">
<source>Display name</source>
<target>Имя профиля</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
<source>Do NOT use SimpleX for emergency calls.</source>
<target>Не используйте SimpleX для экстренных звонков</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Edit" xml:space="preserve">
<source>Edit</source>
<target>Редактировать</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Enable SimpleX Lock" xml:space="preserve">
<source>Enable SimpleX Lock</source>
<target>Включить блокировку SimpleX</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Enable notifications? (BETA)" xml:space="preserve">
<source>Enable notifications? (BETA)</source>
<target>Включить уведомления? (БЕТА)</target>
@@ -531,6 +571,11 @@
<target>Как форматировать</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="If the video fails to connect, flip the camera to resolve it." xml:space="preserve">
<source>If the video fails to connect, flip the camera to resolve it.</source>
<target>Если видео не соединилось, переключите камеру.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="If you can't meet in person, **show QR code in the video call**, or share the link." xml:space="preserve">
<source>If you can't meet in person, **show QR code in the video call**, or share the link.</source>
<target>Если вы не можете встретиться лично, вы можете **показать QR код во время видеозвонка**, или поделиться ссылкой.</target>
@@ -586,6 +631,21 @@
<target>Ошибка в ссылке контакта</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="It can happen when:&#10;1. The messages expire on the server if they were not received for 30 days,&#10;2. The server you use to receive the messages from this contact was updated and restarted.&#10;3. The connection is compromised.&#10;Please connect to the developers via Settings to receive the updates about the servers.&#10;We will be adding server redundancy to prevent lost messages." xml:space="preserve">
<source>It can happen when:
1. The messages expire on the server if they were not received for 30 days,
2. The server you use to receive the messages from this contact was updated and restarted.
3. The connection is compromised.
Please connect to the developers via Settings to receive the updates about the servers.
We will be adding server redundancy to prevent lost messages.</source>
<target>Это может случится, когда:
1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.
2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.
3. Соединение компроментировано.
Пожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.
Мы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
<source>It seems like you are already connected via this link. If it is not the case, there was an error (%@).</source>
<target>Возможно, вы уже соединились через эту ссылку. Если это не так, то это ошибка (%@).</target>
@@ -601,6 +661,11 @@
<target>Большой файл!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Limitations" xml:space="preserve">
<source>Limitations</source>
<target>Ограничения</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Make a private connection" xml:space="preserve">
<source>Make a private connection</source>
<target>Добавьте контакт</target>
@@ -706,6 +771,11 @@
<target>Пожалуйста, проверьте ваше соединение с сетью и попробуйте еще раз.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Pre-arrange the calls, as notifications arrive with a delay (we are improving it)." xml:space="preserve">
<source>Pre-arrange the calls, as notifications arrive with a delay (we are improving it).</source>
<target>Назначайте звонки заранее, поскольку уведомления приходят с задержкой (мы улучшаем это)</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Privacy redefined" xml:space="preserve">
<source>Privacy redefined</source>
<target>Более конфиденциальный</target>
@@ -751,6 +821,11 @@
<target>Ответить</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Retry" xml:space="preserve">
<source>Retry</source>
<target>Повторить</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SMP servers" xml:space="preserve">
<source>SMP servers</source>
<target>SMP серверы</target>
@@ -811,6 +886,21 @@
<target>Показать ожидаемые соединения</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SimpleX Lock" xml:space="preserve">
<source>SimpleX Lock</source>
<target>Блокировка SimpleX</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="SimpleX Lock turned on" xml:space="preserve">
<source>SimpleX Lock turned on</source>
<target>Блокировка SimpleX включена</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Skipped messages" xml:space="preserve">
<source>Skipped messages</source>
<target>Пропущенные сообщения</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Take picture" xml:space="preserve">
<source>Take picture</source>
<target>Сделать фото</target>
@@ -853,6 +943,11 @@
<target>Контакт, которому вы отправили эту ссылку, не сможет соединиться!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="The microphone does not work when the app is in the background." xml:space="preserve">
<source>The microphone does not work when the app is in the background.</source>
<target>Микрофон не работает, когда приложение в фоновом режиме.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="The next generation of private messaging" xml:space="preserve">
<source>The next generation of private messaging</source>
<target>Новое поколение приватных сообщений</target>
@@ -888,11 +983,23 @@
<target>Чтобы добавить ваш первый контакт, выберите **одно из**:</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To prevent the call interruption, enable Do Not Disturb mode." xml:space="preserve">
<source>To prevent the call interruption, enable Do Not Disturb mode.</source>
<target>Чтобы избежать прерывания звонков, включите режим Не Беспокоить.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." xml:space="preserve">
<source>To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts.</source>
<target>Чтобы защитить вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, SimpleX использует ID для очередей сообщений, разные для каждого контакта.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="To protect your information, turn on SimpleX Lock.&#10;You will be prompted to complete authentication before this feature is enabled." xml:space="preserve">
<source>To protect your information, turn on SimpleX Lock.
You will be prompted to complete authentication before this feature is enabled.</source>
<target>Чтобы защитить вашу информацию, включите блокировку SimpleX Chat.
Вам будет нужно пройти аутентификацию для включения блокировки.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
<source>Trying to connect to the server used to receive messages from this contact (error: %@).</source>
<target>Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта (ошибка: %@).</target>
@@ -903,6 +1010,11 @@
<target>Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Turn on" xml:space="preserve">
<source>Turn on</source>
<target>Включить</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Unexpected error: %@" xml:space="preserve">
<source>Unexpected error: %@</source>
<target>Неожиданная ошибка: %@</target>
@@ -915,6 +1027,11 @@ To connect, please ask your contact to create another connection link and check
Чтобы установить соединение, попросите ваш контакт создать еще одну ссылку и проверьте ваше соединение с сетью.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Unlock" xml:space="preserve">
<source>Unlock</source>
<target>Разблокировать</target>
<note>authentication reason</note>
</trans-unit>
<trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
<source>Use SimpleX Chat servers?</source>
<target>Использовать серверы предосталенные SimpleX Chat?</target>
@@ -985,6 +1102,11 @@ To connect, please ask your contact to create another connection link and check
<target>Вы определяете через какие серверы вы **получаете сообщения**, ваши контакты - серверы, которые вы используете для отправки.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You could not be verified; please try again." xml:space="preserve">
<source>You could not be verified; please try again.</source>
<target>Верификация не удалась; пожалуйста, попробуйте ещё раз.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You invited your contact" xml:space="preserve">
<source>You invited your contact</source>
<target>Вы пригласили ваш контакт</target>
@@ -1000,6 +1122,11 @@ To connect, please ask your contact to create another connection link and check
<target>Соединение будет установлено, когда ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="You will be required to authenticate when you start or resume the app after 30 seconds in background." xml:space="preserve">
<source>You will be required to authenticate when you start or resume the app after 30 seconds in background.</source>
<target>Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Your SMP servers" xml:space="preserve">
<source>Your SMP servers</source>
<target>Ваши SMP серверы</target>
@@ -1099,6 +1226,16 @@ SimpleX серверы не могут получить доступ к ваше
<target>аудиозвонок (не e2e зашифрованный)</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="bad message ID" xml:space="preserve">
<source>bad message ID</source>
<target>ошибка ID сообщения</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bad message hash" xml:space="preserve">
<source>bad message hash</source>
<target>ошибка хэш сообщения</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bold" xml:space="preserve">
<source>bold</source>
<target>жирный</target>
@@ -1169,6 +1306,11 @@ SimpleX серверы не могут получить доступ к ваше
<target>удалено</target>
<note>deleted chat item</note>
</trans-unit>
<trans-unit id="duplicate message" xml:space="preserve">
<source>duplicate message</source>
<target>повторное сообщение</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="e2e encrypted" xml:space="preserve">
<source>e2e encrypted</source>
<target>e2e зашифровано</target>
@@ -1316,6 +1458,11 @@ SimpleX серверы не могут получить доступ к ваше
<target>SimpleX использует камеру для сканирования QR кодов при соединении с другими пользователями и для видео звонков.</target>
<note>Privacy - Camera Usage Description</note>
</trans-unit>
<trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
<source>SimpleX uses Face ID for local authentication</source>
<target>SimpleX использует Face ID для аутентификации</target>
<note>Privacy - Face ID Usage Description</note>
</trans-unit>
<trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
<source>SimpleX needs microphone access for audio and video calls.</source>
<target>SimpleX использует микрофон для аудио и видео звонков.</target>
@@ -1365,6 +1512,11 @@ SimpleX серверы не могут получить доступ к ваше
<target>%@ хочет соединиться!</target>
<note>notification title</note>
</trans-unit>
<trans-unit id="%d skipped message(s)" xml:space="preserve">
<source>%d skipped message(s)</source>
<target>%d пропущенных сообщений</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
<source>**e2e encrypted** audio call</source>
<target>**e2e зашифрованный** аудиозвонок</target>
@@ -1405,6 +1557,16 @@ SimpleX серверы не могут получить доступ к ваше
<target>аудиозвонок (не e2e зашифрованный)</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="bad message ID" xml:space="preserve">
<source>bad message ID</source>
<target>ошибка ID сообщения</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="bad message hash" xml:space="preserve">
<source>bad message hash</source>
<target>ошибка хэш сообщения</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="call error" xml:space="preserve">
<source>call error</source>
<target>ошибка звонка</target>
@@ -1445,6 +1607,11 @@ SimpleX серверы не могут получить доступ к ваше
<target>удалено</target>
<note>deleted chat item</note>
</trans-unit>
<trans-unit id="duplicate message" xml:space="preserve">
<source>duplicate message</source>
<target>повторное сообщение</target>
<note>integrity error chat item</note>
</trans-unit>
<trans-unit id="ended call %@" xml:space="preserve">
<source>ended call %@</source>
<target>завершённый звонок %@</target>

BIN
apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings
View File

Binary file not shown.

2
apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings
View File

@@ -2,6 +2,8 @@
"CFBundleName" = "SimpleX";
/* Privacy - Camera Usage Description */
"NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
/* Privacy - Face ID Usage Description */
"NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
/* Privacy - Microphone Usage Description */
"NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls.";
/* Privacy - Photo Library Additions Usage Description */

12
apps/ios/SimpleX NSE/ru.lproj/Localizable.strings
View File

@@ -10,6 +10,9 @@
/* notification title */
"%@ wants to connect!" = "%@ хочет соединиться!";
/* integrity error chat item */
"%d skipped message(s)" = "%d пропущенных сообщений";
/* notification body */
"Accept contact request from %@?" = "Принять запрос на соединение от %@?";
@@ -19,6 +22,12 @@
/* No comment provided by engineer. */
"audio call (not e2e encrypted)" = "аудиозвонок (не e2e зашифрованный)";
/* integrity error chat item */
"bad message hash" = "ошибка хэш сообщения";
/* integrity error chat item */
"bad message ID" = "ошибка ID сообщения";
/* call status */
"call error" = "ошибка звонка";
@@ -43,6 +52,9 @@
/* deleted chat item */
"deleted" = "удалено";
/* integrity error chat item */
"duplicate message" = "повторное сообщение";
/* call status */
"ended call %@" = "завершённый звонок %@";

4
apps/ios/SimpleX.xcodeproj/project.pbxproj
View File

@@ -28,6 +28,7 @@
5C36027327F47AD5009F19D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C36027227F47AD5009F19D9 /* AppDelegate.swift */; };
5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; };
5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5346A727B59A6A004DF848 /* ChatHelp.swift */; };
5C55A91F283AD0E400C4E99E /* CallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A91E283AD0E400C4E99E /* CallManager.swift */; };
5C55A921283CCCB700C4E99E /* IncomingCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A920283CCCB700C4E99E /* IncomingCallView.swift */; };
@@ -154,6 +155,7 @@
5C36027227F47AD5009F19D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetermineWidth.swift; sourceTree = "<group>"; };
5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = "<group>"; };
5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrityErrorItemView.swift; sourceTree = "<group>"; };
5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = "<group>"; };
5C5346A727B59A6A004DF848 /* ChatHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHelp.swift; sourceTree = "<group>"; };
5C55A91E283AD0E400C4E99E /* CallManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallManager.swift; sourceTree = "<group>"; };
@@ -524,6 +526,7 @@
5C3A88D027DF57800060F1C2 /* FramedItemView.swift */,
64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */,
5C029EA72837DBB3004A9677 /* CICallItemView.swift */,
5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */,
);
path = ChatItem;
sourceTree = "<group>";
@@ -693,6 +696,7 @@
5CDCAD5328186F9500503DA2 /* GroupDefaults.swift in Sources */,
5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */,
5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */,
5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */,
5C029EAA283942EA004A9677 /* CallController.swift in Sources */,
5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */,
648010AB281ADD15009009B9 /* CIFileView.swift in Sources */,

78
apps/ios/ru.lproj/Localizable.strings
View File

@@ -61,6 +61,9 @@
/* notification title */
"%@ wants to connect!" = "%@ хочет соединиться!";
/* integrity error chat item */
"%d skipped message(s)" = "%d пропущенных сообщение(й)";
/* No comment provided by engineer. */
"%lld" = "%lld";
@@ -119,6 +122,18 @@
/* No comment provided by engineer. */
"audio call (not e2e encrypted)" = "аудиозвонок (не e2e зашифрованный)";
/* No comment provided by engineer. */
"Authentication failed" = "Ошибка аутентификации";
/* No comment provided by engineer. */
"Authentication unavailable" = "Аутентификация недоступна";
/* integrity error chat item */
"bad message hash" = "ошибка хэш сообщения";
/* integrity error chat item */
"bad message ID" = "ошибка ID сообщения";
/* No comment provided by engineer. */
"bold" = "жирный";
@@ -323,9 +338,24 @@
/* No comment provided by engineer. */
"Develop" = "Для разработчиков";
/* No comment provided by engineer. */
"Device authentication is disabled. Turning off SimpleX Lock." = "Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.";
/* No comment provided by engineer. */
"Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.";
/* authentication reason */
"Disable SimpleX Lock" = "Отключить блокировку SimpleX";
/* No comment provided by engineer. */
"Display name" = "Имя профиля";
/* No comment provided by engineer. */
"Do NOT use SimpleX for emergency calls." = "Не используйте SimpleX для экстренных звонков";
/* integrity error chat item */
"duplicate message" = "повторное сообщение";
/* No comment provided by engineer. */
"e2e encrypted" = "e2e зашифровано";
@@ -335,6 +365,9 @@
/* No comment provided by engineer. */
"Enable notifications? (BETA)" = "Включить уведомления? (БЕТА)";
/* authentication reason */
"Enable SimpleX Lock" = "Включить блокировку SimpleX";
/* No comment provided by engineer. */
"ended" = "завершён";
@@ -386,6 +419,9 @@
/* No comment provided by engineer. */
"How to use markdown" = "Как форматировать";
/* No comment provided by engineer. */
"If the video fails to connect, flip the camera to resolve it." = "Если видео не соединилось, переключите камеру.";
/* No comment provided by engineer. */
"If you can't meet in person, **show QR code in the video call**, or share the link." = "Если вы не можете встретиться лично, вы можете **показать QR код во время видеозвонка**, или поделиться ссылкой.";
@@ -422,6 +458,9 @@
/* chat list item title */
"invited to connect" = "приглашение";
/* No comment provided by engineer. */
"It can happen when:\n1. The messages expire on the server if they were not received for 30 days,\n2. The server you use to receive the messages from this contact was updated and restarted.\n3. The connection is compromised.\nPlease connect to the developers via Settings to receive the updates about the servers.\nWe will be adding server redundancy to prevent lost messages." = "Это может случится, когда:\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.\n2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.\n3. Соединение компроментировано.\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.";
/* No comment provided by engineer. */
"It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Возможно, вы уже соединились через эту ссылку. Если это не так, то это ошибка (%@).";
@@ -434,6 +473,9 @@
/* No comment provided by engineer. */
"Large file!" = "Большой файл!";
/* No comment provided by engineer. */
"Limitations" = "Ограничения";
/* No comment provided by engineer. */
"Make a private connection" = "Добавьте контакт";
@@ -509,6 +551,9 @@
/* No comment provided by engineer. */
"Please check your network connection and try again." = "Пожалуйста, проверьте ваше соединение с сетью и попробуйте еще раз.";
/* No comment provided by engineer. */
"Pre-arrange the calls, as notifications arrive with a delay (we are improving it)." = "Назначайте звонки заранее, поскольку уведомления приходят с задержкой (мы улучшаем это)";
/* No comment provided by engineer. */
"Privacy redefined" = "Более конфиденциальный";
@@ -545,6 +590,9 @@
/* No comment provided by engineer. */
"Reply" = "Ответить";
/* No comment provided by engineer. */
"Retry" = "Повторить";
/* No comment provided by engineer. */
"Save" = "Сохранить";
@@ -581,6 +629,15 @@
/* No comment provided by engineer. */
"Show pending connections" = "Показать ожидаемые соединения";
/* No comment provided by engineer. */
"SimpleX Lock" = "Блокировка SimpleX";
/* No comment provided by engineer. */
"SimpleX Lock turned on" = "Блокировка SimpleX включена";
/* No comment provided by engineer. */
"Skipped messages" = "Пропущенные сообщения";
/* No comment provided by engineer. */
"SMP servers" = "SMP серверы";
@@ -614,6 +671,9 @@
/* No comment provided by engineer. */
"The contact you shared this link with will NOT be able to connect!" = "Контакт, которому вы отправили эту ссылку, не сможет соединиться!";
/* No comment provided by engineer. */
"The microphone does not work when the app is in the background." = "Микрофон не работает, когда приложение в фоновом режиме.";
/* No comment provided by engineer. */
"The next generation of private messaging" = "Новое поколение приватных сообщений";
@@ -635,15 +695,24 @@
/* No comment provided by engineer. */
"To make your first private connection, choose **one of the following**:" = "Чтобы добавить ваш первый контакт, выберите **одно из**:";
/* No comment provided by engineer. */
"To prevent the call interruption, enable Do Not Disturb mode." = "Чтобы избежать прерывания звонков, включите режим Не Беспокоить.";
/* No comment provided by engineer. */
"To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." = "Чтобы защитить вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, SimpleX использует ID для очередей сообщений, разные для каждого контакта.";
/* No comment provided by engineer. */
"To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Чтобы защитить вашу информацию, включите блокировку SimpleX Chat.\nВам будет нужно пройти аутентификацию для включения блокировки.";
/* No comment provided by engineer. */
"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта (ошибка: %@).";
/* No comment provided by engineer. */
"Trying to connect to the server used to receive messages from this contact." = "Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта.";
/* No comment provided by engineer. */
"Turn on" = "Включить";
/* No comment provided by engineer. */
"Unexpected error: %@" = "Неожиданная ошибка: %@";
@@ -653,6 +722,9 @@
/* No comment provided by engineer. */
"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Возможно, ваш контакт удалил ссылку, или она уже была использована. Если это не так, то это может быть ошибкой - пожалуйста, сообщите нам об этом.\nЧтобы установить соединение, попросите ваш контакт создать еще одну ссылку и проверьте ваше соединение с сетью.";
/* authentication reason */
"Unlock" = "Разблокировать";
/* No comment provided by engineer. */
"Use SimpleX Chat servers?" = "Использовать серверы предосталенные SimpleX Chat?";
@@ -719,6 +791,9 @@
/* No comment provided by engineer. */
"You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Вы определяете через какие серверы вы **получаете сообщения**, ваши контакты - серверы, которые вы используете для отправки.";
/* No comment provided by engineer. */
"You could not be verified; please try again." = "Верификация не удалась; пожалуйста, попробуйте ещё раз.";
/* No comment provided by engineer. */
"You invited your contact" = "Вы пригласили ваш контакт";
@@ -731,6 +806,9 @@
/* No comment provided by engineer. */
"You will be connected when your contact's device is online, please wait or check later!" = "Соединение будет установлено, когда ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!";
/* 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. */
"Your chat address" = "Ваш SimpleX адрес";

3
apps/ios/ru.lproj/SimpleX--iOS--InfoPlist.strings
View File

@@ -4,6 +4,9 @@
/* Privacy - Camera Usage Description */
"NSCameraUsageDescription" = "SimpleX использует камеру для сканирования QR кодов при соединении с другими пользователями и для видео звонков.";
/* Privacy - Face ID Usage Description */
"NSFaceIDUsageDescription" = "SimpleX использует Face ID для аутентификации";
/* Privacy - Microphone Usage Description */
"NSMicrophoneUsageDescription" = "SimpleX использует микрофон для аудио и видео звонков.";