5.8-beta.4: ios 221, android 215, desktop 50

This reverts commit d22c0c2614.

PRIVACY.md

@@ -1,5 +1,6 @@
 ---
 layout: layouts/privacy.html
+permalink: /privacy/index.html
 ---
 
 # SimpleX Chat Privacy Policy and Conditions of Use
@@ -10,7 +11,7 @@ SimpleX Chat communication protocol is the first protocol that has no user profi
 
 Double ratchet algorithm has such important properties as [forward secrecy](/docs/GLOSSARY.md#forward-secrecy), sender [repudiation](/docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](/docs/GLOSSARY.md#post-compromise-security)).
 
-If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Privacy Policy
 
@@ -78,7 +79,7 @@ When you choose to use instant push notifications in SimpleX iOS app, because th
 
 Preset notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who sends messages to you. Apple push notifications servers can only observe how many notifications are sent to you, but not from how many contacts, or from which messaging relays, as notifications are delivered to your device end-to-end encrypted by one of the preset notification servers - these notifications only contain end-to-end encrypted metadata, not even encrypted message content, and they look completely random to Apple push notification servers.
 
-You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).
 
 #### Another information stored on the servers
 
@@ -115,7 +116,7 @@ We will update this Privacy Policy as needed so that it is current, accurate, an
 
 Please also read our Conditions of Use of Software and Infrastructure below.
 
-If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you have questions about our Privacy Policy please contact us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Conditions of Use of Software and Infrastructure
 

README.md

@@ -74,7 +74,7 @@ Messages not following these rules will be deleted, the right to send messages m
 
 You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
 
-There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FvYCRjIflKNMGYlfTkuHe4B40qSlQ0439%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAHNdcqNbzXZhyMoSBjT2R0-Eb1EPaLyUg3KZjn-kmM1w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22PD20tcXjw7IpkkMCfR6HLA%3D%3D%22%7D) for developers who build on SimpleX platform:
 
 - chat bots and automations
 - integrations with other apps

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -341,8 +341,8 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
     throw r
 }
 
-func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64) async -> ChatItem? {
-    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId)
+func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
+    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
     return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
 }
 
@@ -927,14 +927,19 @@ func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationF
     }
 }
 
-func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get(), auto: auto) {
+func receiveFile(user: any UserLike, fileId: Int64, userApprovedRelays: Bool = false, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(
+        fileId: fileId,
+        userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
+        encrypted: privacyEncryptLocalFilesGroupDefault.get(),
+        auto: auto
+    ) {
         await chatItemSimpleUpdate(user, chatItem)
     }
 }
 
-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
     let am = AlertManager.shared
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     if case .rcvFileAcceptedSndCancelled = r {
@@ -947,19 +952,50 @@ func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: B
         }
     } else if let networkErrorAlert = networkErrorAlert(r) {
         logger.error("apiReceiveFile network error: \(String(describing: r))")
-        am.showAlert(networkErrorAlert)
+        if !auto {
+            am.showAlert(networkErrorAlert)
+        }
     } else {
         switch chatError(r) {
         case .fileCancelled:
             logger.debug("apiReceiveFile ignoring fileCancelled error")
         case .fileAlreadyReceiving:
             logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
+        case let .fileNotApproved(fileId, unknownServers):
+            logger.debug("apiReceiveFile fileNotApproved error")
+            if !auto {
+                let srvs = unknownServers.map { s in
+                    if let srv = parseServerAddress(s), !srv.hostnames.isEmpty {
+                        srv.hostnames[0]
+                    } else {
+                        serverHost(s)
+                    }
+                }
+                am.showAlert(Alert(
+                    title: Text("Unknown servers!"),
+                    message: Text("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs.sorted().joined(separator: ", "))."),
+                    primaryButton: .default(
+                        Text("Download"),
+                        action: {
+                            Task {
+                                logger.debug("apiReceiveFile fileNotApproved alert - in Task")
+                                if let user = ChatModel.shared.currentUser {
+                                    await receiveFile(user: user, fileId: fileId, userApprovedRelays: true)
+                                }
+                            }
+                        }
+                    ),
+                    secondaryButton: .cancel()
+                ))
+            }
         default:
             logger.error("apiReceiveFile error: \(String(describing: r))")
-            am.showAlertMsg(
-                title: "Error receiving file",
-                message: "Error: \(String(describing: r))"
-            )
+            if !auto {
+                am.showAlertMsg(
+                    title: "Error receiving file",
+                    message: "Error: \(String(describing: r))"
+                )
+            }
         }
     }
     return nil
@@ -1849,21 +1885,35 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
     case .chatSuspended:
         chatSuspended()
-    case let .contactSwitch(_, contact, switchProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+    case let .contactSwitch(user, contact, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+            }
         }
-    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+    case let .groupMemberSwitch(user, groupInfo, member, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+            }
         }
-    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+    case let .contactRatchetSync(user, contact, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+            }
         }
-    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+    case let .groupMemberRatchetSync(user, groupInfo, member, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+            }
+        }
+    case let .contactDisabled(user, contact):
+        if active(user) {
+            await MainActor.run {
+                m.updateContact(contact)
+            }
         }
     case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
         await MainActor.run {

apps/ios/Shared/Views/Chat/ChatInfoView.swift

@@ -49,7 +49,7 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
     }
 }
 
-private func serverHost(_ s: String) -> String {
+func serverHost(_ s: String) -> String {
     if let i = s.range(of: "@")?.lowerBound {
         return String(s[i...].dropFirst())
     } else {

apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift

@@ -60,6 +60,7 @@ struct CIFileView: View {
             case .rcvInvitation: return true
             case .rcvAccepted: return true
             case .rcvTransfer: return false
+            case .rcvAborted: return true
             case .rcvComplete: return true
             case .rcvCancelled: return false
             case .rcvError: return false
@@ -73,10 +74,10 @@ struct CIFileView: View {
         logger.debug("CIFileView fileAction")
         if let file = file {
             switch (file.fileStatus) {
-            case .rcvInvitation:
+            case .rcvInvitation, .rcvAborted:
                 if fileSizeValid(file) {
                     Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
                         if let user = m.currentUser {
                             await receiveFile(user: user, fileId: file.fileId)
                         }
@@ -148,6 +149,8 @@ struct CIFileView: View {
                 } else {
                     progressView()
                 }
+            case .rcvAborted:
+                fileIcon("doc.fill", color: .accentColor, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)

apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift

@@ -21,6 +21,8 @@ struct CIGroupInvitationView: View {
     @State private var inProgress = false
     @State private var progressByTimeout = false
 
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
     var body: some View {
         let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
         let v = ZStack(alignment: .bottomTrailing) {
@@ -43,7 +45,7 @@ struct CIGroupInvitationView: View {
                                     .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
                                     .font(.callout)
                                 + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false)
+                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                             )
                             .overlay(DetermineWidth())
                         }
@@ -51,7 +53,7 @@ struct CIGroupInvitationView: View {
                         (
                             groupInvitationText()
                             + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false)
+                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                         )
                         .overlay(DetermineWidth())
                     }

apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift

@@ -17,7 +17,6 @@ struct CIImageView: View {
     let maxWidth: CGFloat
     @Binding var imgWidth: CGFloat?
     @State var scrollProxy: ScrollViewProxy?
-    @State var metaColor: Color
     @State private var showFullScreenImage = false
 
     var body: some View {
@@ -38,7 +37,7 @@ struct CIImageView: View {
                     .onTapGesture {
                         if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                 Task {
                                     if let user = m.currentUser {
                                         await receiveFile(user: user, fileId: file.fileId)
@@ -103,6 +102,7 @@ struct CIImageView: View {
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case .rcvTransfer: progressView()
+            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
@@ -116,7 +116,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(metaColor)
+            .foregroundColor(.white)
             .padding(padding)
     }
 

apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift

@@ -17,6 +17,8 @@ struct CIMetaView: View {
     var showStatus = true
     var showEdited = true
 
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
     var body: some View {
         if chatItem.isDeletedContent {
             chatItem.timestampText.font(.caption).foregroundColor(metaColor)
@@ -27,24 +29,24 @@ struct CIMetaView: View {
             switch meta.itemStatus {
             case let .sndSent(sndProgress):
                 switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                 }
             case let .sndRcvd(_, sndProgress):
                 switch sndProgress {
                 case .complete:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                     }
                 case .partial:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                     }
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
             }
         }
     }
@@ -64,7 +66,8 @@ func ciMetaText(
     transparent: Bool = false,
     sent: SentCheckmark? = nil,
     showStatus: Bool = true,
-    showEdited: Bool = true
+    showEdited: Bool = true,
+    showViaProxy: Bool
 ) -> Text {
     var r = Text("")
     if showEdited, meta.itemEdited {
@@ -78,6 +81,9 @@ func ciMetaText(
         }
         r = r + Text(" ")
     }
+    if showViaProxy, meta.sentViaProxy == true {
+        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
+    }
     if showStatus {
         if let (icon, statusColor) = meta.statusIcon(color) {
             let t = Text(Image(systemName: icon)).font(.caption2)

apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift

@@ -19,6 +19,8 @@ struct CIRcvDecryptionError: View {
     var chatItem: ChatItem
     @State private var alert: CIRcvDecryptionErrorAlert?
 
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
     enum CIRcvDecryptionErrorAlert: Identifiable {
         case syncAllowedAlert(_ syncConnection: () -> Void)
         case syncNotSupportedContactAlert
@@ -119,7 +121,7 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
                 )
             }
             .padding(.horizontal, 12)
@@ -140,7 +142,7 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
             }
             .padding(.horizontal, 12)
             CIMetaView(chat: chat, chatItem: chatItem)

apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift

@@ -69,7 +69,7 @@ struct CIVideoView: View {
                     .onTapGesture {
                         if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                 receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
@@ -95,7 +95,7 @@ struct CIVideoView: View {
                 }
                 durationProgress()
             }
-            if let file = file, case .rcvInvitation = file.fileStatus {
+            if let file = file, showDownloadButton(file.fileStatus) {
                 Button {
                     receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                 } label: {
@@ -105,6 +105,14 @@ struct CIVideoView: View {
         }
     }
 
+    private func showDownloadButton(_ fileStatus: CIFileStatus) -> Bool {
+        switch fileStatus {
+        case .rcvInvitation: true
+        case .rcvAborted: true
+        default: false
+        }
+    }
+
     private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
         return ZStack(alignment: .topTrailing) {
             ZStack(alignment: .center) {
@@ -280,6 +288,7 @@ struct CIVideoView: View {
                 } else {
                     progressView()
                 }
+            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
@@ -318,10 +327,10 @@ struct CIVideoView: View {
     }
 
     // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
         Task {
             if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false)
+                await receiveFile(user, file.fileId, false, false)
             }
         }
     }

apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift

@@ -139,9 +139,10 @@ struct VoiceMessagePlayer: View {
                 case .sndComplete: playbackButton()
                 case .sndCancelled: playbackButton()
                 case .sndError: playbackButton()
-                case .rcvInvitation: downloadButton(recordingFile)
+                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
+                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                 case .rcvComplete: playbackButton()
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -217,7 +218,7 @@ struct VoiceMessagePlayer: View {
         }
     }
 
-    private func downloadButton(_ recordingFile: CIFile) -> some View {
+    private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
         Button {
             Task {
                 if let user = chatModel.currentUser {
@@ -225,7 +226,7 @@ struct VoiceMessagePlayer: View {
                 }
             }
         } label: {
-            playPauseIcon("play.fill")
+            playPauseIcon(icon)
         }
     }
 

apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift

@@ -87,12 +87,17 @@ struct FramedItemView: View {
             .cornerRadius(18)
             .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
 
-        switch chatItem.meta.itemStatus {
-        case .sndErrorAuth:
-            v.onTapGesture { msgDeliveryError("Most likely this contact has deleted the connection with you.") }
-        case let .sndError(agentError):
-            v.onTapGesture { msgDeliveryError("Unexpected error: \(agentError)") }
-        default: v
+        if let (title, text) = chatItem.meta.itemStatus.statusInfo {
+            v.onTapGesture {
+                AlertManager.shared.showAlert(
+                    Alert(
+                        title: Text(title),
+                        message: Text(text)
+                    )
+                )
+            }
+        } else {
+            v
         }
     }
 
@@ -110,7 +115,7 @@ struct FramedItemView: View {
         } else {
             switch (chatItem.content.msgContent) {
             case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
                     .overlay(DetermineWidth())
                 if text == "" && !chatItem.meta.isLive {
                     Color.clear
@@ -157,13 +162,6 @@ struct FramedItemView: View {
             }
         }
     }
-    
-    private func msgDeliveryError(_ err: LocalizedStringKey) {
-        AlertManager.shared.showAlertMsg(
-            title: "Message delivery error",
-            message: err
-        )
-    }
 
     @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text, pad: Bool = false) -> some View {
         let v = HStack(spacing: 6) {

apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift

@@ -35,6 +35,8 @@ struct MsgContentView: View {
     @State private var typingIdx = 0
     @State private var timer: Timer?
 
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
     var body: some View {
         if meta?.isLive == true {
             msgContentView()
@@ -81,7 +83,7 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
     }
 }
 

apps/ios/Shared/Views/Chat/ChatItemInfoView.swift

@@ -383,7 +383,7 @@ struct ChatItemInfoView: View {
             let mss = membersStatuses(memberDeliveryStatuses)
             if !mss.isEmpty {
                 ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
                 }
             } else {
                 Text("No delivery information")
@@ -392,23 +392,27 @@ struct ChatItemInfoView: View {
         }
     }
 
-    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus, Bool?)] {
         memberDeliveryStatuses.compactMap({ mds in
             if let mem = chatModel.getGroupMember(mds.groupMemberId) {
-                return (mem.wrapped, mds.memberDeliveryStatus)
+                return (mem.wrapped, mds.memberDeliveryStatus, mds.sentViaProxy)
             } else {
                 return nil
             }
         })
     }
 
-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus, _ sentViaProxy: Bool?) -> some View {
         HStack{
             ProfileImage(imageStr: member.image, size: 30)
                 .padding(.trailing, 2)
             Text(member.chatViewName)
                 .lineLimit(1)
             Spacer()
+            if sentViaProxy == true {
+                Image(systemName: "arrow.forward")
+                    .foregroundColor(.secondary).opacity(0.67)
+            }
             let v = Group {
                 if let (icon, statusColor) = status.statusIcon(Color.secondary) {
                     switch status {

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -712,9 +712,9 @@ struct ComposeView: View {
         if chat.chatInfo.contact?.nextSendGrpInv ?? false {
             await sendMemberContactInvitation()
         } else if case let .forwardingItem(ci, fromChatInfo) = composeState.contextItem {
-            sent = await forwardItem(ci, fromChatInfo)
+            sent = await forwardItem(ci, fromChatInfo, ttl)
             if !composeState.message.isEmpty {
-                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: nil)
+                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
             }
         } else if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
@@ -890,13 +890,14 @@ struct ComposeView: View {
             return nil
         }
 
-        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo) async -> ChatItem? {
+        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
             if let chatItem = await apiForwardChatItem(
                 toChatType: chat.chatInfo.chatType,
                 toChatId: chat.chatInfo.apiId,
                 fromChatType: fromChatInfo.chatType,
                 fromChatId: fromChatInfo.apiId,
-                itemId: forwardedItem.id
+                itemId: forwardedItem.id,
+                ttl: ttl
             ) {
                 await MainActor.run {
                     chatModel.addChatItem(chat.chatInfo, chatItem)

apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift

@@ -224,8 +224,7 @@ struct SendMessageView: View {
 
     @ViewBuilder private func sendButtonContextMenuItems() -> some View {
         if composeState.liveMessage == nil,
-           !composeState.editing,
-           !composeState.forwarding {
+           !composeState.editing {
             if case .noContextItem = composeState.contextItem,
                !composeState.voicePreview,
                let send = sendLiveMessage,

apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift

@@ -34,8 +34,7 @@ struct GroupPreferencesView: View {
                 featureSection(.reactions, $preferences.reactions.enable)
                 featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
                 featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                // TODO enable simplexLinks preference in 5.8
-                // featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
                 featureSection(.history, $preferences.history.enable)
 
                 if groupInfo.canEdit {
@@ -102,8 +101,6 @@ struct GroupPreferencesView: View {
                         }
                     }
                     .frame(height: 36)
-                    // remove in v5.8
-                    .disabled(true)
                 }
             } else {
                 settingsRow(icon, color: color) {

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -240,14 +240,14 @@ struct ChatPreviewView: View {
 
     private func itemStatusMark(_ cItem: ChatItem) -> Text {
         switch cItem.meta.itemStatus {
-        case .sndErrorAuth:
+        case .sndErrorAuth, .sndError:
             return Text(Image(systemName: "multiply"))
                 .font(.caption)
                 .foregroundColor(.red) + Text(" ")
-        case .sndError:
+        case .sndWarning:
             return Text(Image(systemName: "exclamationmark.triangle.fill"))
                 .font(.caption)
-                .foregroundColor(.yellow) + Text(" ")
+                .foregroundColor(.orange) + Text(" ")
         default: return Text("")
         }
     }

apps/ios/Shared/Views/Onboarding/WhatsNewView.swift

@@ -406,7 +406,28 @@ private let versionDescriptions: [VersionDescription] = [
                 description: "More reliable network connection."
             )
         ]
-    )
+    ),
+    VersionDescription(
+        version: "v5.8",
+        post: URL(string: "https://simplex.chat/blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.html"),
+        features: [
+            FeatureDescription(
+                icon: "arrow.forward",
+                title: "Private message routing 🚀",
+                description: "Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings."
+            ),
+            FeatureDescription(
+                icon: "network.badge.shield.half.filled",
+                title: "Safely receive files",
+                description: "Confirm files from unknown servers."
+            ),
+            FeatureDescription(
+                icon: "battery.50",
+                title: "Improved message delivery",
+                description: "With reduced battery usage."
+            )
+        ]
+    ),
 ]
 
 private let lastVersion = versionDescriptions.last!.version

apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift

@@ -51,10 +51,10 @@ struct AdvancedNetworkSettings: View {
                     }
                     .disabled(currentNetCfg == NetCfg.proxyDefaults)
 
-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 25_000000, 35_000000, 50_000000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
-                    intSettingPicker("Receiving concurrency", selection: $netCfg.rcvConcurrency, values: [1, 2, 4, 8, 12, 16, 24], label: "")
+                    // intSettingPicker("Receiving concurrency", selection: $netCfg.rcvConcurrency, values: [1, 2, 4, 8, 12, 16, 24], label: "")
                     timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                     intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                     Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)

apps/ios/Shared/Views/UserSettings/AppSettings.swift

@@ -23,6 +23,7 @@ extension AppSettings {
             setNetCfg(val)
         }
         if let val = privacyEncryptLocalFiles { privacyEncryptLocalFilesGroupDefault.set(val) }
+        if let val = privacyAskToApproveRelays { privacyAskToApproveRelaysGroupDefault.set(val) }
         if let val = privacyAcceptImages {
             privacyAcceptImagesGroupDefault.set(val)
             def.setValue(val, forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
@@ -50,6 +51,7 @@ extension AppSettings {
         var c = AppSettings.defaults
         c.networkConfig = getNetCfg()
         c.privacyEncryptLocalFiles = privacyEncryptLocalFilesGroupDefault.get()
+        c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
         c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()
         c.privacyLinkPreviews = def.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
         c.privacyShowChatPreviews = def.bool(forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS)

apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift

@@ -12,12 +12,16 @@ import SimpleXChat
 private enum NetworkAlert: Identifiable {
     case updateOnionHosts(hosts: OnionHosts)
     case updateSessionMode(mode: TransportSessionMode)
+    case updateSMPProxyMode(proxyMode: SMPProxyMode)
+    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
     case error(err: String)
 
     var id: String {
         switch self {
         case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
         case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
+        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
+        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
         case let .error(err): return "error \(err)"
         }
     }
@@ -26,11 +30,14 @@ private enum NetworkAlert: Identifiable {
 struct NetworkAndServers: View {
     @EnvironmentObject var m: ChatModel
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = true
     @State private var cfgLoaded = false
     @State private var currentNetCfg = NetCfg.defaults
     @State private var netCfg = NetCfg.defaults
     @State private var onionHosts: OnionHosts = .no
     @State private var sessionMode: TransportSessionMode = .user
+    @State private var proxyMode: SMPProxyMode = .never
+    @State private var proxyFallback: SMPProxyFallback = .allow
     @State private var alert: NetworkAlert?
 
     var body: some View {
@@ -75,6 +82,30 @@ struct NetworkAndServers: View {
                     Text("Using .onion hosts requires compatible VPN provider.")
                 }
 
+                Section {
+                    Picker("Private routing", selection: $proxyMode) {
+                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+
+                    Picker("Allow downgrade", selection: $proxyFallback) {
+                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
+                    }
+                    .disabled(proxyMode == .never)
+                    .frame(height: 36)
+
+                    Toggle("Show message status", isOn: $showSentViaProxy)
+                } header: {
+                    Text("Private message routing")
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
+                        if showSentViaProxy {
+                            Text("Show → on messages sent via private routing.")
+                        }
+                    }
+                }
+
                 Section("Calls") {
                     NavigationLink {
                         RTCServers()
@@ -99,14 +130,24 @@ struct NetworkAndServers: View {
             currentNetCfg = getNetCfg()
             resetNetCfgView()
         }
-        .onChange(of: onionHosts) { _ in
-            if onionHosts != OnionHosts(netCfg: currentNetCfg) {
-                alert = .updateOnionHosts(hosts: onionHosts)
+        .onChange(of: onionHosts) { hosts in
+            if hosts != OnionHosts(netCfg: currentNetCfg) {
+                alert = .updateOnionHosts(hosts: hosts)
             }
         }
-        .onChange(of: sessionMode) { _ in
-            if sessionMode != netCfg.sessionMode {
-                alert = .updateSessionMode(mode: sessionMode)
+        .onChange(of: sessionMode) { mode in
+            if mode != netCfg.sessionMode {
+                alert = .updateSessionMode(mode: mode)
+            }
+        }
+        .onChange(of: proxyMode) { mode in
+            if mode != netCfg.smpProxyMode {
+                alert = .updateSMPProxyMode(proxyMode: mode)
+            }
+        }
+        .onChange(of: proxyFallback) { fallbackMode in
+            if fallbackMode != netCfg.smpProxyFallback {
+                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
             }
         }
         .alert(item: $alert) { a in
@@ -137,6 +178,30 @@ struct NetworkAndServers: View {
                         resetNetCfgView()
                     }
                 )
+            case let .updateSMPProxyMode(proxyMode):
+                return Alert(
+                    title: Text("Message routing mode"),
+                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyMode = proxyMode
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .updateSMPProxyFallback(proxyFallback):
+                return Alert(
+                    title: Text("Message routing fallback"),
+                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyFallback = proxyFallback
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
             case let .error(err):
                 return Alert(
                     title: Text("Error updating settings"),
@@ -166,6 +231,8 @@ struct NetworkAndServers: View {
         netCfg = currentNetCfg
         onionHosts = OnionHosts(netCfg: netCfg)
         sessionMode = netCfg.sessionMode
+        proxyMode = netCfg.smpProxyMode
+        proxyFallback = netCfg.smpProxyFallback
     }
 
     private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
@@ -182,6 +249,23 @@ struct NetworkAndServers: View {
         case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
         }
     }
+    
+    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
+        switch mode {
+        case .always: return "Always use private routing."
+        case .unknown: return "Use private routing with unknown servers."
+        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
+        case .never: return "Do NOT use private routing."
+        }
+    }
+
+    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
+        switch proxyFallback {
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
+        }
+    }
 }
 
 struct NetworkServersView_Previews: PreviewProvider {

apps/ios/Shared/Views/UserSettings/PrivacySettings.swift

@@ -16,6 +16,7 @@ struct PrivacySettings: View {
     @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
     @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
     @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
+    @AppStorage(GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS, store: groupDefaults) private var askToApproveRelays = true
     @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -64,18 +65,6 @@ struct PrivacySettings: View {
                 }
 
                 Section {
-                    settingsRow("lock.doc") {
-                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                            .onChange(of: encryptLocalFiles) {
-                                setEncryptLocalFiles($0)
-                            }
-                    }
-                    settingsRow("photo") {
-                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
-                            .onChange(of: autoAcceptImages) {
-                                privacyAcceptImagesGroupDefault.set($0)
-                            }
-                    }
                     settingsRow("network") {
                         Toggle("Send link previews", isOn: $useLinkPreviews)
                     }
@@ -108,6 +97,32 @@ struct PrivacySettings: View {
                     Text("Chats")
                 }
 
+                Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                            .onChange(of: encryptLocalFiles) {
+                                setEncryptLocalFiles($0)
+                            }
+                    }
+                    settingsRow("photo") {
+                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
+                            .onChange(of: autoAcceptImages) {
+                                privacyAcceptImagesGroupDefault.set($0)
+                            }
+                    }
+                    settingsRow("network.badge.shield.half.filled") {
+                        Toggle("Protect IP address", isOn: $askToApproveRelays)
+                    }
+                } header: {
+                    Text("Files")
+                } footer: {
+                    if askToApproveRelays {
+                        Text("The app will ask to confirm downloads from unknown file servers (except .onion).")
+                    } else {
+                        Text("Without Tor or VPN, your IP address will be visible to file servers.")
+                    }
+                }
+
                 Section {
                     settingsRow("person") {
                         Toggle("Contacts", isOn: $contactReceipts)

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -60,6 +60,7 @@ let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
+let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
 
 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
 
@@ -99,6 +100,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
+    DEFAULT_SHOW_SENT_VIA_RPOXY: false,
     ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue
 ]
 

apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff

@@ -713,6 +713,10 @@
         <target>Позволи изчезващи съобщения само ако вашият контакт ги разрешава.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Позволи необратимо изтриване на съобщение само ако вашият контакт го рарешава. (24 часа)</target>
@@ -808,6 +812,10 @@
         <target>Вече се присъединихте към групата!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Винаги използвай реле</target>
@@ -1088,6 +1096,10 @@
         <target>Файлът не може да бъде получен</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Мобилна мрежа</target>
@@ -1284,6 +1296,10 @@
         <target>Потвърди актуализаациите на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Потвърди мрежовите настройки</target>
@@ -1948,6 +1964,10 @@ This cannot be undone!</source>
         <target>Настолни устройства</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Разработване</target>
@@ -2053,11 +2073,19 @@ This cannot be undone!</source>
         <target>Откриване през локалната мрежа</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Отложи</target>
@@ -2621,7 +2649,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Грешка: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ This cannot be undone!</source>
         <target>Файл: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Файлове и медия</target>
@@ -2818,6 +2850,16 @@ This cannot be undone!</source>
         <target>Препратено от</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Намерено настолно устройство</target>
@@ -3633,6 +3675,10 @@ This is your link for group %@!</source>
         <target>Потвърждениe за доставка на съобщения!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Чернова на съобщение</target>
@@ -3653,6 +3699,14 @@ This is your link for group %@!</source>
         <target>Реакциите на съобщения са забранени в тази група.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Източникът на съобщението остава скрит.</target>
@@ -3783,11 +3837,6 @@ This is your link for group %@!</source>
         <target>Най-вероятно тази връзка е изтрита.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Най-вероятно този контакт е изтрил връзката с вас.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Множество профили за чат</target>
@@ -3818,6 +3867,10 @@ This is your link for group %@!</source>
         <target>Мрежова връзка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Управление на мрежата</target>
@@ -4359,11 +4412,23 @@ Error: %@</source>
         <target>Поверителни имена на файлове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Лични бележки</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Профилни и сървърни връзки</target>
@@ -4444,11 +4509,20 @@ Error: %@</source>
         <target>Забрани изпращането на гласови съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Защити екрана на приложението</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Защитете чат профилите с парола!</target>
@@ -4554,11 +4628,6 @@ Error: %@</source>
         <target>Получаващият адрес ще бъде променен към друг сървър. Промяната на адреса ще завърши, след като подателят е онлайн.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Паралелност на получаване</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Получаващият се файл ще бъде спрян.</target>
@@ -4794,6 +4863,10 @@ Error: %@</source>
         <target>SMP сървъри</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>По-безопасни групи</target>
@@ -5019,6 +5092,14 @@ Error: %@</source>
         <target>Изпрати съобщение на живо</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Изпращай известия</target>
@@ -5124,6 +5205,10 @@ Error: %@</source>
         <target>Изпратените съобщения ще бъдат изтрити след зададеното време.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Сървърът изисква оторизация за създаване на опашки, проверете паролата</target>
@@ -5139,6 +5224,10 @@ Error: %@</source>
         <target>Тестът на сървъра е неуспешен!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Сървъри</target>
@@ -5259,11 +5348,19 @@ Error: %@</source>
         <target>Показване на последните съобщения в листа с чатовете</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Показване на визуализация</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Покажи:</target>
@@ -5586,6 +5683,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Приложението може да ви уведоми, когато получите съобщения или заявки за контакт - моля, отворете настройките, за да активирате.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Опитът за промяна на паролата на базата данни не беше завършен.</target>
@@ -5771,6 +5872,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>За да не се разкрива часовата зона, файловете с изображения/глас използват UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <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>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Неочаквано състояние на миграция</target>
@@ -5913,6 +6013,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Непозната грешка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Освен ако не използвате интерфейса за повикване на iOS, активирайте режима "Не безпокой", за да избегнете прекъсвания.</target>
@@ -6060,6 +6164,14 @@ 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="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Използвай сървър</target>
@@ -6295,11 +6407,23 @@ 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="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Грешна парола за базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Грешна парола!</target>
@@ -7455,11 +7579,19 @@ SimpleX сървърите не могат да видят вашия профи
         <target>неизвестен</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>неизвестен статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>актуализиран профил на групата</target>
@@ -7525,6 +7657,10 @@ SimpleX сървърите не могат да видят вашия профи
         <target>седмици</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>да</target>

apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff

@@ -690,6 +690,10 @@
         <target>Povolte mizící zprávy, pouze pokud vám to váš kontakt dovolí.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí. (24 hodin)</target>
@@ -782,6 +786,10 @@
         <source>Already joining the group!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Spojení přes relé</target>
@@ -1047,6 +1055,10 @@
         <target>Nelze přijmout soubor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <note>No comment provided by engineer.</note>
@@ -1238,6 +1250,10 @@
         <target>Potvrdit aktualizaci databáze</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <note>No comment provided by engineer.</note>
@@ -1870,6 +1886,10 @@ This cannot be undone!</source>
         <source>Desktop devices</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Vyvinout</target>
@@ -1973,11 +1993,19 @@ This cannot be undone!</source>
         <source>Discover via local network</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>NEpoužívejte SimpleX pro tísňová volání.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Udělat později</target>
@@ -2519,7 +2547,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Chyba: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2608,6 +2636,10 @@ This cannot be undone!</source>
         <target>Soubor: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Soubory a média</target>
@@ -2706,6 +2738,16 @@ This cannot be undone!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <note>No comment provided by engineer.</note>
@@ -3490,6 +3532,10 @@ This is your link for group %@!</source>
         <target>Potvrzení o doručení zprávy!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Návrh zprávy</target>
@@ -3510,6 +3556,14 @@ This is your link for group %@!</source>
         <target>Reakce na zprávy jsou v této skupině zakázány.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -3627,11 +3681,6 @@ This is your link for group %@!</source>
         <target>Pravděpodobně je toto spojení smazáno.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Tento kontakt s největší pravděpodobností smazal spojení s vámi.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Více chatovacích profilů</target>
@@ -3661,6 +3710,10 @@ This is your link for group %@!</source>
         <source>Network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <note>No comment provided by engineer.</note>
@@ -4181,10 +4234,22 @@ Error: %@</source>
         <target>Soukromé názvy souborů</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil a připojení k serveru</target>
@@ -4261,11 +4326,20 @@ Error: %@</source>
         <target>Zakázat odesílání hlasových zpráv.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Ochrana obrazovky aplikace</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Chraňte své chat profily heslem!</target>
@@ -4368,10 +4442,6 @@ Error: %@</source>
         <target>Přijímací adresa bude změněna na jiný server. Změna adresy bude dokončena po připojení odesílatele.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Příjem souboru bude zastaven.</target>
@@ -4599,6 +4669,10 @@ Error: %@</source>
         <target>SMP servery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <note>No comment provided by engineer.</note>
@@ -4817,6 +4891,14 @@ Error: %@</source>
         <target>Odeslat živou zprávu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Odeslat oznámení</target>
@@ -4921,6 +5003,10 @@ Error: %@</source>
         <target>Odeslané zprávy se po uplynutí nastavené doby odstraní.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Server vyžaduje autorizaci pro vytváření front, zkontrolujte heslo</target>
@@ -4936,6 +5022,10 @@ Error: %@</source>
         <target>Test serveru se nezdařil!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Servery</target>
@@ -5051,11 +5141,19 @@ Error: %@</source>
         <target>Zobrazit poslední zprávy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Zobrazení náhledu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Zobrazit:</target>
@@ -5369,6 +5467,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <target>Aplikace vás může upozornit na přijaté zprávy nebo žádosti o kontakt - povolte to v nastavení.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Pokus o změnu přístupové fráze databáze nebyl dokončen.</target>
@@ -5545,6 +5647,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <target>K ochraně časového pásma používají obrazové/hlasové soubory UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5631,11 +5737,6 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <source>Unblock member?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Neočekávaná chyba: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Neočekávaný stav přenášení</target>
@@ -5681,6 +5782,10 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <target>Neznámá chyba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Při nepoužívání rozhraní volání iOS, povolte režim Nerušit, abyste se vyhnuli vyrušování.</target>
@@ -5821,6 +5926,14 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>Use only local notifications?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Použít server</target>
@@ -6038,11 +6151,23 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>With reduced battery usage.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Špatná přístupová fráze k databázi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Špatná přístupová fráze!</target>
@@ -7158,10 +7283,18 @@ Servery SimpleX nevidí váš profil.</target>
         <target>neznámý</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>aktualizoval profil skupiny</target>
@@ -7225,6 +7358,10 @@ Servery SimpleX nevidí váš profil.</target>
         <target>týdnů</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>ano</target>

apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff

@@ -695,7 +695,7 @@
       </trans-unit>
       <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
         <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
-        <target>Alle Ihre Kontakte, Unterhaltungen und Dateien werden sicher verschlüsselt und in Daten-Paketen auf die konfigurierten XTFP-Server hochgeladen.</target>
+        <target>Alle Ihre Kontakte, Unterhaltungen und Dateien werden sicher verschlüsselt und in Daten-Paketen auf die konfigurierten XTFP-Relais hochgeladen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow" xml:space="preserve">
@@ -713,6 +713,10 @@
         <target>Erlauben Sie verschwindende Nachrichten nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Erlauben Sie das unwiederbringliche Löschen von Nachrichten nur dann, wenn es Ihnen Ihr Kontakt ebenfalls erlaubt. (24 Stunden)</target>
@@ -808,6 +812,10 @@
         <target>Sie sind bereits Mitglied der Gruppe!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Über ein Relais verbinden</target>
@@ -1088,6 +1096,10 @@
         <target>Datei kann nicht empfangen werden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Zellulär</target>
@@ -1284,6 +1296,10 @@
         <target>Datenbank-Aktualisierungen bestätigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Bestätigen Sie die Netzwerkeinstellungen</target>
@@ -1948,6 +1964,10 @@ Das kann nicht rückgängig gemacht werden!</target>
         <target>Desktop-Geräte</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Entwicklung</target>
@@ -2053,11 +2073,19 @@ Das kann nicht rückgängig gemacht werden!</target>
         <target>Lokales Netzwerk durchsuchen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>Nutzen Sie SimpleX nicht für Notrufe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Später wiederholen</target>
@@ -2621,7 +2649,7 @@ Das kann nicht rückgängig gemacht werden!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fehler: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Das kann nicht rückgängig gemacht werden!</target>
         <target>Datei: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Dateien &amp; Medien</target>
@@ -2818,6 +2850,16 @@ Das kann nicht rückgängig gemacht werden!</target>
         <target>Weitergeleitet aus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Gefundener Desktop</target>
@@ -3633,6 +3675,10 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Empfangsbestätigungen für Nachrichten!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Nachrichtenentwurf</target>
@@ -3653,6 +3699,14 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>In dieser Gruppe sind Reaktionen auf Nachrichten nicht erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Die Nachrichtenquelle bleibt privat.</target>
@@ -3783,11 +3837,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Wahrscheinlich ist diese Verbindung gelöscht worden.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Dieser Kontakt hat sehr wahrscheinlich die Verbindung mit Ihnen gelöscht.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Mehrere Chat-Profile</target>
@@ -3818,6 +3867,10 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Netzwerkverbindung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Netzwerk-Verwaltung</target>
@@ -4004,12 +4057,12 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve">
         <source>Onion hosts will be required for connection. Requires enabling VPN.</source>
-        <target>Für die Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.</target>
+        <target>Für diese Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
         <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion-Hosts werden verwendet, sobald sie verfügbar sind. Dies erfordert die Aktivierung eines VPNs.</target>
+        <target>Wenn Onion-Hosts verfügbar sind, werden sie verwendet. Dies erfordert die Aktivierung eines VPNs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -4359,11 +4412,23 @@ Fehler: %@</target>
         <target>Neutrale Dateinamen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Private Notizen</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil und Serververbindungen</target>
@@ -4444,11 +4509,20 @@ Fehler: %@</target>
         <target>Das Senden von Sprachnachrichten nicht erlauben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>App-Bildschirm schützen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Ihre Chat-Profile mit einem Passwort schützen!</target>
@@ -4554,11 +4628,6 @@ Fehler: %@</target>
         <target>Die Empfängeradresse wird auf einen anderen Server geändert. Der Adresswechsel wird abgeschlossen, wenn der Absender wieder online ist.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Gleichzeitiger Empfang</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Der Empfang der Datei wird beendet.</target>
@@ -4794,6 +4863,10 @@ Fehler: %@</target>
         <target>SMP-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Sicherere Gruppen</target>
@@ -5019,6 +5092,14 @@ Fehler: %@</target>
         <target>Live Nachricht senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Benachrichtigungen senden</target>
@@ -5124,6 +5205,10 @@ Fehler: %@</target>
         <target>Gesendete Nachrichten werden nach der eingestellten Zeit gelöscht.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Um Warteschlangen zu erzeugen benötigt der Server eine Authentifizierung. Bitte überprüfen Sie das Passwort</target>
@@ -5139,6 +5224,10 @@ Fehler: %@</target>
         <target>Server Test ist fehlgeschlagen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Server</target>
@@ -5259,11 +5348,19 @@ Fehler: %@</target>
         <target>Letzte Nachrichten anzeigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Vorschau anzeigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Anzeigen:</target>
@@ -5586,6 +5683,10 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Wenn sie Nachrichten oder Kontaktanfragen empfangen, kann Sie die App benachrichtigen - Um dies zu aktivieren, öffnen Sie bitte die Einstellungen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Die Änderung des Datenbank-Passworts konnte nicht abgeschlossen werden.</target>
@@ -5771,6 +5872,10 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Bild- und Sprachdateinamen enthalten UTC, um Informationen zur Zeitzone zu schützen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
         <target>Mitglied freigeben?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Unerwarteter Fehler: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Unerwarteter Migrationsstatus</target>
@@ -5913,6 +6013,10 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
         <target>Unbekannter Fehler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Aktivieren Sie den Modus "Bitte nicht stören", um Unterbrechungen zu vermeiden, es sei denn, Sie verwenden die iOS Anrufschnittstelle.</target>
@@ -6060,6 +6164,14 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Nur lokale Benachrichtigungen nutzen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Server nutzen</target>
@@ -6295,11 +6407,23 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Mit reduziertem Akkuverbrauch.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Falsches Datenbank-Passwort</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Falsches Passwort!</target>
@@ -7455,11 +7579,19 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Unbekannt</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>unbekannter Gruppenmitglieds-Status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>Aktualisiertes Gruppenprofil</target>
@@ -7525,6 +7657,10 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Wochen</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>Ja</target>

apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff

@@ -713,6 +713,11 @@
         <target>Allow disappearing messages only if your contact allows it to you.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <target>Allow downgrade</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</target>
@@ -808,6 +813,11 @@
         <target>Already joining the group!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <target>Always use private routing.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Always use relay</target>
@@ -1088,6 +1098,11 @@
         <target>Cannot receive file</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <target>Capacity exceeded - recipient did not receive previously sent messages.</target>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Cellular</target>
@@ -1284,6 +1299,11 @@
         <target>Confirm database upgrades</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <target>Confirm files from unknown servers.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Confirm network settings</target>
@@ -1948,6 +1968,11 @@ This cannot be undone!</target>
         <target>Desktop devices</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <target>Destination server error: %@</target>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Develop</target>
@@ -2053,11 +2078,21 @@ This cannot be undone!</target>
         <target>Discover via local network</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <target>Do NOT send messages directly, even if your or destination server does not support private routing.</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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <target>Do NOT use private routing.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Do it later</target>
@@ -2621,7 +2656,7 @@ This cannot be undone!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2748,11 @@ This cannot be undone!</target>
         <target>File: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <target>Files</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Files &amp; media</target>
@@ -2818,6 +2858,20 @@ This cannot be undone!</target>
         <target>Forwarded from</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <target>Forwarding server: %1$@
+Destination server error: %2$@</target>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <target>Forwarding server: %1$@
+Error: %2$@</target>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Found desktop</target>
@@ -3633,6 +3687,11 @@ This is your link for group %@!</target>
         <target>Message delivery receipts!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <target>Message delivery warning</target>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Message draft</target>
@@ -3653,6 +3712,16 @@ This is your link for group %@!</target>
         <target>Message reactions are prohibited in this group.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <target>Message routing fallback</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <target>Message routing mode</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Message source remains private.</target>
@@ -3783,11 +3852,6 @@ This is your link for group %@!</target>
         <target>Most likely this connection is deleted.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Most likely this contact has deleted the connection with you.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Multiple chat profiles</target>
@@ -3818,6 +3882,11 @@ This is your link for group %@!</target>
         <target>Network connection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <target>Network issues - message expired after many attempts to send it.</target>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Network management</target>
@@ -4359,11 +4428,26 @@ Error: %@</target>
         <target>Private filenames</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <target>Private message routing</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <target>Private message routing 🚀</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Private notes</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <target>Private routing</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profile and server connections</target>
@@ -4444,11 +4528,23 @@ Error: %@</target>
         <target>Prohibit sending voice messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <target>Protect IP address</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Protect app screen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <target>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Protect your chat profiles with a password!</target>
@@ -4554,11 +4650,6 @@ Error: %@</target>
         <target>Receiving address will be changed to a different server. Address change will complete after sender comes online.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Receiving concurrency</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Receiving file will be stopped.</target>
@@ -4794,6 +4885,11 @@ Error: %@</target>
         <target>SMP servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <target>Safely receive files</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Safer groups</target>
@@ -5019,6 +5115,16 @@ Error: %@</target>
         <target>Send live message</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <target>Send messages directly when IP address is protected and your or destination server does not support private routing.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <target>Send messages directly when your or destination server does not support private routing.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Send notifications</target>
@@ -5124,6 +5230,11 @@ Error: %@</target>
         <target>Sent messages will be deleted after set time.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <target>Server address is incompatible with network settings.</target>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Server requires authorization to create queues, check password</target>
@@ -5139,6 +5250,11 @@ Error: %@</target>
         <target>Server test failed!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <target>Server version is incompatible with network settings.</target>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Servers</target>
@@ -5259,11 +5375,21 @@ Error: %@</target>
         <target>Show last messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <target>Show message status</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Show preview</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <target>Show → on messages sent via private routing.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Show:</target>
@@ -5586,6 +5712,11 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>The app can notify you when you receive messages or contact requests - please open settings to enable.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <target>The app will ask to confirm downloads from unknown file servers (except .onion).</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>The attempt to change database passphrase was not completed.</target>
@@ -5771,6 +5902,11 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>To protect timezone, image/voice files use UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <target>To protect your IP address, private routing uses your SMP servers to deliver messages.</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>
@@ -5863,11 +5999,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Unblock member?</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>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Unexpected migration state</target>
@@ -5913,6 +6044,11 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Unknown error</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <target>Unknown servers!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</target>
@@ -6060,6 +6196,16 @@ To connect, please ask your contact to create another connection link and check
         <target>Use only local notifications?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <target>Use private routing with unknown servers when IP address is not protected.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <target>Use private routing with unknown servers.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Use server</target>
@@ -6295,11 +6441,26 @@ To connect, please ask your contact to create another connection link and check
         <target>With reduced battery usage.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <target>Without Tor or VPN, your IP address will be visible to file servers.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <target>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Wrong database passphrase</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <target>Wrong key or unknown connection - most likely this connection is deleted.</target>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Wrong passphrase!</target>
@@ -7455,11 +7616,21 @@ SimpleX servers cannot see your profile.</target>
         <target>unknown</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <target>unknown relays</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>unknown status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <target>unprotected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>updated group profile</target>
@@ -7525,6 +7696,11 @@ SimpleX servers cannot see your profile.</target>
         <target>weeks</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <target>when IP hidden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>yes</target>

apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff

@@ -713,6 +713,10 @@
         <target>Se permiten los mensajes temporales pero sólo si tu contacto también los permite para tí.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Se permite la eliminación irreversible de mensajes pero sólo si tu contacto también la permite para tí. (24 horas)</target>
@@ -808,6 +812,10 @@
         <target>¡Ya en proceso de unirte al grupo!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Usar siempre retransmisor</target>
@@ -1040,7 +1048,7 @@
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
-        <target>Mediante perfil (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
+        <target>Mediante perfil (predeterminado) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
@@ -1088,6 +1096,10 @@
         <target>No se puede recibir el archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Móvil</target>
@@ -1284,6 +1296,10 @@
         <target>Confirmar actualizaciones de la bases de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Confirmar configuración de red</target>
@@ -1948,6 +1964,10 @@ This cannot be undone!</source>
         <target>Ordenadores</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Desarrollo</target>
@@ -2053,11 +2073,19 @@ This cannot be undone!</source>
         <target>Descubrir en red local</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>NO uses SimpleX para llamadas de emergencia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Hacer más tarde</target>
@@ -2205,7 +2233,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enabled for" xml:space="preserve">
         <source>Enabled for</source>
-        <target>Activar para</target>
+        <target>Activado para</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt" xml:space="preserve">
@@ -2621,7 +2649,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ This cannot be undone!</source>
         <target>Archivo: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Archivos y multimedia</target>
@@ -2818,6 +2850,16 @@ This cannot be undone!</source>
         <target>Reenviado por</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Ordenador encontrado</target>
@@ -3633,6 +3675,10 @@ This is your link for group %@!</source>
         <target>¡Confirmación de entrega de mensajes!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Borrador de mensaje</target>
@@ -3653,6 +3699,14 @@ This is your link for group %@!</source>
         <target>Las reacciones a los mensajes no están permitidas en este grupo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>El autor del mensaje se mantiene privado.</target>
@@ -3783,11 +3837,6 @@ This is your link for group %@!</source>
         <target>Probablemente la conexión ha sido eliminada.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Lo más probable es que este contacto haya eliminado la conexión contigo.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Múltiples perfiles</target>
@@ -3818,6 +3867,10 @@ This is your link for group %@!</source>
         <target>Conexión de red</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Gestión de la red</target>
@@ -4359,11 +4412,23 @@ Error: %@</target>
         <target>Nombres de archivos privados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Notas privadas</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Datos del perfil y conexiones</target>
@@ -4376,7 +4441,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Profile images" xml:space="preserve">
         <source>Profile images</source>
-        <target>Imágenes del perfil</target>
+        <target>Forma de los perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile name" xml:space="preserve">
@@ -4444,11 +4509,20 @@ Error: %@</target>
         <target>No se permiten mensajes de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Proteger la pantalla de la aplicación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>¡Protege tus perfiles con contraseña!</target>
@@ -4554,11 +4628,6 @@ Error: %@</target>
         <target>La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Concurrencia en la recepción</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Se detendrá la recepción del archivo.</target>
@@ -4716,7 +4785,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Reset to defaults" xml:space="preserve">
         <source>Reset to defaults</source>
-        <target>Restablecer valores por defecto</target>
+        <target>Restablecer valores predetarminados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Restart the app to create a new chat profile" xml:space="preserve">
@@ -4794,6 +4863,10 @@ Error: %@</target>
         <target>Servidores SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Grupos más seguros</target>
@@ -5019,6 +5092,14 @@ Error: %@</target>
         <target>Mensaje en vivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Enviar notificaciones</target>
@@ -5124,6 +5205,10 @@ Error: %@</target>
         <target>Los mensajes enviados se eliminarán una vez transcurrido el tiempo establecido.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>El servidor requiere autorización para crear colas, comprueba la contraseña</target>
@@ -5139,6 +5224,10 @@ Error: %@</target>
         <target>¡Error en prueba del servidor!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Servidores</target>
@@ -5259,11 +5348,19 @@ Error: %@</target>
         <target>Mostrar último mensaje</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Mostrar vista previa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Mostrar:</target>
@@ -5586,6 +5683,10 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>La aplicación puede notificarte cuando recibas mensajes o solicitudes de contacto: por favor, abre la configuración para activarlo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>El intento de cambiar la contraseña de la base de datos no se ha completado.</target>
@@ -5771,6 +5872,10 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>Para proteger la zona horaria, los archivos de imagen/voz usan la hora UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>¿Desbloquear miembro?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Error inesperado: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Estado de migración inesperado</target>
@@ -5913,6 +6013,10 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>Error desconocido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>A menos que utilices la interfaz de llamadas de iOS, activa el modo No molestar para evitar interrupciones.</target>
@@ -6061,6 +6165,14 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
         <target>¿Usar sólo notificaciones locales?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Usar servidor</target>
@@ -6296,11 +6408,23 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
         <target>Con uso reducido de batería.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Contraseña de base de datos incorrecta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>¡Contraseña incorrecta!</target>
@@ -6986,17 +7110,17 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
-        <target>por defecto (%@)</target>
+        <target>predeterminado (%@)</target>
         <note>pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
-        <target>por defecto (no)</target>
+        <target>predeterminado (no)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="default (yes)" xml:space="preserve">
         <source>default (yes)</source>
-        <target>por defecto (sí)</target>
+        <target>predeterminado (sí)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="deleted" xml:space="preserve">
@@ -7456,11 +7580,19 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>desconocido</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>estado desconocido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>ha actualizado el perfil del grupo</target>
@@ -7526,6 +7658,10 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>semanas</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>sí</target>

apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff

@@ -685,6 +685,10 @@
         <target>Salli katoavat viestit vain, jos kontaktisi sallii sen sinulle.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Salli peruuttamaton viestien poisto vain, jos kontaktisi sallii ne sinulle. (24 tuntia)</target>
@@ -777,6 +781,10 @@
         <source>Already joining the group!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Käytä aina relettä</target>
@@ -1040,6 +1048,10 @@
         <target>Tiedostoa ei voi vastaanottaa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <note>No comment provided by engineer.</note>
@@ -1231,6 +1243,10 @@
         <target>Vahvista tietokannan päivitykset</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <note>No comment provided by engineer.</note>
@@ -1863,6 +1879,10 @@ This cannot be undone!</source>
         <source>Desktop devices</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Kehitä</target>
@@ -1966,11 +1986,19 @@ This cannot be undone!</source>
         <source>Discover via local network</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>Älä käytä SimpleX-sovellusta hätäpuheluihin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Tee myöhemmin</target>
@@ -2509,7 +2537,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Virhe: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2598,6 +2626,10 @@ This cannot be undone!</source>
         <target>Tiedosto: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Tiedostot &amp; media</target>
@@ -2696,6 +2728,16 @@ This cannot be undone!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <note>No comment provided by engineer.</note>
@@ -3480,6 +3522,10 @@ This is your link for group %@!</source>
         <target>Viestien toimituskuittaukset!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Viestiluonnos</target>
@@ -3500,6 +3546,14 @@ This is your link for group %@!</source>
         <target>Viestireaktiot ovat kiellettyjä tässä ryhmässä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -3617,11 +3671,6 @@ This is your link for group %@!</source>
         <target>Todennäköisesti tämä yhteys on poistettu.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Todennäköisesti tämä kontakti on poistanut yhteyden sinuun.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Useita keskusteluprofiileja</target>
@@ -3651,6 +3700,10 @@ This is your link for group %@!</source>
         <source>Network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <note>No comment provided by engineer.</note>
@@ -4169,10 +4222,22 @@ Error: %@</source>
         <target>Yksityiset tiedostonimet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profiili- ja palvelinyhteydet</target>
@@ -4249,11 +4314,20 @@ Error: %@</source>
         <target>Estä ääniviestien lähettäminen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Suojaa sovellusnäyttö</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Suojaa keskusteluprofiilisi salasanalla!</target>
@@ -4356,10 +4430,6 @@ Error: %@</source>
         <target>Vastaanotto-osoite vaihdetaan toiseen palvelimeen. Osoitteenmuutos tehdään sen jälkeen, kun lähettäjä tulee verkkoon.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Tiedoston vastaanotto pysäytetään.</target>
@@ -4587,6 +4657,10 @@ Error: %@</source>
         <target>SMP-palvelimet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <note>No comment provided by engineer.</note>
@@ -4804,6 +4878,14 @@ Error: %@</source>
         <target>Lähetä live-viesti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Lähetys ilmoitukset</target>
@@ -4908,6 +4990,10 @@ Error: %@</source>
         <target>Lähetetyt viestit poistetaan asetetun ajan kuluttua.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Palvelin vaatii valtuutuksen jonojen luomiseen, tarkista salasana</target>
@@ -4923,6 +5009,10 @@ Error: %@</source>
         <target>Palvelintesti epäonnistui!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Palvelimet</target>
@@ -5038,11 +5128,19 @@ Error: %@</source>
         <target>Näytä viimeiset viestit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Näytä esikatselu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Näytä:</target>
@@ -5355,6 +5453,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Sovellus voi ilmoittaa sinulle, kun saat viestejä tai yhteydenottopyyntöjä - avaa asetukset ottaaksesi ne käyttöön.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Tietokannan tunnuslauseen muuttamista ei suoritettu loppuun.</target>
@@ -5531,6 +5633,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Aikavyöhykkeen suojaamiseksi kuva-/äänitiedostot käyttävät UTC:tä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5616,11 +5722,6 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
         <source>Unblock member?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Odottamaton virhe: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Odottamaton siirtotila</target>
@@ -5666,6 +5767,10 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
         <target>Tuntematon virhe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Ellet käytä iOS:n puhelinkäyttöliittymää, ota Älä häiritse -tila käyttöön keskeytysten välttämiseksi.</target>
@@ -5806,6 +5911,14 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>Use only local notifications?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Käytä palvelinta</target>
@@ -6023,11 +6136,23 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>With reduced battery usage.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Väärä tietokannan tunnuslause</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Väärä tunnuslause!</target>
@@ -7142,10 +7267,18 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>tuntematon</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>päivitetty ryhmäprofiili</target>
@@ -7209,6 +7342,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>viikkoa</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>kyllä</target>

apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff

@@ -713,6 +713,10 @@
         <target>Autorise les messages éphémères seulement si votre contact vous l’autorise.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Autoriser la suppression irréversible des messages uniquement si votre contact vous l'autorise. (24 heures)</target>
@@ -808,6 +812,10 @@
         <target>Groupe déjà rejoint !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Se connecter via relais</target>
@@ -1088,6 +1096,10 @@
         <target>Impossible de recevoir le fichier</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Cellulaire</target>
@@ -1284,6 +1296,10 @@
         <target>Confirmer la mise à niveau de la base de données</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Confirmer les paramètres réseau</target>
@@ -1925,7 +1941,7 @@ Cette opération ne peut être annulée !</target>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
         <source>Delivery receipts!</source>
-        <target>Justificatifs de réception!</target>
+        <target>Justificatifs de réception !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Description" xml:space="preserve">
@@ -1948,6 +1964,10 @@ Cette opération ne peut être annulée !</target>
         <target>Appareils de bureau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Développer</target>
@@ -2053,11 +2073,19 @@ Cette opération ne peut être annulée !</target>
         <target>Rechercher sur le réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>N'utilisez PAS SimpleX pour les appels d'urgence.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Faites-le plus tard</target>
@@ -2621,7 +2649,7 @@ Cette opération ne peut être annulée !</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Erreur : %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Cette opération ne peut être annulée !</target>
         <target>Fichier : %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Fichiers &amp; médias</target>
@@ -2775,7 +2807,7 @@ Cette opération ne peut être annulée !</target>
       </trans-unit>
       <trans-unit id="Fix connection?" xml:space="preserve">
         <source>Fix connection?</source>
-        <target>Réparer la connexion?</target>
+        <target>Réparer la connexion ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
@@ -2818,6 +2850,16 @@ Cette opération ne peut être annulée !</target>
         <target>Transféré depuis</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Bureau trouvé</target>
@@ -3633,6 +3675,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Accusés de réception des messages !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Brouillon de message</target>
@@ -3653,6 +3699,14 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Les réactions aux messages sont interdites dans ce groupe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>La source du message reste privée.</target>
@@ -3783,11 +3837,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Connexion probablement supprimée.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Il est fort probable que ce contact ait supprimé la connexion avec vous.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Différents profils de chat</target>
@@ -3818,6 +3867,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Connexion au réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Gestion du réseau</target>
@@ -4359,11 +4412,23 @@ Erreur : %@</target>
         <target>Noms de fichiers privés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Notes privées</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil et connexions au serveur</target>
@@ -4444,11 +4509,20 @@ Erreur : %@</target>
         <target>Interdire l'envoi de messages vocaux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Protéger l'écran de l'app</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Protégez vos profils de chat par un mot de passe !</target>
@@ -4554,11 +4628,6 @@ Erreur : %@</target>
         <target>L'adresse de réception sera changée pour un autre serveur. Le changement d'adresse sera terminé lorsque l'expéditeur sera en ligne.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Réception simultanée</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>La réception du fichier sera interrompue.</target>
@@ -4591,7 +4660,7 @@ Erreur : %@</target>
       </trans-unit>
       <trans-unit id="Reconnect servers?" xml:space="preserve">
         <source>Reconnect servers?</source>
-        <target>Reconnecter les serveurs?</target>
+        <target>Reconnecter les serveurs ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Record updated at" xml:space="preserve">
@@ -4666,7 +4735,7 @@ Erreur : %@</target>
       </trans-unit>
       <trans-unit id="Renegotiate encryption?" xml:space="preserve">
         <source>Renegotiate encryption?</source>
-        <target>Renégocier le chiffrement?</target>
+        <target>Renégocier le chiffrement ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat connection request?" xml:space="preserve">
@@ -4794,6 +4863,10 @@ Erreur : %@</target>
         <target>Serveurs SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Groupes plus sûrs</target>
@@ -5019,6 +5092,14 @@ Erreur : %@</target>
         <target>Envoyer un message dynamique</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Envoi de notifications</target>
@@ -5124,6 +5205,10 @@ Erreur : %@</target>
         <target>Les messages envoyés seront supprimés après une durée déterminée.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Le serveur requiert une autorisation pour créer des files d'attente, vérifiez le mot de passe</target>
@@ -5139,6 +5224,10 @@ Erreur : %@</target>
         <target>Échec du test du serveur !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Serveurs</target>
@@ -5259,11 +5348,19 @@ Erreur : %@</target>
         <target>Voir les derniers messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Afficher l'aperçu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Afficher :</target>
@@ -5586,6 +5683,10 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>L'application peut vous avertir lorsque vous recevez des messages ou des demandes de contact - veuillez ouvrir les paramètres pour les activer.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>La tentative de modification de la phrase secrète de la base de données n'a pas abouti.</target>
@@ -5771,6 +5872,10 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Pour préserver le fuseau horaire, les fichiers image/voix utilisent le système UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Débloquer ce membre ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Erreur inattendue : %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>État de la migration inattendu</target>
@@ -5913,6 +6013,10 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Erreur inconnue</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>À moins que vous utilisiez l'interface d'appel d'iOS, activez le mode "Ne pas déranger" pour éviter les interruptions.</target>
@@ -6060,6 +6164,14 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utilisation de notifications locales uniquement ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Utiliser ce serveur</target>
@@ -6212,7 +6324,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
-        <target>Attention: démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages</target>
+        <target>Attention : démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -6295,11 +6407,23 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Consommation réduite de la batterie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Mauvaise phrase secrète pour la base de données</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Mauvaise phrase secrète !</target>
@@ -7455,11 +7579,19 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>inconnu</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>statut inconnu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>mise à jour du profil de groupe</target>
@@ -7525,6 +7657,10 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>semaines</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>oui</target>

apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff

@@ -570,7 +570,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Kapcsolatfelvétel elfogadása?</target>
+        <target>Kapcsolódási kérelem elfogadása?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -705,22 +705,26 @@
       </trans-unit>
       <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve">
         <source>Allow calls only if your contact allows them.</source>
-        <target>Hívások engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.</target>
+        <target>A hívások kezdeményezése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
-        <target>Eltűnő üzenetek engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi az ön számára.</target>
+        <target>Az eltűnő üzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi az ön számára.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
-        <target>Üzenet végleges törlésének engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi. (24 óra)</target>
+        <target>Az üzenetek végleges törlése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
         <source>Allow message reactions only if your contact allows them.</source>
-        <target>Üzenetreakciók engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.</target>
+        <target>Az üzenetreakciók küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions." xml:space="preserve">
@@ -735,7 +739,7 @@
       </trans-unit>
       <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
         <source>Allow sending disappearing messages.</source>
-        <target>Eltűnő üzenetek küldésének engedélyezése.</target>
+        <target>Az eltűnő üzenetek küldése engedélyezve van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -760,7 +764,7 @@
       </trans-unit>
       <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
         <source>Allow voice messages only if your contact allows them.</source>
-        <target>Hangüzenetek küldésének engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.</target>
+        <target>A hangüzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow voice messages?" xml:space="preserve">
@@ -770,27 +774,27 @@
       </trans-unit>
       <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve">
         <source>Allow your contacts adding message reactions.</source>
-        <target>Ismerősök általi üzenetreakciók hozzáadásának engedélyezése.</target>
+        <target>Az üzenetreakciók küldése engedélyezve van az ismerősei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to call you." xml:space="preserve">
         <source>Allow your contacts to call you.</source>
-        <target>Hívások engedélyezése ismerősök számára.</target>
+        <target>A hívások kezdeményezése engedélyezve van az ismerősei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
-        <target>Elküldött üzenetek végleges törlésének engedélyezése az ismerősök számára. (24 óra)</target>
+        <target>Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
         <source>Allow your contacts to send disappearing messages.</source>
-        <target>Eltűnő üzenetek engedélyezése ismerősök számára.</target>
+        <target>Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
-        <target>Hangüzenetek küldésének engedélyezése ismerősök számára.</target>
+        <target>A hangüzenetek küldése engedélyezve van az ismerősei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Already connected?" xml:space="preserve">
@@ -808,6 +812,10 @@
         <target>A csatlakozás folyamatban van a csoporthoz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Mindig használjon átjátszó kiszolgálót</target>
@@ -905,12 +913,12 @@
       </trans-unit>
       <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
         <source>Audio/video calls are prohibited.</source>
-        <target>A hang- és videóhívások le vannak tiltva.</target>
+        <target>A hívások kezdeményezése le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Authentication cancelled" xml:space="preserve">
         <source>Authentication cancelled</source>
-        <target>Hitelesítés megszakítva</target>
+        <target>Hitelesítés visszavonva</target>
         <note>PIN entry</note>
       </trans-unit>
       <trans-unit id="Authentication failed" xml:space="preserve">
@@ -935,7 +943,7 @@
       </trans-unit>
       <trans-unit id="Auto-accept contact requests" xml:space="preserve">
         <source>Auto-accept contact requests</source>
-        <target>Ismerős jelölések automatikus elfogadása</target>
+        <target>Kapcsolódási kérelmek automatikus elfogadása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Auto-accept images" xml:space="preserve">
@@ -995,7 +1003,7 @@
       </trans-unit>
       <trans-unit id="Block member for all?" xml:space="preserve">
         <source>Block member for all?</source>
-        <target>Tag letiltása mindenki számára?</target>
+        <target>Mindenki számára letiltja ezt a tagot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member?" xml:space="preserve">
@@ -1020,7 +1028,7 @@
       </trans-unit>
       <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
         <source>Both you and your contact can make calls.</source>
-        <target>Mindkét fél tud hívásokat indítani.</target>
+        <target>Mindkét fél tud hívásokat kezdeményezni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can send disappearing messages." xml:space="preserve">
@@ -1088,6 +1096,10 @@
         <target>Nem lehet fogadni a fájlt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Mobilhálózat</target>
@@ -1284,6 +1296,10 @@
         <target>Adatbázis frissítés megerősítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Hálózati beállítások megerősítése</target>
@@ -1465,7 +1481,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
         <source>Contacts can mark messages for deletion; you will be able to view them.</source>
-        <target>Az ismerősök törlésre jelölhetnek üzeneteket ; megtekintheti őket.</target>
+        <target>Az ismerősei törlésre jelölhetnek üzeneteket; ön majd meg tudja nézni azokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
@@ -1738,7 +1754,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete after" xml:space="preserve">
         <source>Delete after</source>
-        <target>Törlés miután</target>
+        <target>Törlés ennyi idő után</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete all files" xml:space="preserve">
@@ -1865,7 +1881,7 @@ Ez a művelet nem vonható vissza!</target>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
-        <target>Üzenetek törlése miután</target>
+        <target>Üzenetek törlése ennyi idő után</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete old database" xml:space="preserve">
@@ -1948,6 +1964,10 @@ Ez a művelet nem vonható vissza!</target>
         <target>Számítógépek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Fejlesztés</target>
@@ -1985,7 +2005,7 @@ Ez a művelet nem vonható vissza!</target>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
         <source>Direct messages between members are prohibited in this group.</source>
-        <target>Ebben a csoportban tiltott a tagok közötti közvetlen üzenetek küldése.</target>
+        <target>A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2015,7 +2035,7 @@ Ez a művelet nem vonható vissza!</target>
       </trans-unit>
       <trans-unit id="Disappearing messages are prohibited in this chat." xml:space="preserve">
         <source>Disappearing messages are prohibited in this chat.</source>
-        <target>Az eltűnő üzenetek le vannak tiltva ebben a csevegésben.</target>
+        <target>Az eltűnő üzenetek küldése le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
@@ -2053,11 +2073,19 @@ Ez a művelet nem vonható vissza!</target>
         <target>Felfedezés helyi hálózaton keresztül</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>NE használja a SimpleX-et segélyhívásokhoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Későbbre halaszt</target>
@@ -2621,7 +2649,7 @@ Ez a művelet nem vonható vissza!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Hiba: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Ez a művelet nem vonható vissza!</target>
         <target>Fájl: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Fájlok és média</target>
@@ -2818,6 +2850,16 @@ Ez a művelet nem vonható vissza!</target>
         <target>Továbbítva innen:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Megtalált számítógép</target>
@@ -3090,7 +3132,7 @@ Ez a művelet nem vonható vissza!</target>
       </trans-unit>
       <trans-unit id="If you enter your self-destruct passcode while opening the app:" xml:space="preserve">
         <source>If you enter your self-destruct passcode while opening the app:</source>
-        <target>Ha az alkalmazás megnyitásakor az önmegsemmisítő jelkódot megadásra kerül:</target>
+        <target>Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." xml:space="preserve">
@@ -3337,12 +3379,12 @@ Ez a művelet nem vonható vissza!</target>
       </trans-unit>
       <trans-unit id="Irreversible message deletion is prohibited in this chat." xml:space="preserve">
         <source>Irreversible message deletion is prohibited in this chat.</source>
-        <target>Ebben a csevegésben az üzenetek végleges törlése le van tiltva.</target>
+        <target>Az üzenetek végleges törlése le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
         <source>Irreversible message deletion is prohibited in this group.</source>
-        <target>Ebben a csoportban az üzenetek végleges törlése le van tiltva.</target>
+        <target>Az üzenetek végleges törlése le van tiltva ebben a csoportban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -3470,7 +3512,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Leave" xml:space="preserve">
         <source>Leave</source>
-        <target>Elhagy</target>
+        <target>Elhagyás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -3585,12 +3627,12 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Mark read" xml:space="preserve">
         <source>Mark read</source>
-        <target>Megjelölés olvasottként</target>
+        <target>Olvasottként jelölés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mark verified" xml:space="preserve">
         <source>Mark verified</source>
-        <target>Ellenőrzöttként jelölve</target>
+        <target>Hitelesítés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Markdown in messages" xml:space="preserve">
@@ -3633,6 +3675,10 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Üzenetkézbesítési bizonylatok!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Üzenetvázlat</target>
@@ -3645,12 +3691,20 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message reactions are prohibited in this chat." xml:space="preserve">
         <source>Message reactions are prohibited in this chat.</source>
-        <target>Az üzenetreakciók ebben a csevegésben le vannak tiltva.</target>
+        <target>Az üzenetreakciók küldése le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
         <source>Message reactions are prohibited in this group.</source>
-        <target>Ebben a csoportban az üzenetreakciók le vannak tiltva.</target>
+        <target>Az üzenetreakciók küldése le van tiltva ebben a csoportban.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -3783,11 +3837,6 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Valószínűleg ez a kapcsolat törlésre került.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Valószínűleg ez az ismerős törölte önnel a kapcsolatot.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Több csevegőprofil</target>
@@ -3818,6 +3867,10 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Internetkapcsolat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Hálózatkezelés</target>
@@ -4079,7 +4132,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Only your contact can send disappearing messages." xml:space="preserve">
         <source>Only your contact can send disappearing messages.</source>
-        <target>Csak az ismerős tud eltűnő üzeneteket küldeni.</target>
+        <target>Csak az ismerőse tud eltűnő üzeneteket küldeni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
@@ -4359,11 +4412,23 @@ Hiba: %@</target>
         <target>Privát fájl nevek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Privát jegyzetek</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil és kiszolgálókapcsolatok</target>
@@ -4401,7 +4466,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit audio/video calls." xml:space="preserve">
         <source>Prohibit audio/video calls.</source>
-        <target>Hang- és videóhívások tiltása.</target>
+        <target>A hívások kezdeményezése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit irreversible message deletion." xml:space="preserve">
@@ -4411,7 +4476,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit message reactions." xml:space="preserve">
         <source>Prohibit message reactions.</source>
-        <target>Üzenetreakciók tiltása.</target>
+        <target>Az üzenetreakciók küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit messages reactions." xml:space="preserve">
@@ -4426,12 +4491,12 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
         <source>Prohibit sending direct messages to members.</source>
-        <target>Közvetlen üzenetek küldésének letiltása a tagok számára.</target>
+        <target>A közvetlen üzenetek küldése le van tiltva a tagok között.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending disappearing messages." xml:space="preserve">
         <source>Prohibit sending disappearing messages.</source>
-        <target>Eltűnő üzenetek küldésének letiltása.</target>
+        <target>Az eltűnő üzenetek küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending files and media." xml:space="preserve">
@@ -4441,7 +4506,11 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
         <source>Prohibit sending voice messages.</source>
-        <target>Hangüzenetek küldésének letiltása.</target>
+        <target>A hangüzenetek küldése le van tiltva.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
@@ -4449,6 +4518,11 @@ Hiba: %@</target>
         <target>Alkalmazás képernyőjének védelme</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Csevegési profiljok védelme jelszóval!</target>
@@ -4554,11 +4628,6 @@ Hiba: %@</target>
         <target>A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Egyidejű fogadás</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>A fájl fogadása leállt.</target>
@@ -4641,12 +4710,12 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Remove member" xml:space="preserve">
         <source>Remove member</source>
-        <target>Tag eltávolítása</target>
+        <target>Eltávolítás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove member?" xml:space="preserve">
         <source>Remove member?</source>
-        <target>Tag eltávolítása?</target>
+        <target>Biztosan eltávolítja?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove passphrase from keychain?" xml:space="preserve">
@@ -4794,6 +4863,10 @@ Hiba: %@</target>
         <target>Üzenetküldő (SMP) kiszolgálók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Biztonságosabb csoportok</target>
@@ -4911,7 +4984,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
-        <target>Kód beolvasása</target>
+        <target>Beolvasás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Scan security code from your contact's app." xml:space="preserve">
@@ -5019,6 +5092,14 @@ Hiba: %@</target>
         <target>Élő üzenet küldése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Értesítések küldése</target>
@@ -5051,7 +5132,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
-        <target>A küldő megszakította a fájl átvitelt.</target>
+        <target>A fájl küldője visszavonta az átvitelt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
@@ -5124,6 +5205,10 @@ Hiba: %@</target>
         <target>Az elküldött üzenetek törlésre kerülnek a beállított idő után.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>A kiszolgálónak engedélyre van szüksége a várólisták létrehozásához, ellenőrizze jelszavát</target>
@@ -5139,6 +5224,10 @@ Hiba: %@</target>
         <target>Sikertelen kiszolgáló-teszt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Kiszolgálók</target>
@@ -5259,11 +5348,19 @@ Hiba: %@</target>
         <target>Utolsó üzenetek megjelenítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Előnézet megjelenítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Megjelenítés:</target>
@@ -5326,7 +5423,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
         <source>SimpleX links are prohibited in this group.</source>
-        <target>A SimpleX hivatkozások küldése ebben a csoportban le van tiltva.</target>
+        <target>A SimpleX hivatkozások küldése le van tiltva ebben a csoportban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -5586,6 +5683,10 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
         <target>Az alkalmazás értesíteni fogja, amikor üzeneteket vagy kapcsolatfelvételi kéréseket kap – beállítások megnyitása az engedélyezéshez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.</target>
@@ -5598,7 +5699,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
         <source>The connection you accepted will be cancelled!</source>
-        <target>Az ön által elfogadott kapcsolat megszakad!</target>
+        <target>Az ön által elfogadott kapcsolat vissza lesz vonva!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve">
@@ -5771,6 +5872,10 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
         <target>Az időzóna védelme érdekében a kép-/hangfájlok UTC-t használnak.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
         <target>Tag feloldása?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Váratlan hiba: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Váratlan átköltöztetési állapot</target>
@@ -5913,6 +6013,10 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
         <target>Ismeretlen hiba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Hacsak nem az iOS hívási felületét használja, engedélyezze a Ne zavarjanak módot a megszakítások elkerülése érdekében.</target>
@@ -6060,6 +6164,14 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>Csak helyi értesítések használata?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Kiszolgáló használata</target>
@@ -6167,7 +6279,7 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
       </trans-unit>
       <trans-unit id="Voice messages are prohibited in this chat." xml:space="preserve">
         <source>Voice messages are prohibited in this chat.</source>
-        <target>A hangüzenetek le vannak tiltva ebben a csevegésben.</target>
+        <target>A hangüzenetek küldése le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
@@ -6295,11 +6407,23 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>Csökkentett akkumulátorhasználattal.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Téves adatbázis jelmondat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Téves jelmondat!</target>
@@ -6642,8 +6766,8 @@ Kapcsolódási kérés megismétlése?</target>
       <trans-unit id="Your contact needs to be online for the connection to complete.&#10;You can cancel this connection and remove the contact (and try later with a new link)." xml:space="preserve">
         <source>Your contact needs to be online for the connection to complete.
 You can cancel this connection and remove the contact (and try later with a new link).</source>
-        <target>Az ismerősnek online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.
-Megszakíthatja ezt a kapcsolatfelvételt és törölheti az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).</target>
+        <target>Az ismerősének online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.
+Visszavonhatja ezt a kapcsolatfelvételt és törölheti az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -6850,7 +6974,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
-        <target>%@ törölve</target>
+        <target>%@ visszavonva</target>
         <note>feature offered item</note>
       </trans-unit>
       <trans-unit id="changed address for you" xml:space="preserve">
@@ -6965,7 +7089,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
-        <target>szerző</target>
+        <target>készítő</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="custom" xml:space="preserve">
@@ -7185,12 +7309,12 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="invited" xml:space="preserve">
         <source>invited</source>
-        <target>meghívta</target>
+        <target>meghíva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="invited %@" xml:space="preserve">
         <source>invited %@</source>
-        <target>meghívta %@-t</target>
+        <target>meghívta őt: %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="invited to connect" xml:space="preserve">
@@ -7200,7 +7324,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="invited via your group link" xml:space="preserve">
         <source>invited via your group link</source>
-        <target>meghívta a csoport hivatkozásán keresztül</target>
+        <target>meghíva az ön csoport hivatkozásán keresztül</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="italic" xml:space="preserve">
@@ -7235,7 +7359,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
         <source>connected</source>
-        <target>kapcsolódva</target>
+        <target>kapcsolódott</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="message received" xml:space="preserve">
@@ -7455,14 +7579,22 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
         <target>ismeretlen</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>ismeretlen státusz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
-        <target>módosított csoport profil</target>
+        <target>frissítette a csoport profilját</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="updated profile" xml:space="preserve">
@@ -7507,7 +7639,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="waiting for answer…" xml:space="preserve">
         <source>waiting for answer…</source>
-        <target>várakozás válaszra…</target>
+        <target>várakozás a válaszra…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="waiting for confirmation…" xml:space="preserve">
@@ -7525,6 +7657,10 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
         <target>hét</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>igen</target>

apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff

@@ -713,6 +713,10 @@
         <target>Consenti i messaggi a tempo solo se il contatto li consente a te.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Consenti l'eliminazione irreversibile dei messaggi solo se il contatto la consente a te. (24 ore)</target>
@@ -808,6 +812,10 @@
         <target>Già in ingresso nel gruppo!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Connetti via relay</target>
@@ -1088,6 +1096,10 @@
         <target>Impossibile ricevere il file</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Mobile</target>
@@ -1284,6 +1296,10 @@
         <target>Conferma aggiornamenti database</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Conferma le impostazioni di rete</target>
@@ -1948,6 +1964,10 @@ Non è reversibile!</target>
         <target>Dispositivi desktop</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Sviluppa</target>
@@ -2053,11 +2073,19 @@ Non è reversibile!</target>
         <target>Individua via rete locale</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>NON usare SimpleX per chiamate di emergenza.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Fallo dopo</target>
@@ -2621,7 +2649,7 @@ Non è reversibile!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Errore: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Non è reversibile!</target>
         <target>File: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>File e multimediali</target>
@@ -2818,6 +2850,16 @@ Non è reversibile!</target>
         <target>Inoltrato da</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Desktop trovato</target>
@@ -3633,6 +3675,10 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Ricevute di consegna dei messaggi!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Bozza dei messaggi</target>
@@ -3653,6 +3699,14 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Le reazioni ai messaggi sono vietate in questo gruppo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>La fonte del messaggio resta privata.</target>
@@ -3783,11 +3837,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Probabilmente questa connessione è stata eliminata.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Probabilmente questo contatto ha eliminato la connessione con te.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Profili di chat multipli</target>
@@ -3818,6 +3867,10 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Connessione di rete</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Gestione della rete</target>
@@ -4359,11 +4412,23 @@ Errore: %@</target>
         <target>Nomi di file privati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Note private</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profilo e connessioni al server</target>
@@ -4444,11 +4509,20 @@ Errore: %@</target>
         <target>Proibisci l'invio di messaggi vocali.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Proteggi la schermata dell'app</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Proteggi i tuoi profili di chat con una password!</target>
@@ -4554,11 +4628,6 @@ Errore: %@</target>
         <target>L'indirizzo di ricezione verrà cambiato in un server diverso. La modifica dell'indirizzo verrà completata dopo che il mittente sarà in linea.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Ricezione concomitanza</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>La ricezione del file verrà interrotta.</target>
@@ -4794,6 +4863,10 @@ Errore: %@</target>
         <target>Server SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Gruppi più sicuri</target>
@@ -5019,6 +5092,14 @@ Errore: %@</target>
         <target>Invia messaggio in diretta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Invia notifiche</target>
@@ -5124,6 +5205,10 @@ Errore: %@</target>
         <target>I messaggi inviati verranno eliminati dopo il tempo impostato.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Il server richiede l'autorizzazione di creare code, controlla la password</target>
@@ -5139,6 +5224,10 @@ Errore: %@</target>
         <target>Test del server fallito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Server</target>
@@ -5259,11 +5348,19 @@ Errore: %@</target>
         <target>Mostra ultimi messaggi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Mostra anteprima</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Mostra:</target>
@@ -5586,6 +5683,10 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>L'app può avvisarti quando ricevi messaggi o richieste di contatto: apri le impostazioni per attivare.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Il tentativo di cambiare la password del database non è stato completato.</target>
@@ -5771,6 +5872,10 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Per proteggere il fuso orario, i file immagine/vocali usano UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Sbloccare il membro?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Errore imprevisto: % @</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Stato di migrazione imprevisto</target>
@@ -5913,6 +6013,10 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Errore sconosciuto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>A meno che non utilizzi l'interfaccia di chiamata iOS, attiva la modalità Non disturbare per evitare interruzioni.</target>
@@ -6060,6 +6164,14 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usare solo notifiche locali?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Usa il server</target>
@@ -6295,11 +6407,23 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Con consumo di batteria ridotto.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Password del database sbagliata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Password sbagliata!</target>
@@ -7455,11 +7579,19 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>sconosciuto</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>stato sconosciuto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>ha aggiornato il profilo del gruppo</target>
@@ -7525,6 +7657,10 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>settimane</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>sì</target>

apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff

@@ -703,6 +703,10 @@
         <target>連絡先が許可している場合のみ消えるメッセージを許可する。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>送信相手も永久メッセージ削除を許可する時のみに許可する。</target>
@@ -798,6 +802,10 @@
         <target>すでにグループに参加しています！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>常にリレーを経由する</target>
@@ -1064,6 +1072,10 @@
         <target>ファイル受信ができません</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <note>No comment provided by engineer.</note>
@@ -1255,6 +1267,10 @@
         <target>データベースのアップグレードを確認</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <note>No comment provided by engineer.</note>
@@ -1887,6 +1903,10 @@ This cannot be undone!</source>
         <source>Desktop devices</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>開発</target>
@@ -1990,11 +2010,19 @@ This cannot be undone!</source>
         <source>Discover via local network</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>後で行う</target>
@@ -2534,7 +2562,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>エラー : %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2623,6 +2651,10 @@ This cannot be undone!</source>
         <target>ファイル: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>ファイルとメディア</target>
@@ -2721,6 +2753,16 @@ This cannot be undone!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <note>No comment provided by engineer.</note>
@@ -3504,6 +3546,10 @@ This is your link for group %@!</source>
         <source>Message delivery receipts!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>メッセージの下書き</target>
@@ -3524,6 +3570,14 @@ This is your link for group %@!</source>
         <target>このグループではメッセージへのリアクションは禁止されています。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -3641,11 +3695,6 @@ This is your link for group %@!</source>
         <target>おそらく、この接続は削除されています。</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>恐らくこの連絡先があなたとの接続を削除しました。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>複数チャットのプロフィール</target>
@@ -3675,6 +3724,10 @@ This is your link for group %@!</source>
         <source>Network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <note>No comment provided by engineer.</note>
@@ -4195,10 +4248,22 @@ Error: %@</source>
         <target>プライベートなファイル名</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>プロフィールとサーバ接続</target>
@@ -4275,11 +4340,20 @@ Error: %@</source>
         <target>音声メッセージを使用禁止にする。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>アプリ画面を守る</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>チャットのプロフィールをパスワードで保護します！</target>
@@ -4381,10 +4455,6 @@ Error: %@</source>
         <target>開発中の機能です！相手のクライアントが4.2でなければ機能しません。アドレス変更が完了すると、会話にメッセージが出ます。連絡相手 (またはグループのメンバー) からメッセージを受信できないかをご確認ください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>ファイルの受信を停止します。</target>
@@ -4612,6 +4682,10 @@ Error: %@</source>
         <target>SMPサーバ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <note>No comment provided by engineer.</note>
@@ -4829,6 +4903,14 @@ Error: %@</source>
         <target>ライブメッセージを送信</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>通知を送信する</target>
@@ -4926,6 +5008,10 @@ Error: %@</source>
         <target>一定時間が経ったら送信されたメッセージが削除されます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>キューを作成するにはサーバーの認証が必要です。パスワードを確認してください</target>
@@ -4941,6 +5027,10 @@ Error: %@</source>
         <target>サーバテスト失敗！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>サーバ</target>
@@ -5056,11 +5146,19 @@ Error: %@</source>
         <target>最新のメッセージを表示</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>プレビューを表示</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>表示する：</target>
@@ -5374,6 +5472,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>アプリは、メッセージや連絡先のリクエストを受信したときに通知することができます - 設定を開いて有効にしてください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>データベースのパスフレーズ変更が完了してません。</target>
@@ -5549,6 +5651,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>時間帯を漏らさないために、画像と音声ファイルはUTCを使います。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5634,11 +5740,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>Unblock member?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>予期しないエラー: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>予期しない移行状態</target>
@@ -5684,6 +5785,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>不明なエラー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>iOS 通話インターフェイスを使用しない場合は、中断を避けるために「おやすみモード」を有効にしてください。</target>
@@ -5824,6 +5929,14 @@ To connect, please ask your contact to create another connection link and check
         <source>Use only local notifications?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>サーバを使う</target>
@@ -6041,11 +6154,23 @@ To connect, please ask your contact to create another connection link and check
         <source>With reduced battery usage.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>データベースのパスフレーズが違います</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>パスフレーズが違います！</target>
@@ -7160,10 +7285,18 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>不明</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>グループプロフィールを更新しました</target>
@@ -7227,6 +7360,10 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>週</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>はい</target>

apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff

@@ -713,6 +713,10 @@
         <target>Sta verdwijnende berichten alleen toe als uw contact dit toestaat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Sta het onomkeerbaar verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)</target>
@@ -808,6 +812,10 @@
         <target>Al lid van de groep!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Altijd relay gebruiken</target>
@@ -1088,6 +1096,10 @@
         <target>Kan bestand niet ontvangen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Mobiel</target>
@@ -1284,6 +1296,10 @@
         <target>Bevestig database upgrades</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Bevestig netwerk instellingen</target>
@@ -1948,6 +1964,10 @@ Dit kan niet ongedaan gemaakt worden!</target>
         <target>Desktop apparaten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Ontwikkelen</target>
@@ -2053,11 +2073,19 @@ Dit kan niet ongedaan gemaakt worden!</target>
         <target>Ontdek via het lokale netwerk</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>Gebruik SimpleX NIET voor noodoproepen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Doe het later</target>
@@ -2621,7 +2649,7 @@ Dit kan niet ongedaan gemaakt worden!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fout: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Dit kan niet ongedaan gemaakt worden!</target>
         <target>Bestand: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Bestanden en media</target>
@@ -2818,6 +2850,16 @@ Dit kan niet ongedaan gemaakt worden!</target>
         <target>Doorgestuurd vanuit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Desktop gevonden</target>
@@ -3633,6 +3675,10 @@ Dit is jouw link voor groep %@!</target>
         <target>Ontvangst bevestiging voor berichten!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Concept bericht</target>
@@ -3653,6 +3699,14 @@ Dit is jouw link voor groep %@!</target>
         <target>Reacties op berichten zijn verboden in deze groep.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Berichtbron blijft privé.</target>
@@ -3783,11 +3837,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Hoogstwaarschijnlijk is deze verbinding verwijderd.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Hoogstwaarschijnlijk heeft dit contact de verbinding met jou verwijderd.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Meerdere chat profielen</target>
@@ -3818,6 +3867,10 @@ Dit is jouw link voor groep %@!</target>
         <target>Netwerkverbinding</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Netwerkbeheer</target>
@@ -4359,11 +4412,23 @@ Fout: %@</target>
         <target>Privé bestandsnamen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Privé notities</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profiel- en serververbindingen</target>
@@ -4444,11 +4509,20 @@ Fout: %@</target>
         <target>Verbieden het verzenden van spraak berichten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>App scherm verbergen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Bescherm je chat profielen met een wachtwoord!</target>
@@ -4554,11 +4628,6 @@ Fout: %@</target>
         <target>Het ontvangstadres wordt gewijzigd naar een andere server. Adres wijziging wordt voltooid nadat de afzender online is.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Gelijktijdig ontvangen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Het ontvangen van het bestand wordt gestopt.</target>
@@ -4794,6 +4863,10 @@ Fout: %@</target>
         <target>SMP servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Veiligere groepen</target>
@@ -5019,6 +5092,14 @@ Fout: %@</target>
         <target>Stuur een livebericht</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Meldingen verzenden</target>
@@ -5124,6 +5205,10 @@ Fout: %@</target>
         <target>Verzonden berichten worden na ingestelde tijd verwijderd.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Server vereist autorisatie om wachtrijen te maken, controleer wachtwoord</target>
@@ -5139,6 +5224,10 @@ Fout: %@</target>
         <target>Servertest mislukt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Servers</target>
@@ -5259,11 +5348,19 @@ Fout: %@</target>
         <target>Laat laatste berichten zien</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Toon voorbeeld</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Toon:</target>
@@ -5586,6 +5683,10 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
         <target>De app kan u op de hoogte stellen wanneer u berichten of contact verzoeken ontvangt - open de instellingen om dit in te schakelen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>De poging om het wachtwoord van de database te wijzigen is niet voltooid.</target>
@@ -5771,6 +5872,10 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
         <target>Om de tijdzone te beschermen, gebruiken afbeeldings-/spraakbestanden UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
         <target>Lid deblokkeren?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Onverwachte fout: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Onverwachte migratiestatus</target>
@@ -5913,6 +6013,10 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
         <target>Onbekende fout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Schakel de modus Niet storen in om onderbrekingen te voorkomen, tenzij u de iOS-oproepinterface gebruikt.</target>
@@ -6060,6 +6164,14 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Alleen lokale meldingen gebruiken?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Gebruik server</target>
@@ -6295,11 +6407,23 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Met verminderd batterijgebruik.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Verkeerd wachtwoord voor de database</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Verkeerd wachtwoord!</target>
@@ -7455,11 +7579,19 @@ SimpleX servers kunnen uw profiel niet zien.</target>
         <target>onbekend</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>onbekende status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>bijgewerkt groep profiel</target>
@@ -7525,6 +7657,10 @@ SimpleX servers kunnen uw profiel niet zien.</target>
         <target>weken</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>Ja</target>

apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff

@@ -713,6 +713,10 @@
         <target>Zezwól na znikające wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Zezwalaj na nieodwracalne usuwanie wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli. (24 godziny)</target>
@@ -808,6 +812,10 @@
         <target>Już dołączono do grupy!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Zawsze używaj przekaźnika</target>
@@ -1088,6 +1096,10 @@
         <target>Nie można odebrać pliku</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Sieć komórkowa</target>
@@ -1284,6 +1296,10 @@
         <target>Potwierdź aktualizacje bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Potwierdź ustawienia sieciowe</target>
@@ -1948,6 +1964,10 @@ To nie może być cofnięte!</target>
         <target>Urządzenia komputerowe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Deweloperskie</target>
@@ -2053,11 +2073,19 @@ To nie może być cofnięte!</target>
         <target>Odkryj przez sieć lokalną</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>NIE używaj SimpleX do połączeń alarmowych.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Zrób to później</target>
@@ -2621,7 +2649,7 @@ To nie może być cofnięte!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Błąd: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ To nie może być cofnięte!</target>
         <target>Plik: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Pliki i media</target>
@@ -2818,6 +2850,16 @@ To nie może być cofnięte!</target>
         <target>Przekazane dalej od</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Znaleziono komputer</target>
@@ -3633,6 +3675,10 @@ To jest twój link do grupy %@!</target>
         <target>Potwierdzenia dostarczenia wiadomości!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Wersja robocza wiadomości</target>
@@ -3653,6 +3699,14 @@ To jest twój link do grupy %@!</target>
         <target>Reakcje wiadomości są zabronione w tej grupie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Źródło wiadomości pozostaje prywatne.</target>
@@ -3783,11 +3837,6 @@ To jest twój link do grupy %@!</target>
         <target>Najprawdopodobniej to połączenie jest usunięte.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Najprawdopodobniej ten kontakt usunął połączenie z Tobą.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Wiele profili czatu</target>
@@ -3818,6 +3867,10 @@ To jest twój link do grupy %@!</target>
         <target>Połączenie z siecią</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Zarządzenie sieciowe</target>
@@ -4359,11 +4412,23 @@ Błąd: %@</target>
         <target>Prywatne nazwy plików</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Prywatne notatki</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil i połączenia z serwerem</target>
@@ -4444,11 +4509,20 @@ Błąd: %@</target>
         <target>Zabroń wysyłania wiadomości głosowych.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Chroń ekran aplikacji</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Chroń swoje profile czatu hasłem!</target>
@@ -4554,11 +4628,6 @@ Błąd: %@</target>
         <target>Adres odbiorczy zostanie zmieniony na inny serwer. Zmiana adresu zostanie zakończona gdy nadawca będzie online.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Konkurencyjne odbieranie</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Odbieranie pliku zostanie przerwane.</target>
@@ -4794,6 +4863,10 @@ Błąd: %@</target>
         <target>Serwery SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Bezpieczniejsze grupy</target>
@@ -5019,6 +5092,14 @@ Błąd: %@</target>
         <target>Wyślij wiadomość na żywo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Wyślij powiadomienia</target>
@@ -5124,6 +5205,10 @@ Błąd: %@</target>
         <target>Wysłane wiadomości zostaną usunięte po ustawionym czasie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Serwer wymaga autoryzacji do tworzenia kolejek, sprawdź hasło</target>
@@ -5139,6 +5224,10 @@ Błąd: %@</target>
         <target>Test serwera nie powiódł się!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Serwery</target>
@@ -5259,11 +5348,19 @@ Błąd: %@</target>
         <target>Pokaż ostatnie wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Pokaż podgląd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Pokaż:</target>
@@ -5586,6 +5683,10 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Aplikacja może powiadamiać Cię, gdy otrzymujesz wiadomości lub prośby o kontakt — otwórz ustawienia, aby włączyć.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Próba zmiany hasła bazy danych nie została zakończona.</target>
@@ -5771,6 +5872,10 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Aby chronić strefę czasową, pliki obrazów/głosów używają UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
         <target>Odblokować członka?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Nieoczekiwany błąd: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Nieoczekiwany stan migracji</target>
@@ -5913,6 +6013,10 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
         <target>Nieznany błąd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>O ile nie korzystasz z interfejsu połączeń systemu iOS, włącz tryb Nie przeszkadzać, aby uniknąć przerywania.</target>
@@ -6060,6 +6164,14 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Używać tylko lokalnych powiadomień?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Użyj serwera</target>
@@ -6295,11 +6407,23 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Ze zmniejszonym zużyciem baterii.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Nieprawidłowe hasło bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Nieprawidłowe hasło!</target>
@@ -7455,11 +7579,19 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>nieznany</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>nieznany status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>zaktualizowano profil grupy</target>
@@ -7525,6 +7657,10 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>tygodnie</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>tak</target>

apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff

@@ -713,6 +713,10 @@
         <target>Разрешить исчезающие сообщения, только если Ваш контакт разрешает их Вам.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Разрешить необратимое удаление сообщений, только если Ваш контакт разрешает это Вам. (24 часа)</target>
@@ -808,6 +812,10 @@
         <target>Вступление в группу уже начато!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Всегда соединяться через relay</target>
@@ -1088,6 +1096,10 @@
         <target>Невозможно получить файл</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Мобильная сеть</target>
@@ -1284,6 +1296,10 @@
         <target>Подтвердить обновление базы данных</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Подтвердите настройки сети</target>
@@ -1948,6 +1964,10 @@ This cannot be undone!</source>
         <target>Компьютеры</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Для разработчиков</target>
@@ -2053,11 +2073,19 @@ This cannot be undone!</source>
         <target>Обнаружение по локальной сети</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Отложить</target>
@@ -2621,7 +2649,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Ошибка: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ This cannot be undone!</source>
         <target>Файл: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Файлы и медиа</target>
@@ -2818,6 +2850,16 @@ This cannot be undone!</source>
         <target>Переслано из</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Компьютер найден</target>
@@ -3633,6 +3675,10 @@ This is your link for group %@!</source>
         <target>Отчеты о доставке сообщений!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Черновик сообщения</target>
@@ -3653,6 +3699,14 @@ This is your link for group %@!</source>
         <target>Реакции на сообщения запрещены в этой группе.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Источник сообщения остаётся конфиденциальным.</target>
@@ -3783,11 +3837,6 @@ This is your link for group %@!</source>
         <target>Скорее всего, соединение удалено.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Скорее всего, этот контакт удалил соединение с Вами.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Много профилей чата</target>
@@ -3818,6 +3867,10 @@ This is your link for group %@!</source>
         <target>Интернет-соединение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Статус сети</target>
@@ -4359,11 +4412,23 @@ Error: %@</source>
         <target>Защищенные имена файлов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Личные заметки</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Профиль и соединения на сервере</target>
@@ -4444,11 +4509,20 @@ Error: %@</source>
         <target>Запретить отправлять голосовые сообщений.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Защитить экран приложения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Защитите Ваши профили чата паролем!</target>
@@ -4554,11 +4628,6 @@ Error: %@</source>
         <target>Адрес получения сообщений будет перемещён на другой сервер. Изменение адреса завершится после того как отправитель будет онлайн.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Одновременный приём</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Приём файла будет прекращён.</target>
@@ -4794,6 +4863,10 @@ Error: %@</source>
         <target>SMP серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Более безопасные группы</target>
@@ -5019,6 +5092,14 @@ Error: %@</source>
         <target>Отправить живое сообщение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Отправлять уведомления</target>
@@ -5124,6 +5205,10 @@ Error: %@</source>
         <target>Отправленные сообщения будут удалены через заданное время.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Сервер требует авторизации для создания очередей, проверьте пароль</target>
@@ -5139,6 +5224,10 @@ Error: %@</source>
         <target>Ошибка теста сервера!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Серверы</target>
@@ -5259,11 +5348,19 @@ Error: %@</source>
         <target>Показывать последние сообщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Показывать уведомления</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Показать:</target>
@@ -5586,6 +5683,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Приложение может посылать Вам уведомления о сообщениях и запросах на соединение - уведомления можно включить в Настройках.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Попытка поменять пароль базы данных не была завершена.</target>
@@ -5771,6 +5872,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Чтобы защитить Ваш часовой пояс, файлы картинок и голосовых сообщений используют UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <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>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Неожиданная ошибка при перемещении данных чата</target>
@@ -5913,6 +6013,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Неизвестная ошибка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Если Вы не используете интерфейс iOS, включите режим Не отвлекать, чтобы звонок не прерывался.</target>
@@ -6060,6 +6164,14 @@ 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="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Использовать сервер</target>
@@ -6295,11 +6407,23 @@ 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="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Неправильный пароль базы данных</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Неправильный пароль!</target>
@@ -7455,11 +7579,19 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>неизвестно</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>неизвестный статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>обновил(а) профиль группы</target>
@@ -7525,6 +7657,10 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>недель</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>да</target>

apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff

@@ -677,6 +677,10 @@
         <target>อนุญาตให้ข้อความที่หายไปเฉพาะในกรณีที่ผู้ติดต่อของคุณอนุญาตเท่านั้น.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>อนุญาตให้ลบข้อความแบบถาวรเฉพาะในกรณีที่ผู้ติดต่อของคุณอนุญาตให้คุณเท่านั้น</target>
@@ -769,6 +773,10 @@
         <source>Already joining the group!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>ใช้รีเลย์เสมอ</target>
@@ -1032,6 +1040,10 @@
         <target>ไม่สามารถรับไฟล์ได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <note>No comment provided by engineer.</note>
@@ -1223,6 +1235,10 @@
         <target>ยืนยันการอัพเกรดฐานข้อมูล</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <note>No comment provided by engineer.</note>
@@ -1851,6 +1867,10 @@ This cannot be undone!</source>
         <source>Desktop devices</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>พัฒนา</target>
@@ -1953,11 +1973,19 @@ This cannot be undone!</source>
         <source>Discover via local network</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>ทำในภายหลัง</target>
@@ -2494,7 +2522,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>ข้อผิดพลาด: % @</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2583,6 +2611,10 @@ This cannot be undone!</source>
         <target>ไฟล์: % @</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>ไฟล์และสื่อ</target>
@@ -2681,6 +2713,16 @@ This cannot be undone!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <note>No comment provided by engineer.</note>
@@ -3463,6 +3505,10 @@ This is your link for group %@!</source>
         <target>ใบเสร็จการส่งข้อความ!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>ร่างข้อความ</target>
@@ -3483,6 +3529,14 @@ This is your link for group %@!</source>
         <target>ปฏิกิริยาบนข้อความเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -3599,11 +3653,6 @@ This is your link for group %@!</source>
         <source>Most likely this connection is deleted.</source>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>เป็นไปได้มากว่าผู้ติดต่อนี้ได้ลบการเชื่อมต่อกับคุณ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>โปรไฟล์การแชทหลายรายการ</target>
@@ -3633,6 +3682,10 @@ This is your link for group %@!</source>
         <source>Network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <note>No comment provided by engineer.</note>
@@ -4150,10 +4203,22 @@ Error: %@</source>
         <target>ชื่อไฟล์ส่วนตัว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>การเชื่อมต่อโปรไฟล์และเซิร์ฟเวอร์</target>
@@ -4230,11 +4295,20 @@ Error: %@</source>
         <target>ห้ามส่งข้อความเสียง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>ปกป้องหน้าจอแอป</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>ปกป้องโปรไฟล์การแชทของคุณด้วยรหัสผ่าน!</target>
@@ -4336,10 +4410,6 @@ Error: %@</source>
         <target>ที่อยู่ผู้รับจะถูกเปลี่ยนเป็นเซิร์ฟเวอร์อื่น การเปลี่ยนแปลงที่อยู่จะเสร็จสมบูรณ์หลังจากที่ผู้ส่งออนไลน์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>การรับไฟล์จะหยุดลง</target>
@@ -4566,6 +4636,10 @@ Error: %@</source>
         <target>เซิร์ฟเวอร์ SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <note>No comment provided by engineer.</note>
@@ -4783,6 +4857,14 @@ Error: %@</source>
         <target>ส่งข้อความสด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>ส่งการแจ้งเตือน</target>
@@ -4885,6 +4967,10 @@ Error: %@</source>
         <target>ข้อความที่ส่งจะถูกลบหลังเกินเวลาที่กําหนด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>เซิร์ฟเวอร์ต้องการการอนุญาตในการสร้างคิว โปรดตรวจสอบรหัสผ่าน</target>
@@ -4900,6 +4986,10 @@ Error: %@</source>
         <target>การทดสอบเซิร์ฟเวอร์ล้มเหลว!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>เซิร์ฟเวอร์</target>
@@ -5014,11 +5104,19 @@ Error: %@</source>
         <source>Show last messages</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>แสดงตัวอย่าง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>แสดง:</target>
@@ -5331,6 +5429,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>แอปสามารถแจ้งให้คุณทราบเมื่อคุณได้รับข้อความหรือคำขอติดต่อ - โปรดเปิดการตั้งค่าเพื่อเปิดใช้งาน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>ความพยายามในการเปลี่ยนรหัสผ่านของฐานข้อมูลไม่เสร็จสมบูรณ์</target>
@@ -5505,6 +5607,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>ไฟล์ภาพ/เสียงใช้ UTC เพื่อป้องกันเขตเวลา</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5590,11 +5696,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>Unblock member?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>ข้อผิดพลาดที่ไม่คาดคิด: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>สถานะการย้ายข้อมูลที่ไม่คาดคิด</target>
@@ -5640,6 +5741,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>ข้อผิดพลาดที่ไม่รู้จัก</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>ยกเว้นกรณีที่คุณใช้อินเทอร์เฟซการโทรของ iOS ให้เปิดใช้งานโหมดห้ามรบกวนเพื่อหลีกเลี่ยงการรบกวน</target>
@@ -5778,6 +5883,14 @@ To connect, please ask your contact to create another connection link and check
         <source>Use only local notifications?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>ใช้เซิร์ฟเวอร์</target>
@@ -5995,11 +6108,23 @@ To connect, please ask your contact to create another connection link and check
         <source>With reduced battery usage.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>รหัสผ่านฐานข้อมูลไม่ถูกต้อง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>รหัสผ่านผิด!</target>
@@ -7110,10 +7235,18 @@ SimpleX servers cannot see your profile.</source>
         <target>ไม่ทราบ</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>อัปเดตโปรไฟล์กลุ่มแล้ว</target>
@@ -7177,6 +7310,10 @@ SimpleX servers cannot see your profile.</source>
         <target>สัปดาห์</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>ใช่</target>

apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff

@@ -713,6 +713,10 @@
         <target>Eğer kişide izin verirse kaybolan mesajlara izin ver.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Konuştuğun kişi, kalıcı olarak silinebilen mesajlara izin veriyorsa sen de ver. (24 saat içinde)</target>
@@ -808,6 +812,10 @@
         <target>Zaten gruba bağlanılıyor!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Her zaman yönlendirici kullan</target>
@@ -1088,6 +1096,10 @@
         <target>Dosya alınamıyor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <target>Hücresel Veri</target>
@@ -1284,6 +1296,10 @@
         <target>Veritabanı geliştirmelerini onayla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Ağ ayarlarını onaylayın</target>
@@ -1948,6 +1964,10 @@ Bu geri alınamaz!</target>
         <target>Bilgisayar cihazları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Geliştir</target>
@@ -2053,11 +2073,19 @@ Bu geri alınamaz!</target>
         <target>Yerel ağ aracılığıyla keşfet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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>Acil aramalar için SimpleX'i KULLANMAYIN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Sonra yap</target>
@@ -2621,7 +2649,7 @@ Bu geri alınamaz!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Hata: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2713,6 +2741,10 @@ Bu geri alınamaz!</target>
         <target>Dosya: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Dosyalar &amp; medya</target>
@@ -2818,6 +2850,16 @@ Bu geri alınamaz!</target>
         <target>Şuradan iletildi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Bilgisayar bulundu</target>
@@ -3633,6 +3675,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Mesaj alındı bilgisi!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Mesaj taslağı</target>
@@ -3653,6 +3699,14 @@ Bu senin grup için bağlantın %@!</target>
         <target>Mesaj tepkileri bu grupta yasaklandı.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Mesaj kaynağı gizli kalır.</target>
@@ -3783,11 +3837,6 @@ Bu senin grup için bağlantın %@!</target>
         <target>Büyük ihtimalle bu bağlantı silinmiş.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Büyük ihtimalle bu kişi seninle bağlantını sildi.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Çoklu sohbet profili</target>
@@ -3818,6 +3867,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Ağ bağlantısı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <target>Ağ yönetimi</target>
@@ -4359,11 +4412,23 @@ Hata: %@</target>
         <target>Gizli dosya adları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Gizli notlar</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>Profil ve sunucu bağlantıları</target>
@@ -4444,11 +4509,20 @@ Hata: %@</target>
         <target>Sesli mesajların gönderimini yasakla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Uygulama ekranını koru</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Bir parolayla birlikte sohbet profillerini koru!</target>
@@ -4554,11 +4628,6 @@ Hata: %@</target>
         <target>Alıcı adresi farklı bir sunucuya değiştirilecektir. Gönderici çevrimiçi olduktan sonra adres değişikliği tamamlanacaktır.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <target>Eşzamanlılık alınıyor</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Dosya alımı durdurulacaktır.</target>
@@ -4794,6 +4863,10 @@ Hata: %@</target>
         <target>SMP sunucuları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Daha güvenli gruplar</target>
@@ -5019,6 +5092,14 @@ Hata: %@</target>
         <target>Canlı mesaj gönder</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Bildirimler gönder</target>
@@ -5124,6 +5205,10 @@ Hata: %@</target>
         <target>Gönderilen mesajlar ayarlanan süreden sonra silinecektir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Sunucunun sıra oluşturması için yetki gereklidir, şifreyi kontrol edin</target>
@@ -5139,6 +5224,10 @@ Hata: %@</target>
         <target>Sunucu testinde hata oluştu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Sunucular</target>
@@ -5259,11 +5348,19 @@ Hata: %@</target>
         <target>Son mesajları göster</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Ön gösterimi göser</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Göster:</target>
@@ -5371,7 +5468,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
-        <target>Kare,daire, veya aralarında herhangi birşey.</target>
+        <target>Kare,daire, veya aralarında herhangi bir şey.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Start chat" xml:space="preserve">
@@ -5586,6 +5683,10 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
         <target>Uygulama, mesaj veya iletişim isteği aldığınızda sizi bilgilendirebilir - etkinleştirmek için lütfen ayarları açın.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Veritabanı parolasını değiştirme girişimi tamamlanmadı.</target>
@@ -5771,6 +5872,10 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
         <target>Zaman bölgesini korumak için,fotoğraf/ses dosyaları UTC kullanır.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5863,11 +5968,6 @@ Bu özellik etkinleştirilmeden önce kimlik doğrulamayı tamamlamanız istenec
         <target>Üyenin engeli kaldırılsın mı?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unexpected error: %@" xml:space="preserve">
-        <source>Unexpected error: %@</source>
-        <target>Beklenmeyen hata: %@</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Beklenmeyen geçiş durumu</target>
@@ -5913,6 +6013,10 @@ Bu özellik etkinleştirilmeden önce kimlik doğrulamayı tamamlamanız istenec
         <target>Bilinmeyen hata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>iOS arama arayüzünü kullanmadığınız sürece, kesintileri önlemek için Rahatsız Etmeyin modunu etkinleştirin.</target>
@@ -6060,6 +6164,14 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Sadece yerel bildirimler kullanılsın mı?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Sunucu kullan</target>
@@ -6295,11 +6407,23 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Azaltılmış pil kullanımı ile birlikte.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Yanlış veritabanı parolası</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Yanlış parola!</target>
@@ -7455,11 +7579,19 @@ SimpleX sunucuları profilinizi göremez.</target>
         <target>bilinmeyen</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>bilinmeyen durum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>grup profili güncellendi</target>
@@ -7525,6 +7657,10 @@ SimpleX sunucuları profilinizi göremez.</target>
         <target>haftalar</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>evet</target>

apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff

@@ -713,6 +713,10 @@
         <target>Дозволяйте зникати повідомленням, тільки якщо контакт дозволяє вам це робити.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити. (24 години)</target>
@@ -807,6 +811,10 @@
         <target>Вже приєднуємося до групи!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Завжди використовуйте реле</target>
@@ -1087,6 +1095,10 @@
         <target>Не вдається отримати файл</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
         <note>No comment provided by engineer.</note>
@@ -1282,6 +1294,10 @@
         <target>Підтвердити оновлення бази даних</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
         <target>Підтвердьте налаштування мережі</target>
@@ -1946,6 +1962,10 @@ This cannot be undone!</source>
         <target>Настільні пристрої</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Розробник</target>
@@ -2051,11 +2071,19 @@ This cannot be undone!</source>
         <target>Відкриття через локальну мережу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>Зробіть це пізніше</target>
@@ -2617,7 +2645,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Помилка: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2709,6 +2737,10 @@ This cannot be undone!</source>
         <target>Файл: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>Файли та медіа</target>
@@ -2809,6 +2841,16 @@ This cannot be undone!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>Знайдено робочий стіл</target>
@@ -3622,6 +3664,10 @@ This is your link for group %@!</source>
         <target>Підтвердження доставки повідомлення!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>Чернетка повідомлення</target>
@@ -3642,6 +3688,14 @@ This is your link for group %@!</source>
         <target>Реакції на повідомлення в цій групі заборонені.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -3770,11 +3824,6 @@ This is your link for group %@!</source>
         <target>Швидше за все, це з'єднання видалено.</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>Швидше за все, цей контакт видалив зв'язок з вами.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>Кілька профілів чату</target>
@@ -3804,6 +3853,10 @@ This is your link for group %@!</source>
         <source>Network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
         <note>No comment provided by engineer.</note>
@@ -4342,11 +4395,23 @@ Error: %@</source>
         <target>Приватні імена файлів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>Приватні нотатки</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>З'єднання профілю та сервера</target>
@@ -4425,11 +4490,20 @@ Error: %@</source>
         <target>Заборонити надсилання голосових повідомлень.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>Захистіть екран програми</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>Захистіть свої профілі чату паролем!</target>
@@ -4535,10 +4609,6 @@ Error: %@</source>
         <target>Адреса отримувача буде змінена на інший сервер. Зміна адреси завершиться після того, як відправник з'явиться в мережі.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>Отримання файлу буде зупинено.</target>
@@ -4773,6 +4843,10 @@ Error: %@</source>
         <target>Сервери SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
         <target>Безпечніші групи</target>
@@ -4996,6 +5070,14 @@ Error: %@</source>
         <target>Надіслати живе повідомлення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>Надсилати сповіщення</target>
@@ -5101,6 +5183,10 @@ Error: %@</source>
         <target>Надіслані повідомлення будуть видалені через встановлений час.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>Сервер вимагає авторизації для створення черг, перевірте пароль</target>
@@ -5116,6 +5202,10 @@ Error: %@</source>
         <target>Тест сервера завершився невдало!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>Сервери</target>
@@ -5235,11 +5325,19 @@ Error: %@</source>
         <target>Показати останні повідомлення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Показати попередній перегляд</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>Показати:</target>
@@ -5559,6 +5657,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Додаток може сповіщати вас, коли ви отримуєте повідомлення або запити на контакт - будь ласка, відкрийте налаштування, щоб увімкнути цю функцію.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>Спроба змінити пароль до бази даних не була завершена.</target>
@@ -5744,6 +5846,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Для захисту часового поясу у файлах зображень/голосу використовується UTC.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5836,11 +5942,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <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>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>Неочікуваний стан міграції</target>
@@ -5886,6 +5987,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Невідома помилка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>Якщо ви не користуєтеся інтерфейсом виклику iOS, увімкніть режим "Не турбувати", щоб уникнути переривань.</target>
@@ -6033,6 +6138,14 @@ 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="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Використовувати сервер</target>
@@ -6263,11 +6376,23 @@ 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="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>Неправильний пароль до бази даних</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>Неправильний пароль!</target>
@@ -7417,11 +7542,19 @@ SimpleX servers cannot see your profile.</source>
         <target>невідомий</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>невідомий статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>оновлений профіль групи</target>
@@ -7487,6 +7620,10 @@ SimpleX servers cannot see your profile.</source>
         <target>тижнів</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>так</target>

apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff

@@ -623,6 +623,7 @@
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
         <source>Admins can block a member for all.</source>
+        <target>管理员可以为所有人封禁一名成员。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -681,6 +682,7 @@
       </trans-unit>
       <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
         <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target>你的所有联系人、对话和文件将被安全加密并分块上传到配置的 XFTP 中继。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow" xml:space="preserve">
@@ -698,6 +700,10 @@
         <target>仅当您的联系人允许时才允许限时消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve">
+        <source>Allow downgrade</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>仅有您的联系人许可后才允许不可撤回消息移除。</target>
@@ -730,6 +736,7 @@
       </trans-unit>
       <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
         <source>Allow to send SimpleX links.</source>
+        <target>允许发送 SimpleX 链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -792,6 +799,10 @@
         <target>已经加入了该群组！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve">
+        <source>Always use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>一直使用中继</target>
@@ -814,6 +825,7 @@
       </trans-unit>
       <trans-unit id="App data migration" xml:space="preserve">
         <source>App data migration</source>
+        <target>应用数据迁移</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
@@ -853,14 +865,17 @@
       </trans-unit>
       <trans-unit id="Apply" xml:space="preserve">
         <source>Apply</source>
+        <target>应用</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
+        <target>存档和上传</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
         <source>Archiving database</source>
+        <target>正在存档数据库</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Attach" xml:space="preserve">
@@ -1055,6 +1070,7 @@
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
+        <target>取消迁移</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
@@ -1067,8 +1083,13 @@
         <target>无法接收文件</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
         <source>Cellular</source>
+        <target>移动网络</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change" xml:space="preserve">
@@ -1164,6 +1185,7 @@
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
         <source>Chat migrated!</source>
+        <target>已迁移聊天！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat preferences" xml:space="preserve">
@@ -1260,8 +1282,13 @@
         <target>确认数据库升级</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve">
+        <source>Confirm files from unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
+        <target>确认网络设置</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm new passphrase…" xml:space="preserve">
@@ -1276,10 +1303,12 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
+        <target>请在迁移前确认你记得数据库的密码短语。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
         <source>Confirm upload</source>
+        <target>确认上传</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
@@ -1535,6 +1564,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Creating archive link" xml:space="preserve">
         <source>Creating archive link</source>
+        <target>正在创建存档链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Creating link…" xml:space="preserve">
@@ -1756,6 +1786,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Delete database from this device" xml:space="preserve">
         <source>Delete database from this device</source>
+        <target>从这部设备上删除数据库</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete file" xml:space="preserve">
@@ -1907,6 +1938,10 @@ This cannot be undone!</source>
         <target>桌面设备</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve">
+        <source>Destination server error: %@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>开发</target>
@@ -2012,11 +2047,19 @@ This cannot be undone!</source>
         <target>通过本地网络发现</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <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="Do NOT use private routing." xml:space="preserve">
+        <source>Do NOT use private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
         <source>Do it later</source>
         <target>稍后再做</target>
@@ -2049,10 +2092,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
+        <target>下载</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download failed" xml:space="preserve">
         <source>Download failed</source>
+        <target>下载失败了</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Download file" xml:space="preserve">
@@ -2062,10 +2107,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Downloading archive" xml:space="preserve">
         <source>Downloading archive</source>
+        <target>正在下载存档</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downloading link details" xml:space="preserve">
         <source>Downloading link details</source>
+        <target>正在下载链接详情</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Duplicate display name!" xml:space="preserve">
@@ -2125,6 +2172,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
         <source>Enable in direct chats (BETA)!</source>
+        <target>在私聊中开启（公测）！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -2159,6 +2207,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enabled for" xml:space="preserve">
         <source>Enabled for</source>
+        <target>启用对象</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt" xml:space="preserve">
@@ -2246,6 +2295,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter passphrase" xml:space="preserve">
         <source>Enter passphrase</source>
+        <target>输入密码短语</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
@@ -2399,6 +2449,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error downloading the archive" xml:space="preserve">
         <source>Error downloading the archive</source>
+        <target>下载存档出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
@@ -2477,6 +2528,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
         <source>Error saving settings</source>
+        <target>保存设置出错</target>
         <note>when migrating</note>
       </trans-unit>
       <trans-unit id="Error saving user password" xml:space="preserve">
@@ -2550,10 +2602,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error uploading the archive" xml:space="preserve">
         <source>Error uploading the archive</source>
+        <target>上传存档出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error verifying passphrase:" xml:space="preserve">
         <source>Error verifying passphrase:</source>
+        <target>验证密码短语出错：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: " xml:space="preserve">
@@ -2564,7 +2618,7 @@ This cannot be undone!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>错误： ％@</target>
-        <note>No comment provided by engineer.</note>
+        <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2608,6 +2662,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Exported file doesn't exist" xml:space="preserve">
         <source>Exported file doesn't exist</source>
+        <target>导出的文件不存在</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Exporting database archive…" xml:space="preserve">
@@ -2655,6 +2710,10 @@ This cannot be undone!</source>
         <target>文件：%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Files" xml:space="preserve">
+        <source>Files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files &amp; media" xml:space="preserve">
         <source>Files &amp; media</source>
         <target>文件和媒体</target>
@@ -2672,6 +2731,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Files and media not allowed" xml:space="preserve">
         <source>Files and media not allowed</source>
+        <target>不允许文件和媒体</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Files and media prohibited!" xml:space="preserve">
@@ -2686,10 +2746,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Finalize migration" xml:space="preserve">
         <source>Finalize migration</source>
+        <target>完成迁移</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finalize migration on another device." xml:space="preserve">
         <source>Finalize migration on another device.</source>
+        <target>在另一部设备上完成迁移</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2739,20 +2801,34 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Forward" xml:space="preserve">
         <source>Forward</source>
+        <target>转发</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
+        <target>转发并保存消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
+        <target>已转发</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarded from" xml:space="preserve">
         <source>Forwarded from</source>
+        <target>转发自</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Destination server error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
+      <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
+        <source>Forwarding server: %1$@
+Error: %2$@</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
         <target>找到了桌面</target>
@@ -2864,6 +2940,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
         <source>Group members can send SimpleX links.</source>
+        <target>群成员可发送 SimpleX 链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -3072,10 +3149,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Import failed" xml:space="preserve">
         <source>Import failed</source>
+        <target>导入失败了</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Importing archive" xml:space="preserve">
         <source>Importing archive</source>
+        <target>正在导入存档</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -3095,6 +3174,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
         <source>In order to continue, chat should be stopped.</source>
+        <target>必须停止聊天才能继续。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
@@ -3104,6 +3184,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="In-call sounds" xml:space="preserve">
         <source>In-call sounds</source>
+        <target>通话声音</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
@@ -3210,10 +3291,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Invalid link" xml:space="preserve">
         <source>Invalid link</source>
+        <target>无效链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid migration confirmation" xml:space="preserve">
         <source>Invalid migration confirmation</source>
+        <target>迁移确认无效</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid name!" xml:space="preserve">
@@ -3554,6 +3637,10 @@ This is your link for group %@!</source>
         <target>消息送达回执！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message delivery warning" xml:space="preserve">
+        <source>Message delivery warning</source>
+        <note>item status text</note>
+      </trans-unit>
       <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
         <target>消息草稿</target>
@@ -3574,8 +3661,17 @@ This is your link for group %@!</source>
         <target>该群组禁用了消息回应。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Message routing fallback" xml:space="preserve">
+        <source>Message routing fallback</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message routing mode" xml:space="preserve">
+        <source>Message routing mode</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
+        <target>消息来源保持私密。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message text" xml:space="preserve">
@@ -3585,6 +3681,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message too large" xml:space="preserve">
         <source>Message too large</source>
+        <target>消息太大了</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages" xml:space="preserve">
@@ -3611,26 +3708,32 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
         <source>Migrate device</source>
+        <target>迁移设备</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>从另一台设备迁移</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
         <source>Migrate here</source>
+        <target>迁移到此处</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device" xml:space="preserve">
         <source>Migrate to another device</source>
+        <target>迁移到另一部设备</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
+        <target>通过二维码迁移到另一部设备。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
         <source>Migrating</source>
+        <target>迁移中</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
@@ -3640,6 +3743,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migration complete" xml:space="preserve">
         <source>Migration complete</source>
+        <target>迁移完毕</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
@@ -3684,6 +3788,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="More reliable network connection." xml:space="preserve">
         <source>More reliable network connection.</source>
+        <target>更可靠的网络连接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -3691,11 +3796,6 @@ This is your link for group %@!</source>
         <target>此连接很可能已被删除。</target>
         <note>item status description</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
-        <source>Most likely this contact has deleted the connection with you.</source>
-        <target>很可能此联系人已经删除了与您的联系。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
         <target>多个聊天资料</target>
@@ -3723,10 +3823,16 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Network connection" xml:space="preserve">
         <source>Network connection</source>
+        <target>网络连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
+        <source>Network issues - message expired after many attempts to send it.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
         <source>Network management</source>
+        <target>网络管理</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network settings" xml:space="preserve">
@@ -3841,6 +3947,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No network connection" xml:space="preserve">
         <source>No network connection</source>
+        <target>无网络连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -4037,6 +4144,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
         <source>Or paste archive link</source>
+        <target>或粘贴存档链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or scan QR code" xml:space="preserve">
@@ -4046,6 +4154,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or securely share this file link" xml:space="preserve">
         <source>Or securely share this file link</source>
+        <target>或安全地分享此文件链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
@@ -4055,6 +4164,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
+        <target>其他</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
@@ -4138,6 +4248,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Picture-in-picture calls" xml:space="preserve">
         <source>Picture-in-picture calls</source>
+        <target>画中画通话</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -4162,6 +4273,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
         <source>Please confirm that network settings are correct for this device.</source>
+        <target>请确认网络设置对此这台设备正确无误。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
@@ -4254,11 +4366,23 @@ Error: %@</source>
         <target>私密文件名</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private message routing" xml:space="preserve">
+        <source>Private message routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private message routing 🚀" xml:space="preserve">
+        <source>Private message routing 🚀</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
         <target>私密笔记</target>
         <note>name of notes to self</note>
       </trans-unit>
+      <trans-unit id="Private routing" xml:space="preserve">
+        <source>Private routing</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
         <target>资料和服务器连接</target>
@@ -4271,6 +4395,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Profile images" xml:space="preserve">
         <source>Profile images</source>
+        <target>个人资料图</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile name" xml:space="preserve">
@@ -4336,11 +4461,20 @@ Error: %@</source>
         <target>禁止发送语音消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect IP address" xml:space="preserve">
+        <source>Protect IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
         <target>保护应用程序屏幕</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
+        <source>Protect your IP address from the messaging relays chosen by your contacts.
+Enable in *Network &amp; servers* settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
         <target>使用密码保护您的聊天资料！</target>
@@ -4367,6 +4501,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
+        <target>抗量子加密</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -4444,10 +4579,6 @@ Error: %@</source>
         <target>接收地址将变更到不同的服务器。地址更改将在发件人上线后完成。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
         <target>即将停止接收文件。</target>
@@ -4464,6 +4595,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Recipient(s) can't see who this message is from." xml:space="preserve">
         <source>Recipient(s) can't see who this message is from.</source>
+        <target>收件人看不到这条消息来自何人。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
@@ -4563,10 +4695,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
         <source>Repeat download</source>
+        <target>重复下载</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat import" xml:space="preserve">
         <source>Repeat import</source>
+        <target>重复导入</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
@@ -4576,6 +4710,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
         <source>Repeat upload</source>
+        <target>重复上传</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
@@ -4678,8 +4813,13 @@ Error: %@</source>
         <target>SMP 服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve">
+        <source>Safely receive files</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
+        <target>更安全的群组</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
@@ -4764,6 +4904,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
         <source>Saved</source>
+        <target>已保存</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Saved WebRTC ICE servers will be removed" xml:space="preserve">
@@ -4773,6 +4914,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Saved from" xml:space="preserve">
         <source>Saved from</source>
+        <target>保存自</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Saved message" xml:space="preserve">
@@ -4900,6 +5042,14 @@ Error: %@</source>
         <target>发送实时消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
+        <source>Send messages directly when your or destination server does not support private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
         <source>Send notifications</source>
         <target>发送通知</target>
@@ -5005,6 +5155,10 @@ Error: %@</source>
         <target>已发送的消息将在设定的时间后被删除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve">
+        <source>Server address is incompatible with network settings.</source>
+        <note>srv error text.</note>
+      </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
         <target>服务器需要授权才能创建队列，检查密码</target>
@@ -5020,6 +5174,10 @@ Error: %@</source>
         <target>服务器测试失败！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve">
+        <source>Server version is incompatible with network settings.</source>
+        <note>srv error text</note>
+      </trans-unit>
       <trans-unit id="Servers" xml:space="preserve">
         <source>Servers</source>
         <target>服务器</target>
@@ -5057,6 +5215,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Set passphrase" xml:space="preserve">
         <source>Set passphrase</source>
+        <target>设置密码短语</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passphrase to export" xml:space="preserve">
@@ -5081,6 +5240,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
         <source>Shape profile images</source>
+        <target>改变个人资料图形状</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
@@ -5120,6 +5280,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
+        <target>显示二维码</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show calls in phone history" xml:space="preserve">
@@ -5137,11 +5298,19 @@ Error: %@</source>
         <target>显示最近的消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve">
+        <source>Show message status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>显示预览</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
+        <source>Show → on messages sent via private routing.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
         <target>显示：</target>
@@ -5204,10 +5373,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
         <source>SimpleX links are prohibited in this group.</source>
+        <target>此群禁止 SimpleX 链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX links not allowed" xml:space="preserve">
         <source>SimpleX links not allowed</source>
+        <target>不允许SimpleX 链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
@@ -5247,6 +5418,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
+        <target>方形、圆形、或两者之间的任意形状</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Start chat" xml:space="preserve">
@@ -5276,6 +5448,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
+        <target>停止聊天程序</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
@@ -5320,6 +5493,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
         <source>Stopping chat</source>
+        <target>正在停止聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -5459,6 +5633,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>该应用可以在您收到消息或联系人请求时通知您——请打开设置以启用通知。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
+        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
         <target>更改数据库密码的尝试未完成。</target>
@@ -5571,10 +5749,12 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by end-to-end encryption.</source>
+        <target>此聊天受端到端加密保护。</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
+        <target>此聊天受抗量子的端到端加密保护。</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -5642,6 +5822,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>为了保护时区，图像/语音文件使用 UTC。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To protect your IP address, private routing uses your SMP servers to deliver messages." xml:space="preserve">
+        <source>To protect your IP address, private routing uses your SMP servers to deliver messages.</source>
+        <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>
@@ -5733,11 +5917,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <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>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
         <target>未预料的迁移状态</target>
@@ -5783,6 +5962,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>未知错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unknown servers!" xml:space="preserve">
+        <source>Unknown servers!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
         <target>除非您使用 iOS 通话界面，否则请启用请勿打扰模式以避免打扰。</target>
@@ -5872,6 +6055,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Upload failed" xml:space="preserve">
         <source>Upload failed</source>
+        <target>上传失败了</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
@@ -5881,6 +6065,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Uploading archive" xml:space="preserve">
         <source>Uploading archive</source>
+        <target>正在上传存档</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -5927,6 +6112,14 @@ To connect, please ask your contact to create another connection link and check
         <source>Use only local notifications?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
+        <source>Use private routing with unknown servers when IP address is not protected.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
+        <source>Use private routing with unknown servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>使用服务器</target>
@@ -5934,6 +6127,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
         <source>Use the app while in the call.</source>
+        <target>通话时使用本应用</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -5973,10 +6167,12 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Verify database passphrase" xml:space="preserve">
         <source>Verify database passphrase</source>
+        <target>验证数据库密码短语</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify passphrase" xml:space="preserve">
         <source>Verify passphrase</source>
+        <target>验证密码短语</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
@@ -6041,6 +6237,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Voice messages not allowed" xml:space="preserve">
         <source>Voice messages not allowed</source>
+        <target>不允许语音消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -6074,6 +6271,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
+        <target>警告：不支持在多部设备上启动聊天，这么做会导致消息传送失败。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -6098,6 +6296,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Welcome message is too long" xml:space="preserve">
         <source>Welcome message is too long</source>
+        <target>欢迎消息太大了</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="What's new" xml:space="preserve">
@@ -6112,6 +6311,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="When connecting audio and video calls." xml:space="preserve">
         <source>When connecting audio and video calls.</source>
+        <target>连接音频和视频通话时。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
@@ -6126,14 +6326,17 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="WiFi" xml:space="preserve">
         <source>WiFi</source>
+        <target>WiFi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
         <source>Will be enabled in direct chats!</source>
+        <target>将在私聊中启用！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wired ethernet" xml:space="preserve">
         <source>Wired ethernet</source>
+        <target>有线以太网</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="With encrypted files and media." xml:space="preserve">
@@ -6151,11 +6354,23 @@ 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="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
+        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
         <target>数据库密码错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
+        <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
+        <note>snd error text</note>
+      </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
         <target>密码错误！</target>
@@ -6258,6 +6473,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
         <source>You can give another try.</source>
+        <target>你可以再试一次。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -6609,6 +6825,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="admins" xml:space="preserve">
         <source>admins</source>
+        <target>管理员</target>
         <note>feature role</note>
       </trans-unit>
       <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
@@ -6623,6 +6840,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
+        <target>所有成员</target>
         <note>feature role</note>
       </trans-unit>
       <trans-unit id="always" xml:space="preserve">
@@ -6955,6 +7173,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
+        <target>已转发</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
@@ -7165,6 +7384,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="owners" xml:space="preserve">
         <source>owners</source>
+        <target>所有者</target>
         <note>feature role</note>
       </trans-unit>
       <trans-unit id="peer-to-peer" xml:space="preserve">
@@ -7174,6 +7394,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
+        <target>抗量子端到端加密</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -7218,6 +7439,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
+        <target>已保存</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="saved from %@" xml:space="preserve">
@@ -7261,6 +7483,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
         <source>standard end-to-end encryption</source>
+        <target>标准端到端加密</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -7287,11 +7510,19 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>未知</target>
         <note>connection info</note>
       </trans-unit>
+      <trans-unit id="unknown relays" xml:space="preserve">
+        <source>unknown relays</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
         <target>未知状态</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve">
+        <source>unprotected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
         <source>updated group profile</source>
         <target>已更新的群组资料</target>
@@ -7356,6 +7587,10 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>周</target>
         <note>time unit</note>
       </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve">
+        <source>when IP hidden</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="yes" xml:space="preserve">
         <source>yes</source>
         <target>是</target>
@@ -7363,6 +7598,7 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="you" xml:space="preserve">
         <source>you</source>
+        <target>您</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">

apps/ios/SimpleX NSE/NotificationService.swift

@@ -696,14 +696,16 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
 }
 
 func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
-    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+    let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
+    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     logger.error("receiveFile error: \(responseError(r))")
     return nil
 }
 
 func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
-    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, encrypted: encrypted))
+    let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
+    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted))
     if case .cmdOk = r { return }
     logger.error("setFileToReceive error: \(responseError(r))")
 }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -115,11 +115,6 @@
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
-		5CE0E8972BE7F144008D6E06 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE0E8922BE7F144008D6E06 /* libgmp.a */; };
-		5CE0E8982BE7F144008D6E06 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE0E8932BE7F144008D6E06 /* libgmpxx.a */; };
-		5CE0E8992BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE0E8942BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a */; };
-		5CE0E89A2BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE0E8952BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a */; };
-		5CE0E89B2BE7F144008D6E06 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE0E8962BE7F144008D6E06 /* libffi.a */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */; };
@@ -144,6 +139,11 @@
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
+		5CEE879E2C076B8400583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE87992C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a */; };
+		5CEE879F2C076B8400583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE879A2C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a */; };
+		5CEE87A02C076B8400583B8A /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE879B2C076B8400583B8A /* libffi.a */; };
+		5CEE87A12C076B8400583B8A /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE879C2C076B8400583B8A /* libgmp.a */; };
+		5CEE87A22C076B8400583B8A /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE879D2C076B8400583B8A /* libgmpxx.a */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
@@ -420,11 +420,6 @@
 		5CDCAD7428188D2900503DA2 /* APITypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APITypes.swift; sourceTree = "<group>"; };
 		5CDCAD7D2818941F00503DA2 /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
 		5CDCAD80281A7E2700503DA2 /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
-		5CE0E8922BE7F144008D6E06 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CE0E8932BE7F144008D6E06 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CE0E8942BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5CE0E8952BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a"; sourceTree = "<group>"; };
-		5CE0E8962BE7F144008D6E06 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CE1330328E118CC00FFFD8C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = "de.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CE1330428E118CC00FFFD8C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5CE2BA682845308900EC33A6 /* SimpleXChat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SimpleXChat.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -440,6 +435,11 @@
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
+		5CEE87992C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a"; sourceTree = "<group>"; };
+		5CEE879A2C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5CEE879B2C076B8400583B8A /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5CEE879C2C076B8400583B8A /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CEE879D2C076B8400583B8A /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
 		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
@@ -529,13 +529,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CE0E8992BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a in Frameworks */,
-				5CE0E8982BE7F144008D6E06 /* libgmpxx.a in Frameworks */,
+				5CEE879E2C076B8400583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CE0E89A2BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a in Frameworks */,
-				5CE0E89B2BE7F144008D6E06 /* libffi.a in Frameworks */,
-				5CE0E8972BE7F144008D6E06 /* libgmp.a in Frameworks */,
+				5CEE879F2C076B8400583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a in Frameworks */,
+				5CEE87A02C076B8400583B8A /* libffi.a in Frameworks */,
+				5CEE87A12C076B8400583B8A /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
+				5CEE87A22C076B8400583B8A /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -601,11 +601,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CE0E8962BE7F144008D6E06 /* libffi.a */,
-				5CE0E8922BE7F144008D6E06 /* libgmp.a */,
-				5CE0E8932BE7F144008D6E06 /* libgmpxx.a */,
-				5CE0E8942BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW-ghc9.6.3.a */,
-				5CE0E8952BE7F144008D6E06 /* libHSsimplex-chat-5.7.1.0-dbWFHyA3wYHsyiwKvX3TW.a */,
+				5CEE879B2C076B8400583B8A /* libffi.a */,
+				5CEE879C2C076B8400583B8A /* libgmp.a */,
+				5CEE879D2C076B8400583B8A /* libgmpxx.a */,
+				5CEE879A2C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7-ghc9.6.3.a */,
+				5CEE87992C076B8300583B8A /* libHSsimplex-chat-5.8.0.4-LLYprD9nQTR9mmjl4EdHW7.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1552,7 +1552,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1577,7 +1577,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1601,7 +1601,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1626,7 +1626,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1687,7 +1687,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1702,7 +1702,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1724,7 +1724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1739,7 +1739,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1761,7 +1761,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1787,7 +1787,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1812,7 +1812,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 213;
+				CURRENT_PROJECT_VERSION = 221;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1838,7 +1838,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7.1;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/APITypes.swift

@@ -48,7 +48,7 @@ public enum ChatCommand {
     case apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode)
     case apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64)
     case apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction)
-    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64)
+    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?)
     case apiGetNtfToken
     case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
     case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
@@ -123,8 +123,8 @@ public enum ChatCommand {
     case apiGetNetworkStatuses
     case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
     case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, encrypted: Bool?, inline: Bool?)
-    case setFileToReceive(fileId: Int64, encrypted: Bool?)
+    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
+    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
     case cancelFile(fileId: Int64)
     // remote desktop commands
     case setLocalDeviceName(displayName: String)
@@ -192,7 +192,9 @@ public enum ChatCommand {
             case let .apiDeleteChatItem(type, id, itemId, mode): return "/_delete item \(ref(type, id)) \(itemId) \(mode.rawValue)"
             case let .apiDeleteMemberChatItem(groupId, groupMemberId, itemId): return "/_delete member item #\(groupId) \(groupMemberId) \(itemId)"
             case let .apiChatItemReaction(type, id, itemId, add, reaction): return "/_reaction \(ref(type, id)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
-            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId): return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId)"
+            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl):
+                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
+                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId) ttl=\(ttlStr)"
             case .apiGetNtfToken: return "/_ntf get "
             case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
             case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
@@ -280,8 +282,8 @@ public enum ChatCommand {
             case .apiGetNetworkStatuses: return "/_network_statuses"
             case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
             case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, encrypt, inline): return "/freceive \(fileId)\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
-            case let .setFileToReceive(fileId, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("encrypt", encrypt))"
+            case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
+            case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
             case let .cancelFile(fileId): return "/fcancel \(fileId)"
             case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
             case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
@@ -639,6 +641,7 @@ public enum ChatResponse: Decodable, Error {
     case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
     case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
+    case contactDisabled(user: UserRef, contact: Contact)
     // remote desktop responses/events
     case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
     case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo, ctrlAppInfo_: CtrlAppInfo?, appVersion: String, compatible: Bool)
@@ -796,6 +799,7 @@ public enum ChatResponse: Decodable, Error {
             case .ntfMessages: return "ntfMessages"
             case .ntfMessage: return "ntfMessage"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
+            case .contactDisabled: return "contactDisabled"
             case .remoteCtrlList: return "remoteCtrlList"
             case .remoteCtrlFound: return "remoteCtrlFound"
             case .remoteCtrlConnecting: return "remoteCtrlConnecting"
@@ -953,6 +957,7 @@ public enum ChatResponse: Decodable, Error {
             case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
             case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
+            case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
             case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
             case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
             case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
@@ -1242,9 +1247,12 @@ public struct ServerAddress: Decodable {
 
 public struct NetCfg: Codable, Equatable {
     public var socksProxy: String? = nil
+    var socksMode: SocksMode = .always
     public var hostMode: HostMode = .publicHost
     public var requiredHostMode = true
     public var sessionMode: TransportSessionMode
+    public var smpProxyMode: SMPProxyMode = .never
+    public var smpProxyFallback: SMPProxyFallback = .allow
     public var tcpConnectTimeout: Int // microseconds
     public var tcpTimeout: Int // microseconds
     public var tcpTimeoutPerKb: Int // microseconds
@@ -1289,6 +1297,49 @@ public enum HostMode: String, Codable {
     case publicHost = "public"
 }
 
+public enum SocksMode: String, Codable {
+    case always = "always"
+    case onion = "onion"
+}
+
+public enum SMPProxyMode: String, Codable {
+    case always = "always"
+    case unknown = "unknown"
+    case unprotected = "unprotected"
+    case never = "never"
+
+    public var text: LocalizedStringKey {
+        switch self {
+        case .always: return "always"
+        case .unknown: return "unknown relays"
+        case .unprotected: return "unprotected"
+        case .never: return "never"
+        }
+    }
+
+    public var id: SMPProxyMode { self }
+
+    public static let values: [SMPProxyMode] = [.always, .unknown, .unprotected, .never]
+}
+
+public enum SMPProxyFallback: String, Codable {
+    case allow = "allow"
+    case allowProtected = "allowProtected"
+    case prohibit = "prohibit"
+
+    public var text: LocalizedStringKey {
+        switch self {
+        case .allow: return "yes"
+        case .allowProtected: return "when IP hidden"
+        case .prohibit: return "no"
+        }
+    }
+
+    public var id: SMPProxyFallback { self }
+
+    public static let values: [SMPProxyFallback] = [.allow, .allowProtected, .prohibit]
+}
+
 public enum OnionHosts: String, Identifiable {
     case no
     case prefer
@@ -1692,7 +1743,6 @@ public enum ChatErrorType: Decodable {
     case groupMemberNotActive
     case groupMemberUserRemoved
     case groupMemberNotFound
-    case groupMemberIntroNotFound(contactName: ContactName)
     case groupCantResendInvitation(groupInfo: GroupInfo, contactName: ContactName)
     case groupInternal(message: String)
     case fileNotFound(message: String)
@@ -1709,6 +1759,7 @@ public enum ChatErrorType: Decodable {
     case fileImageType(filePath: String)
     case fileImageSize(filePath: String)
     case fileNotReceived(fileId: Int64)
+    case fileNotApproved(fileId: Int64, unknownServers: [String])
     // case xFTPRcvFile
     // case xFTPSndFile
     case fallbackToSMPProhibited(fileId: Int64)
@@ -1987,6 +2038,7 @@ public struct MigrationFileLinkData: Codable {
 public struct AppSettings: Codable, Equatable {
     public var networkConfig: NetCfg? = nil
     public var privacyEncryptLocalFiles: Bool? = nil
+    public var privacyAskToApproveRelays: Bool? = nil
     public var privacyAcceptImages: Bool? = nil
     public var privacyLinkPreviews: Bool? = nil
     public var privacyShowChatPreviews: Bool? = nil
@@ -2010,6 +2062,7 @@ public struct AppSettings: Codable, Equatable {
         let def = AppSettings.defaults
         if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
         if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
+        if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
         if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
         if privacyLinkPreviews != def.privacyLinkPreviews { empty.privacyLinkPreviews = privacyLinkPreviews }
         if privacyShowChatPreviews != def.privacyShowChatPreviews { empty.privacyShowChatPreviews = privacyShowChatPreviews }
@@ -2034,6 +2087,7 @@ public struct AppSettings: Codable, Equatable {
         AppSettings (
             networkConfig: NetCfg.defaults,
             privacyEncryptLocalFiles: true,
+            privacyAskToApproveRelays: true,
             privacyAcceptImages: true,
             privacyLinkPreviews: true,
             privacyShowChatPreviews: true,

apps/ios/SimpleXChat/AppGroup.swift

@@ -23,9 +23,12 @@ public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
 public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
+public let GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS = "privacyAskToApproveRelays"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
+let GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE = "networkSMPProxyMode"
+let GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK = "networkSMPProxyFallback"
 let GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT = "networkTCPConnectTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT = "networkTCPTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB = "networkTCPTimeoutPerKb"
@@ -53,6 +56,8 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_NTF_ENABLE_PERIODIC: false,
         GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS: OnionHosts.no.rawValue,
         GROUP_DEFAULT_NETWORK_SESSION_MODE: TransportSessionMode.user.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.never.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allow.rawValue,
         GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT: NetCfg.defaults.tcpConnectTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT: NetCfg.defaults.tcpTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB: NetCfg.defaults.tcpTimeoutPerKb,
@@ -69,6 +74,7 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
         GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false,
         GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES: true,
+        GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS: true,
         GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
         GROUP_DEFAULT_CALL_KIT_ENABLED: true,
         GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED: false,
@@ -177,6 +183,8 @@ public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults
 
 public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)
 
+public let privacyAskToApproveRelaysGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS)
+
 public let ntfBadgeCountGroupDefault = IntDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_BADGE_COUNT)
 
 public let networkUseOnionHostsGroupDefault = EnumDefault<OnionHosts>(
@@ -191,6 +199,18 @@ public let networkSessionModeGroupDefault = EnumDefault<TransportSessionMode>(
     withDefault: .user
 )
 
+public let networkSMPProxyModeGroupDefault = EnumDefault<SMPProxyMode>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE,
+    withDefault: .never
+)
+
+public let networkSMPProxyFallbackGroupDefault = EnumDefault<SMPProxyFallback>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK,
+    withDefault: .allow
+)
+
 public let storeDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_STORE_DB_PASSPHRASE)
 
 public let initialRandomDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE)
@@ -275,6 +295,8 @@ public func getNetCfg() -> NetCfg {
     let onionHosts = networkUseOnionHostsGroupDefault.get()
     let (hostMode, requiredHostMode) = onionHosts.hostMode
     let sessionMode = networkSessionModeGroupDefault.get()
+    let smpProxyMode = networkSMPProxyModeGroupDefault.get()
+    let smpProxyFallback = networkSMPProxyFallbackGroupDefault.get()
     let tcpConnectTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
     let tcpTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
     let tcpTimeoutPerKb = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
@@ -295,6 +317,8 @@ public func getNetCfg() -> NetCfg {
         hostMode: hostMode,
         requiredHostMode: requiredHostMode,
         sessionMode: sessionMode,
+        smpProxyMode: smpProxyMode,
+        smpProxyFallback: smpProxyFallback,
         tcpConnectTimeout: tcpConnectTimeout,
         tcpTimeout: tcpTimeout,
         tcpTimeoutPerKb: tcpTimeoutPerKb,
@@ -309,6 +333,8 @@ public func getNetCfg() -> NetCfg {
 public func setNetCfg(_ cfg: NetCfg) {
     networkUseOnionHostsGroupDefault.set(OnionHosts(netCfg: cfg))
     networkSessionModeGroupDefault.set(cfg.sessionMode)
+    networkSMPProxyModeGroupDefault.set(cfg.smpProxyMode)
+    networkSMPProxyFallbackGroupDefault.set(cfg.smpProxyFallback)
     groupDefaults.set(cfg.tcpConnectTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeoutPerKb, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)

apps/ios/SimpleXChat/ChatTypes.swift

@@ -1510,7 +1510,12 @@ public struct Contact: Identifiable, Decodable, NamedChat {
     public var ready: Bool { get { activeConn?.connStatus == .ready } }
     public var active: Bool { get { contactStatus == .active } }
     public var sendMsgEnabled: Bool { get {
-        (ready && active && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false))
+        (
+            ready
+            && active
+            && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false)
+            && !(activeConn?.connDisabled ?? true)
+        )
         || nextSendGrpInv
     } }
     public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
@@ -1601,15 +1606,20 @@ public struct Connection: Decodable {
     public var pqEncryption: Bool
     public var pqSndEnabled: Bool?
     public var pqRcvEnabled: Bool?
+    public var authErrCounter: Int
 
     public var connectionStats: ConnectionStats? = nil
 
     private enum CodingKeys: String, CodingKey {
-        case connId, agentConnId, peerChatVRange, connStatus, connLevel, viaGroupLink, customUserProfileId, connectionCode, pqSupport, pqEncryption, pqSndEnabled, pqRcvEnabled
+        case connId, agentConnId, peerChatVRange, connStatus, connLevel, viaGroupLink, customUserProfileId, connectionCode, pqSupport, pqEncryption, pqSndEnabled, pqRcvEnabled, authErrCounter
     }
 
     public var id: ChatId { get { ":\(connId)" } }
 
+    public var connDisabled: Bool {
+        authErrCounter >= 10 // authErrDisableCount in core
+    }
+
     public var connPQEnabled: Bool {
         pqSndEnabled == true && pqRcvEnabled == true
     }
@@ -1622,7 +1632,8 @@ public struct Connection: Decodable {
         connLevel: 0,
         viaGroupLink: false,
         pqSupport: false,
-        pqEncryption: false
+        pqEncryption: false,
+        authErrCounter: 0
     )
 }
 
@@ -2621,6 +2632,7 @@ public struct CIMeta: Decodable {
     public var itemTs: Date
     var itemText: String
     public var itemStatus: CIStatus
+    public var sentViaProxy: Bool?
     public var createdAt: Date
     public var updatedAt: Date
     public var itemForwarded: CIForwardedFrom?
@@ -2710,7 +2722,8 @@ public enum CIStatus: Decodable {
     case sndSent(sndProgress: SndCIStatusProgress)
     case sndRcvd(msgRcptStatus: MsgReceiptStatus, sndProgress: SndCIStatusProgress)
     case sndErrorAuth
-    case sndError(agentError: String)
+    case sndError(agentError: SndError)
+    case sndWarning(agentError: SndError)
     case rcvNew
     case rcvRead
     case invalid(text: String)
@@ -2722,6 +2735,7 @@ public enum CIStatus: Decodable {
         case .sndRcvd: return "sndRcvd"
         case .sndErrorAuth: return "sndErrorAuth"
         case .sndError: return "sndError"
+        case .sndWarning: return "sndWarning"
         case .rcvNew: return "rcvNew"
         case .rcvRead: return "rcvRead"
         case .invalid: return "invalid"
@@ -2738,7 +2752,8 @@ public enum CIStatus: Decodable {
             case .badMsgHash: return ("checkmark", .red)
             }
         case .sndErrorAuth: return ("multiply", .red)
-        case .sndError: return ("exclamationmark.triangle.fill", .yellow)
+        case .sndError: return ("multiply", .red)
+        case .sndWarning: return ("exclamationmark.triangle.fill", .orange)
         case .rcvNew: return ("circlebadge.fill", Color.accentColor)
         case .rcvRead: return nil
         case .invalid: return ("questionmark", metaColor)
@@ -2756,7 +2771,11 @@ public enum CIStatus: Decodable {
             )
         case let .sndError(agentError): return (
                 NSLocalizedString("Message delivery error", comment: "item status text"),
-                String.localizedStringWithFormat(NSLocalizedString("Unexpected error: %@", comment: "item status description"), agentError)
+                agentError.errorInfo
+            )
+        case let .sndWarning(agentError): return (
+                NSLocalizedString("Message delivery warning", comment: "item status text"),
+                agentError.errorInfo
             )
         case .rcvNew: return nil
         case .rcvRead: return nil
@@ -2768,6 +2787,42 @@ public enum CIStatus: Decodable {
     }
 }
 
+public enum SndError: Decodable {
+    case auth
+    case quota
+    case expired
+    case relay(srvError: SrvError)
+    case proxy(proxyServer: String, srvError: SrvError)
+    case proxyRelay(proxyServer: String, srvError: SrvError)
+    case other(sndError: String)
+
+    public var errorInfo: String {
+        switch self {
+        case .auth: NSLocalizedString("Wrong key or unknown connection - most likely this connection is deleted.", comment: "snd error text")
+        case .quota: NSLocalizedString("Capacity exceeded - recipient did not receive previously sent messages.", comment: "snd error text")
+        case .expired: NSLocalizedString("Network issues - message expired after many attempts to send it.", comment: "snd error text")
+        case let .relay(srvError): String.localizedStringWithFormat(NSLocalizedString("Destination server error: %@", comment: "snd error text"), srvError.errorInfo)
+        case let .proxy(proxyServer, srvError): String.localizedStringWithFormat(NSLocalizedString("Forwarding server: %@\nError: %@", comment: "snd error text"), proxyServer, srvError.errorInfo)
+        case let .proxyRelay(proxyServer, srvError): String.localizedStringWithFormat(NSLocalizedString("Forwarding server: %@\nDestination server error: %@", comment: "snd error text"), proxyServer, srvError.errorInfo)
+        case let .other(sndError): String.localizedStringWithFormat(NSLocalizedString("Error: %@", comment: "snd error text"), sndError)
+        }
+    }
+}
+
+public enum SrvError: Decodable {
+    case host
+    case version
+    case other(srvError: String)
+
+    public var errorInfo: String {
+        switch self {
+        case .host: NSLocalizedString("Server address is incompatible with network settings.", comment: "srv error text.")
+        case .version: NSLocalizedString("Server version is incompatible with network settings.", comment: "srv error text")
+        case let .other(srvError): srvError
+        }
+    }
+}
+
 public enum MsgReceiptStatus: String, Decodable {
     case ok
     case badMsgHash
@@ -3119,6 +3174,7 @@ public struct CIFile: Decodable {
             case .rcvInvitation: return false
             case .rcvAccepted: return false
             case .rcvTransfer: return false
+            case .rcvAborted: return false
             case .rcvCancelled: return false
             case .rcvComplete: return true
             case .rcvError: return false
@@ -3143,6 +3199,7 @@ public struct CIFile: Decodable {
             case .rcvInvitation: return nil
             case .rcvAccepted: return rcvCancelAction
             case .rcvTransfer: return rcvCancelAction
+            case .rcvAborted: return nil
             case .rcvCancelled: return nil
             case .rcvComplete: return nil
             case .rcvError: return nil
@@ -3257,6 +3314,7 @@ public enum CIFileStatus: Decodable, Equatable {
     case rcvInvitation
     case rcvAccepted
     case rcvTransfer(rcvProgress: Int64, rcvTotal: Int64)
+    case rcvAborted
     case rcvComplete
     case rcvCancelled
     case rcvError
@@ -3272,6 +3330,7 @@ public enum CIFileStatus: Decodable, Equatable {
         case .rcvInvitation: return "rcvInvitation"
         case .rcvAccepted: return "rcvAccepted"
         case let .rcvTransfer(rcvProgress, rcvTotal): return "rcvTransfer \(rcvProgress) \(rcvTotal)"
+        case .rcvAborted: return "rcvAborted"
         case .rcvComplete: return "rcvComplete"
         case .rcvCancelled: return "rcvCancelled"
         case .rcvError: return "rcvError"
@@ -3886,4 +3945,5 @@ public struct ChatItemVersion: Decodable {
 public struct MemberDeliveryStatus: Decodable {
     public var groupMemberId: Int64
     public var memberDeliveryStatus: CIStatus
+    public var sentViaProxy: Bool?
 }

apps/ios/bg.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Грешка: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Грешка: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Най-вероятно тази връзка е изтрита.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Най-вероятно този контакт е изтрил връзката с вас.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Множество профили за чат";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Получаващият адрес ще бъде променен към друг сървър. Промяната на адреса ще завърши, след като подателят е онлайн.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Паралелност на получаване";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Получаващият се файл ще бъде спрян.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "отблокиран %@";
 
-/* item status description */
-"Unexpected error: %@" = "Неочаквана грешка: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неочаквано състояние на миграция";
 

apps/ios/cs.lproj/Localizable.strings

@@ -1461,7 +1461,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Chyba: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Chyba: %@";
 
 /* No comment provided by engineer. */
@@ -2082,9 +2082,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Pravděpodobně je toto spojení smazáno.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Tento kontakt s největší pravděpodobností smazal spojení s vámi.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Více chatovacích profilů";
 
@@ -3179,9 +3176,6 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "Nelze nahrát hlasovou zprávu";
 
-/* item status description */
-"Unexpected error: %@" = "Neočekávaná chyba: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Neočekávaný stav přenášení";
 

apps/ios/de.lproj/Localizable.strings

@@ -438,7 +438,7 @@
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "Alle Ihre Kontakte bleiben verbunden. Es wird eine Profilaktualisierung an Ihre Kontakte gesendet.";
 
 /* No comment provided by engineer. */
-"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Alle Ihre Kontakte, Unterhaltungen und Dateien werden sicher verschlüsselt und in Daten-Paketen auf die konfigurierten XTFP-Server hochgeladen.";
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Alle Ihre Kontakte, Unterhaltungen und Dateien werden sicher verschlüsselt und in Daten-Paketen auf die konfigurierten XTFP-Relais hochgeladen.";
 
 /* No comment provided by engineer. */
 "Allow" = "Erlauben";
@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Fehler: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Fehler: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Wahrscheinlich ist diese Verbindung gelöscht worden.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Dieser Kontakt hat sehr wahrscheinlich die Verbindung mit Ihnen gelöscht.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Mehrere Chat-Profile";
 
@@ -2730,10 +2727,10 @@
 "One-time invitation link" = "Einmal-Einladungslink";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Für die Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.";
+"Onion hosts will be required for connection. Requires enabling VPN." = "Für diese Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion-Hosts werden verwendet, sobald sie verfügbar sind. Dies erfordert die Aktivierung eines VPNs.";
+"Onion hosts will be used when available. Requires enabling VPN." = "Wenn Onion-Hosts verfügbar sind, werden sie verwendet. Dies erfordert die Aktivierung eines VPNs.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion-Hosts werden nicht verwendet.";
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Die Empfängeradresse wird auf einen anderen Server geändert. Der Adresswechsel wird abgeschlossen, wenn der Absender wieder online ist.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Gleichzeitiger Empfang";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Der Empfang der Datei wird beendet.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ wurde freigegeben";
 
-/* item status description */
-"Unexpected error: %@" = "Unerwarteter Fehler: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Unerwarteter Migrationsstatus";
 

apps/ios/es.lproj/Localizable.strings

@@ -675,7 +675,7 @@
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Búlgaro, Finlandés, Tailandés y Ucraniano - gracias a los usuarios y [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
 /* No comment provided by engineer. */
-"By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Mediante perfil (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
+"By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Mediante perfil (predeterminado) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
 /* No comment provided by engineer. */
 "Call already ended!" = "¡La llamada ha terminado!";
@@ -1162,13 +1162,13 @@
 "Decryption error" = "Error descifrado";
 
 /* pref value */
-"default (%@)" = "por defecto (%@)";
+"default (%@)" = "predeterminado (%@)";
 
 /* No comment provided by engineer. */
-"default (no)" = "por defecto (no)";
+"default (no)" = "predeterminado (no)";
 
 /* No comment provided by engineer. */
-"default (yes)" = "por defecto (sí)";
+"default (yes)" = "predeterminado (sí)";
 
 /* chat item action */
 "Delete" = "Eliminar";
@@ -1492,7 +1492,7 @@
 "enabled" = "activado";
 
 /* No comment provided by engineer. */
-"Enabled for" = "Activar para";
+"Enabled for" = "Activado para";
 
 /* enabled status */
 "enabled for contact" = "activado para el contacto";
@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Error: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Error: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Probablemente la conexión ha sido eliminada.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Lo más probable es que este contacto haya eliminado la conexión contigo.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Múltiples perfiles";
 
@@ -2961,7 +2958,7 @@
 "Profile image" = "Imagen del perfil";
 
 /* No comment provided by engineer. */
-"Profile images" = "Imágenes del perfil";
+"Profile images" = "Forma de los perfiles";
 
 /* No comment provided by engineer. */
 "Profile name" = "Nombre del perfil";
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Concurrencia en la recepción";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Se detendrá la recepción del archivo.";
 
@@ -3192,7 +3186,7 @@
 "Reset colors" = "Restablecer colores";
 
 /* No comment provided by engineer. */
-"Reset to defaults" = "Restablecer valores por defecto";
+"Reset to defaults" = "Restablecer valores predetarminados";
 
 /* No comment provided by engineer. */
 "Restart the app to create a new chat profile" = "Reinicia la aplicación para crear un perfil nuevo";
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "ha desbloqueado a %@";
 
-/* item status description */
-"Unexpected error: %@" = "Error inesperado: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Estado de migración inesperado";
 

apps/ios/fi.lproj/Localizable.strings

@@ -1434,7 +1434,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Virhe: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Virhe: %@";
 
 /* No comment provided by engineer. */
@@ -2058,9 +2058,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Todennäköisesti tämä yhteys on poistettu.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Todennäköisesti tämä kontakti on poistanut yhteyden sinuun.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Useita keskusteluprofiileja";
 
@@ -3137,9 +3134,6 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "Ääniviestiä ei voi tallentaa";
 
-/* item status description */
-"Unexpected error: %@" = "Odottamaton virhe: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Odottamaton siirtotila";
 

apps/ios/fr.lproj/Localizable.strings

@@ -1306,7 +1306,7 @@
 "Delivery receipts are disabled!" = "Les accusés de réception sont désactivés !";
 
 /* No comment provided by engineer. */
-"Delivery receipts!" = "Justificatifs de réception!";
+"Delivery receipts!" = "Justificatifs de réception !";
 
 /* No comment provided by engineer. */
 "Description" = "Description";
@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Erreur : ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Erreur : %@";
 
 /* No comment provided by engineer. */
@@ -1876,7 +1876,7 @@
 "Fix connection" = "Réparer la connexion";
 
 /* No comment provided by engineer. */
-"Fix connection?" = "Réparer la connexion?";
+"Fix connection?" = "Réparer la connexion ?";
 
 /* No comment provided by engineer. */
 "Fix encryption after restoring backups." = "Réparer le chiffrement après la restauration des sauvegardes.";
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Connexion probablement supprimée.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Il est fort probable que ce contact ait supprimé la connexion avec vous.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Différents profils de chat";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "L'adresse de réception sera changée pour un autre serveur. Le changement d'adresse sera terminé lorsque l'expéditeur sera en ligne.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Réception simultanée";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "La réception du fichier sera interrompue.";
 
@@ -3099,7 +3093,7 @@
 "Reconnect all connected servers to force message delivery. It uses additional traffic." = "Reconnecter tous les serveurs connectés pour forcer la livraison des messages. Cette méthode utilise du trafic supplémentaire.";
 
 /* No comment provided by engineer. */
-"Reconnect servers?" = "Reconnecter les serveurs?";
+"Reconnect servers?" = "Reconnecter les serveurs ?";
 
 /* No comment provided by engineer. */
 "Record updated at" = "Enregistrement mis à jour le";
@@ -3162,7 +3156,7 @@
 "Renegotiate encryption" = "Renégocier le chiffrement";
 
 /* No comment provided by engineer. */
-"Renegotiate encryption?" = "Renégocier le chiffrement?";
+"Renegotiate encryption?" = "Renégocier le chiffrement ?";
 
 /* No comment provided by engineer. */
 "Repeat connection request?" = "Répéter la demande de connexion ?";
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ débloqué";
 
-/* item status description */
-"Unexpected error: %@" = "Erreur inattendue : %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "État de la migration inattendu";
 
@@ -4170,7 +4161,7 @@
 "wants to connect to you!" = "veut établir une connexion !";
 
 /* No comment provided by engineer. */
-"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Attention: démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages";
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Attention : démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages";
 
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Attention : vous risquez de perdre des données !";

apps/ios/hu.lproj/Localizable.strings

@@ -345,7 +345,7 @@
 "Accept" = "Elfogadás";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Kapcsolatfelvétel elfogadása?";
+"Accept connection request?" = "Kapcsolódási kérelem elfogadása?";
 
 /* notification body */
 "Accept contact request from %@?" = "Elfogadja %@ kapcsolat kérését?";
@@ -444,16 +444,16 @@
 "Allow" = "Engedélyezés";
 
 /* No comment provided by engineer. */
-"Allow calls only if your contact allows them." = "Hívások engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.";
+"Allow calls only if your contact allows them." = "A hívások kezdeményezése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
 
 /* No comment provided by engineer. */
-"Allow disappearing messages only if your contact allows it to you." = "Eltűnő üzenetek engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi az ön számára.";
+"Allow disappearing messages only if your contact allows it to you." = "Az eltűnő üzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi az ön számára.";
 
 /* No comment provided by engineer. */
-"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Üzenet végleges törlésének engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi. (24 óra)";
+"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Az üzenetek végleges törlése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)";
 
 /* No comment provided by engineer. */
-"Allow message reactions only if your contact allows them." = "Üzenetreakciók engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.";
+"Allow message reactions only if your contact allows them." = "Az üzenetreakciók küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
 
 /* No comment provided by engineer. */
 "Allow message reactions." = "Üzenetreakciók engedélyezése.";
@@ -462,7 +462,7 @@
 "Allow sending direct messages to members." = "Közvetlen üzenetek küldésének engedélyezése a tagok számára.";
 
 /* No comment provided by engineer. */
-"Allow sending disappearing messages." = "Eltűnő üzenetek küldésének engedélyezése.";
+"Allow sending disappearing messages." = "Az eltűnő üzenetek küldése engedélyezve van.";
 
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Elküldött üzenetek végleges törlésének engedélyezése. (24 óra)";
@@ -477,25 +477,25 @@
 "Allow to send voice messages." = "Hangüzenetek küldésének engedélyezése.";
 
 /* No comment provided by engineer. */
-"Allow voice messages only if your contact allows them." = "Hangüzenetek küldésének engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.";
+"Allow voice messages only if your contact allows them." = "A hangüzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
 
 /* No comment provided by engineer. */
 "Allow voice messages?" = "Hangüzenetek engedélyezése?";
 
 /* No comment provided by engineer. */
-"Allow your contacts adding message reactions." = "Ismerősök általi üzenetreakciók hozzáadásának engedélyezése.";
+"Allow your contacts adding message reactions." = "Az üzenetreakciók küldése engedélyezve van az ismerősei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to call you." = "Hívások engedélyezése ismerősök számára.";
+"Allow your contacts to call you." = "A hívások kezdeményezése engedélyezve van az ismerősei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to irreversibly delete sent messages. (24 hours)" = "Elküldött üzenetek végleges törlésének engedélyezése az ismerősök számára. (24 óra)";
+"Allow your contacts to irreversibly delete sent messages. (24 hours)" = "Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)";
 
 /* No comment provided by engineer. */
-"Allow your contacts to send disappearing messages." = "Eltűnő üzenetek engedélyezése ismerősök számára.";
+"Allow your contacts to send disappearing messages." = "Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to send voice messages." = "Hangüzenetek küldésének engedélyezése ismerősök számára.";
+"Allow your contacts to send voice messages." = "A hangüzenetek küldése engedélyezve van az ismerősei számára.";
 
 /* No comment provided by engineer. */
 "Already connected?" = "Már kapcsolódott?";
@@ -573,10 +573,10 @@
 "Audio/video calls" = "Hang-/videóhívások";
 
 /* No comment provided by engineer. */
-"Audio/video calls are prohibited." = "A hang- és videóhívások le vannak tiltva.";
+"Audio/video calls are prohibited." = "A hívások kezdeményezése le van tiltva ebben a csevegésben.";
 
 /* PIN entry */
-"Authentication cancelled" = "Hitelesítés megszakítva";
+"Authentication cancelled" = "Hitelesítés visszavonva";
 
 /* No comment provided by engineer. */
 "Authentication failed" = "Sikertelen hitelesítés";
@@ -594,7 +594,7 @@
 "Auto-accept" = "Automatikus elfogadás";
 
 /* No comment provided by engineer. */
-"Auto-accept contact requests" = "Ismerős jelölések automatikus elfogadása";
+"Auto-accept contact requests" = "Kapcsolódási kérelmek automatikus elfogadása";
 
 /* No comment provided by engineer. */
 "Auto-accept images" = "Fotók automatikus elfogadása";
@@ -636,7 +636,7 @@
 "Block member" = "Tag blokkolása";
 
 /* No comment provided by engineer. */
-"Block member for all?" = "Tag letiltása mindenki számára?";
+"Block member for all?" = "Mindenki számára letiltja ezt a tagot?";
 
 /* No comment provided by engineer. */
 "Block member?" = "Tag blokkolása?";
@@ -663,7 +663,7 @@
 "Both you and your contact can irreversibly delete sent messages. (24 hours)" = "Mindkét fél törölheti véglegesen az elküldött üzeneteket. (24 óra)";
 
 /* No comment provided by engineer. */
-"Both you and your contact can make calls." = "Mindkét fél tud hívásokat indítani.";
+"Both you and your contact can make calls." = "Mindkét fél tud hívásokat kezdeményezni.";
 
 /* No comment provided by engineer. */
 "Both you and your contact can send disappearing messages." = "Mindkét fél küldhet eltűnő üzeneteket.";
@@ -708,7 +708,7 @@
 "Cancel migration" = "Átköltöztetés visszavonása";
 
 /* feature offered item */
-"cancelled %@" = "%@ törölve";
+"cancelled %@" = "%@ visszavonva";
 
 /* No comment provided by engineer. */
 "Cannot access keychain to save database password" = "Nem lehet hozzáférni a kulcstartóhoz az adatbázis jelszavának mentéséhez";
@@ -1006,7 +1006,7 @@
 "Contacts" = "Ismerősök";
 
 /* No comment provided by engineer. */
-"Contacts can mark messages for deletion; you will be able to view them." = "Az ismerősök törlésre jelölhetnek üzeneteket ; megtekintheti őket.";
+"Contacts can mark messages for deletion; you will be able to view them." = "Az ismerősei törlésre jelölhetnek üzeneteket; ön majd meg tudja nézni azokat.";
 
 /* No comment provided by engineer. */
 "Continue" = "Folytatás";
@@ -1075,7 +1075,7 @@
 "Creating link…" = "Hivatkozás létrehozása…";
 
 /* No comment provided by engineer. */
-"creator" = "szerző";
+"creator" = "készítő";
 
 /* No comment provided by engineer. */
 "Current Passcode" = "Jelenlegi jelkód";
@@ -1183,7 +1183,7 @@
 "Delete address?" = "Azonosító törlése?";
 
 /* No comment provided by engineer. */
-"Delete after" = "Törlés miután";
+"Delete after" = "Törlés ennyi idő után";
 
 /* No comment provided by engineer. */
 "Delete all files" = "Minden fájl törlése";
@@ -1261,7 +1261,7 @@
 "Delete messages" = "Üzenetek törlése";
 
 /* No comment provided by engineer. */
-"Delete messages after" = "Üzenetek törlése miután";
+"Delete messages after" = "Üzenetek törlése ennyi idő után";
 
 /* No comment provided by engineer. */
 "Delete old database" = "Régi adatbázis törlése";
@@ -1348,7 +1348,7 @@
 "Direct messages" = "Közvetlen üzenetek";
 
 /* No comment provided by engineer. */
-"Direct messages between members are prohibited in this group." = "Ebben a csoportban tiltott a tagok közötti közvetlen üzenetek küldése.";
+"Direct messages between members are prohibited in this group." = "A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.";
 
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Letiltás (felülírások megtartásával)";
@@ -1369,7 +1369,7 @@
 "Disappearing messages" = "Eltűnő üzenetek";
 
 /* No comment provided by engineer. */
-"Disappearing messages are prohibited in this chat." = "Az eltűnő üzenetek le vannak tiltva ebben a csevegésben.";
+"Disappearing messages are prohibited in this chat." = "Az eltűnő üzenetek küldése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
 "Disappearing messages are prohibited in this group." = "Az eltűnő üzenetek küldése le van tiltva ebben a csoportban.";
@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Hiba: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Hiba: %@";
 
 /* No comment provided by engineer. */
@@ -2077,7 +2077,7 @@
 "If you enter this passcode when opening the app, all app data will be irreversibly removed!" = "Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen törlődik!";
 
 /* No comment provided by engineer. */
-"If you enter your self-destruct passcode while opening the app:" = "Ha az alkalmazás megnyitásakor az önmegsemmisítő jelkódot megadásra kerül:";
+"If you enter your self-destruct passcode while opening the app:" = "Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:";
 
 /* No comment provided by engineer. */
 "If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." = "Ha most kell használnia a csevegést, koppintson a ** Csináld később** elemre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis áttelepítése).";
@@ -2245,16 +2245,16 @@
 "Invite to group" = "Meghívás a csoportba";
 
 /* No comment provided by engineer. */
-"invited" = "meghívta";
+"invited" = "meghíva";
 
 /* rcv group event chat item */
-"invited %@" = "meghívta %@-t";
+"invited %@" = "meghívta őt: %@";
 
 /* chat list item title */
 "invited to connect" = "meghívta, hogy csatlakozzon";
 
 /* rcv group event chat item */
-"invited via your group link" = "meghívta a csoport hivatkozásán keresztül";
+"invited via your group link" = "meghíva az ön csoport hivatkozásán keresztül";
 
 /* No comment provided by engineer. */
 "iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "Az iOS kulcstár a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.";
@@ -2266,10 +2266,10 @@
 "Irreversible message deletion" = "Végleges üzenettörlés";
 
 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited in this chat." = "Ebben a csevegésben az üzenetek végleges törlése le van tiltva.";
+"Irreversible message deletion is prohibited in this chat." = "Az üzenetek végleges törlése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited in this group." = "Ebben a csoportban az üzenetek végleges törlése le van tiltva.";
+"Irreversible message deletion is prohibited in this group." = "Az üzenetek végleges törlése le van tiltva ebben a csoportban.";
 
 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Lehetővé teszi, hogy egyetlen csevegőprofilon belül több anonim kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.";
@@ -2344,7 +2344,7 @@
 "Learn more" = "Tudjon meg többet";
 
 /* No comment provided by engineer. */
-"Leave" = "Elhagy";
+"Leave" = "Elhagyás";
 
 /* No comment provided by engineer. */
 "Leave group" = "Csoport elhagyása";
@@ -2419,10 +2419,10 @@
 "Mark deleted for everyone" = "Jelölje meg mindenki számára töröltként";
 
 /* No comment provided by engineer. */
-"Mark read" = "Megjelölés olvasottként";
+"Mark read" = "Olvasottként jelölés";
 
 /* No comment provided by engineer. */
-"Mark verified" = "Ellenőrzöttként jelölve";
+"Mark verified" = "Hitelesítés";
 
 /* No comment provided by engineer. */
 "Markdown in messages" = "Markdown az üzenetekben";
@@ -2443,7 +2443,7 @@
 "member %@ changed to %@" = "%1$@ megváltoztatta a nevét erre: %2$@";
 
 /* rcv group event chat item */
-"member connected" = "kapcsolódva";
+"member connected" = "kapcsolódott";
 
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "A tag szerepköre meg fog változni erre: \"%@\". A csoport minden tagja értesítést kap róla.";
@@ -2467,10 +2467,10 @@
 "Message reactions" = "Üzenetreakciók";
 
 /* No comment provided by engineer. */
-"Message reactions are prohibited in this chat." = "Az üzenetreakciók ebben a csevegésben le vannak tiltva.";
+"Message reactions are prohibited in this chat." = "Az üzenetreakciók küldése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Message reactions are prohibited in this group." = "Ebben a csoportban az üzenetreakciók le vannak tiltva.";
+"Message reactions are prohibited in this group." = "Az üzenetreakciók küldése le van tiltva ebben a csoportban.";
 
 /* notification */
 "message received" = "üzenet érkezett";
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Valószínűleg ez a kapcsolat törlésre került.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Valószínűleg ez az ismerős törölte önnel a kapcsolatot.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Több csevegőprofil";
 
@@ -2775,7 +2772,7 @@
 "Only your contact can make calls." = "Csak az ismerős tud hívást indítani.";
 
 /* No comment provided by engineer. */
-"Only your contact can send disappearing messages." = "Csak az ismerős tud eltűnő üzeneteket küldeni.";
+"Only your contact can send disappearing messages." = "Csak az ismerőse tud eltűnő üzeneteket küldeni.";
 
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Csak az ismerős tud hangüzeneteket küldeni.";
@@ -2976,22 +2973,22 @@
 "Profile update will be sent to your contacts." = "A profilfrissítés elküldésre került az ismerősök számára.";
 
 /* No comment provided by engineer. */
-"Prohibit audio/video calls." = "Hang- és videóhívások tiltása.";
+"Prohibit audio/video calls." = "A hívások kezdeményezése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Prohibit irreversible message deletion." = "Az üzenetek véglegesen való törlése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit message reactions." = "Üzenetreakciók tiltása.";
+"Prohibit message reactions." = "Az üzenetreakciók küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Az üzenetreakciók tiltása.";
 
 /* No comment provided by engineer. */
-"Prohibit sending direct messages to members." = "Közvetlen üzenetek küldésének letiltása a tagok számára.";
+"Prohibit sending direct messages to members." = "A közvetlen üzenetek küldése le van tiltva a tagok között.";
 
 /* No comment provided by engineer. */
-"Prohibit sending disappearing messages." = "Eltűnő üzenetek küldésének letiltása.";
+"Prohibit sending disappearing messages." = "Az eltűnő üzenetek küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Prohibit sending files and media." = "Fájlok- és a médiatartalom küldés letiltása.";
@@ -3000,7 +2997,7 @@
 "Prohibit sending SimpleX links." = "A SimpleX hivatkozások küldése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit sending voice messages." = "Hangüzenetek küldésének letiltása.";
+"Prohibit sending voice messages." = "A hangüzenetek küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Protect app screen" = "Alkalmazás képernyőjének védelme";
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Egyidejű fogadás";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "A fájl fogadása leállt.";
 
@@ -3132,10 +3126,10 @@
 "Remove" = "Eltávolítás";
 
 /* No comment provided by engineer. */
-"Remove member" = "Tag eltávolítása";
+"Remove member" = "Eltávolítás";
 
 /* No comment provided by engineer. */
-"Remove member?" = "Tag eltávolítása?";
+"Remove member?" = "Biztosan eltávolítja?";
 
 /* No comment provided by engineer. */
 "Remove passphrase from keychain?" = "Jelmondat eltávolítása a kulcstárolóból?";
@@ -3306,7 +3300,7 @@
 "Saved WebRTC ICE servers will be removed" = "A mentett WebRTC ICE kiszolgálók eltávolításra kerülnek";
 
 /* No comment provided by engineer. */
-"Scan code" = "Kód beolvasása";
+"Scan code" = "Beolvasás";
 
 /* No comment provided by engineer. */
 "Scan QR code" = "QR-kód beolvasása";
@@ -3411,7 +3405,7 @@
 "Send up to 100 last messages to new members." = "Az utolsó 100 üzenet elküldése az új tagoknak.";
 
 /* No comment provided by engineer. */
-"Sender cancelled file transfer." = "A küldő megszakította a fájl átvitelt.";
+"Sender cancelled file transfer." = "A fájl küldője visszavonta az átvitelt.";
 
 /* No comment provided by engineer. */
 "Sender may have deleted the connection request." = "A küldő törölhette a kapcsolódási kérelmet.";
@@ -3570,7 +3564,7 @@
 "SimpleX links" = "SimpleX hivatkozások";
 
 /* No comment provided by engineer. */
-"SimpleX links are prohibited in this group." = "A SimpleX hivatkozások küldése ebben a csoportban le van tiltva.";
+"SimpleX links are prohibited in this group." = "A SimpleX hivatkozások küldése le van tiltva ebben a csoportban.";
 
 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "A SimpleX hivatkozások küldése le van tiltva";
@@ -3753,7 +3747,7 @@
 "The code you scanned is not a SimpleX link QR code." = "A beolvasott kód nem egy SimpleX hivatkozás QR-kód.";
 
 /* No comment provided by engineer. */
-"The connection you accepted will be cancelled!" = "Az ön által elfogadott kapcsolat megszakad!";
+"The connection you accepted will be cancelled!" = "Az ön által elfogadott kapcsolat vissza lesz vonva!";
 
 /* No comment provided by engineer. */
 "The contact you shared this link with will NOT be able to connect!" = "Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ feloldva";
 
-/* item status description */
-"Unexpected error: %@" = "Váratlan hiba: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Váratlan átköltöztetési állapot";
 
@@ -3999,7 +3990,7 @@
 "Update transport isolation mode?" = "Kapcsolat izolációs mód frissítése?";
 
 /* rcv group event chat item */
-"updated group profile" = "módosított csoport profil";
+"updated group profile" = "frissítette a csoport profilját";
 
 /* profile update event chat item */
 "updated profile" = "frissített profil";
@@ -4137,7 +4128,7 @@
 "Voice messages" = "Hangüzenetek";
 
 /* No comment provided by engineer. */
-"Voice messages are prohibited in this chat." = "A hangüzenetek le vannak tiltva ebben a csevegésben.";
+"Voice messages are prohibited in this chat." = "A hangüzenetek küldése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
 "Voice messages are prohibited in this group." = "A hangüzenetek küldése le van tiltva ebben a csoportban.";
@@ -4149,7 +4140,7 @@
 "Voice messages prohibited!" = "A hangüzenetek le vannak tilva!";
 
 /* No comment provided by engineer. */
-"waiting for answer…" = "várakozás válaszra…";
+"waiting for answer…" = "várakozás a válaszra…";
 
 /* No comment provided by engineer. */
 "waiting for confirmation…" = "várakozás a visszaigazolásra…";
@@ -4461,7 +4452,7 @@
 "Your chat profiles" = "Csevegési profiljai";
 
 /* No comment provided by engineer. */
-"Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)." = "Az ismerősnek online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.\nMegszakíthatja ezt a kapcsolatfelvételt és törölheti az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).";
+"Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)." = "Az ismerősének online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.\nVisszavonhatja ezt a kapcsolatfelvételt és törölheti az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).";
 
 /* No comment provided by engineer. */
 "Your contact sent a file that is larger than currently supported maximum size (%@)." = "Ismerőse olyan fájlt küldött, amely meghaladja a jelenleg támogatott maximális méretet (%@).";

apps/ios/it.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Errore: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Errore: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Probabilmente questa connessione è stata eliminata.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Probabilmente questo contatto ha eliminato la connessione con te.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Profili di chat multipli";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "L'indirizzo di ricezione verrà cambiato in un server diverso. La modifica dell'indirizzo verrà completata dopo che il mittente sarà in linea.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Ricezione concomitanza";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "La ricezione del file verrà interrotta.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "ha sbloccato %@";
 
-/* item status description */
-"Unexpected error: %@" = "Errore imprevisto: % @";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Stato di migrazione imprevisto";
 

apps/ios/ja.lproj/Localizable.strings

@@ -1509,7 +1509,7 @@
 /* No comment provided by engineer. */
 "Error: " = "エラー : ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "エラー : %@";
 
 /* No comment provided by engineer. */
@@ -2130,9 +2130,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "おそらく、この接続は削除されています。";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "恐らくこの連絡先があなたとの接続を削除しました。";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "複数チャットのプロフィール";
 
@@ -3191,9 +3188,6 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "音声メッセージを録音できません";
 
-/* item status description */
-"Unexpected error: %@" = "予期しないエラー: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "予期しない移行状態";
 

apps/ios/nl.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Fout: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Fout: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Hoogstwaarschijnlijk is deze verbinding verwijderd.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Hoogstwaarschijnlijk heeft dit contact de verbinding met jou verwijderd.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Meerdere chat profielen";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Het ontvangstadres wordt gewijzigd naar een andere server. Adres wijziging wordt voltooid nadat de afzender online is.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Gelijktijdig ontvangen";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Het ontvangen van het bestand wordt gestopt.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "gedeblokkeerd %@";
 
-/* item status description */
-"Unexpected error: %@" = "Onverwachte fout: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Onverwachte migratiestatus";
 

apps/ios/pl.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Błąd: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Błąd: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Najprawdopodobniej to połączenie jest usunięte.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Najprawdopodobniej ten kontakt usunął połączenie z Tobą.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Wiele profili czatu";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Adres odbiorczy zostanie zmieniony na inny serwer. Zmiana adresu zostanie zakończona gdy nadawca będzie online.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Konkurencyjne odbieranie";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Odbieranie pliku zostanie przerwane.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "odblokowano %@";
 
-/* item status description */
-"Unexpected error: %@" = "Nieoczekiwany błąd: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Nieoczekiwany stan migracji";
 

apps/ios/ru.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Ошибка: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Ошибка: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Скорее всего, соединение удалено.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Скорее всего, этот контакт удалил соединение с Вами.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Много профилей чата";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Адрес получения сообщений будет перемещён на другой сервер. Изменение адреса завершится после того как отправитель будет онлайн.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Одновременный приём";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Приём файла будет прекращён.";
 
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ разблокирован";
 
-/* item status description */
-"Unexpected error: %@" = "Неожиданная ошибка: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неожиданная ошибка при перемещении данных чата";
 

apps/ios/th.lproj/Localizable.strings

@@ -1386,7 +1386,7 @@
 /* No comment provided by engineer. */
 "Error: " = "ผิดพลาด: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "ข้อผิดพลาด: % @";
 
 /* No comment provided by engineer. */
@@ -1998,9 +1998,6 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "การปรับปรุงเพิ่มเติมกำลังจะมาเร็ว ๆ นี้!";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "เป็นไปได้มากว่าผู้ติดต่อนี้ได้ลบการเชื่อมต่อกับคุณ";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "โปรไฟล์การแชทหลายรายการ";
 
@@ -3050,9 +3047,6 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "ไม่สามารถบันทึกข้อความเสียง";
 
-/* item status description */
-"Unexpected error: %@" = "ข้อผิดพลาดที่ไม่คาดคิด: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "สถานะการย้ายข้อมูลที่ไม่คาดคิด";
 

apps/ios/tr.lproj/Localizable.strings

@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Hata: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Hata: %@";
 
 /* No comment provided by engineer. */
@@ -2568,9 +2568,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Büyük ihtimalle bu bağlantı silinmiş.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Büyük ihtimalle bu kişi seninle bağlantını sildi.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Çoklu sohbet profili";
 
@@ -3077,9 +3074,6 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Alıcı adresi farklı bir sunucuya değiştirilecektir. Gönderici çevrimiçi olduktan sonra adres değişikliği tamamlanacaktır.";
 
-/* No comment provided by engineer. */
-"Receiving concurrency" = "Eşzamanlılık alınıyor";
-
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Dosya alımı durdurulacaktır.";
 
@@ -3612,7 +3606,7 @@
 "Somebody" = "Biri";
 
 /* No comment provided by engineer. */
-"Square, circle, or anything in between." = "Kare,daire, veya aralarında herhangi birşey.";
+"Square, circle, or anything in between." = "Kare,daire, veya aralarında herhangi bir şey.";
 
 /* chat item text */
 "standard end-to-end encryption" = "standart uçtan uca şifreleme";
@@ -3920,9 +3914,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "engeli kaldırıldı %@";
 
-/* item status description */
-"Unexpected error: %@" = "Beklenmeyen hata: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Beklenmeyen geçiş durumu";
 

apps/ios/uk.lproj/Localizable.strings

@@ -1761,7 +1761,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Помилка: ";
 
-/* No comment provided by engineer. */
+/* snd error text */
 "Error: %@" = "Помилка: %@";
 
 /* No comment provided by engineer. */
@@ -2520,9 +2520,6 @@
 /* item status description */
 "Most likely this connection is deleted." = "Швидше за все, це з'єднання видалено.";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "Швидше за все, цей контакт видалив зв'язок з вами.";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Кілька профілів чату";
 
@@ -3821,9 +3818,6 @@
 /* rcv group event chat item */
 "unblocked %@" = "розблоковано %@";
 
-/* item status description */
-"Unexpected error: %@" = "Неочікувана помилка: %@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неочікуваний стан міграції";
 

apps/ios/zh-Hans.lproj/Localizable.strings

@@ -353,6 +353,12 @@
 /* member role */
 "admin" = "管理员";
 
+/* feature role */
+"admins" = "管理员";
+
+/* No comment provided by engineer. */
+"Admins can block a member for all." = "管理员可以为所有人封禁一名成员。";
+
 /* No comment provided by engineer. */
 "Admins can create the links to join groups." = "管理员可以创建链接以加入群组。";
 
@@ -377,6 +383,9 @@
 /* No comment provided by engineer. */
 "All group members will remain connected." = "所有群组成员将保持连接。";
 
+/* feature role */
+"all members" = "所有成员";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "所有消息都将被删除 - 这无法被撤销！";
 
@@ -389,6 +398,9 @@
 /* No comment provided by engineer. */
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "您的所有联系人将保持连接。个人资料更新将发送给您的联系人。";
 
+/* No comment provided by engineer. */
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "你的所有联系人、对话和文件将被安全加密并分块上传到配置的 XFTP 中继。";
+
 /* No comment provided by engineer. */
 "Allow" = "允许";
 
@@ -419,6 +431,9 @@
 /* No comment provided by engineer. */
 "Allow to send files and media." = "允许发送文件和媒体。";
 
+/* No comment provided by engineer. */
+"Allow to send SimpleX links." = "允许发送 SimpleX 链接。";
+
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "允许发送语音消息。";
 
@@ -467,6 +482,9 @@
 /* No comment provided by engineer. */
 "App build: %@" = "应用程序构建：%@";
 
+/* No comment provided by engineer. */
+"App data migration" = "应用数据迁移";
+
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "应用程序为新的本地文件（视频除外）加密。";
 
@@ -488,6 +506,15 @@
 /* No comment provided by engineer. */
 "Appearance" = "外观";
 
+/* No comment provided by engineer. */
+"Apply" = "应用";
+
+/* No comment provided by engineer. */
+"Archive and upload" = "存档和上传";
+
+/* No comment provided by engineer. */
+"Archiving database" = "正在存档数据库";
+
 /* No comment provided by engineer. */
 "Attach" = "附件";
 
@@ -635,6 +662,9 @@
 /* No comment provided by engineer. */
 "Cancel" = "取消";
 
+/* No comment provided by engineer. */
+"Cancel migration" = "取消迁移";
+
 /* feature offered item */
 "cancelled %@" = "已取消 %@";
 
@@ -644,6 +674,9 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "无法接收文件";
 
+/* No comment provided by engineer. */
+"Cellular" = "移动网络";
+
 /* No comment provided by engineer. */
 "Change" = "更改";
 
@@ -714,6 +747,9 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "聊天已停止。如果你已经在另一台设备商使用过此数据库，你应该在启动聊天前将数据库传输回来。";
 
+/* No comment provided by engineer. */
+"Chat migrated!" = "已迁移聊天！";
+
 /* No comment provided by engineer. */
 "Chat preferences" = "聊天偏好设置";
 
@@ -771,6 +807,9 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "确认数据库升级";
 
+/* No comment provided by engineer. */
+"Confirm network settings" = "确认网络设置";
+
 /* No comment provided by engineer. */
 "Confirm new passphrase…" = "确认新密码……";
 
@@ -780,6 +819,12 @@
 /* No comment provided by engineer. */
 "Confirm password" = "确认密码";
 
+/* No comment provided by engineer. */
+"Confirm that you remember database passphrase to migrate it." = "请在迁移前确认你记得数据库的密码短语。";
+
+/* No comment provided by engineer. */
+"Confirm upload" = "确认上传";
+
 /* server test step */
 "Connect" = "连接";
 
@@ -957,6 +1002,9 @@
 /* No comment provided by engineer. */
 "Created on %@" = "创建于 %@";
 
+/* No comment provided by engineer. */
+"Creating archive link" = "正在创建存档链接";
+
 /* No comment provided by engineer. */
 "Creating link…" = "创建链接中…";
 
@@ -1098,6 +1146,9 @@
 /* No comment provided by engineer. */
 "Delete database" = "删除数据库";
 
+/* No comment provided by engineer. */
+"Delete database from this device" = "从这部设备上删除数据库";
+
 /* server test step */
 "Delete file" = "删除文件";
 
@@ -1287,9 +1338,21 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "降级并打开聊天";
 
+/* chat item action */
+"Download" = "下载";
+
+/* No comment provided by engineer. */
+"Download failed" = "下载失败了";
+
 /* server test step */
 "Download file" = "下载文件";
 
+/* No comment provided by engineer. */
+"Downloading archive" = "正在下载存档";
+
+/* No comment provided by engineer. */
+"Downloading link details" = "正在下载链接详情";
+
 /* No comment provided by engineer. */
 "Duplicate display name!" = "重复的显示名！";
 
@@ -1323,6 +1386,9 @@
 /* No comment provided by engineer. */
 "Enable for all" = "全部启用";
 
+/* No comment provided by engineer. */
+"Enable in direct chats (BETA)!" = "在私聊中开启（公测）！";
+
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "启用即时通知？";
 
@@ -1350,6 +1416,9 @@
 /* enabled status */
 "enabled" = "已启用";
 
+/* No comment provided by engineer. */
+"Enabled for" = "启用对象";
+
 /* enabled status */
 "enabled for contact" = "已为联系人启用";
 
@@ -1431,6 +1500,9 @@
 /* No comment provided by engineer. */
 "Enter Passcode" = "输入密码";
 
+/* No comment provided by engineer. */
+"Enter passphrase" = "输入密码短语";
+
 /* No comment provided by engineer. */
 "Enter passphrase…" = "输入密码……";
 
@@ -1521,6 +1593,9 @@
 /* No comment provided by engineer. */
 "Error deleting user profile" = "删除用户资料错误";
 
+/* No comment provided by engineer. */
+"Error downloading the archive" = "下载存档出错";
+
 /* No comment provided by engineer. */
 "Error enabling delivery receipts!" = "启用送达回执出错！";
 
@@ -1563,6 +1638,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "保存密码到钥匙串错误";
 
+/* when migrating */
+"Error saving settings" = "保存设置出错";
+
 /* No comment provided by engineer. */
 "Error saving user password" = "保存用户密码时出错";
 
@@ -1603,9 +1681,15 @@
 "Error updating user privacy" = "更新用户隐私时出错";
 
 /* No comment provided by engineer. */
-"Error: " = "错误： ";
+"Error uploading the archive" = "上传存档出错";
 
 /* No comment provided by engineer. */
+"Error verifying passphrase:" = "验证密码短语出错：";
+
+/* No comment provided by engineer. */
+"Error: " = "错误： ";
+
+/* snd error text */
 "Error: %@" = "错误： ％@";
 
 /* No comment provided by engineer. */
@@ -1635,6 +1719,9 @@
 /* No comment provided by engineer. */
 "Exported database archive." = "导出数据库归档。";
 
+/* No comment provided by engineer. */
+"Exported file doesn't exist" = "导出的文件不存在";
+
 /* No comment provided by engineer. */
 "Exporting database archive…" = "导出数据库档案中…";
 
@@ -1671,12 +1758,21 @@
 /* No comment provided by engineer. */
 "Files and media are prohibited in this group." = "此群组中禁止文件和媒体。";
 
+/* No comment provided by engineer. */
+"Files and media not allowed" = "不允许文件和媒体";
+
 /* No comment provided by engineer. */
 "Files and media prohibited!" = "禁止文件和媒体！";
 
 /* No comment provided by engineer. */
 "Filter unread and favorite chats." = "过滤未读和收藏的聊天记录。";
 
+/* No comment provided by engineer. */
+"Finalize migration" = "完成迁移";
+
+/* No comment provided by engineer. */
+"Finalize migration on another device." = "在另一部设备上完成迁移";
+
 /* No comment provided by engineer. */
 "Finally, we have them! 🚀" = "终于我们有它们了！ 🚀";
 
@@ -1704,6 +1800,21 @@
 /* No comment provided by engineer. */
 "For console" = "用于控制台";
 
+/* chat item action */
+"Forward" = "转发";
+
+/* No comment provided by engineer. */
+"Forward and save messages" = "转发并保存消息";
+
+/* No comment provided by engineer. */
+"forwarded" = "已转发";
+
+/* No comment provided by engineer. */
+"Forwarded" = "已转发";
+
+/* No comment provided by engineer. */
+"Forwarded from" = "转发自";
+
 /* No comment provided by engineer. */
 "Found desktop" = "找到了桌面";
 
@@ -1779,6 +1890,9 @@
 /* No comment provided by engineer. */
 "Group members can send files and media." = "群组成员可以发送文件和媒体。";
 
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "群成员可发送 SimpleX 链接。";
+
 /* No comment provided by engineer. */
 "Group members can send voice messages." = "群组成员可以发送语音消息。";
 
@@ -1896,6 +2010,12 @@
 /* No comment provided by engineer. */
 "Import database" = "导入数据库";
 
+/* No comment provided by engineer. */
+"Import failed" = "导入失败了";
+
+/* No comment provided by engineer. */
+"Importing archive" = "正在导入存档";
+
 /* No comment provided by engineer. */
 "Improved message delivery" = "改进了消息传递";
 
@@ -1905,9 +2025,15 @@
 /* No comment provided by engineer. */
 "Improved server configuration" = "改进的服务器配置";
 
+/* No comment provided by engineer. */
+"In order to continue, chat should be stopped." = "必须停止聊天才能继续。";
+
 /* No comment provided by engineer. */
 "In reply to" = "答复";
 
+/* No comment provided by engineer. */
+"In-call sounds" = "通话声音";
+
 /* No comment provided by engineer. */
 "Incognito" = "隐身聊天";
 
@@ -1986,6 +2112,12 @@
 /* No comment provided by engineer. */
 "Invalid display name!" = "无效的显示名！";
 
+/* No comment provided by engineer. */
+"Invalid link" = "无效链接";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "迁移确认无效";
+
 /* No comment provided by engineer. */
 "Invalid name!" = "无效名称！";
 
@@ -2232,18 +2364,45 @@
 /* notification */
 "message received" = "消息已收到";
 
+/* No comment provided by engineer. */
+"Message source remains private." = "消息来源保持私密。";
+
 /* No comment provided by engineer. */
 "Message text" = "消息正文";
 
+/* No comment provided by engineer. */
+"Message too large" = "消息太大了";
+
 /* No comment provided by engineer. */
 "Messages" = "消息";
 
 /* No comment provided by engineer. */
 "Messages & files" = "消息";
 
+/* No comment provided by engineer. */
+"Migrate device" = "迁移设备";
+
+/* No comment provided by engineer. */
+"Migrate from another device" = "从另一台设备迁移";
+
+/* No comment provided by engineer. */
+"Migrate here" = "迁移到此处";
+
+/* No comment provided by engineer. */
+"Migrate to another device" = "迁移到另一部设备";
+
+/* No comment provided by engineer. */
+"Migrate to another device via QR code." = "通过二维码迁移到另一部设备。";
+
+/* No comment provided by engineer. */
+"Migrating" = "迁移中";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "迁移数据库档案中…";
 
+/* No comment provided by engineer. */
+"Migration complete" = "迁移完毕";
+
 /* No comment provided by engineer. */
 "Migration error:" = "迁移错误：";
 
@@ -2283,12 +2442,12 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "更多改进即将推出！";
 
+/* No comment provided by engineer. */
+"More reliable network connection." = "更可靠的网络连接。";
+
 /* item status description */
 "Most likely this connection is deleted." = "此连接很可能已被删除。";
 
-/* No comment provided by engineer. */
-"Most likely this contact has deleted the connection with you." = "很可能此联系人已经删除了与您的联系。";
-
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "多个聊天资料";
 
@@ -2304,6 +2463,12 @@
 /* No comment provided by engineer. */
 "Network & servers" = "网络和服务器";
 
+/* No comment provided by engineer. */
+"Network connection" = "网络连接";
+
+/* No comment provided by engineer. */
+"Network management" = "网络管理";
+
 /* No comment provided by engineer. */
 "Network settings" = "网络设置";
 
@@ -2382,6 +2547,9 @@
 /* No comment provided by engineer. */
 "No history" = "无历史记录";
 
+/* No comment provided by engineer. */
+"No network connection" = "无网络连接";
+
 /* No comment provided by engineer. */
 "No permission to record voice message" = "没有录制语音消息的权限";
 
@@ -2510,15 +2678,27 @@
 /* No comment provided by engineer. */
 "Open-source protocol and code – anybody can run the servers." = "开源协议和代码——任何人都可以运行服务器。";
 
+/* No comment provided by engineer. */
+"Or paste archive link" = "或粘贴存档链接";
+
 /* No comment provided by engineer. */
 "Or scan QR code" = "或者扫描二维码";
 
+/* No comment provided by engineer. */
+"Or securely share this file link" = "或安全地分享此文件链接";
+
 /* No comment provided by engineer. */
 "Or show this code" = "或者显示此码";
 
+/* No comment provided by engineer. */
+"Other" = "其他";
+
 /* member role */
 "owner" = "群主";
 
+/* feature role */
+"owners" = "所有者";
+
 /* No comment provided by engineer. */
 "Passcode" = "密码";
 
@@ -2561,6 +2741,9 @@
 /* message decrypt error item */
 "Permanent decryption error" = "解密错误";
 
+/* No comment provided by engineer. */
+"Picture-in-picture calls" = "画中画通话";
+
 /* No comment provided by engineer. */
 "PING count" = "PING 次数";
 
@@ -2579,6 +2762,9 @@
 /* No comment provided by engineer. */
 "Please check yours and your contact preferences." = "请检查您和您的联系人偏好设置。";
 
+/* No comment provided by engineer. */
+"Please confirm that network settings are correct for this device." = "请确认网络设置对此这台设备正确无误。";
+
 /* No comment provided by engineer. */
 "Please contact group admin." = "请联系群组管理员。";
 
@@ -2639,6 +2825,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "资料图片";
 
+/* No comment provided by engineer. */
+"Profile images" = "个人资料图";
+
 /* No comment provided by engineer. */
 "Profile name:" = "显示名：";
 
@@ -2687,6 +2876,12 @@
 /* No comment provided by engineer. */
 "Push notifications" = "推送通知";
 
+/* chat item text */
+"quantum resistant e2e encryption" = "抗量子端到端加密";
+
+/* No comment provided by engineer. */
+"Quantum resistant encryption" = "抗量子加密";
+
 /* No comment provided by engineer. */
 "Rate the app" = "评价此应用程序";
 
@@ -2744,6 +2939,9 @@
 /* No comment provided by engineer. */
 "Receiving via" = "接收通过";
 
+/* No comment provided by engineer. */
+"Recipient(s) can't see who this message is from." = "收件人看不到这条消息来自何人。";
+
 /* No comment provided by engineer. */
 "Recipients see updates as you type them." = "对方会在您键入时看到更新。";
 
@@ -2819,9 +3017,18 @@
 /* No comment provided by engineer. */
 "Repeat connection request?" = "重复连接请求吗？";
 
+/* No comment provided by engineer. */
+"Repeat download" = "重复下载";
+
+/* No comment provided by engineer. */
+"Repeat import" = "重复导入";
+
 /* No comment provided by engineer. */
 "Repeat join request?" = "重复加入请求吗？";
 
+/* No comment provided by engineer. */
+"Repeat upload" = "重复上传";
+
 /* chat item action */
 "Reply" = "回复";
 
@@ -2879,6 +3086,9 @@
 /* No comment provided by engineer. */
 "Run chat" = "运行聊天程序";
 
+/* No comment provided by engineer. */
+"Safer groups" = "更安全的群组";
+
 /* chat item action */
 "Save" = "保存";
 
@@ -2927,6 +3137,15 @@
 /* No comment provided by engineer. */
 "Save welcome message?" = "保存欢迎信息？";
 
+/* No comment provided by engineer. */
+"saved" = "已保存";
+
+/* No comment provided by engineer. */
+"Saved" = "已保存";
+
+/* No comment provided by engineer. */
+"Saved from" = "保存自";
+
 /* message info title */
 "Saved message" = "已保存的消息";
 
@@ -3119,6 +3338,9 @@
 /* No comment provided by engineer. */
 "Set passcode" = "设置密码";
 
+/* No comment provided by engineer. */
+"Set passphrase" = "设置密码短语";
+
 /* No comment provided by engineer. */
 "Set passphrase to export" = "设置密码来导出";
 
@@ -3131,6 +3353,9 @@
 /* No comment provided by engineer. */
 "Settings" = "设置";
 
+/* No comment provided by engineer. */
+"Shape profile images" = "改变个人资料图形状";
+
 /* chat item action */
 "Share" = "分享";
 
@@ -3164,6 +3389,9 @@
 /* No comment provided by engineer. */
 "Show preview" = "显示预览";
 
+/* No comment provided by engineer. */
+"Show QR code" = "显示二维码";
+
 /* No comment provided by engineer. */
 "Show:" = "显示：";
 
@@ -3188,6 +3416,12 @@
 /* chat feature */
 "SimpleX links" = "SimpleX 链接";
 
+/* No comment provided by engineer. */
+"SimpleX links are prohibited in this group." = "此群禁止 SimpleX 链接。";
+
+/* No comment provided by engineer. */
+"SimpleX links not allowed" = "不允许SimpleX 链接";
+
 /* No comment provided by engineer. */
 "SimpleX Lock" = "SimpleX 锁定";
 
@@ -3224,6 +3458,12 @@
 /* notification title */
 "Somebody" = "某人";
 
+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "方形、圆形、或两者之间的任意形状";
+
+/* chat item text */
+"standard end-to-end encryption" = "标准端到端加密";
+
 /* No comment provided by engineer. */
 "Start chat" = "开始聊天";
 
@@ -3239,6 +3479,9 @@
 /* No comment provided by engineer. */
 "Stop" = "停止";
 
+/* No comment provided by engineer. */
+"Stop chat" = "停止聊天程序";
+
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "停止聊天以启用数据库操作";
 
@@ -3266,6 +3509,9 @@
 /* authentication reason */
 "Stop SimpleX" = "停止 SimpleX";
 
+/* No comment provided by engineer. */
+"Stopping chat" = "正在停止聊天";
+
 /* No comment provided by engineer. */
 "strike" = "删去";
 
@@ -3416,6 +3662,12 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "此操作无法撤消——您的个人资料、联系人、消息和文件将不可撤回地丢失。";
 
+/* E2EE info chat item */
+"This chat is protected by end-to-end encryption." = "此聊天受端到端加密保护。";
+
+/* E2EE info chat item */
+"This chat is protected by quantum resistant end-to-end encryption." = "此聊天受抗量子的端到端加密保护。";
+
 /* notification title */
 "this contact" = "这个联系人";
 
@@ -3509,9 +3761,6 @@
 /* No comment provided by engineer. */
 "Unblock member?" = "解封成员吗？";
 
-/* item status description */
-"Unexpected error: %@" = "意外错误： ％@";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "未预料的迁移状态";
 
@@ -3602,9 +3851,15 @@
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "升级并打开聊天";
 
+/* No comment provided by engineer. */
+"Upload failed" = "上传失败了";
+
 /* server test step */
 "Upload file" = "上传文件";
 
+/* No comment provided by engineer. */
+"Uploading archive" = "正在上传存档";
+
 /* No comment provided by engineer. */
 "Use .onion hosts" = "使用 .onion 主机";
 
@@ -3632,6 +3887,9 @@
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "使用 SimpleX Chat 服务器？";
 
+/* No comment provided by engineer. */
+"Use the app while in the call." = "通话时使用本应用";
+
 /* No comment provided by engineer. */
 "User profile" = "用户资料";
 
@@ -3656,6 +3914,12 @@
 /* No comment provided by engineer. */
 "Verify connections" = "验证连接";
 
+/* No comment provided by engineer. */
+"Verify database passphrase" = "验证数据库密码短语";
+
+/* No comment provided by engineer. */
+"Verify passphrase" = "验证密码短语";
+
 /* No comment provided by engineer. */
 "Verify security code" = "验证安全码";
 
@@ -3710,6 +3974,9 @@
 /* No comment provided by engineer. */
 "Voice messages are prohibited in this group." = "语音信息在该群组中被禁用。";
 
+/* No comment provided by engineer. */
+"Voice messages not allowed" = "不允许语音消息";
+
 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "语音消息禁止发送！";
 
@@ -3731,6 +3998,9 @@
 /* No comment provided by engineer. */
 "wants to connect to you!" = "想要与您连接！";
 
+/* No comment provided by engineer. */
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "警告：不支持在多部设备上启动聊天，这么做会导致消息传送失败。";
+
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "警告：您可能会丢失部分数据！";
 
@@ -3746,18 +4016,33 @@
 /* No comment provided by engineer. */
 "Welcome message" = "欢迎消息";
 
+/* No comment provided by engineer. */
+"Welcome message is too long" = "欢迎消息太大了";
+
 /* No comment provided by engineer. */
 "What's new" = "更新内容";
 
 /* No comment provided by engineer. */
 "When available" = "当可用时";
 
+/* No comment provided by engineer. */
+"When connecting audio and video calls." = "连接音频和视频通话时。";
+
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "当人们请求连接时，您可以接受或拒绝它。";
 
 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "当您与某人共享隐身聊天资料时，该资料将用于他们邀请您加入的群组。";
 
+/* No comment provided by engineer. */
+"WiFi" = "WiFi";
+
+/* No comment provided by engineer. */
+"Will be enabled in direct chats!" = "将在私聊中启用！";
+
+/* No comment provided by engineer. */
+"Wired ethernet" = "有线以太网";
+
 /* No comment provided by engineer. */
 "With encrypted files and media." = "加密的文件和媒体。";
 
@@ -3779,6 +4064,9 @@
 /* pref value */
 "yes" = "是";
 
+/* No comment provided by engineer. */
+"you" = "您";
+
 /* No comment provided by engineer. */
 "You" = "您";
 
@@ -3824,6 +4112,9 @@
 /* No comment provided by engineer. */
 "You can enable them later via app Privacy & Security settings." = "您可以稍后通过应用程序的 \"隐私与安全 \"设置启用它们。";
 
+/* No comment provided by engineer. */
+"You can give another try." = "你可以再试一次。";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "您可以隐藏或静音用户个人资料——只需向右滑动。";
 

apps/multiplatform/android/build.gradle.kts

@@ -88,6 +88,7 @@ android {
         "cs",
         "de",
         "es",
+        "fa",
         "fi",
         "fr",
         "hu",

apps/multiplatform/android/src/main/java/chat/simplex/app/MessagesFetcherWorker.kt

@@ -7,7 +7,7 @@ import chat.simplex.app.SimplexService.Companion.showPassphraseNotification
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.views.helpers.DBMigrationResult
 import chat.simplex.common.platform.chatModel
-import chat.simplex.common.platform.initChatControllerAndRunMigrations
+import chat.simplex.common.platform.initChatControllerOnStart
 import chat.simplex.common.views.helpers.DatabaseUtils
 import kotlinx.coroutines.*
 import java.util.Date
@@ -60,7 +60,7 @@ class MessagesFetcherWork(
     try {
       // In case of self-destruct is enabled the initialization process will not start in SimplexApp, Let's start it here
       if (DatabaseUtils.ksSelfDestructPassword.get() != null && chatModel.chatDbStatus.value == null) {
-        initChatControllerAndRunMigrations()
+        initChatControllerOnStart()
       }
       withTimeout(durationSeconds * 1000L) {
         val chatController = ChatController

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -6,7 +6,6 @@ import android.content.Context
 import chat.simplex.common.platform.Log
 import android.content.Intent
 import android.content.pm.ActivityInfo
-import android.media.AudioManager
 import android.os.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -66,6 +65,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
     context = this
     initHaskell()
     initMultiplatform()
+    runMigrations()
     tmpDir.deleteRecursively()
     tmpDir.mkdir()
 
@@ -74,7 +74,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
       // It's important, otherwise, user may be locked in undefined state
       appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
     } else if (DatabaseUtils.ksAppPassword.get() == null || DatabaseUtils.ksSelfDestructPassword.get() == null) {
-      initChatControllerAndRunMigrations()
+      initChatControllerOnStart()
     }
     ProcessLifecycleOwner.get().lifecycle.addObserver(this@SimplexApp)
   }
@@ -254,7 +254,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
       override fun androidSetNightModeIfSupported() {
         if (Build.VERSION.SDK_INT < 31) return
 
-        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM.name) {
+        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM_THEME_NAME) {
           null
         } else {
           CurrentColors.value.colors.isLight

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt

@@ -77,7 +77,7 @@ class SimplexService: Service() {
       isServiceStarted = true
       // In case of self-destruct is enabled the initialization process will not start in SimplexApp, Let's start it here
       if (DatabaseUtils.ksSelfDestructPassword.get() != null && chatModel.chatDbStatus.value == null) {
-        initChatControllerAndRunMigrations()
+        initChatControllerOnStart()
       }
     }
   }

apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt

@@ -77,7 +77,7 @@ object NtfManager {
     val msgNtfs = manager.activeNotifications.filter { ntf ->
       ntf.notification.channelId == MessageChannel
     }
-    if (msgNtfs.count() == 1) {
+    if (msgNtfs.size <= 1) {
       // Have a group notification with no children so cancel it
       manager.cancel(0)
     }

apps/multiplatform/common/build.gradle.kts

@@ -37,7 +37,7 @@ kotlin {
         api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
         api("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
         api("com.russhwolf:multiplatform-settings:1.1.1")
-        api("com.charleskorn.kaml:kaml:0.58.0")
+        api("com.charleskorn.kaml:kaml:0.59.0")
         api("org.jetbrains.compose.ui:ui-text:${rootProject.extra["compose.version"] as String}")
         implementation("org.jetbrains.compose.components:components-animatedimage:${rootProject.extra["compose.version"] as String}")
         //Barcode
@@ -53,6 +53,9 @@ kotlin {
     val commonTest by getting {
       dependencies {
         implementation(kotlin("test"))
+        implementation(kotlin("test-junit"))
+        implementation(kotlin("test-common"))
+        implementation(kotlin("test-annotations-common"))
       }
     }
     val androidMain by getting {

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Extensions.kt

@@ -17,6 +17,6 @@ val NotificationsMode.requiresIgnoringBattery
 
 lateinit var APPLICATION_ID: String
 
-fun Uri.toURI(): URI = URI(toString())
+fun Uri.toURI(): URI = URI(toString().replace("\n", ""))
 
 fun URI.toUri(): Uri = Uri.parse(toString())

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Files.android.kt

@@ -15,8 +15,10 @@ actual val dataDir: File = androidAppContext.dataDir
 actual val tmpDir: File = androidAppContext.getDir("temp", Application.MODE_PRIVATE)
 actual val filesDir: File = File(dataDir.absolutePath + File.separator + "files")
 actual val appFilesDir: File = File(filesDir.absolutePath + File.separator + "app_files")
+actual val wallpapersDir: File = File(filesDir.absolutePath + File.separator + "assets" + File.separator + "wallpapers").also { it.mkdirs() }
 actual val coreTmpDir: File = File(filesDir.absolutePath + File.separator + "temp_files")
 actual val dbAbsolutePrefixPath: String = dataDir.absolutePath + File.separator + "files"
+actual val preferencesDir = File(dataDir.absolutePath + File.separator + "shared_prefs")
 
 actual val chatDatabaseFileName: String = "files_chat.db"
 actual val agentDatabaseFileName: String = "files_agent.db"

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Resources.android.kt

@@ -7,6 +7,8 @@ import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.text.BidiFormatter
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.Font
@@ -14,9 +16,11 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.core.graphics.drawable.toBitmap
 import chat.simplex.common.model.AppPreferences
 import com.russhwolf.settings.Settings
 import com.russhwolf.settings.SharedPreferencesSettings
+import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.desc
 
@@ -51,3 +55,6 @@ actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
 actual fun desktopExpandWindowToWidth(width: Dp) {}
 
 actual fun isRtl(text: CharSequence): Boolean = BidiFormatter.getInstance().isRtl(text)
+
+actual fun ImageResource.toComposeImageBitmap(): ImageBitmap? =
+  getDrawable(androidAppContext)?.toBitmap()?.asImageBitmap()

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt

@@ -37,7 +37,7 @@ actual fun ClipboardManager.shareText(text: String) {
   }
 }
 
-actual fun shareFile(text: String, fileSource: CryptoFile) {
+fun openOrShareFile(text: String, fileSource: CryptoFile, justOpen: Boolean) {
   val uri = if (fileSource.cryptoArgs != null) {
     val tmpFile = File(tmpDir, fileSource.filePath)
     tmpFile.deleteOnExit()
@@ -55,20 +55,31 @@ actual fun shareFile(text: String, fileSource: CryptoFile) {
   }
   val ext = fileSource.filePath.substringAfterLast(".")
   val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext) ?: return
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
+  val sendIntent: Intent = Intent(if (justOpen) Intent.ACTION_VIEW else Intent.ACTION_SEND).apply {
     /*if (text.isNotEmpty()) {
       putExtra(Intent.EXTRA_TEXT, text)
     }*/
-    putExtra(Intent.EXTRA_STREAM, uri.toUri())
-    type = mimeType
-    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    if (justOpen) {
+      flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+      setDataAndType(uri.toUri(), mimeType)
+    } else {
+      putExtra(Intent.EXTRA_STREAM, uri.toUri())
+      type = mimeType
+    }
   }
   val shareIntent = Intent.createChooser(sendIntent, null)
   shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
   androidAppContext.startActivity(shareIntent)
 }
 
+actual fun shareFile(text: String, fileSource: CryptoFile) {
+  openOrShareFile(text, fileSource, justOpen = false)
+}
+
+actual fun openFile(fileSource: CryptoFile) {
+  openOrShareFile("", fileSource, justOpen = true)
+}
+
 actual fun UriHandler.sendEmail(subject: String, body: CharSequence) {
   val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
   emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt

@@ -11,6 +11,7 @@ import android.media.*
 import android.os.Build
 import android.os.PowerManager
 import android.os.PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK
+import android.view.View
 import android.view.ViewGroup
 import android.webkit.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
@@ -670,37 +671,43 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
   Box(Modifier.fillMaxSize()) {
     AndroidView(
       factory = { AndroidViewContext ->
-        (staticWebView ?: WebView(androidAppContext)).apply {
-          layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT,
-          )
-          this.webChromeClient = object: WebChromeClient() {
-            override fun onPermissionRequest(request: PermissionRequest) {
-              if (request.origin.toString().startsWith("file:/")) {
-                request.grant(request.resources)
-              } else {
-                Log.d(TAG, "Permission request from webview denied.")
-                request.deny()
+        try {
+          (staticWebView ?: WebView(androidAppContext)).apply {
+            layoutParams = ViewGroup.LayoutParams(
+              ViewGroup.LayoutParams.MATCH_PARENT,
+              ViewGroup.LayoutParams.MATCH_PARENT,
+            )
+            this.webChromeClient = object: WebChromeClient() {
+              override fun onPermissionRequest(request: PermissionRequest) {
+                if (request.origin.toString().startsWith("file:/")) {
+                  request.grant(request.resources)
+                } else {
+                  Log.d(TAG, "Permission request from webview denied.")
+                  request.deny()
+                }
               }
             }
+            this.webViewClient = LocalContentWebViewClient(webView, assetLoader)
+            this.clearHistory()
+            this.clearCache(true)
+            this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
+            this.setBackgroundColor(android.graphics.Color.BLACK)
+            val webViewSettings = this.settings
+            webViewSettings.allowFileAccess = true
+            webViewSettings.allowContentAccess = true
+            webViewSettings.javaScriptEnabled = true
+            webViewSettings.mediaPlaybackRequiresUserGesture = false
+            webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
+            if (staticWebView == null) {
+              this.loadUrl("file:android_asset/www/android/call.html")
+            } else {
+              webView.value = this
+            }
           }
-          this.webViewClient = LocalContentWebViewClient(webView, assetLoader)
-          this.clearHistory()
-          this.clearCache(true)
-          this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
-          this.setBackgroundColor(android.graphics.Color.BLACK)
-          val webViewSettings = this.settings
-          webViewSettings.allowFileAccess = true
-          webViewSettings.allowContentAccess = true
-          webViewSettings.javaScriptEnabled = true
-          webViewSettings.mediaPlaybackRequiresUserGesture = false
-          webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-          if (staticWebView == null) {
-            this.loadUrl("file:android_asset/www/android/call.html")
-          } else {
-            webView.value = this
-          }
+        } catch (e: Exception) {
+          Log.e(TAG, "Error initializing WebView: ${e.stackTraceToString()}")
+          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), generalGetString(MR.strings.error_initializing_web_view).format(e.stackTraceToString()))
+          return@AndroidView View(androidAppContext)
         }
       }
     ) { /* WebView */ }

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/Appearance.android.kt

@@ -19,14 +19,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.*
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import chat.simplex.common.R
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -34,7 +30,6 @@ import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.saveAppLocale
-import chat.simplex.common.views.usersettings.AppearanceScope.ColorEditor
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.painterResource
@@ -46,9 +41,8 @@ enum class AppIcon(val image: ImageResource) {
 }
 
 @Composable
-actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)) {
+actual fun AppearanceView(m: ChatModel) {
   val appIcon = remember { mutableStateOf(findEnabledIcon()) }
-
   fun setAppIcon(newIcon: AppIcon) {
     if (appIcon.value == newIcon) return
     val newComponent = ComponentName(APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
@@ -65,18 +59,11 @@ actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatMod
 
     appIcon.value = newIcon
   }
-
   AppearanceScope.AppearanceLayout(
     appIcon,
     m.controller.appPrefs.appLanguage,
     m.controller.appPrefs.systemDarkTheme,
     changeIcon = ::setAppIcon,
-    showSettingsModal = showSettingsModal,
-    editColor = { name, initialColor ->
-      ModalManager.start.showModalCloseable { close ->
-        ColorEditor(name, initialColor, close)
-      }
-    },
   )
 }
 
@@ -86,8 +73,6 @@ fun AppearanceScope.AppearanceLayout(
   languagePref: SharedPreference<String?>,
   systemDarkTheme: SharedPreference<String?>,
   changeIcon: (AppIcon) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  editColor: (ThemeColor, Color) -> Unit,
 ) {
   ColumnWithScrollBar(
     Modifier.fillMaxWidth(),
@@ -120,6 +105,13 @@ fun AppearanceScope.AppearanceLayout(
       }
       //      }
     }
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ThemesSection(systemDarkTheme)
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ProfileImageSection()
+
     SectionDividerSpaced()
 
     SectionView(stringResource(MR.strings.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
@@ -145,11 +137,6 @@ fun AppearanceScope.AppearanceLayout(
       }
     }
 
-    SectionDividerSpaced(maxTopPadding = true)
-    ProfileImageSection()
-
-    SectionDividerSpaced(maxTopPadding = true)
-    ThemesSection(systemDarkTheme, showSettingsModal, editColor)
     SectionBottomSpacer()
   }
 }
@@ -169,8 +156,6 @@ fun PreviewAppearanceSettings() {
       languagePref = SharedPreference({ null }, {}),
       systemDarkTheme = SharedPreference({ null }, {}),
       changeIcon = {},
-      showSettingsModal = { {} },
-      editColor = { _, _ -> },
     )
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -4,7 +4,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.*
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
@@ -399,6 +399,18 @@ object ChatModel {
     currentUser.value = updated
   }
 
+  fun updateCurrentUserUiThemes(rhId: Long?, uiThemes: ThemeModeOverrides?) {
+    val current = currentUser.value ?: return
+    val updated = current.copy(
+      uiThemes = uiThemes
+    )
+    val i = users.indexOfFirst { it.user.userId == current.userId && it.user.remoteHostId == rhId }
+    if (i != -1) {
+      users[i] = users[i].copy(user = updated)
+    }
+    currentUser.value = updated
+  }
+
   suspend fun addLiveDummy(chatInfo: ChatInfo): ChatItem {
     val cItem = ChatItem.liveDummy(chatInfo is ChatInfo.Direct)
     withContext(Dispatchers.Main) {
@@ -682,7 +694,8 @@ data class User(
   override val showNtfs: Boolean,
   val sendRcptsContacts: Boolean,
   val sendRcptsSmallGroups: Boolean,
-  val viewPwdHash: UserPwdHash?
+  val viewPwdHash: UserPwdHash?,
+  val uiThemes: ThemeModeOverrides? = null,
 ): NamedChat, UserLike {
   override val displayName: String get() = profile.displayName
   override val fullName: String get() = profile.fullName
@@ -709,6 +722,7 @@ data class User(
       sendRcptsContacts = true,
       sendRcptsSmallGroups = false,
       viewPwdHash = null,
+      uiThemes = null,
     )
   }
 }
@@ -1041,16 +1055,21 @@ data class Contact(
   override val updatedAt: Instant,
   val chatTs: Instant?,
   val contactGroupMemberId: Long? = null,
-  val contactGrpInvSent: Boolean
+  val contactGrpInvSent: Boolean,
+  val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Direct
   override val id get() = "@$contactId"
   override val apiId get() = contactId
   override val ready get() = activeConn?.connStatus == ConnStatus.Ready
   val active get() = contactStatus == ContactStatus.Active
-  override val sendMsgEnabled get() =
-    (ready && active && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?: false))
-        || nextSendGrpInv
+  override val sendMsgEnabled get() = (
+      ready
+          && active
+          && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?: false)
+          && !(activeConn?.connDisabled ?: true)
+      )
+      || nextSendGrpInv
   val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
   override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
   override val incognito get() = contactConnIncognito
@@ -1109,7 +1128,8 @@ data class Contact(
       createdAt = Clock.System.now(),
       updatedAt = Clock.System.now(),
       chatTs = Clock.System.now(),
-      contactGrpInvSent = false
+      contactGrpInvSent = false,
+      uiThemes = null,
     )
   }
 }
@@ -1150,15 +1170,19 @@ data class Connection(
   val pqEncryption: Boolean,
   val pqSndEnabled: Boolean? = null,
   val pqRcvEnabled: Boolean? = null,
-  val connectionStats: ConnectionStats? = null
+  val connectionStats: ConnectionStats? = null,
+  val authErrCounter: Int
 ) {
   val id: ChatId get() = ":$connId"
 
+  val connDisabled: Boolean
+    get() = authErrCounter >= 10 // authErrDisableCount in core
+
   val connPQEnabled: Boolean
     get() = pqSndEnabled == true && pqRcvEnabled == true
 
   companion object {
-    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null, pqSupport = false, pqEncryption = false)
+    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null, pqSupport = false, pqEncryption = false, authErrCounter = 0)
   }
 }
 
@@ -1245,7 +1269,8 @@ data class GroupInfo (
   val chatSettings: ChatSettings,
   override val createdAt: Instant,
   override val updatedAt: Instant,
-  val chatTs: Instant?
+  val chatTs: Instant?,
+  val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Group
   override val id get() = "#$groupId"
@@ -1287,7 +1312,8 @@ data class GroupInfo (
       chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
       createdAt = Clock.System.now(),
       updatedAt = Clock.System.now(),
-      chatTs = Clock.System.now()
+      chatTs = Clock.System.now(),
+      uiThemes = null,
     )
   }
 }
@@ -1900,18 +1926,20 @@ data class ChatItem (
       ts: Instant = Clock.System.now(),
       text: String = "hello\nthere",
       status: CIStatus = CIStatus.SndNew(),
+      sentViaProxy: Boolean? = null,
       quotedItem: CIQuote? = null,
       file: CIFile? = null,
       itemForwarded: CIForwardedFrom? = null,
       itemDeleted: CIDeleted? = null,
       itemEdited: Boolean = false,
       itemTimed: CITimed? = null,
+      itemLive: Boolean = false,
       deletable: Boolean = true,
       editable: Boolean = true
     ) =
       ChatItem(
         chatDir = dir,
-        meta = CIMeta.getSample(id, ts, text, status, itemForwarded, itemDeleted, itemEdited, itemTimed, deletable, editable),
+        meta = CIMeta.getSample(id, ts, text, status, sentViaProxy, itemForwarded, itemDeleted, itemEdited, itemTimed, itemLive, deletable, editable),
         content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
         quotedItem = quotedItem,
         reactions = listOf(),
@@ -1993,6 +2021,7 @@ data class ChatItem (
           itemTs = Clock.System.now(),
           itemText = generalGetString(MR.strings.deleted_description),
           itemStatus = CIStatus.RcvRead(),
+          sentViaProxy = null,
           createdAt = Clock.System.now(),
           updatedAt = Clock.System.now(),
           itemForwarded = null,
@@ -2016,6 +2045,7 @@ data class ChatItem (
           itemTs = Clock.System.now(),
           itemText = "",
           itemStatus = CIStatus.RcvRead(),
+          sentViaProxy = null,
           createdAt = Clock.System.now(),
           updatedAt = Clock.System.now(),
           itemForwarded = null,
@@ -2118,6 +2148,7 @@ data class CIMeta (
   val itemTs: Instant,
   val itemText: String,
   val itemStatus: CIStatus,
+  val sentViaProxy: Boolean?,
   val createdAt: Instant,
   val updatedAt: Instant,
   val itemForwarded: CIForwardedFrom?,
@@ -2144,7 +2175,7 @@ data class CIMeta (
 
   companion object {
     fun getSample(
-      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(),
+      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(), sentViaProxy: Boolean? = null,
       itemForwarded: CIForwardedFrom? = null, itemDeleted: CIDeleted? = null, itemEdited: Boolean = false,
       itemTimed: CITimed? = null, itemLive: Boolean = false, deletable: Boolean = true, editable: Boolean = true
     ): CIMeta =
@@ -2153,6 +2184,7 @@ data class CIMeta (
         itemTs = ts,
         itemText = text,
         itemStatus = status,
+        sentViaProxy = sentViaProxy,
         createdAt = ts,
         updatedAt = ts,
         itemForwarded = itemForwarded,
@@ -2171,6 +2203,7 @@ data class CIMeta (
         itemTs = Clock.System.now(),
         itemText = "invalid JSON",
         itemStatus = CIStatus.SndNew(),
+        sentViaProxy = null,
         createdAt = Clock.System.now(),
         updatedAt = Clock.System.now(),
         itemForwarded = null,
@@ -2227,7 +2260,8 @@ sealed class CIStatus {
   @Serializable @SerialName("sndSent") class SndSent(val sndProgress: SndCIStatusProgress): CIStatus()
   @Serializable @SerialName("sndRcvd") class SndRcvd(val msgRcptStatus: MsgReceiptStatus, val sndProgress: SndCIStatusProgress): CIStatus()
   @Serializable @SerialName("sndErrorAuth") class SndErrorAuth: CIStatus()
-  @Serializable @SerialName("sndError") class SndError(val agentError: String): CIStatus()
+  @Serializable @SerialName("sndError") class CISSndError(val agentError: SndError): CIStatus()
+  @Serializable @SerialName("sndWarning") class SndWarning(val agentError: SndError): CIStatus()
   @Serializable @SerialName("rcvNew") class RcvNew: CIStatus()
   @Serializable @SerialName("rcvRead") class RcvRead: CIStatus()
   @Serializable @SerialName("invalid") class Invalid(val text: String): CIStatus()
@@ -2251,7 +2285,8 @@ sealed class CIStatus {
         MsgReceiptStatus.BadMsgHash -> MR.images.ic_double_check to Color.Red
       }
       is SndErrorAuth -> MR.images.ic_close to Color.Red
-      is SndError -> MR.images.ic_warning_filled to WarningYellow
+      is CISSndError -> MR.images.ic_close to Color.Red
+      is SndWarning -> MR.images.ic_warning_filled to WarningOrange
       is RcvNew -> MR.images.ic_circle_filled to primaryColor
       is RcvRead -> null
       is CIStatus.Invalid -> MR.images.ic_question_mark to metaColor
@@ -2262,13 +2297,48 @@ sealed class CIStatus {
     is SndSent -> null
     is SndRcvd -> null
     is SndErrorAuth -> generalGetString(MR.strings.message_delivery_error_title) to generalGetString(MR.strings.message_delivery_error_desc)
-    is SndError -> generalGetString(MR.strings.message_delivery_error_title) to (generalGetString(MR.strings.unknown_error) + ": $agentError")
+    is CISSndError -> generalGetString(MR.strings.message_delivery_error_title) to agentError.errorInfo
+    is SndWarning -> generalGetString(MR.strings.message_delivery_warning_title) to agentError.errorInfo
     is RcvNew -> null
     is RcvRead -> null
     is Invalid -> "Invalid status" to this.text
   }
 }
 
+@Serializable
+sealed class SndError {
+  @Serializable @SerialName("auth") class Auth: SndError()
+  @Serializable @SerialName("quota") class Quota: SndError()
+  @Serializable @SerialName("expired") class Expired: SndError()
+  @Serializable @SerialName("relay") class Relay(val srvError: SrvError): SndError()
+  @Serializable @SerialName("proxy") class Proxy(val proxyServer: String, val srvError: SrvError): SndError()
+  @Serializable @SerialName("proxyRelay") class ProxyRelay(val proxyServer: String, val srvError: SrvError): SndError()
+  @Serializable @SerialName("other") class Other(val sndError: String): SndError()
+
+  val errorInfo: String get() = when (this) {
+    is SndError.Auth -> generalGetString(MR.strings.snd_error_auth)
+    is SndError.Quota -> generalGetString(MR.strings.snd_error_quota)
+    is SndError.Expired -> generalGetString(MR.strings.snd_error_expired)
+    is SndError.Relay -> generalGetString(MR.strings.snd_error_relay).format(srvError.errorInfo)
+    is SndError.Proxy -> generalGetString(MR.strings.snd_error_proxy).format(proxyServer, srvError.errorInfo)
+    is SndError.ProxyRelay -> generalGetString(MR.strings.snd_error_proxy_relay).format(proxyServer, srvError.errorInfo)
+    is SndError.Other -> generalGetString(MR.strings.ci_status_other_error).format(sndError)
+  }
+}
+
+@Serializable
+sealed class SrvError {
+  @Serializable @SerialName("host") class Host: SrvError()
+  @Serializable @SerialName("version") class Version: SrvError()
+  @Serializable @SerialName("other") class Other(val srvError: String): SrvError()
+
+  val errorInfo: String get() = when (this) {
+    is SrvError.Host -> generalGetString(MR.strings.srv_error_host)
+    is SrvError.Version -> generalGetString(MR.strings.srv_error_version)
+    is SrvError.Other -> srvError
+  }
+}
+
 @Serializable
 enum class MsgReceiptStatus {
   @SerialName("ok") Ok,
@@ -2593,6 +2663,7 @@ data class CIFile(
     is CIFileStatus.RcvInvitation -> false
     is CIFileStatus.RcvAccepted -> false
     is CIFileStatus.RcvTransfer -> false
+    is CIFileStatus.RcvAborted -> false
     is CIFileStatus.RcvCancelled -> false
     is CIFileStatus.RcvComplete -> true
     is CIFileStatus.RcvError -> false
@@ -2614,6 +2685,7 @@ data class CIFile(
     is CIFileStatus.RcvInvitation -> null
     is CIFileStatus.RcvAccepted -> rcvCancelAction
     is CIFileStatus.RcvTransfer -> rcvCancelAction
+    is CIFileStatus.RcvAborted -> null
     is CIFileStatus.RcvCancelled -> null
     is CIFileStatus.RcvComplete -> null
     is CIFileStatus.RcvError -> null
@@ -2653,6 +2725,12 @@ data class CIFile(
     return res
   }
 
+  fun forwardingAllowed(): Boolean = when {
+    chatModel.connectedToRemote() && cachedRemoteFileRequests[fileSource] != false && loaded -> true
+    getLoadedFilePath(this) != null -> true
+    else -> false
+  }
+
   companion object {
     fun getSample(
       fileId: Long = 1,
@@ -2788,6 +2866,7 @@ sealed class CIFileStatus {
   @Serializable @SerialName("rcvInvitation") object RcvInvitation: CIFileStatus()
   @Serializable @SerialName("rcvAccepted") object RcvAccepted: CIFileStatus()
   @Serializable @SerialName("rcvTransfer") class RcvTransfer(val rcvProgress: Long, val rcvTotal: Long): CIFileStatus()
+  @Serializable @SerialName("rcvAborted") object RcvAborted: CIFileStatus()
   @Serializable @SerialName("rcvComplete") object RcvComplete: CIFileStatus()
   @Serializable @SerialName("rcvCancelled") object RcvCancelled: CIFileStatus()
   @Serializable @SerialName("rcvError") object RcvError: CIFileStatus()
@@ -2802,6 +2881,7 @@ sealed class CIFileStatus {
     is RcvInvitation -> false
     is RcvAccepted -> false
     is RcvTransfer -> false
+    is RcvAborted -> false
     is RcvComplete -> false
     is RcvCancelled -> false
     is RcvError -> false
@@ -3348,7 +3428,8 @@ data class ChatItemVersion(
 @Serializable
 data class MemberDeliveryStatus(
   val groupMemberId: Long,
-  val memberDeliveryStatus: CIStatus
+  val memberDeliveryStatus: CIStatus,
+  val sentViaProxy: Boolean?
 )
 
 enum class NotificationPreviewMode {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -12,6 +12,7 @@ import dev.icerock.moko.resources.compose.painterResource
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
+import chat.simplex.common.views.chat.group.toggleShowMemberMessages
 import chat.simplex.common.views.migration.MigrationFileLinkData
 import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.common.views.usersettings.*
@@ -25,8 +26,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.builtins.*
 import kotlinx.serialization.json.*
 import java.util.Date
 
@@ -106,6 +106,7 @@ class AppPreferences {
   val privacySaveLastDraft = mkBoolPreference(SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT, true)
   val privacyDeliveryReceiptsSet = mkBoolPreference(SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET, false)
   val privacyEncryptLocalFiles = mkBoolPreference(SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES, true)
+  val privacyAskToApproveRelays = mkBoolPreference(SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS, true)
   val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
   val showUnreadAndFavorites = mkBoolPreference(SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES, false)
   val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
@@ -130,6 +131,8 @@ class AppPreferences {
     },
     set = fun(mode: TransportSessionMode) { _networkSessionMode.set(mode.name) }
   )
+  val networkSMPProxyMode = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_MODE, SMPProxyMode.Never.name)
+  val networkSMPProxyFallback = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK, SMPProxyFallback.Allow.name)
   val networkHostMode = mkStrPreference(SHARED_PREFS_NETWORK_HOST_MODE, HostMode.OnionViaSocks.name)
   val networkRequiredHostMode = mkBoolPreference(SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE, false)
   val networkTCPConnectTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT, NetCfg.defaults.tcpConnectTimeout, NetCfg.proxyDefaults.tcpConnectTimeout)
@@ -164,13 +167,20 @@ class AppPreferences {
   val selfDestruct = mkBoolPreference(SHARED_PREFS_SELF_DESTRUCT, false)
   val selfDestructDisplayName = mkStrPreference(SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME, null)
 
-  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM.name)
-  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.name)
-  val themeOverrides = mkMapPreference(SHARED_PREFS_THEMES, mapOf(), encode = {
+  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM_THEME_NAME)
+  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.themeName)
+  val currentThemeIds = mkMapPreference(SHARED_PREFS_CURRENT_THEME_IDs, mapOf(), encode = {
+    json.encodeToString(MapSerializer(String.serializer(), String.serializer()), it)
+  }, decode = {
+    json.decodeFromString(MapSerializer(String.serializer(), String.serializer()), it)
+  })
+  // Deprecated. Remove key from preferences in 2025
+  val themeOverridesOld = mkMapPreference(SHARED_PREFS_THEMES_OLD, mapOf(), encode = {
     json.encodeToString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
   }, decode = {
-    json.decodeFromString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
+    jsonCoerceInputValues.decodeFromString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
   }, settingsThemes)
+  val themeOverrides = mkThemeOverridesPreference()
   val profileImageCornerRadius = mkFloatPreference(SHARED_PREFS_PROFILE_IMAGE_CORNER_RADIUS, 22.5f)
 
   val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null)
@@ -185,6 +195,8 @@ class AppPreferences {
 
   val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)
 
+  val showSentViaProxy = mkBoolPreference(SHARED_PREFS_SHOW_SENT_VIA_RPOXY, false)
+
 
   val iosCallKitEnabled = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_ENABLED, true)
   val iosCallKitCallsInRecents = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS, false)
@@ -263,6 +275,12 @@ class AppPreferences {
       set = fun(value) = prefs.putString(prefName, encode(value))
     )
 
+  private fun mkThemeOverridesPreference(): SharedPreference<List<ThemeOverrides>> =
+    SharedPreference(
+      get = fun() = themeOverridesStore ?: (readThemeOverrides()).also { themeOverridesStore = it },
+      set = fun(value) { if (writeThemeOverrides(value)) { themeOverridesStore = value } }
+    )
+
   companion object {
     const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
     internal const val SHARED_PREFS_THEMES_ID = "chat.simplex.app.THEMES"
@@ -288,6 +306,7 @@ class AppPreferences {
     private const val SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT = "PrivacySaveLastDraft"
     private const val SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET = "PrivacyDeliveryReceiptsSet"
     private const val SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES = "PrivacyEncryptLocalFiles"
+    private const val SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS = "PrivacyAskToApproveRelays"
     const val SHARED_PREFS_PRIVACY_FULL_BACKUP = "FullBackup"
     private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
     private const val SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES = "ShowUnreadAndFavorites"
@@ -306,6 +325,8 @@ class AppPreferences {
     private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
     private const val SHARED_PREFS_NETWORK_PROXY_HOST_PORT = "NetworkProxyHostPort"
     private const val SHARED_PREFS_NETWORK_SESSION_MODE = "NetworkSessionMode"
+    private const val SHARED_PREFS_NETWORK_SMP_PROXY_MODE = "NetworkSMPProxyMode"
+    private const val SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK = "NetworkSMPProxyFallback"
     private const val SHARED_PREFS_NETWORK_HOST_MODE = "NetworkHostMode"
     private const val SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE = "NetworkRequiredHostMode"
     private const val SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT = "NetworkTCPConnectTimeout"
@@ -336,8 +357,10 @@ class AppPreferences {
     private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
     private const val SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED = "PQExperimentalEnabled" // no longer used
     private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme"
+    private const val SHARED_PREFS_CURRENT_THEME_IDs = "CurrentThemeIds"
     private const val SHARED_PREFS_SYSTEM_DARK_THEME = "SystemDarkTheme"
-    private const val SHARED_PREFS_THEMES = "Themes"
+    private const val SHARED_PREFS_THEMES_OLD = "Themes"
+    private const val SHARED_PREFS_THEME_OVERRIDES = "ThemeOverrides"
     private const val SHARED_PREFS_PROFILE_IMAGE_CORNER_RADIUS = "ProfileImageCornerRadius"
     private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion"
     private const val SHARED_PREFS_LAST_MIGRATED_VERSION_CODE = "LastMigratedVersionCode"
@@ -348,9 +371,12 @@ class AppPreferences {
     private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "ConnectRemoteViaMulticastAuto"
     private const val SHARED_PREFS_OFFER_REMOTE_MULTICAST = "OfferRemoteMulticast"
     private const val SHARED_PREFS_DESKTOP_WINDOW_STATE = "DesktopWindowState"
+    private const val SHARED_PREFS_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
 
     private const val SHARED_PREFS_IOS_CALL_KIT_ENABLED = "iOSCallKitEnabled"
     private const val SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS = "iOSCallKitCallsInRecents"
+
+    private var themeOverridesStore: List<ThemeOverrides>? = null
   }
 }
 
@@ -435,8 +461,13 @@ object ChatController {
     Log.d(TAG, "startChatWithTemporaryDatabase")
     val migrationActiveUser = apiGetActiveUser(null, ctrl) ?: apiCreateActiveUser(null, Profile(displayName = "Temp", fullName = ""), ctrl = ctrl)
     apiSetNetworkConfig(netCfg, ctrl)
-    apiSetTempFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
-    apiSetFilesFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
+    apiSetAppFilePaths(
+      getMigrationTempFilesDirectory().absolutePath,
+      getMigrationTempFilesDirectory().absolutePath,
+      wallpapersDir.parentFile.absolutePath,
+      remoteHostsDir.absolutePath,
+      ctrl
+    )
     apiStartChat(ctrl)
     return migrationActiveUser
   }
@@ -655,22 +686,10 @@ object ChatController {
     }
   }
 
-  suspend fun apiSetTempFolder(tempFolder: String, ctrl: ChatCtrl? = null) {
-    val r = sendCmd(null, CC.SetTempFolder(tempFolder), ctrl)
+  suspend fun apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, remoteHostsFolder: String, ctrl: ChatCtrl? = null) {
+    val r = sendCmd(null, CC.ApiSetAppFilePaths(filesFolder, tempFolder, assetsFolder, remoteHostsFolder), ctrl)
     if (r is CR.CmdOk) return
-    throw Exception("failed to set temp folder: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiSetFilesFolder(filesFolder: String, ctrl: ChatCtrl? = null) {
-    val r = sendCmd(null, CC.SetFilesFolder(filesFolder), ctrl)
-    if (r is CR.CmdOk) return
-    throw Exception("failed to set files folder: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiSetRemoteHostsFolder(remoteHostsFolder: String) {
-    val r = sendCmd(null, CC.SetRemoteHostsFolder(remoteHostsFolder))
-    if (r is CR.CmdOk) return
-    throw Exception("failed to set remote hosts folder: ${r.responseType} ${r.details}")
+    throw Exception("failed to set app file paths: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetEncryptLocalFiles(enable))
@@ -775,8 +794,8 @@ object ChatController {
     }
   }
 
-  suspend fun apiForwardChatItem(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemId: Long): ChatItem? {
-    val cmd = CC.ApiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId)
+  suspend fun apiForwardChatItem(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemId: Long, ttl: Int?): ChatItem? {
+    val cmd = CC.ApiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl)
     return processSendMessageCmd(rh, cmd)?.chatItem
   }
 
@@ -1156,6 +1175,20 @@ object ChatController {
     return null
   }
 
+  suspend fun apiSetUserUIThemes(rh: Long?, userId: Long, themes: ThemeModeOverrides?): Boolean {
+    val r = sendCmd(rh, CC.ApiSetUserUIThemes(userId, themes))
+    if (r is CR.CmdOk) return true
+    Log.e(TAG, "apiSetUserUIThemes bad response: ${r.responseType} ${r.details}")
+    return false
+  }
+
+  suspend fun apiSetChatUIThemes(rh: Long?, chatId: ChatId, themes: ThemeModeOverrides?): Boolean {
+    val r = sendCmd(rh, CC.ApiSetChatUIThemes(chatId, themes))
+    if (r is CR.CmdOk) return true
+    Log.e(TAG, "apiSetChatUIThemes bad response: ${r.responseType} ${r.details}")
+    return false
+  }
+
   suspend fun apiCreateUserAddress(rh: Long?): String? {
     val userId = kotlin.runCatching { currentUserId("apiCreateUserAddress") }.getOrElse { return null }
     val r = sendCmd(rh, CC.ApiCreateMyAddress(userId))
@@ -1330,9 +1363,9 @@ object ChatController {
     }
   }
 
-  suspend fun apiReceiveFile(rh: Long?, fileId: Long, encrypted: Boolean, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
+  suspend fun apiReceiveFile(rh: Long?, fileId: Long, userApprovedRelays: Boolean, encrypted: Boolean, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
     // -1 here is to override default behavior of providing current remote host id because file can be asked by local device while remote is connected
-    val r = sendCmd(rh, CC.ReceiveFile(fileId, encrypted, inline))
+    val r = sendCmd(rh, CC.ReceiveFile(fileId, userApprovedRelays = userApprovedRelays, encrypt = encrypted, inline = inline))
     return when (r) {
       is CR.RcvFileAccepted -> r.chatItem
       is CR.RcvFileAcceptedSndCancelled -> {
@@ -1351,7 +1384,23 @@ object ChatController {
           val maybeChatError = chatError(r)
           if (maybeChatError is ChatErrorType.FileCancelled || maybeChatError is ChatErrorType.FileAlreadyReceiving) {
             Log.d(TAG, "apiReceiveFile ignoring FileCancelled or FileAlreadyReceiving error")
-          } else {
+          } else if (maybeChatError is ChatErrorType.FileNotApproved) {
+            Log.d(TAG, "apiReceiveFile FileNotApproved error")
+            if (!auto) {
+              val srvs = maybeChatError.unknownServers.map{ serverHostname(it) }
+              AlertManager.shared.showAlertDialog(
+                title = generalGetString(MR.strings.file_not_approved_title),
+                text = generalGetString(MR.strings.file_not_approved_descr).format(srvs.sorted().joinToString(separator = ", ")),
+                confirmText = generalGetString(MR.strings.download_file),
+                onConfirm = {
+                  val user = chatModel.currentUser.value
+                  if (user != null) {
+                    withBGApi { chatModel.controller.receiveFile(rh, user, fileId, userApprovedRelays = true) }
+                  }
+                },
+              )
+            }
+          } else if (!auto) {
             apiErrorAlert("apiReceiveFile", generalGetString(MR.strings.error_receiving_file), r)
           }
         }
@@ -2031,13 +2080,21 @@ object ChatController {
         }
       }
       is CR.ContactSwitch ->
-        chatModel.updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
+        }
       is CR.GroupMemberSwitch ->
-        chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
+        }
       is CR.ContactRatchetSync ->
-        chatModel.updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
+        }
       is CR.GroupMemberRatchetSync ->
-        chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
+        }
       is CR.RemoteHostSessionCode -> {
         chatModel.remoteHostPairing.value = r.remoteHost_ to RemoteHostSessionState.PendingConfirmation(r.sessionCode)
       }
@@ -2046,6 +2103,11 @@ object ChatController {
         chatModel.currentRemoteHost.value = r.remoteHost
         switchUIRemoteHost(r.remoteHost.remoteHostId)
       }
+      is CR.ContactDisabled -> {
+        if (active(r.user)) {
+          chatModel.updateContact(rhId, r.contact)
+        }
+      }
       is CR.RemoteHostStopped -> {
         val disconnectedHost = chatModel.remoteHosts.firstOrNull { it.remoteHostId == r.remoteHostId_ }
         chatModel.remoteHostPairing.value = null
@@ -2196,9 +2258,14 @@ object ChatController {
     }
   }
 
-  suspend fun receiveFile(rhId: Long?, user: UserLike, fileId: Long, auto: Boolean = false) {
-    val encrypted = appPrefs.privacyEncryptLocalFiles.get()
-    val chatItem = apiReceiveFile(rhId, fileId, encrypted = encrypted, auto = auto)
+  suspend fun receiveFile(rhId: Long?, user: UserLike, fileId: Long, userApprovedRelays: Boolean = false, auto: Boolean = false) {
+    val chatItem = apiReceiveFile(
+      rhId,
+      fileId,
+      userApprovedRelays = userApprovedRelays || !appPrefs.privacyAskToApproveRelays.get(),
+      encrypted = appPrefs.privacyEncryptLocalFiles.get(),
+      auto = auto
+    )
     if (chatItem != null) {
       chatItemSimpleUpdate(rhId, user, chatItem)
     }
@@ -2302,6 +2369,8 @@ object ChatController {
     val hostMode = HostMode.valueOf(appPrefs.networkHostMode.get()!!)
     val requiredHostMode = appPrefs.networkRequiredHostMode.get()
     val sessionMode = appPrefs.networkSessionMode.get()
+    val smpProxyMode = SMPProxyMode.valueOf(appPrefs.networkSMPProxyMode.get()!!)
+    val smpProxyFallback = SMPProxyFallback.valueOf(appPrefs.networkSMPProxyFallback.get()!!)
     val tcpConnectTimeout = appPrefs.networkTCPConnectTimeout.get()
     val tcpTimeout = appPrefs.networkTCPTimeout.get()
     val tcpTimeoutPerKb = appPrefs.networkTCPTimeoutPerKb.get()
@@ -2322,6 +2391,8 @@ object ChatController {
       hostMode = hostMode,
       requiredHostMode = requiredHostMode,
       sessionMode = sessionMode,
+      smpProxyMode = smpProxyMode,
+      smpProxyFallback = smpProxyFallback,
       tcpConnectTimeout = tcpConnectTimeout,
       tcpTimeout = tcpTimeout,
       tcpTimeoutPerKb = tcpTimeoutPerKb,
@@ -2340,6 +2411,8 @@ object ChatController {
     appPrefs.networkHostMode.set(cfg.hostMode.name)
     appPrefs.networkRequiredHostMode.set(cfg.requiredHostMode)
     appPrefs.networkSessionMode.set(cfg.sessionMode)
+    appPrefs.networkSMPProxyMode.set(cfg.smpProxyMode.name)
+    appPrefs.networkSMPProxyFallback.set(cfg.smpProxyFallback.name)
     appPrefs.networkTCPConnectTimeout.set(cfg.tcpConnectTimeout)
     appPrefs.networkTCPTimeout.set(cfg.tcpTimeout)
     appPrefs.networkTCPTimeoutPerKb.set(cfg.tcpTimeoutPerKb)
@@ -2387,9 +2460,8 @@ sealed class CC {
   class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean, val viewPwd: String?): CC()
   class StartChat(val mainApp: Boolean): CC()
   class ApiStopChat: CC()
-  class SetTempFolder(val tempFolder: String): CC()
-  class SetFilesFolder(val filesFolder: String): CC()
-  class SetRemoteHostsFolder(val remoteHostsFolder: String): CC()
+  @Serializable
+  class ApiSetAppFilePaths(val appFilesFolder: String, val appTempFolder: String, val appAssetsFolder: String, val appRemoteHostsFolder: String): CC()
   class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
   class ApiExportArchive(val config: ArchiveConfig): CC()
   class ApiImportArchive(val config: ArchiveConfig): CC()
@@ -2407,7 +2479,7 @@ sealed class CC {
   class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
   class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
   class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
-  class ApiForwardChatItem(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemId: Long): CC()
+  class ApiForwardChatItem(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemId: Long, val ttl: Int?): CC()
   class ApiNewGroup(val userId: Long, val incognito: Boolean, val groupProfile: GroupProfile): CC()
   class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
   class ApiJoinGroup(val groupId: Long): CC()
@@ -2457,6 +2529,8 @@ sealed class CC {
   class ApiSetContactPrefs(val contactId: Long, val prefs: ChatPreferences): CC()
   class ApiSetContactAlias(val contactId: Long, val localAlias: String): CC()
   class ApiSetConnectionAlias(val connId: Long, val localAlias: String): CC()
+  class ApiSetUserUIThemes(val userId: Long, val themes: ThemeModeOverrides?): CC()
+  class ApiSetChatUIThemes(val chatId: String, val themes: ThemeModeOverrides?): CC()
   class ApiCreateMyAddress(val userId: Long): CC()
   class ApiDeleteMyAddress(val userId: Long): CC()
   class ApiShowMyAddress(val userId: Long): CC()
@@ -2475,7 +2549,7 @@ sealed class CC {
   class ApiRejectContact(val contactReqId: Long): CC()
   class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
   class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
-  class ReceiveFile(val fileId: Long, val encrypt: Boolean, val inline: Boolean?): CC()
+  class ReceiveFile(val fileId: Long, val userApprovedRelays: Boolean, val encrypt: Boolean, val inline: Boolean?): CC()
   class CancelFile(val fileId: Long): CC()
   // Remote control
   class SetLocalDeviceName(val displayName: String): CC()
@@ -2524,9 +2598,7 @@ sealed class CC {
     is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}${maybePwd(viewPwd)}"
     is StartChat -> "/_start main=${onOff(mainApp)}"
     is ApiStopChat -> "/_stop"
-    is SetTempFolder -> "/_temp_folder $tempFolder"
-    is SetFilesFolder -> "/_files_folder $filesFolder"
-    is SetRemoteHostsFolder -> "/remote_hosts_folder $remoteHostsFolder"
+    is ApiSetAppFilePaths -> "/set file paths ${json.encodeToString(this)}"
     is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
     is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
     is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
@@ -2549,7 +2621,10 @@ sealed class CC {
     is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
     is ApiDeleteMemberChatItem -> "/_delete member item #$groupId $groupMemberId $itemId"
     is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
-    is ApiForwardChatItem -> "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} $itemId"
+    is ApiForwardChatItem -> {
+      val ttlStr = if (ttl != null) "$ttl" else "default"
+      "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} $itemId ttl=${ttlStr}"
+    }
     is ApiNewGroup -> "/_group $userId incognito=${onOff(incognito)} ${json.encodeToString(groupProfile)}"
     is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
     is ApiJoinGroup -> "/_join #$groupId"
@@ -2603,6 +2678,8 @@ sealed class CC {
     is ApiSetContactPrefs -> "/_set prefs @$contactId ${json.encodeToString(prefs)}"
     is ApiSetContactAlias -> "/_set alias @$contactId ${localAlias.trim()}"
     is ApiSetConnectionAlias -> "/_set alias :$connId ${localAlias.trim()}"
+    is ApiSetUserUIThemes -> "/_set theme user $userId ${if (themes != null) json.encodeToString(themes) else ""}"
+    is ApiSetChatUIThemes -> "/_set theme $chatId ${if (themes != null) json.encodeToString(themes) else ""}"
     is ApiCreateMyAddress -> "/_address $userId"
     is ApiDeleteMyAddress -> "/_delete_address $userId"
     is ApiShowMyAddress -> "/_show_address $userId"
@@ -2623,6 +2700,7 @@ sealed class CC {
     is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
     is ReceiveFile ->
       "/freceive $fileId" +
+          (" approved_relays=${onOff(userApprovedRelays)}") +
           (if (encrypt == null) "" else " encrypt=${onOff(encrypt)}") +
           (if (inline == null) "" else " inline=${onOff(inline)}")
     is CancelFile -> "/fcancel $fileId"
@@ -2666,9 +2744,7 @@ sealed class CC {
     is ApiDeleteUser -> "apiDeleteUser"
     is StartChat -> "startChat"
     is ApiStopChat -> "apiStopChat"
-    is SetTempFolder -> "setTempFolder"
-    is SetFilesFolder -> "setFilesFolder"
-    is SetRemoteHostsFolder -> "setRemoteHostsFolder"
+    is ApiSetAppFilePaths -> "apiSetAppFilePaths"
     is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
     is ApiExportArchive -> "apiExportArchive"
     is ApiImportArchive -> "apiImportArchive"
@@ -2736,6 +2812,8 @@ sealed class CC {
     is ApiSetContactPrefs -> "apiSetContactPrefs"
     is ApiSetContactAlias -> "apiSetContactAlias"
     is ApiSetConnectionAlias -> "apiSetConnectionAlias"
+    is ApiSetUserUIThemes -> "apiSetUserUIThemes"
+    is ApiSetChatUIThemes -> "apiSetChatUIThemes"
     is ApiCreateMyAddress -> "apiCreateMyAddress"
     is ApiDeleteMyAddress -> "apiDeleteMyAddress"
     is ApiShowMyAddress -> "apiShowMyAddress"
@@ -3025,9 +3103,12 @@ data class ParsedServerAddress (
 @Serializable
 data class NetCfg(
   val socksProxy: String?,
+  val socksMode: SocksMode = SocksMode.Always,
   val hostMode: HostMode,
   val requiredHostMode: Boolean,
   val sessionMode: TransportSessionMode,
+  val smpProxyMode: SMPProxyMode,
+  val smpProxyFallback: SMPProxyFallback,
   val tcpConnectTimeout: Long, // microseconds
   val tcpTimeout: Long, // microseconds
   val tcpTimeoutPerKb: Long, // microseconds
@@ -3056,6 +3137,8 @@ data class NetCfg(
         hostMode = HostMode.OnionViaSocks,
         requiredHostMode = false,
         sessionMode = TransportSessionMode.User,
+        smpProxyMode = SMPProxyMode.Never,
+        smpProxyFallback = SMPProxyFallback.Allow,
         tcpConnectTimeout = 25_000_000,
         tcpTimeout = 15_000_000,
         tcpTimeoutPerKb = 10_000,
@@ -3071,6 +3154,8 @@ data class NetCfg(
         hostMode = HostMode.OnionViaSocks,
         requiredHostMode = false,
         sessionMode = TransportSessionMode.User,
+        smpProxyMode = SMPProxyMode.Never,
+        smpProxyFallback = SMPProxyFallback.Allow,
         tcpConnectTimeout = 35_000_000,
         tcpTimeout = 20_000_000,
         tcpTimeoutPerKb = 15_000,
@@ -3109,6 +3194,35 @@ enum class HostMode {
   @SerialName("public") Public;
 }
 
+@Serializable
+enum class SocksMode {
+  @SerialName("always") Always,
+  @SerialName("onion") Onion;
+}
+
+@Serializable
+enum class SMPProxyMode {
+  @SerialName("always") Always,
+  @SerialName("unknown") Unknown,
+  @SerialName("unprotected") Unprotected,
+  @SerialName("never") Never;
+
+  companion object {
+    val default = Never
+  }
+}
+
+@Serializable
+enum class SMPProxyFallback {
+  @SerialName("allow") Allow,
+  @SerialName("allowProtected") AllowProtected,
+  @SerialName("prohibit") Prohibit;
+
+  companion object {
+    val default = Allow
+  }
+}
+
 @Serializable
 enum class TransportSessionMode {
   @SerialName("user") User,
@@ -3971,6 +4085,15 @@ val json = Json {
   explicitNulls = false
 }
 
+// Can decode unknown enum to default value specified for this field
+val jsonCoerceInputValues = Json {
+  prettyPrint = true
+  ignoreUnknownKeys = true
+  encodeDefaults = true
+  explicitNulls = false
+  coerceInputValues = true
+}
+
 val jsonShort = Json {
   prettyPrint = false
   ignoreUnknownKeys = true
@@ -3981,6 +4104,8 @@ val jsonShort = Json {
 val yaml = Yaml(configuration = YamlConfiguration(
   strictMode = false,
   encodeDefaults = false,
+  /** ~5.5 MB limitation since wallpaper is limited by 5 MB, see [saveWallpaperFile] */
+  codePointLimit = 5500000,
 ))
 
 @Serializable
@@ -4175,7 +4300,7 @@ sealed class CR {
   @Serializable @SerialName("rcvStandaloneFileComplete") class RcvStandaloneFileComplete(val user: UserRef, val targetPath: String, val rcvFileTransfer: RcvFileTransfer): CR()
   @Serializable @SerialName("rcvFileCancelled") class RcvFileCancelled(val user: UserRef, val chatItem_: AChatItem?, val rcvFileTransfer: RcvFileTransfer): CR()
   @Serializable @SerialName("rcvFileSndCancelled") class RcvFileSndCancelled(val user: UserRef, val chatItem: AChatItem, val rcvFileTransfer: RcvFileTransfer): CR()
-  @Serializable @SerialName("rcvFileError") class RcvFileError(val user: UserRef, val chatItem_: AChatItem?, val rcvFileTransfer: RcvFileTransfer): CR()
+  @Serializable @SerialName("rcvFileError") class RcvFileError(val user: UserRef, val chatItem_: AChatItem?, val agentError: AgentErrorType, val rcvFileTransfer: RcvFileTransfer): CR()
   // sending file events
   @Serializable @SerialName("sndFileStart") class SndFileStart(val user: UserRef, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
   @Serializable @SerialName("sndFileComplete") class SndFileComplete(val user: UserRef, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
@@ -4197,6 +4322,7 @@ sealed class CR {
   @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val user: UserRef, val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
   @Serializable @SerialName("callEnded") class CallEnded(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: UserRef, val connection: PendingContactConnection): CR()
+  @Serializable @SerialName("contactDisabled") class ContactDisabled(val user: UserRef, val contact: Contact): CR()
   // remote events (desktop)
   @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
   @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
@@ -4361,6 +4487,7 @@ sealed class CR {
     is CallExtraInfo -> "callExtraInfo"
     is CallEnded -> "callEnded"
     is ContactConnectionDeleted -> "contactConnectionDeleted"
+    is ContactDisabled -> "contactDisabled"
     is RemoteHostList -> "remoteHostList"
     is CurrentRemoteHost -> "currentRemoteHost"
     is RemoteHostStarted -> "remoteHostStarted"
@@ -4501,7 +4628,7 @@ sealed class CR {
     is RcvFileSndCancelled -> withUser(user, json.encodeToString(chatItem))
     is RcvFileProgressXFTP -> withUser(user, "chatItem: ${json.encodeToString(chatItem_)}\nreceivedSize: $receivedSize\ntotalSize: $totalSize")
     is RcvStandaloneFileComplete -> withUser(user, targetPath)
-    is RcvFileError -> withUser(user, json.encodeToString(chatItem_))
+    is RcvFileError -> withUser(user, "chatItem_: ${json.encodeToString(chatItem_)}\nagentError: ${agentError.string}\nrcvFileTransfer: $rcvFileTransfer")
     is SndFileCancelled -> json.encodeToString(chatItem_)
     is SndStandaloneFileCreated -> noDetails()
     is SndFileStartXFTP -> withUser(user, json.encodeToString(chatItem))
@@ -4521,6 +4648,7 @@ sealed class CR {
     is CallExtraInfo -> withUser(user, "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}")
     is CallEnded -> withUser(user, "contact: ${contact.id}")
     is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
+    is ContactDisabled -> withUser(user, json.encodeToString(contact))
     // remote events (mobile)
     is RemoteHostList -> json.encodeToString(remoteHosts)
     is CurrentRemoteHost -> if (remoteHost_ == null) "local" else json.encodeToString(remoteHost_)
@@ -4814,7 +4942,6 @@ sealed class ChatErrorType {
       is GroupMemberNotActive -> "groupMemberNotActive"
       is GroupMemberUserRemoved -> "groupMemberUserRemoved"
       is GroupMemberNotFound -> "groupMemberNotFound"
-      is GroupMemberIntroNotFound -> "groupMemberIntroNotFound"
       is GroupCantResendInvitation -> "groupCantResendInvitation"
       is GroupInternal -> "groupInternal"
       is FileNotFound -> "fileNotFound"
@@ -4824,13 +4951,14 @@ sealed class ChatErrorType {
       is FileCancel -> "fileCancel"
       is FileAlreadyExists -> "fileAlreadyExists"
       is FileRead -> "fileRead"
-      is FileWrite -> "fileWrite"
+      is FileWrite -> "fileWrite $message"
       is FileSend -> "fileSend"
       is FileRcvChunk -> "fileRcvChunk"
       is FileInternal -> "fileInternal"
       is FileImageType -> "fileImageType"
       is FileImageSize -> "fileImageSize"
       is FileNotReceived -> "fileNotReceived"
+      is FileNotApproved -> "fileNotApproved"
       // is XFTPRcvFile -> "xftpRcvFile"
       // is XFTPSndFile -> "xftpSndFile"
       is FallbackToSMPProhibited -> "fallbackToSMPProhibited"
@@ -4893,7 +5021,6 @@ sealed class ChatErrorType {
   @Serializable @SerialName("groupMemberNotActive") object GroupMemberNotActive: ChatErrorType()
   @Serializable @SerialName("groupMemberUserRemoved") object GroupMemberUserRemoved: ChatErrorType()
   @Serializable @SerialName("groupMemberNotFound") object GroupMemberNotFound: ChatErrorType()
-  @Serializable @SerialName("groupMemberIntroNotFound") class GroupMemberIntroNotFound(val contactName: String): ChatErrorType()
   @Serializable @SerialName("groupCantResendInvitation") class GroupCantResendInvitation(val groupInfo: GroupInfo, val contactName: String): ChatErrorType()
   @Serializable @SerialName("groupInternal") class GroupInternal(val message: String): ChatErrorType()
   @Serializable @SerialName("fileNotFound") class FileNotFound(val message: String): ChatErrorType()
@@ -4910,6 +5037,7 @@ sealed class ChatErrorType {
   @Serializable @SerialName("fileImageType") class FileImageType(val filePath: String): ChatErrorType()
   @Serializable @SerialName("fileImageSize") class FileImageSize(val filePath: String): ChatErrorType()
   @Serializable @SerialName("fileNotReceived") class FileNotReceived(val fileId: Long): ChatErrorType()
+  @Serializable @SerialName("fileNotApproved") class FileNotApproved(val fileId: Long, val unknownServers: List<String>): ChatErrorType()
   // @Serializable @SerialName("xFTPRcvFile") object XFTPRcvFile: ChatErrorType()
   // @Serializable @SerialName("xFTPSndFile") object XFTPSndFile: ChatErrorType()
   @Serializable @SerialName("fallbackToSMPProhibited") class FallbackToSMPProhibited(val fileId: Long): ChatErrorType()
@@ -5408,6 +5536,7 @@ enum class NotificationsMode() {
 data class AppSettings(
   var networkConfig: NetCfg? = null,
   var privacyEncryptLocalFiles: Boolean? = null,
+  var privacyAskToApproveRelays: Boolean? = null,
   var privacyAcceptImages: Boolean? = null,
   var privacyLinkPreviews: Boolean? = null,
   var privacyShowChatPreviews: Boolean? = null,
@@ -5425,12 +5554,18 @@ data class AppSettings(
   var androidCallOnLockScreen: AppSettingsLockScreenCalls? = null,
   var iosCallKitEnabled: Boolean? = null,
   var iosCallKitCallsInRecents: Boolean? = null,
+  var uiProfileImageCornerRadius: Float? = null,
+  var uiColorScheme: String? = null,
+  var uiDarkColorScheme: String? = null,
+  var uiCurrentThemeIds: Map<String, String>? = null,
+  var uiThemes: List<ThemeOverrides>? = null,
 ) {
   fun prepareForExport(): AppSettings {
     val empty = AppSettings()
     val def = defaults
     if (networkConfig != def.networkConfig) { empty.networkConfig = networkConfig }
     if (privacyEncryptLocalFiles != def.privacyEncryptLocalFiles) { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
+    if (privacyAskToApproveRelays != def.privacyAskToApproveRelays) { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
     if (privacyAcceptImages != def.privacyAcceptImages) { empty.privacyAcceptImages = privacyAcceptImages }
     if (privacyLinkPreviews != def.privacyLinkPreviews) { empty.privacyLinkPreviews = privacyLinkPreviews }
     if (privacyShowChatPreviews != def.privacyShowChatPreviews) { empty.privacyShowChatPreviews = privacyShowChatPreviews }
@@ -5448,6 +5583,11 @@ data class AppSettings(
     if (androidCallOnLockScreen != def.androidCallOnLockScreen) { empty.androidCallOnLockScreen = androidCallOnLockScreen }
     if (iosCallKitEnabled != def.iosCallKitEnabled) { empty.iosCallKitEnabled = iosCallKitEnabled }
     if (iosCallKitCallsInRecents != def.iosCallKitCallsInRecents) { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
+    if (uiProfileImageCornerRadius != def.uiProfileImageCornerRadius) { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
+    if (uiColorScheme != def.uiColorScheme) { empty.uiColorScheme = uiColorScheme }
+    if (uiDarkColorScheme != def.uiDarkColorScheme) { empty.uiDarkColorScheme = uiDarkColorScheme }
+    if (uiCurrentThemeIds != def.uiCurrentThemeIds) { empty.uiCurrentThemeIds = uiCurrentThemeIds }
+    if (uiThemes != def.uiThemes) { empty.uiThemes = uiThemes }
     return empty
   }
 
@@ -5462,6 +5602,7 @@ data class AppSettings(
       setNetCfg(net)
     }
     privacyEncryptLocalFiles?.let { def.privacyEncryptLocalFiles.set(it) }
+    privacyAskToApproveRelays?.let { def.privacyAskToApproveRelays.set(it) }
     privacyAcceptImages?.let { def.privacyAcceptImages.set(it) }
     privacyLinkPreviews?.let { def.privacyLinkPreviews.set(it) }
     privacyShowChatPreviews?.let { def.privacyShowChatPreviews.set(it) }
@@ -5479,6 +5620,11 @@ data class AppSettings(
     androidCallOnLockScreen?.let { def.callOnLockScreen.set(it.toCallOnLockScreen()) }
     iosCallKitEnabled?.let { def.iosCallKitEnabled.set(it) }
     iosCallKitCallsInRecents?.let { def.iosCallKitCallsInRecents.set(it) }
+    uiProfileImageCornerRadius?.let { def.profileImageCornerRadius.set(it) }
+    uiColorScheme?.let { def.currentTheme.set(it) }
+    uiDarkColorScheme?.let { def.systemDarkTheme.set(it) }
+    uiCurrentThemeIds?.let { def.currentThemeIds.set(it) }
+    uiThemes?.let { def.themeOverrides.set(it.skipDuplicates()) }
   }
 
   companion object {
@@ -5486,6 +5632,7 @@ data class AppSettings(
       get() = AppSettings(
         networkConfig = NetCfg.defaults,
         privacyEncryptLocalFiles = true,
+        privacyAskToApproveRelays = true,
         privacyAcceptImages = true,
         privacyLinkPreviews = true,
         privacyShowChatPreviews = true,
@@ -5502,7 +5649,12 @@ data class AppSettings(
         confirmDBUpgrades = false,
         androidCallOnLockScreen = AppSettingsLockScreenCalls.SHOW,
         iosCallKitEnabled = true,
-        iosCallKitCallsInRecents = false
+        iosCallKitCallsInRecents = false,
+        uiProfileImageCornerRadius = 22.5f,
+        uiColorScheme = DefaultTheme.SYSTEM_THEME_NAME,
+        uiDarkColorScheme = DefaultTheme.SIMPLEX.themeName,
+        uiCurrentThemeIds = null,
+        uiThemes = null,
       )
 
     val current: AppSettings
@@ -5511,6 +5663,7 @@ data class AppSettings(
         return defaults.copy(
           networkConfig = getNetCfg(),
           privacyEncryptLocalFiles = def.privacyEncryptLocalFiles.get(),
+          privacyAskToApproveRelays = def.privacyAskToApproveRelays.get(),
           privacyAcceptImages = def.privacyAcceptImages.get(),
           privacyLinkPreviews = def.privacyLinkPreviews.get(),
           privacyShowChatPreviews = def.privacyShowChatPreviews.get(),
@@ -5528,6 +5681,11 @@ data class AppSettings(
           androidCallOnLockScreen = AppSettingsLockScreenCalls.from(def.callOnLockScreen.get()),
           iosCallKitEnabled = def.iosCallKitEnabled.get(),
           iosCallKitCallsInRecents = def.iosCallKitCallsInRecents.get(),
+          uiProfileImageCornerRadius = def.profileImageCornerRadius.get(),
+          uiColorScheme = def.currentTheme.get() ?: DefaultTheme.SYSTEM_THEME_NAME,
+          uiDarkColorScheme = def.systemDarkTheme.get() ?: DefaultTheme.SIMPLEX.themeName,
+          uiCurrentThemeIds = def.currentThemeIds.get(),
+          uiThemes = def.themeOverrides.get(),
         )
     }
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/other/wheel-picker/FWheelPickerDefault.kt

@@ -2,7 +2,6 @@ package com.sd.lib.compose.wheel_picker
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
-import chat.simplex.common.ui.theme.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -12,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import chat.simplex.common.ui.theme.isInDarkTheme
 
 /**
  * The default implementation of focus view in vertical.
@@ -76,7 +76,7 @@ fun FWheelPickerFocusHorizontal(
  */
 private val DefaultDividerColor: Color
   @Composable
-  get() = (if (isSystemInDarkTheme()) {
+  get() = (if (isInDarkTheme()) {
     Color.White
   } else {
     Color.Black

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/AppCommon.kt

@@ -42,6 +42,12 @@ fun runMigrations() {
           ChatController.appPrefs.currentTheme.set(DefaultTheme.SIMPLEX.name)
         }
         lastMigration.set(117)
+      } else if (lastMigration.get() < 203) {
+        // Moving to a different key for storing themes as a List
+        val oldOverrides = ChatController.appPrefs.themeOverridesOld.get().values.toList()
+        ChatController.appPrefs.themeOverrides.set(oldOverrides)
+        ChatController.appPrefs.currentThemeIds.set(oldOverrides.associate { it.base.themeName to it.themeId })
+        lastMigration.set(203)
       } else {
         lastMigration.set(BuildConfigCommon.ANDROID_VERSION_CODE)
         break

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt

@@ -43,14 +43,13 @@ val appPreferences: AppPreferences
 
 val chatController: ChatController = ChatController
 
-fun initChatControllerAndRunMigrations() {
+fun initChatControllerOnStart() {
   withLongRunningApi {
     if (appPreferences.chatStopped.get() && appPreferences.storeDBPassphrase.get() && ksDatabasePassword.get() != null) {
       initChatController(startChat = ::showStartChatAfterRestartAlert)
     } else {
       initChatController()
     }
-    runMigrations()
   }
 }
 
@@ -88,11 +87,13 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
       return
     }
     platform.androidRestartNetworkObserver()
-    controller.apiSetTempFolder(coreTmpDir.absolutePath)
-    controller.apiSetFilesFolder(appFilesDir.absolutePath)
-    if (appPlatform.isDesktop) {
-      controller.apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
-    }
+    controller.apiSetAppFilePaths(
+      appFilesDir.absolutePath,
+      coreTmpDir.absolutePath,
+      wallpapersDir.parentFile.absolutePath,
+      remoteHostsDir.absolutePath,
+      ctrl
+    )
     controller.apiSetEncryptLocalFiles(controller.appPrefs.privacyEncryptLocalFiles.get())
     // If we migrated successfully means previous re-encryption process on database level finished successfully too
     if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Files.kt

@@ -1,10 +1,12 @@
 package chat.simplex.common.platform
 
 import androidx.compose.runtime.Composable
-import chat.simplex.common.model.CIFile
-import chat.simplex.common.model.CryptoFile
+import chat.simplex.common.model.*
+import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
+import com.charleskorn.kaml.*
+import kotlinx.serialization.encodeToString
 import java.io.*
 import java.net.URI
 import java.net.URLDecoder
@@ -14,8 +16,10 @@ expect val dataDir: File
 expect val tmpDir: File
 expect val filesDir: File
 expect val appFilesDir: File
+expect val wallpapersDir: File
 expect val coreTmpDir: File
 expect val dbAbsolutePrefixPath: String
+expect val preferencesDir: File
 
 expect val chatDatabaseFileName: String
 expect val agentDatabaseFileName: String
@@ -78,6 +82,20 @@ fun getAppFilePath(fileName: String): String {
   }
 }
 
+fun getWallpaperFilePath(fileName: String): String {
+  val rh = chatModel.currentRemoteHost.value
+  val s = File.separator
+  val path = if (rh == null) {
+    wallpapersDir.absolutePath + s + fileName
+  } else {
+    remoteHostsDir.absolutePath + s + rh.storePath + s + "simplex_v1_assets" + s + "wallpapers" + s + fileName
+  }
+  File(path).parentFile.mkdirs()
+  return path
+}
+
+fun getPreferenceFilePath(fileName: String = "themes.yaml"): String = preferencesDir.absolutePath + File.separator + fileName
+
 fun getLoadedFilePath(file: CIFile?): String? {
   val f = file?.fileSource?.filePath
   return if (f != null && file.loaded) {
@@ -98,6 +116,42 @@ fun getLoadedFileSource(file: CIFile?): CryptoFile? {
   }
 }
 
+fun readThemeOverrides(): List<ThemeOverrides> {
+  return try {
+    val file = File(getPreferenceFilePath("themes.yaml"))
+    if (!file.exists()) return emptyList()
+
+    file.inputStream().use {
+      val map = yaml.parseToYamlNode(it).yamlMap
+      val list = map.get<YamlList>("themes")
+      val res = ArrayList<ThemeOverrides>()
+      list?.items?.forEach {
+        try {
+          res.add(yaml.decodeFromYamlNode(ThemeOverrides.serializer(), it))
+        } catch (e: Throwable) {
+          Log.e(TAG, "Error while reading specific theme: ${e.stackTraceToString()}")
+        }
+      }
+      res.skipDuplicates()
+    }
+  } catch (e: Throwable) {
+    Log.e(TAG, "Error while reading themes file: ${e.stackTraceToString()}")
+    emptyList()
+  }
+}
+
+fun writeThemeOverrides(overrides: List<ThemeOverrides>): Boolean =
+  try {
+    File(getPreferenceFilePath("themes.yaml")).outputStream().use {
+      val string = yaml.encodeToString(ThemesFile(themes = overrides))
+      it.bufferedWriter().use { it.write(string) }
+    }
+    true
+  } catch (e: Throwable) {
+    Log.e(TAG, "Error while writing themes file: ${e.stackTraceToString()}")
+    false
+  }
+
 private fun fileReady(file: CIFile, filePath: String) =
   File(filePath).exists() &&
   CIFile.cachedRemoteFileRequests[file.fileSource] != false

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Resources.kt

@@ -1,11 +1,13 @@
 package chat.simplex.common.platform
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import com.russhwolf.settings.Settings
+import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 
 @Composable
@@ -31,3 +33,5 @@ expect fun windowWidth(): Dp
 expect fun desktopExpandWindowToWidth(width: Dp)
 
 expect fun isRtl(text: CharSequence): Boolean
+
+expect fun ImageResource.toComposeImageBitmap(): ImageBitmap?

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Share.kt

@@ -8,3 +8,4 @@ expect fun UriHandler.sendEmail(subject: String, body: CharSequence)
 
 expect fun ClipboardManager.shareText(text: String)
 expect fun shareFile(text: String, fileSource: CryptoFile)
+expect fun openFile(fileSource: CryptoFile)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Color.kt

@@ -31,17 +31,6 @@ val WarningOrange = Color(255, 127, 0, 255)
 val WarningYellow = Color(255, 192, 0, 255)
 val FileLight = Color(183, 190, 199, 255)
 val FileDark = Color(101, 101, 106, 255)
-val SentMessageColor = Color(0x1E45B8FF)
 
 val MenuTextColor: Color @Composable get () = if (isInDarkTheme()) LocalContentColor.current.copy(alpha = 0.8f) else Color.Black
-val NoteFolderIconColor: Color @Composable get() = with(CurrentColors.collectAsState().value.appColors.sentMessage) {
-  // Default color looks too light and better to have it here a little bit brighter
-  if (alpha == SentMessageColor.alpha) {
-    copy(min(SentMessageColor.alpha + 0.1f, 1f))
-  } else {
-    // Color is non-standard and theme maker can choose color without alpha at all since the theme bound to dark/light variant,
-    // and it shouldn't be universal
-    this
-  }
-}
-
+val NoteFolderIconColor: Color @Composable get() = MaterialTheme.appColors.primaryVariant2

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt

@@ -6,53 +6,136 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatController
-import chat.simplex.common.platform.isInNightMode
+import chat.simplex.common.model.ChatController.appPrefs
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
+import chat.simplex.common.ui.theme.ThemeManager.toReadableHex
 import chat.simplex.common.views.helpers.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import chat.simplex.res.MR
+import kotlinx.serialization.Transient
+import java.util.UUID
 
 enum class DefaultTheme {
-  SYSTEM, LIGHT, DARK, SIMPLEX;
+  LIGHT, DARK, SIMPLEX, BLACK;
+
+  companion object {
+    const val SYSTEM_THEME_NAME: String = "SYSTEM"
+  }
+
+  val themeName: String
+    get() = name
+
+  val mode: DefaultThemeMode get() = if (this == LIGHT) DefaultThemeMode.LIGHT else DefaultThemeMode.DARK
 
   // Call it only with base theme, not SYSTEM
-  fun hasChangedAnyColor(colors: Colors, appColors: AppColors): Boolean {
-    val palette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPalette
-      DARK -> DarkColorPalette
-      SIMPLEX -> SimplexColorPalette
-    }
-    val appPalette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPaletteApp
-      DARK -> DarkColorPaletteApp
-      SIMPLEX -> SimplexColorPaletteApp
-    }
-    return colors.primary != palette.primary ||
-        colors.primaryVariant != palette.primaryVariant ||
-        colors.secondary != palette.secondary ||
-        colors.secondaryVariant != palette.secondaryVariant ||
-        colors.background != palette.background ||
-        colors.surface != palette.surface ||
-        appColors != appPalette
+  fun hasChangedAnyColor(overrides: ThemeOverrides?): Boolean {
+    if (overrides == null) return false
+    return overrides.colors != ThemeColors() ||
+        overrides.wallpaper != null && (overrides.wallpaper.background != null || overrides.wallpaper.tint != null)
   }
 }
 
-data class AppColors(
-  val title: Color,
-  val sentMessage: Color,
-  val receivedMessage: Color
-)
+@Serializable
+enum class DefaultThemeMode {
+  @SerialName("light") LIGHT,
+  @SerialName("dark") DARK
+}
+
+@Stable
+class AppColors(
+  title: Color,
+  primaryVariant2: Color,
+  sentMessage: Color,
+  sentQuote: Color,
+  receivedMessage: Color,
+  receivedQuote: Color,
+) {
+  var title by mutableStateOf(title, structuralEqualityPolicy())
+    internal set
+  var primaryVariant2 by mutableStateOf(primaryVariant2, structuralEqualityPolicy())
+    internal set
+  var sentMessage by mutableStateOf(sentMessage, structuralEqualityPolicy())
+    internal set
+  var sentQuote by mutableStateOf(sentQuote, structuralEqualityPolicy())
+    internal set
+  var receivedMessage by mutableStateOf(receivedMessage, structuralEqualityPolicy())
+    internal set
+  var receivedQuote by mutableStateOf(receivedQuote, structuralEqualityPolicy())
+    internal set
+
+  fun copy(
+    title: Color = this.title,
+    primaryVariant2: Color = this.primaryVariant2,
+    sentMessage: Color = this.sentMessage,
+    sentQuote: Color = this.sentQuote,
+    receivedMessage: Color = this.receivedMessage,
+    receivedQuote: Color = this.receivedQuote,
+  ): AppColors = AppColors(
+    title,
+    primaryVariant2,
+    sentMessage,
+    sentQuote,
+    receivedMessage,
+    receivedQuote,
+  )
+
+  override fun toString(): String {
+    return buildString {
+      append("AppColors(")
+      append("title=$title, ")
+      append("primaryVariant2=$primaryVariant2, ")
+      append("sentMessage=$sentMessage, ")
+      append("sentQuote=$sentQuote, ")
+      append("receivedMessage=$receivedMessage, ")
+      append("receivedQuote=$receivedQuote")
+      append(")")
+    }
+  }
+}
+
+@Stable
+class AppWallpaper(
+  background: Color? = null,
+  tint: Color? = null,
+  type: WallpaperType = WallpaperType.Empty,
+) {
+  var background by mutableStateOf(background, structuralEqualityPolicy())
+    internal set
+  var tint by mutableStateOf(tint, structuralEqualityPolicy())
+    internal set
+  var type by mutableStateOf(type, structuralEqualityPolicy())
+    internal set
+
+  fun copy(
+    background: Color? = this.background,
+    tint: Color? = this.tint,
+    type: WallpaperType = this.type,
+  ): AppWallpaper = AppWallpaper(
+    background,
+    tint,
+    type,
+  )
+
+  override fun toString(): String {
+    return buildString {
+      append("AppWallpaper(")
+      append("background=$background, ")
+      append("tint=$tint, ")
+      append("type=$type")
+      append(")")
+    }
+  }
+}
 
 enum class ThemeColor {
-  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, RECEIVED_MESSAGE;
+  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, SENT_QUOTE, RECEIVED_MESSAGE, RECEIVED_QUOTE, PRIMARY_VARIANT2, WALLPAPER_BACKGROUND, WALLPAPER_TINT;
 
-  fun fromColors(colors: Colors, appColors: AppColors): Color {
+  fun fromColors(colors: Colors, appColors: AppColors, appWallpaper: AppWallpaper): Color? {
     return when (this) {
       PRIMARY -> colors.primary
       PRIMARY_VARIANT -> colors.primaryVariant
@@ -61,8 +144,13 @@ enum class ThemeColor {
       BACKGROUND -> colors.background
       SURFACE -> colors.surface
       TITLE -> appColors.title
+      PRIMARY_VARIANT2 -> appColors.primaryVariant2
       SENT_MESSAGE -> appColors.sentMessage
+      SENT_QUOTE -> appColors.sentQuote
       RECEIVED_MESSAGE -> appColors.receivedMessage
+      RECEIVED_QUOTE -> appColors.receivedQuote
+      WALLPAPER_BACKGROUND -> appWallpaper.background
+      WALLPAPER_TINT -> appWallpaper.tint
     }
   }
 
@@ -75,8 +163,13 @@ enum class ThemeColor {
       BACKGROUND -> generalGetString(MR.strings.color_background)
       SURFACE -> generalGetString(MR.strings.color_surface)
       TITLE -> generalGetString(MR.strings.color_title)
+      PRIMARY_VARIANT2 -> generalGetString(MR.strings.color_primary_variant2)
       SENT_MESSAGE -> generalGetString(MR.strings.color_sent_message)
+      SENT_QUOTE -> generalGetString(MR.strings.color_sent_quote)
       RECEIVED_MESSAGE -> generalGetString(MR.strings.color_received_message)
+      RECEIVED_QUOTE -> generalGetString(MR.strings.color_received_quote)
+      WALLPAPER_BACKGROUND -> generalGetString(MR.strings.color_wallpaper_background)
+      WALLPAPER_TINT -> generalGetString(MR.strings.color_wallpaper_tint)
     }
 }
 
@@ -92,45 +185,232 @@ data class ThemeColors(
   @SerialName("menus")
   val surface: String? = null,
   val title: String? = null,
+  @SerialName("accentVariant2")
+  val primaryVariant2: String? = null,
   val sentMessage: String? = null,
+  @SerialName("sentReply")
+  val sentQuote: String? = null,
   val receivedMessage: String? = null,
+  @SerialName("receivedReply")
+  val receivedQuote: String? = null,
 ) {
-  fun toColors(base: DefaultTheme): Colors {
+  companion object {
+    fun from(colors: Colors, appColors: AppColors): ThemeColors =
+      ThemeColors(
+        primary = colors.primary.toReadableHex(),
+        primaryVariant = colors.primaryVariant.toReadableHex(),
+        secondary = colors.secondary.toReadableHex(),
+        secondaryVariant = colors.secondaryVariant.toReadableHex(),
+        background = colors.background.toReadableHex(),
+        surface = colors.surface.toReadableHex(),
+        title = appColors.title.toReadableHex(),
+        primaryVariant2 = appColors.primaryVariant2.toReadableHex(),
+        sentMessage = appColors.sentMessage.toReadableHex(),
+        sentQuote = appColors.sentQuote.toReadableHex(),
+        receivedMessage = appColors.receivedMessage.toReadableHex(),
+        receivedQuote = appColors.receivedQuote.toReadableHex(),
+      )
+  }
+}
+
+@Serializable
+data class ThemeWallpaper (
+  val preset: String? = null,
+  val scale: Float? = null,
+  val scaleType: WallpaperScaleType? = null,
+  val background: String? = null,
+  val tint: String? = null,
+  val image: String? = null,
+  val imageFile: String? = null,
+) {
+  fun toAppWallpaper(): AppWallpaper {
+    return AppWallpaper(
+      background = background?.colorFromReadableHex(),
+      tint = tint?.colorFromReadableHex(),
+      type = WallpaperType.from(this) ?: WallpaperType.Empty
+    )
+  }
+
+  fun withFilledWallpaperBase64(): ThemeWallpaper {
+    val aw = toAppWallpaper()
+    val type = aw.type
+    return ThemeWallpaper(
+      image = if (type is WallpaperType.Image && type.image != null) resizeImageToStrSize(type.image!!, 5_000_000) else null,
+      imageFile = null,
+      preset = if (type is WallpaperType.Preset) type.filename else null,
+      scale = if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) type.scale else 1f,
+      scaleType = if (type is WallpaperType.Image) type.scaleType else null,
+      background = aw.background?.toReadableHex(),
+      tint = aw.tint?.toReadableHex(),
+    )
+  }
+
+  fun withFilledWallpaperPath(): ThemeWallpaper {
+    val aw = toAppWallpaper()
+    val type = aw.type
+    return ThemeWallpaper(
+      image = null,
+      imageFile = if (type is WallpaperType.Image) type.filename else null,
+      preset = if (type is WallpaperType.Preset) type.filename else null,
+      scale = if (scale == null) null else if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) scale else null,
+      scaleType = if (scaleType == null) null else if (type is WallpaperType.Image) type.scaleType else null,
+      background = aw.background?.toReadableHex(),
+      tint = aw.tint?.toReadableHex(),
+    )
+  }
+
+ fun importFromString(): ThemeWallpaper =
+   if (preset == null && image != null) {
+     // Need to save image from string and to save its path
+     try {
+       val parsed = base64ToBitmap(image)
+       val filename = saveWallpaperFile(parsed)
+       copy(image = null, imageFile = filename)
+     } catch (e: Exception) {
+       Log.e(TAG, "Error while parsing/copying the image: ${e.stackTraceToString()}")
+       ThemeWallpaper()
+     }
+   } else this
+
+  companion object {
+    fun from(type: WallpaperType, background: String?, tint: String?): ThemeWallpaper {
+      return ThemeWallpaper(
+        image = null,
+        imageFile = if (type is WallpaperType.Image) type.filename else null,
+        preset = if (type is WallpaperType.Preset) type.filename else null,
+        scale = if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) type.scale else null,
+        scaleType = if (type is WallpaperType.Image) type.scaleType else null,
+        background = background,
+        tint = tint,
+      )
+    }
+  }
+}
+
+@Serializable
+data class ThemesFile(
+  val themes: List<ThemeOverrides> = emptyList()
+)
+
+@Serializable
+data class ThemeOverrides (
+  val themeId: String = UUID.randomUUID().toString(),
+  val base: DefaultTheme,
+  val colors: ThemeColors = ThemeColors(),
+  val wallpaper: ThemeWallpaper? = null,
+) {
+
+  fun isSame(type: WallpaperType?, themeName: String): Boolean =
+    (
+        (wallpaper?.preset != null && type is WallpaperType.Preset && wallpaper.preset == type.filename) ||
+        (wallpaper?.imageFile != null && type is WallpaperType.Image) ||
+        (wallpaper?.preset == null && wallpaper?.imageFile == null && (type == WallpaperType.Empty || type == null))
+    ) && base.themeName == themeName
+
+  fun withUpdatedColor(name: ThemeColor, color: String?): ThemeOverrides {
+    return copy(
+      colors = when (name) {
+        ThemeColor.PRIMARY -> colors.copy(primary = color)
+        ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
+        ThemeColor.SECONDARY -> colors.copy(secondary = color)
+        ThemeColor.SECONDARY_VARIANT -> colors.copy(secondaryVariant = color)
+        ThemeColor.BACKGROUND -> colors.copy(background = color)
+        ThemeColor.SURFACE -> colors.copy(surface = color)
+        ThemeColor.TITLE -> colors.copy(title = color)
+        ThemeColor.PRIMARY_VARIANT2 -> colors.copy(primaryVariant2 = color)
+        ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
+        ThemeColor.SENT_QUOTE -> colors.copy(sentQuote = color)
+        ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
+        ThemeColor.RECEIVED_QUOTE -> colors.copy(receivedQuote = color)
+        ThemeColor.WALLPAPER_BACKGROUND -> colors.copy()
+        ThemeColor.WALLPAPER_TINT -> colors.copy()
+      }, wallpaper = when (name) {
+        ThemeColor.WALLPAPER_BACKGROUND -> wallpaper?.copy(background = color)
+        ThemeColor.WALLPAPER_TINT -> wallpaper?.copy(tint = color)
+        else -> wallpaper?.copy()
+      }
+    )
+  }
+
+  fun toColors(base: DefaultTheme, perChatTheme: ThemeColors?, perUserTheme: ThemeColors?, presetWallpaperTheme: ThemeColors?): Colors {
     val baseColors = when (base) {
       DefaultTheme.LIGHT -> LightColorPalette
       DefaultTheme.DARK -> DarkColorPalette
       DefaultTheme.SIMPLEX -> SimplexColorPalette
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPalette
+      DefaultTheme.BLACK -> BlackColorPalette
     }
     return baseColors.copy(
-      primary = primary?.colorFromReadableHex() ?: baseColors.primary,
-      primaryVariant = primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
-      secondary = secondary?.colorFromReadableHex() ?: baseColors.secondary,
-      secondaryVariant = secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
-      background = background?.colorFromReadableHex() ?: baseColors.background,
-      surface = surface?.colorFromReadableHex() ?: baseColors.surface,
+      primary = perChatTheme?.primary?.colorFromReadableHex() ?: perUserTheme?.primary?.colorFromReadableHex() ?: colors.primary?.colorFromReadableHex() ?: presetWallpaperTheme?.primary?.colorFromReadableHex() ?: baseColors.primary,
+      primaryVariant = perChatTheme?.primaryVariant?.colorFromReadableHex() ?: perUserTheme?.primaryVariant?.colorFromReadableHex() ?: colors.primaryVariant?.colorFromReadableHex() ?: presetWallpaperTheme?.primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
+      secondary = perChatTheme?.secondary?.colorFromReadableHex() ?: perUserTheme?.secondary?.colorFromReadableHex() ?: colors.secondary?.colorFromReadableHex() ?: presetWallpaperTheme?.secondary?.colorFromReadableHex() ?: baseColors.secondary,
+      secondaryVariant = perChatTheme?.secondaryVariant?.colorFromReadableHex() ?: perUserTheme?.secondaryVariant?.colorFromReadableHex() ?: colors.secondaryVariant?.colorFromReadableHex() ?: presetWallpaperTheme?.secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
+      background = perChatTheme?.background?.colorFromReadableHex() ?: perUserTheme?.background?.colorFromReadableHex() ?: colors.background?.colorFromReadableHex() ?: presetWallpaperTheme?.background?.colorFromReadableHex() ?: baseColors.background,
+      surface = perChatTheme?.surface?.colorFromReadableHex() ?: perUserTheme?.surface?.colorFromReadableHex() ?: colors.surface?.colorFromReadableHex() ?: presetWallpaperTheme?.surface?.colorFromReadableHex() ?: baseColors.surface,
     )
   }
 
-  fun toAppColors(base: DefaultTheme): AppColors {
+  fun toAppColors(base: DefaultTheme, perChatTheme: ThemeColors?, perChatWallpaperType: WallpaperType?, perUserTheme: ThemeColors?, perUserWallpaperType: WallpaperType?, presetWallpaperTheme: ThemeColors?): AppColors {
     val baseColors = when (base) {
       DefaultTheme.LIGHT -> LightColorPaletteApp
       DefaultTheme.DARK -> DarkColorPaletteApp
       DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPaletteApp
+      DefaultTheme.BLACK -> BlackColorPaletteApp
     }
+
+    val sentMessageFallback = colors.sentMessage?.colorFromReadableHex() ?: presetWallpaperTheme?.sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage
+    val sentQuoteFallback = colors.sentQuote?.colorFromReadableHex() ?: presetWallpaperTheme?.sentQuote?.colorFromReadableHex() ?: baseColors.sentQuote
+    val receivedMessageFallback = colors.receivedMessage?.colorFromReadableHex() ?: presetWallpaperTheme?.receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage
+    val receivedQuoteFallback = colors.receivedQuote?.colorFromReadableHex() ?: presetWallpaperTheme?.receivedQuote?.colorFromReadableHex() ?: baseColors.receivedQuote
     return baseColors.copy(
-      title = title?.colorFromReadableHex() ?: baseColors.title,
-      sentMessage = sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage,
-      receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
+      title = perChatTheme?.title?.colorFromReadableHex() ?: perUserTheme?.title?.colorFromReadableHex() ?: colors.title?.colorFromReadableHex() ?: presetWallpaperTheme?.title?.colorFromReadableHex() ?: baseColors.title,
+      primaryVariant2 = perChatTheme?.primaryVariant2?.colorFromReadableHex() ?: perUserTheme?.primaryVariant2?.colorFromReadableHex() ?: colors.primaryVariant2?.colorFromReadableHex() ?: presetWallpaperTheme?.primaryVariant2?.colorFromReadableHex() ?: baseColors.primaryVariant2,
+      sentMessage = if (perChatTheme?.sentMessage != null) perChatTheme.sentMessage.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.sentMessage?.colorFromReadableHex() ?: sentMessageFallback
+        else sentMessageFallback,
+      sentQuote = if (perChatTheme?.sentQuote != null) perChatTheme.sentQuote.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.sentQuote?.colorFromReadableHex() ?: sentQuoteFallback
+        else sentQuoteFallback,
+      receivedMessage = if (perChatTheme?.receivedMessage != null) perChatTheme.receivedMessage.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.receivedMessage?.colorFromReadableHex() ?: receivedMessageFallback
+        else receivedMessageFallback,
+      receivedQuote = if (perChatTheme?.receivedQuote != null) perChatTheme.receivedQuote.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.receivedQuote?.colorFromReadableHex() ?: receivedQuoteFallback
+        else receivedQuoteFallback,
     )
   }
 
-  fun withFilledColors(base: DefaultTheme): ThemeColors {
-    val c = toColors(base)
-    val ac = toAppColors(base)
+  fun toAppWallpaper(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverride?, materialBackgroundColor: Color): AppWallpaper {
+    val mainType = when {
+      themeOverridesForType != null -> themeOverridesForType
+      // type can be null if override is empty `"wallpaper": "{}"`, in this case no wallpaper is needed, empty.
+      // It's not null to override upper level wallpaper
+      perChatTheme?.wallpaper != null -> perChatTheme.wallpaper.toAppWallpaper().type
+      perUserTheme?.wallpaper != null -> perUserTheme.wallpaper.toAppWallpaper().type
+      else -> wallpaper?.toAppWallpaper()?.type ?: return AppWallpaper()
+    }
+    val first: ThemeWallpaper? = if (mainType.sameType(perChatTheme?.wallpaper?.toAppWallpaper()?.type)) perChatTheme?.wallpaper else null
+    val second: ThemeWallpaper? = if (mainType.sameType(perUserTheme?.wallpaper?.toAppWallpaper()?.type)) perUserTheme?.wallpaper else null
+    val third: ThemeWallpaper? = if (mainType.sameType(this.wallpaper?.toAppWallpaper()?.type)) this.wallpaper else null
+
+    return AppWallpaper(type = when (mainType) {
+        is WallpaperType.Preset -> mainType.copy(
+          scale = mainType.scale ?: first?.scale ?: second?.scale ?: third?.scale
+        )
+        is WallpaperType.Image -> mainType.copy(
+          scale = if (themeOverridesForType == null) mainType.scale ?: first?.scale ?: second?.scale ?: third?.scale else second?.scale ?: third?.scale ?: mainType.scale,
+          scaleType = if (themeOverridesForType == null) mainType.scaleType ?: first?.scaleType ?: second?.scaleType ?: third?.scaleType else second?.scaleType ?: third?.scaleType ?: mainType.scaleType,
+          filename = if (themeOverridesForType == null) mainType.filename else first?.imageFile ?: second?.imageFile ?: third?.imageFile ?: mainType.filename,
+        )
+        is WallpaperType.Empty -> mainType
+      },
+      background = (first?.background ?: second?.background ?: third?.background)?.colorFromReadableHex() ?: mainType.defaultBackgroundColor(base, materialBackgroundColor),
+      tint = (first?.tint ?: second?.tint ?: third?.tint)?.colorFromReadableHex() ?: mainType.defaultTintColor(base)
+    )
+  }
+
+  fun withFilledColors(base: DefaultTheme, perChatTheme: ThemeColors?, perChatWallpaperType: WallpaperType?, perUserTheme: ThemeColors?, perUserWallpaperType: WallpaperType?, presetWallpaperTheme: ThemeColors?): ThemeColors {
+    val c = toColors(base, perChatTheme, perUserTheme, presetWallpaperTheme)
+    val ac = toAppColors(base, perChatTheme, perChatWallpaperType, perUserTheme, perUserWallpaperType, presetWallpaperTheme)
     return ThemeColors(
       primary = c.primary.toReadableHex(),
       primaryVariant = c.primaryVariant.toReadableHex(),
@@ -139,23 +419,71 @@ data class ThemeColors(
       background = c.background.toReadableHex(),
       surface = c.surface.toReadableHex(),
       title = ac.title.toReadableHex(),
+      primaryVariant2 = ac.primaryVariant2.toReadableHex(),
       sentMessage = ac.sentMessage.toReadableHex(),
-      receivedMessage = ac.receivedMessage.toReadableHex()
+      sentQuote = ac.sentQuote.toReadableHex(),
+      receivedMessage = ac.receivedMessage.toReadableHex(),
+      receivedQuote = ac.receivedQuote.toReadableHex(),
     )
   }
 }
 
-private fun String.colorFromReadableHex(): Color =
-  Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
+fun List<ThemeOverrides>.getTheme(themeId: String?): ThemeOverrides? =
+  firstOrNull { it.themeId == themeId }
 
-private fun Color.toReadableHex(): String = "#" + Integer.toHexString(toArgb())
+fun List<ThemeOverrides>.getTheme(themeId: String?, type: WallpaperType?, base: DefaultTheme): ThemeOverrides? =
+  firstOrNull { it.themeId == themeId || it.isSame(type, base.themeName)}
+
+fun List<ThemeOverrides>.replace(theme: ThemeOverrides): List<ThemeOverrides> {
+  val index = indexOfFirst { it.themeId == theme.themeId ||
+      // prevent situation when two themes has the same type but different theme id (maybe something was changed in prefs by hand)
+      it.isSame(WallpaperType.from(theme.wallpaper), theme.base.themeName)
+  }
+  return if (index != -1) {
+    val a = ArrayList(this)
+    a[index] = theme
+    a
+  } else {
+    this + theme
+  }
+}
+
+fun List<ThemeOverrides>.sameTheme(type: WallpaperType?, themeName: String): ThemeOverrides? = firstOrNull { it.isSame(type, themeName) }
+
+/** See [ThemesTest.testSkipDuplicates] */
+fun List<ThemeOverrides>.skipDuplicates(): List<ThemeOverrides> {
+  val res = ArrayList<ThemeOverrides>()
+  forEach { theme ->
+    val themeType = WallpaperType.from(theme.wallpaper)
+    if (res.none { it.themeId == theme.themeId || it.isSame(themeType, theme.base.themeName) }) {
+      res.add(theme)
+    }
+  }
+  return res
+}
 
 @Serializable
-data class ThemeOverrides (
-  val base: DefaultTheme,
-  val colors: ThemeColors
+data class ThemeModeOverrides (
+  val light: ThemeModeOverride? = null,
+  val dark: ThemeModeOverride? = null
 ) {
-  fun withUpdatedColor(name: ThemeColor, color: String): ThemeOverrides {
+  fun preferredMode(darkTheme: Boolean): ThemeModeOverride? = when (darkTheme) {
+    false -> light
+    else -> dark
+  }
+}
+
+@Serializable
+data class ThemeModeOverride (
+  val mode: DefaultThemeMode = CurrentColors.value.base.mode,
+  val colors: ThemeColors = ThemeColors(),
+  val wallpaper: ThemeWallpaper? = null,
+) {
+
+  @Transient
+  val type = WallpaperType.from(wallpaper)
+
+  fun withUpdatedColor(name: ThemeColor, color: String?): ThemeModeOverride {
     return copy(colors = when (name) {
       ThemeColor.PRIMARY -> colors.copy(primary = color)
       ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
@@ -164,9 +492,97 @@ data class ThemeOverrides (
       ThemeColor.BACKGROUND -> colors.copy(background = color)
       ThemeColor.SURFACE -> colors.copy(surface = color)
       ThemeColor.TITLE -> colors.copy(title = color)
+      ThemeColor.PRIMARY_VARIANT2 -> colors.copy(primaryVariant2 = color)
       ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
+      ThemeColor.SENT_QUOTE -> colors.copy(sentQuote = color)
       ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
-    })
+      ThemeColor.RECEIVED_QUOTE -> colors.copy(receivedQuote = color)
+      ThemeColor.WALLPAPER_BACKGROUND -> colors.copy()
+      ThemeColor.WALLPAPER_TINT -> colors.copy()
+    }, wallpaper = when (name) {
+      ThemeColor.WALLPAPER_BACKGROUND -> wallpaper?.copy(background = color)
+      ThemeColor.WALLPAPER_TINT -> wallpaper?.copy(tint = color)
+      else -> wallpaper?.copy()
+    }
+    )
+  }
+
+  fun removeSameColors(base: DefaultTheme): ThemeModeOverride {
+    val c = when (base) {
+      DefaultTheme.LIGHT -> LightColorPalette
+      DefaultTheme.DARK -> DarkColorPalette
+      DefaultTheme.SIMPLEX -> SimplexColorPalette
+      DefaultTheme.BLACK -> BlackColorPalette
+    }
+    val ac = when (base) {
+      DefaultTheme.LIGHT -> LightColorPaletteApp
+      DefaultTheme.DARK -> DarkColorPaletteApp
+      DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
+      DefaultTheme.BLACK -> BlackColorPaletteApp
+    }
+    val w = when (val wallpaperType = WallpaperType.from(wallpaper)) {
+      is WallpaperType.Preset -> {
+        val p = PresetWallpaper.from(wallpaperType.filename)
+        ThemeWallpaper(
+          preset = wallpaperType.filename,
+          scale = p?.scale ?: wallpaper?.scale,
+          scaleType = null,
+          background = p?.background?.get(base)?.toReadableHex(),
+          tint = p?.tint?.get(base)?.toReadableHex(),
+          image = null,
+          imageFile = null,
+        )
+      }
+      is WallpaperType.Image -> {
+        ThemeWallpaper(
+          preset = null,
+          scale = null,
+          scaleType = WallpaperScaleType.FILL,
+          background = Color.Transparent.toReadableHex(),
+          tint = Color.Transparent.toReadableHex(),
+          image = null,
+          imageFile = null,
+        )
+      }
+      else -> {
+        ThemeWallpaper()
+      }
+    }
+
+    return copy(
+      colors = ThemeColors(
+        primary = if (colors.primary?.colorFromReadableHex() != c.primary) colors.primary else null,
+        primaryVariant = if (colors.primaryVariant?.colorFromReadableHex() != c.primaryVariant) colors.primaryVariant else null,
+        secondary = if (colors.secondary?.colorFromReadableHex() != c.secondary) colors.secondary else null,
+        secondaryVariant = if (colors.secondaryVariant?.colorFromReadableHex() != c.secondaryVariant) colors.secondaryVariant else null,
+        background = if (colors.background?.colorFromReadableHex() != c.background) colors.background else null,
+        surface = if (colors.surface?.colorFromReadableHex() != c.surface) colors.surface else null,
+        title = if (colors.title?.colorFromReadableHex() != ac.title) colors.title else null,
+        primaryVariant2 = if (colors.primaryVariant2?.colorFromReadableHex() != ac.primaryVariant2) colors.primary else null,
+        sentMessage = if (colors.sentMessage?.colorFromReadableHex() != ac.sentMessage) colors.sentMessage else null,
+        sentQuote = if (colors.sentQuote?.colorFromReadableHex() != ac.sentQuote) colors.sentQuote else null,
+        receivedMessage = if (colors.receivedMessage?.colorFromReadableHex() != ac.receivedMessage) colors.receivedMessage else null,
+        receivedQuote = if (colors.receivedQuote?.colorFromReadableHex() != ac.receivedQuote) colors.receivedQuote else null,
+      ),
+      wallpaper = wallpaper?.copy(
+        preset = wallpaper.preset,
+        scale = if (wallpaper.scale != w.scale) wallpaper.scale else null,
+        scaleType = if (wallpaper.scaleType != w.scaleType) wallpaper.scaleType else null,
+        background = if (wallpaper.background != w.background) wallpaper.background else null,
+        tint = if (wallpaper.tint != w.tint) wallpaper.tint else null,
+        image = wallpaper.image,
+        imageFile = wallpaper.imageFile,
+      )
+    )
+  }
+
+  companion object {
+    fun withFilledAppDefaults(mode: DefaultThemeMode, base: DefaultTheme): ThemeModeOverride =
+      ThemeModeOverride(
+        mode = mode,
+        colors = ThemeOverrides(base = base).withFilledColors(base, null, null, null, null, null),
+        wallpaper = ThemeWallpaper(preset = PresetWallpaper.SCHOOL.filename)
+      )
   }
 }
 
@@ -204,7 +620,6 @@ val DarkColorPalette = darkColors(
 //  background = Color.Black,
   surface = Color(0xFF222222),
 //  background = Color(0xFF121212),
-//  surface = Color(0xFF121212),
   error = Color.Red,
   onBackground = Color(0xFFFFFBFA),
   onSurface = Color(0xFFFFFBFA),
@@ -212,8 +627,11 @@ val DarkColorPalette = darkColors(
 )
 val DarkColorPaletteApp = AppColors(
   title = SimplexBlue,
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFF18262E),
+  sentMessage = Color(0xFF18262E),
+  sentQuote = Color(0xFF1D3847),
+  receivedMessage = Color(0xff262627),
+  receivedQuote = Color(0xff373739),
 )
 
 val LightColorPalette = lightColors(
@@ -231,8 +649,11 @@ val LightColorPalette = lightColors(
 )
 val LightColorPaletteApp = AppColors(
   title = SimplexBlue,
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFFE9F7FF),
+  sentMessage = Color(0xFFE9F7FF),
+  sentQuote = Color(0xFFD6F0FF),
+  receivedMessage = Color(0xfff5f5f6),
+  receivedQuote = Color(0xffececee),
 )
 
 val SimplexColorPalette = darkColors(
@@ -251,11 +672,39 @@ val SimplexColorPalette = darkColors(
 )
 val SimplexColorPaletteApp = AppColors(
   title = Color(0xFF267BE5),
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFF172941),
+  sentMessage = Color(0xFF172941),
+  sentQuote = Color(0xFF1C3A57),
+  receivedMessage = Color(0xff25283a),
+  receivedQuote = Color(0xff36394a),
 )
 
-val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))
+val BlackColorPalette = darkColors(
+  primary = Color(0xff0077e0),  // If this value changes also need to update #0088ff in string resource files
+  primaryVariant = Color(0xff0077e0),
+  secondary = HighOrLowlight,
+  secondaryVariant = DarkGray,
+  background = Color(0xff070707),
+  surface = Color(0xff161617),
+  //  background = Color(0xFF121212),
+  //  surface = Color(0xFF121212),
+  error = Color.Red,
+  onBackground = Color(0xFFFFFBFA),
+  onSurface = Color(0xFFFFFBFA),
+  //  onError: Color = Color.Black,
+)
+val BlackColorPaletteApp = AppColors(
+  title = Color(0xff0077e0),
+  primaryVariant2 = Color(0xff243747),
+  sentMessage = Color(0xFF18262E),
+  sentQuote = Color(0xFF1D3847),
+  receivedMessage = Color(0xff1b1b1b),
+  receivedQuote = Color(0xff29292b),
+)
+
+var systemInDarkThemeCurrently: Boolean = isInNightMode()
+
+val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get()))
 
 @Composable
 fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLight
@@ -263,31 +712,113 @@ fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLi
 @Composable
 expect fun isSystemInDarkTheme(): Boolean
 
+internal val LocalAppColors = staticCompositionLocalOf { LightColorPaletteApp }
+internal val LocalAppWallpaper = staticCompositionLocalOf { AppWallpaper() }
+
+val MaterialTheme.appColors: AppColors
+  @Composable
+  @ReadOnlyComposable
+  get() = LocalAppColors.current
+
+fun AppColors.updateColorsFrom(other: AppColors) {
+  title = other.title
+  primaryVariant2 = other.primaryVariant2
+  sentMessage = other.sentMessage
+  sentQuote = other.sentQuote
+  receivedMessage = other.receivedMessage
+  receivedQuote = other.receivedQuote
+}
+
+fun AppWallpaper.updateWallpaperFrom(other: AppWallpaper) {
+  background = other.background
+  tint = other.tint
+  type = other.type
+}
+
+val MaterialTheme.wallpaper: AppWallpaper
+  @Composable
+  @ReadOnlyComposable
+  get() = LocalAppWallpaper.current
+
 fun reactOnDarkThemeChanges(isDark: Boolean) {
-  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM.name && CurrentColors.value.colors.isLight == isDark) {
+  systemInDarkThemeCurrently = isDark
+  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.value.colors.isLight == isDark) {
     // Change active colors from light to dark and back based on system theme
-    ThemeManager.applyTheme(DefaultTheme.SYSTEM.name, isDark)
+    ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
   }
 }
 
 @Composable
 fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
-  LaunchedEffect(darkTheme) {
-    // For preview
-    if (darkTheme != null)
-      CurrentColors.value = ThemeManager.currentColors(darkTheme)
-  }
-  val systemDark = isSystemInDarkTheme()
-  LaunchedEffect(systemDark) {
-    reactOnDarkThemeChanges(systemDark)
+// TODO: Fix preview working with dark/light theme
+
+//  LaunchedEffect(darkTheme) {
+//    // For preview
+//    if (darkTheme != null)
+//      CurrentColors.value = ThemeManager.currentColors(darkTheme, null, null, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
+//  }
+  val systemDark = rememberUpdatedState(isSystemInDarkTheme())
+  LaunchedEffect(Unit) {
+    // snapshotFlow vs LaunchedEffect reduce number of recomposes
+    snapshotFlow { systemDark.value }
+      .collect {
+        reactOnDarkThemeChanges(systemDark.value)
+      }
   }
   val theme by CurrentColors.collectAsState()
+  LaunchedEffect(Unit) {
+    // snapshotFlow vs LaunchedEffect reduce number of recomposes when user is changed or it's themes
+    snapshotFlow { chatModel.currentUser.value?.uiThemes }
+      .collect {
+        ThemeManager.applyTheme(appPrefs.currentTheme.get()!!)
+      }
+  }
   MaterialTheme(
     colors = theme.colors,
     typography = Typography,
     shapes = Shapes,
     content = {
-      CompositionLocalProvider(LocalContentColor provides MaterialTheme.colors.onBackground, content = content)
+      val rememberedAppColors = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [appColors]
+        // provided, and overwrite the values set in it.
+        theme.appColors.copy()
+      }.apply { updateColorsFrom(theme.appColors) }
+      val rememberedWallpaper = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [wallpaper]
+        // provided, and overwrite the values set in it.
+        theme.wallpaper.copy()
+      }.apply { updateWallpaperFrom(theme.wallpaper) }
+      CompositionLocalProvider(
+        LocalContentColor provides MaterialTheme.colors.onBackground,
+        LocalAppColors provides rememberedAppColors,
+        LocalAppWallpaper provides rememberedWallpaper,
+        content = content)
+    }
+  )
+}
+
+@Composable
+fun SimpleXThemeOverride(theme: ThemeManager.ActiveTheme, content: @Composable () -> Unit) {
+  MaterialTheme(
+    colors = theme.colors,
+    typography = Typography,
+    shapes = Shapes,
+    content = {
+      val rememberedAppColors = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [appColors]
+        // provided, and overwrite the values set in it.
+        theme.appColors.copy()
+      }.apply { updateColorsFrom(theme.appColors) }
+      val rememberedWallpaper = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [wallpaper]
+        // provided, and overwrite the values set in it.
+        theme.wallpaper.copy()
+      }.apply { updateWallpaperFrom(theme.wallpaper) }
+      CompositionLocalProvider(
+        LocalContentColor provides MaterialTheme.colors.onBackground,
+        LocalAppColors provides rememberedAppColors,
+        LocalAppWallpaper provides rememberedWallpaper,
+        content = content)
     }
   )
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/ThemeManager.kt

@@ -1,14 +1,14 @@
 package chat.simplex.common.ui.theme
 
 import androidx.compose.material.Colors
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.text.font.FontFamily
-import chat.simplex.res.MR
-import chat.simplex.common.model.AppPreferences
-import chat.simplex.common.model.ChatController
-import chat.simplex.common.platform.platform
-import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.views.helpers.*
+import java.io.File
 
 // https://github.com/rsms/inter
 // I place it here because IDEA shows an error (but still works anyway) when this declaration inside Type.kt
@@ -18,140 +18,215 @@ expect val EmojiFont: FontFamily
 object ThemeManager {
   private val appPrefs: AppPreferences = ChatController.appPrefs
 
-  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors)
+  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors, val wallpaper: AppWallpaper = AppWallpaper())
 
   private fun systemDarkThemeColors(): Pair<Colors, DefaultTheme> = when (appPrefs.systemDarkTheme.get()) {
-    DefaultTheme.DARK.name -> DarkColorPalette to DefaultTheme.DARK
-    DefaultTheme.SIMPLEX.name -> SimplexColorPalette to DefaultTheme.SIMPLEX
+    DefaultTheme.DARK.themeName -> DarkColorPalette to DefaultTheme.DARK
+    DefaultTheme.SIMPLEX.themeName -> SimplexColorPalette to DefaultTheme.SIMPLEX
+    DefaultTheme.BLACK.themeName -> BlackColorPalette to DefaultTheme.BLACK
     else -> SimplexColorPalette to DefaultTheme.SIMPLEX
   }
 
-  fun currentColors(darkForSystemTheme: Boolean): ActiveTheme {
+  private fun nonSystemThemeName(): String {
     val themeName = appPrefs.currentTheme.get()!!
-    val themeOverrides = appPrefs.themeOverrides.get()
-
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
+    return if (themeName != DefaultTheme.SYSTEM_THEME_NAME) {
       themeName
     } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+      if (systemInDarkThemeCurrently) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.themeName
     }
-    val theme = themeOverrides[nonSystemThemeName]
+  }
+
+  fun defaultActiveTheme(appSettingsTheme: List<ThemeOverrides>): ThemeOverrides? {
+    val nonSystemThemeName = nonSystemThemeName()
+    val defaultThemeId = appPrefs.currentThemeIds.get()[nonSystemThemeName]
+    return appSettingsTheme.getTheme(defaultThemeId)
+  }
+
+  fun defaultActiveTheme(perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ThemeModeOverride {
+    val perUserTheme = if (!CurrentColors.value.colors.isLight) perUserTheme?.dark else perUserTheme?.light
+    if (perUserTheme != null) {
+      return perUserTheme
+    }
+    val defaultTheme = defaultActiveTheme(appSettingsTheme)
+    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper)
+  }
+
+  fun currentColors(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ActiveTheme {
+    val themeName = appPrefs.currentTheme.get()!!
+    val nonSystemThemeName = nonSystemThemeName()
+    val defaultTheme = defaultActiveTheme(appSettingsTheme)
+
     val baseTheme = when (nonSystemThemeName) {
-      DefaultTheme.LIGHT.name -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-      DefaultTheme.DARK.name -> Triple(DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp)
-      DefaultTheme.SIMPLEX.name -> Triple(DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp)
-      else -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
+      DefaultTheme.LIGHT.themeName -> ActiveTheme(DefaultTheme.LIGHT.themeName, DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.LIGHT)))
+      DefaultTheme.DARK.themeName -> ActiveTheme(DefaultTheme.DARK.themeName, DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.DARK)))
+      DefaultTheme.SIMPLEX.themeName -> ActiveTheme(DefaultTheme.SIMPLEX.themeName, DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.SIMPLEX)))
+      DefaultTheme.BLACK.themeName -> ActiveTheme(DefaultTheme.BLACK.themeName, DefaultTheme.BLACK, BlackColorPalette, BlackColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.BLACK)))
+      else -> ActiveTheme(DefaultTheme.LIGHT.themeName, DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.LIGHT)))
     }
-    if (theme == null) {
-      return ActiveTheme(themeName, baseTheme.first, baseTheme.second, baseTheme.third)
+
+    val perUserTheme = if (baseTheme.colors.isLight) perUserTheme?.light else perUserTheme?.dark
+    val theme = (appSettingsTheme.sameTheme(themeOverridesForType ?: perChatTheme?.type ?: perUserTheme?.type ?: defaultTheme?.wallpaper?.toAppWallpaper()?.type, nonSystemThemeName) ?: defaultTheme)
+
+    if (theme == null && perUserTheme == null && perChatTheme == null && themeOverridesForType == null) {
+      return ActiveTheme(themeName, baseTheme.base, baseTheme.colors, baseTheme.appColors, baseTheme.wallpaper)
     }
-    return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.base))
+    val presetWallpaperTheme = when {
+      perChatTheme?.wallpaper != null -> if (perChatTheme.wallpaper.preset != null) PresetWallpaper.from(perChatTheme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+      perUserTheme?.wallpaper != null -> if (perUserTheme.wallpaper.preset != null) PresetWallpaper.from(perUserTheme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+      else -> if (theme?.wallpaper?.preset != null) PresetWallpaper.from(theme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+    }
+    val themeOrEmpty = theme ?: ThemeOverrides(base = baseTheme.base)
+    val colors = themeOrEmpty.toColors(themeOrEmpty.base, perChatTheme?.colors, perUserTheme?.colors, presetWallpaperTheme)
+    return ActiveTheme(
+      themeName,
+      baseTheme.base,
+      colors,
+      themeOrEmpty.toAppColors(themeOrEmpty.base, perChatTheme?.colors, perChatTheme?.type, perUserTheme?.colors, perUserTheme?.type, presetWallpaperTheme),
+      themeOrEmpty.toAppWallpaper(themeOverridesForType, perChatTheme, perUserTheme, colors.background)
+    )
   }
 
-  fun currentThemeOverridesForExport(darkForSystemTheme: Boolean): ThemeOverrides {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val nonFilledTheme = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    return nonFilledTheme.copy(colors = nonFilledTheme.colors.withFilledColors(CurrentColors.value.base))
+  fun currentThemeOverridesForExport(perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?): ThemeOverrides {
+    val current = currentColors(null, perChatTheme, perUserTheme, appPrefs.themeOverrides.get())
+    val wType = current.wallpaper.type
+    val wBackground = current.wallpaper.background
+    val wTint = current.wallpaper.tint
+    return ThemeOverrides(
+      themeId = "",
+      base = current.base,
+      colors = ThemeColors.from(current.colors, current.appColors),
+      wallpaper = if (wType !is WallpaperType.Empty) ThemeWallpaper.from(wType, wBackground?.toReadableHex(), wTint?.toReadableHex()).withFilledWallpaperBase64() else null
+    )
   }
 
-  // colors, default theme enum, localized name of theme
-  fun allThemes(darkForSystemTheme: Boolean): List<Triple<Colors, DefaultTheme, String>> {
-    val allThemes = ArrayList<Triple<Colors, DefaultTheme, String>>()
-    allThemes.add(
-      Triple(
-        if (darkForSystemTheme) systemDarkThemeColors().first else LightColorPalette,
-        DefaultTheme.SYSTEM,
-        generalGetString(MR.strings.theme_system)
-      )
-    )
-    allThemes.add(
-      Triple(
-        LightColorPalette,
-        DefaultTheme.LIGHT,
-        generalGetString(MR.strings.theme_light)
-      )
-    )
-    allThemes.add(
-      Triple(
-        DarkColorPalette,
-        DefaultTheme.DARK,
-        generalGetString(MR.strings.theme_dark)
-      )
-    )
-    allThemes.add(
-      Triple(
-        SimplexColorPalette,
-        DefaultTheme.SIMPLEX,
-        generalGetString(MR.strings.theme_simplex)
-      )
-    )
-    return allThemes
-  }
-
-  fun applyTheme(theme: String, darkForSystemTheme: Boolean) {
+  fun applyTheme(theme: String) {
     appPrefs.currentTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
     platform.androidSetNightModeIfSupported()
   }
 
-  fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {
+  fun changeDarkTheme(theme: String) {
     appPrefs.systemDarkTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
   }
 
-  fun saveAndApplyThemeColor(name: ThemeColor, color: Color? = null, darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+  fun saveAndApplyThemeColor(baseTheme: DefaultTheme, name: ThemeColor, color: Color? = null, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = baseTheme.themeName
+    val overrides = pref.get()
+    val themeId = appPrefs.currentThemeIds.get()[nonSystemThemeName]
+    val prevValue = overrides.getTheme(themeId) ?: ThemeOverrides(base = baseTheme)
+    pref.set(overrides.replace(prevValue.withUpdatedColor(name, color?.toReadableHex())))
+    val themeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    themeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(themeIds)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun applyThemeColor(name: ThemeColor, color: Color? = null, pref: MutableState<ThemeModeOverride>) {
+    pref.value = pref.value.withUpdatedColor(name, color?.toReadableHex())
+  }
+
+  fun saveAndApplyWallpaper(baseTheme: DefaultTheme, type: WallpaperType?, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = baseTheme.themeName
+    val overrides = pref.get()
+    val theme = overrides.sameTheme(type, baseTheme.themeName)
+    val prevValue = theme ?: ThemeOverrides(base = baseTheme)
+    pref.set(overrides.replace(prevValue.copy(wallpaper = if (type != null && type !is WallpaperType.Empty) ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint) else null)))
+    val themeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    themeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(themeIds)
+    CurrentColors.value = currentColors( null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun copyFromSameThemeOverrides(type: WallpaperType?, lowerLevelOverride: ThemeModeOverride?, pref: MutableState<ThemeModeOverride>): Boolean {
+    val overrides = appPrefs.themeOverrides.get()
+    val sameWallpaper = if (lowerLevelOverride?.type?.sameType(type) == true) lowerLevelOverride.wallpaper else overrides.sameTheme(type, CurrentColors.value.base.themeName)?.wallpaper
+    if (sameWallpaper == null) {
+      if (type != null) {
+        pref.value = ThemeModeOverride(wallpaper = ThemeWallpaper.from(type, null, null).copy(scale = null, scaleType = null))
+      } else {
+        // Make an empty wallpaper to override any top level ones
+        pref.value = ThemeModeOverride(wallpaper = ThemeWallpaper())
+      }
+      return true
     }
-    var colorToSet = color
-    if (colorToSet == null) {
-      // Setting default color from a base theme
-      colorToSet = when(nonSystemThemeName) {
-        DefaultTheme.LIGHT.name -> name.fromColors(LightColorPalette, LightColorPaletteApp)
-        DefaultTheme.DARK.name -> name.fromColors(DarkColorPalette, DarkColorPaletteApp)
-        DefaultTheme.SIMPLEX.name -> name.fromColors(SimplexColorPalette, SimplexColorPaletteApp)
-        // Will not be here
-        else -> return
+    var type = sameWallpaper.toAppWallpaper().type
+    if (type is WallpaperType.Image && sameWallpaper.imageFile == type.filename) {
+      // same image file. Needs to be copied first in order to be able to remove the file once it's not needed anymore without affecting main theme override
+      val filename = saveWallpaperFile(File(getWallpaperFilePath(type.filename)).toURI())
+      if (filename != null) {
+        type = WallpaperType.Image(filename, type.scale, type.scaleType)
+      } else {
+        Log.e(TAG, "Error while copying wallpaper from global overrides to chat overrides")
+        return false
       }
     }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[nonSystemThemeName] = prevValue.withUpdatedColor(name, colorToSet.toReadableHex())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
+    val prevValue = pref.value
+    pref.value = prevValue.copy(
+      colors = ThemeColors(),
+      wallpaper = ThemeWallpaper.from(type, null, null).copy(scale = null, scaleType = null)
+    )
+    return true
   }
 
-  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, darkForSystemTheme: Boolean) {
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[theme.base.name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[theme.base.name] = prevValue.copy(colors = theme.colors)
-    appPrefs.themeOverrides.set(overrides)
-    appPrefs.currentTheme.set(theme.base.name)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
+  fun applyWallpaper(type: WallpaperType?, pref: MutableState<ThemeModeOverride>) {
+    val prevValue = pref.value
+    pref.value = prevValue.copy(
+      wallpaper = if (type != null)
+        ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
+      else null
+    )
   }
 
-  fun resetAllThemeColors(darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val wallpaper = theme.wallpaper?.importFromString()
+    val nonSystemThemeName = theme.base.themeName
+    val overrides = pref.get()
+    val prevValue = overrides.getTheme(null, wallpaper?.toAppWallpaper()?.type, theme.base) ?: ThemeOverrides(base = theme.base)
+    if (prevValue.wallpaper?.imageFile != null) {
+      File(getWallpaperFilePath(prevValue.wallpaper.imageFile)).delete()
+    }
+    pref.set(overrides.replace(prevValue.copy(base = theme.base, colors = theme.colors, wallpaper = wallpaper)))
+    appPrefs.currentTheme.set(nonSystemThemeName)
+    val currentThemeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    currentThemeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(currentThemeIds)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun resetAllThemeColors(pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = nonSystemThemeName()
+    val themeId = appPrefs.currentThemeIds.get()[nonSystemThemeName] ?: return
+    val overrides = pref.get()
+    val prevValue = overrides.getTheme(themeId) ?: return
+    pref.set(overrides.replace(prevValue.copy(colors = ThemeColors(), wallpaper = prevValue.wallpaper?.copy(background = null, tint = null))))
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun resetAllThemeColors(pref: MutableState<ThemeModeOverride>) {
+    val prevValue = pref.value
+    pref.value = prevValue.copy(colors = ThemeColors(), wallpaper = prevValue.wallpaper?.copy(background = null, tint = null))
+  }
+
+  fun removeTheme(themeId: String?) {
+    val themes = ArrayList(appPrefs.themeOverrides.get())
+    themes.removeAll { it.themeId == themeId }
+    appPrefs.themeOverrides.set(themes)
+  }
+
+  fun String.colorFromReadableHex(): Color =
+    Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
+
+  fun Color.toReadableHex(): String {
+    val s = Integer.toHexString(toArgb())
+    return when {
+      this == Color.Transparent -> "#00ffffff"
+      s.length == 1 -> "#ff$s$s$s$s$s$s"
+      s.length == 2 -> "#ff$s$s$s"
+      s.length == 3 -> "#ff$s$s"
+      s.length == 6 && this.alpha == 0f -> "#00$s"
+      s.length == 6 -> "#ff$s"
+      else -> "#$s"
     }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: return
-    overrides[nonSystemThemeName] = prevValue.copy(colors = ThemeColors())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
   }
 }
-
-private fun Color.toReadableHex(): String = "#" + Integer.toHexString(toArgb())

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -41,6 +42,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
+import java.io.File
 
 @Composable
 fun ChatInfoView(
@@ -337,6 +339,16 @@ fun ChatInfoLayout(
         if (cStats != null && cStats.ratchetSyncAllowed) {
           SynchronizeConnectionButton(syncContactConnection)
         }
+
+        WallpaperButton {
+          ModalManager.end.showModal {
+            val chat = remember { derivedStateOf { chatModel.chats.firstOrNull { it.id == chat.id } } }
+            val c = chat.value
+            if (c != null) {
+              ChatWallpaperEditorModal(c)
+            }
+          }
+        }
         //      } else if (developerTools) {
         //        SynchronizeConnectionButtonForce(syncContactConnectionForce)
         //      }
@@ -642,6 +654,15 @@ private fun SendReceiptsOption(currentUser: User, state: State<SendReceipts>, on
   )
 }
 
+@Composable
+fun WallpaperButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_image),
+    stringResource(MR.strings.settings_section_title_chat_theme),
+    click = onClick
+  )
+}
+
 @Composable
 fun ClearChatButton(onClick: () -> Unit) {
   SettingsActionItem(
@@ -675,6 +696,72 @@ fun ShareAddressButton(onClick: () -> Unit) {
   )
 }
 
+@Composable
+fun ModalData.ChatWallpaperEditorModal(chat: Chat) {
+  val themes = remember(CurrentColors.collectAsState().value.base) {
+    (chat.chatInfo as? ChatInfo.Direct)?.contact?.uiThemes
+      ?: (chat.chatInfo as? ChatInfo.Group)?.groupInfo?.uiThemes
+      ?: ThemeModeOverrides()
+  }
+  val globalThemeUsed = remember { stateGetOrPut("globalThemeUsed") { false }  }
+  val initialTheme = remember(CurrentColors.collectAsState().value.base) {
+    val preferred = themes.preferredMode(!CurrentColors.value.colors.isLight)
+    globalThemeUsed.value = preferred == null
+    preferred ?: ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+  ChatWallpaperEditor(
+    initialTheme,
+    applyToMode = if (themes.light == themes.dark) null else initialTheme.mode,
+    globalThemeUsed = globalThemeUsed,
+    save = { applyToMode, newTheme ->
+      save(applyToMode, newTheme, chatModel.getChat(chat.id) ?: chat)
+    })
+}
+
+suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, chat: Chat) {
+  val unchangedThemes: ThemeModeOverrides = ((chat.chatInfo as? ChatInfo.Direct)?.contact?.uiThemes ?: (chat.chatInfo as? ChatInfo.Group)?.groupInfo?.uiThemes) ?: ThemeModeOverrides()
+  val wallpaperFiles = setOf(unchangedThemes.light?.wallpaper?.imageFile, unchangedThemes.dark?.wallpaper?.imageFile)
+  var changedThemes: ThemeModeOverrides? = unchangedThemes
+  val changed = newTheme?.copy(wallpaper = newTheme.wallpaper?.withFilledWallpaperPath())
+  changedThemes = when (applyToMode) {
+    null -> changedThemes?.copy(light = changed?.copy(mode = DefaultThemeMode.LIGHT), dark = changed?.copy(mode = DefaultThemeMode.DARK))
+    DefaultThemeMode.LIGHT -> changedThemes?.copy(light = changed?.copy(mode = applyToMode))
+    DefaultThemeMode.DARK -> changedThemes?.copy(dark = changed?.copy(mode = applyToMode))
+  }
+  changedThemes = if (changedThemes?.light != null || changedThemes?.dark != null) {
+    val light = changedThemes.light
+    val dark = changedThemes.dark
+    val currentMode = CurrentColors.value.base.mode
+    // same image file for both modes, copy image to make them as different files
+    if (light?.wallpaper?.imageFile != null && dark?.wallpaper?.imageFile != null && light.wallpaper.imageFile == dark.wallpaper.imageFile) {
+      val imageFile = if (currentMode == DefaultThemeMode.LIGHT) {
+        dark.wallpaper.imageFile
+      } else {
+        light.wallpaper.imageFile
+      }
+      val filePath = saveWallpaperFile(File(getWallpaperFilePath(imageFile)).toURI())
+      changedThemes = if (currentMode == DefaultThemeMode.LIGHT) {
+        changedThemes.copy(dark = dark.copy(wallpaper = dark.wallpaper.copy(imageFile = filePath)))
+      } else {
+        changedThemes.copy(light = light.copy(wallpaper = light.wallpaper.copy(imageFile = filePath)))
+      }
+    }
+    changedThemes
+  } else {
+    null
+  }
+  val wallpaperFilesToDelete = wallpaperFiles - changedThemes?.light?.wallpaper?.imageFile - changedThemes?.dark?.wallpaper?.imageFile
+  wallpaperFilesToDelete.forEach(::removeWallpaperFile)
+
+  if (controller.apiSetChatUIThemes(chat.remoteHostId, chat.id, changedThemes)) {
+    if (chat.chatInfo is ChatInfo.Direct) {
+      chatModel.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(contact = chat.chatInfo.contact.copy(uiThemes = changedThemes)))
+    } else if (chat.chatInfo is ChatInfo.Group) {
+      chatModel.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(groupInfo = chat.chatInfo.groupInfo.copy(uiThemes = changedThemes)))
+    }
+  }
+}
+
 private fun setContactAlias(chat: Chat, localAlias: String, chatModel: ChatModel) = withBGApi {
   val chatRh = chat.remoteHostId
   chatModel.controller.apiSetContactAlias(chatRh, chat.chatInfo.apiId, localAlias)?.let {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt

@@ -42,7 +42,7 @@ sealed class CIInfoTab {
 @Composable
 fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
   val sent = ci.chatDir.sent
-  val appColors = CurrentColors.collectAsState().value.appColors
+  val appColors = MaterialTheme.appColors
   val uriHandler = LocalUriHandler.current
   val selection = remember { mutableStateOf<CIInfoTab>(CIInfoTab.History) }
 
@@ -304,7 +304,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
   }
 
   @Composable
-  fun MemberDeliveryStatusView(member: GroupMember, status: CIStatus) {
+  fun MemberDeliveryStatusView(member: GroupMember, status: CIStatus, sentViaProxy: Boolean?) {
     SectionItemView(
       padding = PaddingValues(horizontal = 0.dp)
     ) {
@@ -317,6 +317,18 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         overflow = TextOverflow.Ellipsis
       )
       Spacer(Modifier.fillMaxWidth().weight(1f))
+      if (sentViaProxy == true) {
+        Box(
+          Modifier.size(36.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          Icon(
+            painterResource(MR.images.ic_arrow_forward),
+            contentDescription = null,
+            tint = CurrentColors.value.colors.secondary
+          )
+        }
+      }
       val statusIcon = status.statusIcon(MaterialTheme.colors.primary, CurrentColors.value.colors.secondary)
       var modifier = Modifier.size(36.dp).clip(RoundedCornerShape(20.dp))
       val info = status.statusInto
@@ -357,8 +369,8 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
       if (mss.isNotEmpty()) {
         SectionView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
           Text(stringResource(MR.strings.delivery), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = DEFAULT_PADDING))
-          mss.forEach { (member, status) ->
-            MemberDeliveryStatusView(member, status)
+          mss.forEach { (member, status, sentViaProxy) ->
+            MemberDeliveryStatusView(member, status, sentViaProxy)
           }
         }
       } else {
@@ -482,10 +494,10 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
   }
 }
 
-private fun membersStatuses(chatModel: ChatModel, memberDeliveryStatuses: List<MemberDeliveryStatus>): List<Pair<GroupMember, CIStatus>> {
+private fun membersStatuses(chatModel: ChatModel, memberDeliveryStatuses: List<MemberDeliveryStatus>): List<Triple<GroupMember, CIStatus, Boolean?>> {
   return memberDeliveryStatuses.mapNotNull { mds ->
     chatModel.getGroupMember(mds.groupMemberId)?.let { mem ->
-      mem to mds.memberDeliveryStatus
+      Triple(mem, mds.memberDeliveryStatus, mds.sentViaProxy)
     }
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt

@@ -5,25 +5,24 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.text.*
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
@@ -118,368 +117,381 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
     val clipboard = LocalClipboardManager.current
     when (chat.chatInfo) {
       is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
-        ChatLayout(
-          chat,
-          unreadCount,
-          composeState,
-          composeView = {
-            Column(
-              Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-              if (
-                chat.chatInfo is ChatInfo.Direct
-                && !chat.chatInfo.contact.ready
-                && chat.chatInfo.contact.active
-                && !chat.chatInfo.contact.nextSendGrpInv
+        val perChatTheme = remember(chat.chatInfo, CurrentColors.value.base) { if (chat.chatInfo is ChatInfo.Direct) chat.chatInfo.contact.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else if (chat.chatInfo is ChatInfo.Group) chat.chatInfo.groupInfo.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else null }
+        val overrides = if (perChatTheme != null) ThemeManager.currentColors(null, perChatTheme, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get()) else null
+        SimpleXThemeOverride(overrides ?: CurrentColors.collectAsState().value) {
+          ChatLayout(
+            chat,
+            unreadCount,
+            composeState,
+            composeView = {
+              Column(
+                Modifier.fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally
               ) {
-                Text(
-                  generalGetString(MR.strings.contact_connection_pending),
-                  Modifier.padding(top = 4.dp),
-                  fontSize = 14.sp,
-                  color = MaterialTheme.colors.secondary
+                if (
+                  chat.chatInfo is ChatInfo.Direct
+                  && !chat.chatInfo.contact.ready
+                  && chat.chatInfo.contact.active
+                  && !chat.chatInfo.contact.nextSendGrpInv
+                ) {
+                  Text(
+                    generalGetString(MR.strings.contact_connection_pending),
+                    Modifier.padding(top = 4.dp),
+                    fontSize = 14.sp,
+                    color = MaterialTheme.colors.secondary
+                  )
+                }
+                ComposeView(
+                  chatModel, chat, composeState, attachmentOption,
+                  showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
                 )
               }
-              ComposeView(
-                chatModel, chat, composeState, attachmentOption,
-                showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
-              )
-            }
-          },
-          attachmentOption,
-          attachmentBottomSheetState,
-          searchText,
-          useLinkPreviews = useLinkPreviews,
-          linkMode = chatModel.simplexLinkMode.value,
-          back = {
-            hideKeyboard(view)
-            AudioPlayer.stop()
-            chatModel.chatId.value = null
-            chatModel.groupMembers.clear()
-          },
-          info = {
-            if (ModalManager.end.hasModalsOpen()) {
-              ModalManager.end.closeModals()
-              return@ChatLayout
-            }
-            hideKeyboard(view)
-            withBGApi {
-              // The idea is to preload information before showing a modal because large groups can take time to load all members
-              var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = null
-              var preloadedCode: String? = null
-              var preloadedLink: Pair<String, GroupMemberRole>? = null
-              if (chat.chatInfo is ChatInfo.Direct) {
-                preloadedContactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-                preloadedCode = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-              } else if (chat.chatInfo is ChatInfo.Group) {
-                setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
-                preloadedLink = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
+            },
+            attachmentOption,
+            attachmentBottomSheetState,
+            searchText,
+            useLinkPreviews = useLinkPreviews,
+            linkMode = chatModel.simplexLinkMode.value,
+            back = {
+              hideKeyboard(view)
+              AudioPlayer.stop()
+              chatModel.chatId.value = null
+              chatModel.groupMembers.clear()
+            },
+            info = {
+              if (ModalManager.end.hasModalsOpen()) {
+                ModalManager.end.closeModals()
+                return@ChatLayout
               }
-              ModalManager.end.showModalCloseable(true) { close ->
-                val chat = remember { activeChat }.value
-                if (chat?.chatInfo is ChatInfo.Direct) {
-                  var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
-                  var code: String? by remember { mutableStateOf(preloadedCode) }
-                  KeyChangeEffect(chat.id, ChatModel.networkStatuses.toMap()) {
-                    contactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-                    preloadedContactInfo = contactInfo
-                    code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-                    preloadedCode = code
-                  }
-                  ChatInfoView(chatModel, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
-                } else if (chat?.chatInfo is ChatInfo.Group) {
-                  var link: Pair<String, GroupMemberRole>? by remember(chat.id) { mutableStateOf(preloadedLink) }
-                  KeyChangeEffect(chat.id) {
-                    setGroupMembers(chatRh, (chat.chatInfo as ChatInfo.Group).groupInfo, chatModel)
-                    link = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
-                    preloadedLink = link
-                  }
-                  GroupChatInfoView(chatModel, chatRh, chat.id, link?.first, link?.second, {
-                    link = it
-                    preloadedLink = it
-                  }, close)
-                }
-              }
-            }
-          },
-          showMemberInfo = { groupInfo: GroupInfo, member: GroupMember ->
-            hideKeyboard(view)
-            withBGApi {
-              val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
-              val stats = r?.second
-              val (_, code) = if (member.memberActive) {
-                val memCode = chatModel.controller.apiGetGroupMemberCode(chatRh, groupInfo.apiId, member.groupMemberId)
-                member to memCode?.second
-              } else {
-                member to null
-              }
-              setGroupMembers(chatRh, groupInfo, chatModel)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) { close ->
-                remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
-                  GroupMemberInfoView(chatRh, groupInfo, mem, stats, code, chatModel, close, close)
-                }
-              }
-            }
-          },
-          loadPrevMessages = {
-            if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-            val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
-            val firstId = chatModel.chatItems.value.firstOrNull()?.id
-            if (c != null && firstId != null) {
+              hideKeyboard(view)
               withBGApi {
-                apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
-              }
-            }
-          },
-          deleteMessage = { itemId, mode ->
-            withBGApi {
-              val cInfo = chat.chatInfo
-              val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
-              val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
-              val groupInfo = toModerate?.first
-              val groupMember = toModerate?.second
-              val deletedChatItem: ChatItem?
-              val toChatItem: ChatItem?
-              if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
-                val r = chatModel.controller.apiDeleteMemberChatItem(
-                  chatRh,
-                  groupId = groupInfo.groupId,
-                  groupMemberId = groupMember.groupMemberId,
-                  itemId = itemId
-                )
-                deletedChatItem = r?.first
-                toChatItem = r?.second
-              } else {
-                val r = chatModel.controller.apiDeleteChatItem(
-                  chatRh,
-                  type = cInfo.chatType,
-                  id = cInfo.apiId,
-                  itemId = itemId,
-                  mode = mode
-                )
-                deletedChatItem = r?.deletedChatItem?.chatItem
-                toChatItem = r?.toChatItem?.chatItem
-              }
-              if (toChatItem == null && deletedChatItem != null) {
-                chatModel.removeChatItem(chatRh, cInfo, deletedChatItem)
-              } else if (toChatItem != null) {
-                chatModel.upsertChatItem(chatRh, cInfo, toChatItem)
-              }
-            }
-          },
-          deleteMessages = { itemIds ->
-            if (itemIds.isNotEmpty()) {
-              val chatInfo = chat.chatInfo
-              withBGApi {
-                val deletedItems: ArrayList<ChatItem> = arrayListOf()
-                for (itemId in itemIds) {
-                  val di = chatModel.controller.apiDeleteChatItem(
-                    chatRh, chatInfo.chatType, chatInfo.apiId, itemId, CIDeleteMode.cidmInternal
-                  )?.deletedChatItem?.chatItem
-                  if (di != null) {
-                    deletedItems.add(di)
-                  }
-                }
-                for (di in deletedItems) {
-                  chatModel.removeChatItem(chatRh, chatInfo, di)
-                }
-              }
-            }
-          },
-          receiveFile = { fileId ->
-            withBGApi { chatModel.controller.receiveFile(chatRh, user, fileId) }
-          },
-          cancelFile = { fileId ->
-            withBGApi { chatModel.controller.cancelFile(chatRh, user, fileId) }
-          },
-          joinGroup = { groupId, onComplete ->
-            withBGApi {
-              chatModel.controller.apiJoinGroup(chatRh, groupId)
-              onComplete.invoke()
-            }
-          },
-          startCall = out@{ media ->
-            withBGApi {
-              val cInfo = chat.chatInfo
-              if (cInfo is ChatInfo.Direct) {
-                val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
-                val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
-                chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
-                chatModel.showCallView.value = true
-                chatModel.callCommand.add(WCallCommand.Capabilities(media))
-              }
-            }
-          },
-          endCall = {
-            val call = chatModel.activeCall.value
-            if (call != null) withBGApi { chatModel.callManager.endCall(call) }
-          },
-          acceptCall = { contact ->
-            hideKeyboard(view)
-            withBGApi {
-              val invitation = chatModel.callInvitations.remove(contact.id)
-                ?: controller.apiGetCallInvitations(chatModel.remoteHostId()).firstOrNull { it.contact.id == contact.id }
-              if (invitation == null) {
-                AlertManager.shared.showAlertMsg(generalGetString(MR.strings.call_already_ended))
-              } else {
-                chatModel.callManager.acceptIncomingCall(invitation = invitation)
-              }
-            }
-          },
-          acceptFeature = { contact, feature, param ->
-            withBGApi {
-              chatModel.controller.allowFeatureToContact(chatRh, contact, feature, param)
-            }
-          },
-          openDirectChat = { contactId ->
-            withBGApi {
-              openDirectChat(chatRh, contactId, chatModel)
-            }
-          },
-          updateContactStats = { contact ->
-            withBGApi {
-              val r = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-              if (r != null) {
-                val contactStats = r.first
-                if (contactStats != null)
-                  chatModel.updateContactConnectionStats(chatRh, contact, contactStats)
-              }
-            }
-          },
-          updateMemberStats = { groupInfo, member ->
-            withBGApi {
-              val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
-              if (r != null) {
-                val memStats = r.second
-                if (memStats != null) {
-                  chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
-                }
-              }
-            }
-          },
-          syncContactConnection = { contact ->
-            withBGApi {
-              val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
-              if (cStats != null) {
-                chatModel.updateContactConnectionStats(chatRh, contact, cStats)
-              }
-            }
-          },
-          syncMemberConnection = { groupInfo, member ->
-            withBGApi {
-              val r = chatModel.controller.apiSyncGroupMemberRatchet(chatRh, groupInfo.apiId, member.groupMemberId, force = false)
-              if (r != null) {
-                chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
-              }
-            }
-          },
-          findModelChat = { chatId ->
-            chatModel.getChat(chatId)
-          },
-          findModelMember = { memberId ->
-            chatModel.groupMembers.find { it.id == memberId }
-          },
-          setReaction = { cInfo, cItem, add, reaction ->
-            withBGApi {
-              val updatedCI = chatModel.controller.apiChatItemReaction(
-                rh = chatRh,
-                type = cInfo.chatType,
-                id = cInfo.apiId,
-                itemId = cItem.id,
-                add = add,
-                reaction = reaction
-              )
-              if (updatedCI != null) {
-                chatModel.updateChatItem(cInfo, updatedCI)
-              }
-            }
-          },
-          showItemDetails = { cInfo, cItem ->
-            suspend fun loadChatItemInfo(): ChatItemInfo? {
-              val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
-              if (ciInfo != null) {
-                if (chat.chatInfo is ChatInfo.Group) {
+                // The idea is to preload information before showing a modal because large groups can take time to load all members
+                var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = null
+                var preloadedCode: String? = null
+                var preloadedLink: Pair<String, GroupMemberRole>? = null
+                if (chat.chatInfo is ChatInfo.Direct) {
+                  preloadedContactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                  preloadedCode = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
+                } else if (chat.chatInfo is ChatInfo.Group) {
                   setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
+                  preloadedLink = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
                 }
-              }
-              return ciInfo
-            }
-            withBGApi {
-              var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(endButtons = {
-                ShareButton {
-                  clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
-                }
-              }) { close ->
-                var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
-                ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
-                LaunchedEffect(cItem.id) {
-                  withContext(Dispatchers.Default) {
-                    for (apiResp in controller.messagesChannel) {
-                      val msg = apiResp.resp
-                      if (apiResp.remoteHostId == chatRh &&
-                        msg is CR.ChatItemStatusUpdated &&
-                        msg.chatItem.chatItem.id == cItem.id
-                      ) {
-                        ciInfo = loadChatItemInfo() ?: return@withContext
-                        initialCiInfo = ciInfo
-                      }
+                ModalManager.end.showModalCloseable(true) { close ->
+                  val chat = remember { activeChat }.value
+                  if (chat?.chatInfo is ChatInfo.Direct) {
+                    var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
+                    var code: String? by remember { mutableStateOf(preloadedCode) }
+                    KeyChangeEffect(chat.id, ChatModel.networkStatuses.toMap()) {
+                      contactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                      preloadedContactInfo = contactInfo
+                      code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
+                      preloadedCode = code
+                    }
+                    ChatInfoView(chatModel, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
+                  } else if (chat?.chatInfo is ChatInfo.Group) {
+                    var link: Pair<String, GroupMemberRole>? by remember(chat.id) { mutableStateOf(preloadedLink) }
+                    KeyChangeEffect(chat.id) {
+                      setGroupMembers(chatRh, (chat.chatInfo as ChatInfo.Group).groupInfo, chatModel)
+                      link = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
+                      preloadedLink = link
+                    }
+                    GroupChatInfoView(chatModel, chatRh, chat.id, link?.first, link?.second, {
+                      link = it
+                      preloadedLink = it
+                    }, close)
+                  } else {
+                    LaunchedEffect(Unit) {
+                      close()
                     }
                   }
                 }
-                KeyChangeEffect(chatModel.chatId.value) {
-                  close()
+              }
+            },
+            showMemberInfo = { groupInfo: GroupInfo, member: GroupMember ->
+              hideKeyboard(view)
+              withBGApi {
+                val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
+                val stats = r?.second
+                val (_, code) = if (member.memberActive) {
+                  val memCode = chatModel.controller.apiGetGroupMemberCode(chatRh, groupInfo.apiId, member.groupMemberId)
+                  member to memCode?.second
+                } else {
+                  member to null
+                }
+                setGroupMembers(chatRh, groupInfo, chatModel)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) { close ->
+                  remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
+                    GroupMemberInfoView(chatRh, groupInfo, mem, stats, code, chatModel, close, close)
+                  }
                 }
               }
-            }
-          },
-          addMembers = { groupInfo ->
-            hideKeyboard(view)
-            withBGApi {
-              setGroupMembers(chatRh, groupInfo, chatModel)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) { close ->
-                AddGroupMembersView(chatRh, groupInfo, false, chatModel, close)
+            },
+            loadPrevMessages = {
+              if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
+              val firstId = chatModel.chatItems.value.firstOrNull()?.id
+              if (c != null && firstId != null) {
+                withBGApi {
+                  apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
+                }
               }
-            }
-          },
-          openGroupLink = { groupInfo ->
-            hideKeyboard(view)
-            withBGApi {
-              val link = chatModel.controller.apiGetGroupLink(chatRh, groupInfo.groupId)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) {
-                GroupLinkView(chatModel, chatRh, groupInfo, link?.first, link?.second, onGroupLinkUpdated = null)
+            },
+            deleteMessage = { itemId, mode ->
+              withBGApi {
+                val cInfo = chat.chatInfo
+                val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
+                val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
+                val groupInfo = toModerate?.first
+                val groupMember = toModerate?.second
+                val deletedChatItem: ChatItem?
+                val toChatItem: ChatItem?
+                if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
+                  val r = chatModel.controller.apiDeleteMemberChatItem(
+                    chatRh,
+                    groupId = groupInfo.groupId,
+                    groupMemberId = groupMember.groupMemberId,
+                    itemId = itemId
+                  )
+                  deletedChatItem = r?.first
+                  toChatItem = r?.second
+                } else {
+                  val r = chatModel.controller.apiDeleteChatItem(
+                    chatRh,
+                    type = cInfo.chatType,
+                    id = cInfo.apiId,
+                    itemId = itemId,
+                    mode = mode
+                  )
+                  deletedChatItem = r?.deletedChatItem?.chatItem
+                  toChatItem = r?.toChatItem?.chatItem
+                }
+                if (toChatItem == null && deletedChatItem != null) {
+                  chatModel.removeChatItem(chatRh, cInfo, deletedChatItem)
+                } else if (toChatItem != null) {
+                  chatModel.upsertChatItem(chatRh, cInfo, toChatItem)
+                }
               }
-            }
-          },
-          markRead = { range, unreadCountAfter ->
-            chatModel.markChatItemsRead(chat, range, unreadCountAfter)
-            ntfManager.cancelNotificationsForChat(chat.id)
-            withBGApi {
-              chatModel.controller.apiChatRead(
-                chatRh,
-                chat.chatInfo.chatType,
-                chat.chatInfo.apiId,
-                range
-              )
-            }
-          },
-          changeNtfsState = { enabled, currentValue -> toggleNotifications(chat, enabled, chatModel, currentValue) },
-          onSearchValueChanged = { value ->
-            if (searchText.value == value) return@ChatLayout
-            if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-            val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
-            withBGApi {
-              apiFindMessages(c, chatModel, value)
-              searchText.value = value
-            }
-          },
-          onComposed,
-          developerTools = chatModel.controller.appPrefs.developerTools.get(),
-        )
+            },
+            deleteMessages = { itemIds ->
+              if (itemIds.isNotEmpty()) {
+                val chatInfo = chat.chatInfo
+                withBGApi {
+                  val deletedItems: ArrayList<ChatItem> = arrayListOf()
+                  for (itemId in itemIds) {
+                    val di = chatModel.controller.apiDeleteChatItem(
+                      chatRh, chatInfo.chatType, chatInfo.apiId, itemId, CIDeleteMode.cidmInternal
+                    )?.deletedChatItem?.chatItem
+                    if (di != null) {
+                      deletedItems.add(di)
+                    }
+                  }
+                  for (di in deletedItems) {
+                    chatModel.removeChatItem(chatRh, chatInfo, di)
+                  }
+                }
+              }
+            },
+            receiveFile = { fileId ->
+              withBGApi { chatModel.controller.receiveFile(chatRh, user, fileId) }
+            },
+            cancelFile = { fileId ->
+              withBGApi { chatModel.controller.cancelFile(chatRh, user, fileId) }
+            },
+            joinGroup = { groupId, onComplete ->
+              withBGApi {
+                chatModel.controller.apiJoinGroup(chatRh, groupId)
+                onComplete.invoke()
+              }
+            },
+            startCall = out@{ media ->
+              withBGApi {
+                val cInfo = chat.chatInfo
+                if (cInfo is ChatInfo.Direct) {
+                  val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
+                  val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
+                  chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
+                  chatModel.showCallView.value = true
+                  chatModel.callCommand.add(WCallCommand.Capabilities(media))
+                }
+              }
+            },
+            endCall = {
+              val call = chatModel.activeCall.value
+              if (call != null) withBGApi { chatModel.callManager.endCall(call) }
+            },
+            acceptCall = { contact ->
+              hideKeyboard(view)
+              withBGApi {
+                val invitation = chatModel.callInvitations.remove(contact.id)
+                  ?: controller.apiGetCallInvitations(chatModel.remoteHostId()).firstOrNull { it.contact.id == contact.id }
+                if (invitation == null) {
+                  AlertManager.shared.showAlertMsg(generalGetString(MR.strings.call_already_ended))
+                } else {
+                  chatModel.callManager.acceptIncomingCall(invitation = invitation)
+                }
+              }
+            },
+            acceptFeature = { contact, feature, param ->
+              withBGApi {
+                chatModel.controller.allowFeatureToContact(chatRh, contact, feature, param)
+              }
+            },
+            openDirectChat = { contactId ->
+              withBGApi {
+                openDirectChat(chatRh, contactId, chatModel)
+              }
+            },
+            forwardItem = { cItem, cInfo ->
+              chatModel.chatId.value = null
+              chatModel.sharedContent.value = SharedContent.Forward(cInfo, cItem)
+            },
+            updateContactStats = { contact ->
+              withBGApi {
+                val r = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                if (r != null) {
+                  val contactStats = r.first
+                  if (contactStats != null)
+                    chatModel.updateContactConnectionStats(chatRh, contact, contactStats)
+                }
+              }
+            },
+            updateMemberStats = { groupInfo, member ->
+              withBGApi {
+                val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
+                if (r != null) {
+                  val memStats = r.second
+                  if (memStats != null) {
+                    chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
+                  }
+                }
+              }
+            },
+            syncContactConnection = { contact ->
+              withBGApi {
+                val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
+                if (cStats != null) {
+                  chatModel.updateContactConnectionStats(chatRh, contact, cStats)
+                }
+              }
+            },
+            syncMemberConnection = { groupInfo, member ->
+              withBGApi {
+                val r = chatModel.controller.apiSyncGroupMemberRatchet(chatRh, groupInfo.apiId, member.groupMemberId, force = false)
+                if (r != null) {
+                  chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
+                }
+              }
+            },
+            findModelChat = { chatId ->
+              chatModel.getChat(chatId)
+            },
+            findModelMember = { memberId ->
+              chatModel.groupMembers.find { it.id == memberId }
+            },
+            setReaction = { cInfo, cItem, add, reaction ->
+              withBGApi {
+                val updatedCI = chatModel.controller.apiChatItemReaction(
+                  rh = chatRh,
+                  type = cInfo.chatType,
+                  id = cInfo.apiId,
+                  itemId = cItem.id,
+                  add = add,
+                  reaction = reaction
+                )
+                if (updatedCI != null) {
+                  chatModel.updateChatItem(cInfo, updatedCI)
+                }
+              }
+            },
+            showItemDetails = { cInfo, cItem ->
+              suspend fun loadChatItemInfo(): ChatItemInfo? {
+                val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
+                if (ciInfo != null) {
+                  if (chat.chatInfo is ChatInfo.Group) {
+                    setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
+                  }
+                }
+                return ciInfo
+              }
+              withBGApi {
+                var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(endButtons = {
+                  ShareButton {
+                    clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
+                  }
+                }) { close ->
+                  var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
+                  ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
+                  LaunchedEffect(cItem.id) {
+                    withContext(Dispatchers.Default) {
+                      for (apiResp in controller.messagesChannel) {
+                        val msg = apiResp.resp
+                        if (apiResp.remoteHostId == chatRh &&
+                          msg is CR.ChatItemStatusUpdated &&
+                          msg.chatItem.chatItem.id == cItem.id
+                        ) {
+                          ciInfo = loadChatItemInfo() ?: return@withContext
+                          initialCiInfo = ciInfo
+                        }
+                      }
+                    }
+                  }
+                  KeyChangeEffect(chatModel.chatId.value) {
+                    close()
+                  }
+                }
+              }
+            },
+            addMembers = { groupInfo ->
+              hideKeyboard(view)
+              withBGApi {
+                setGroupMembers(chatRh, groupInfo, chatModel)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) { close ->
+                  AddGroupMembersView(chatRh, groupInfo, false, chatModel, close)
+                }
+              }
+            },
+            openGroupLink = { groupInfo ->
+              hideKeyboard(view)
+              withBGApi {
+                val link = chatModel.controller.apiGetGroupLink(chatRh, groupInfo.groupId)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) {
+                  GroupLinkView(chatModel, chatRh, groupInfo, link?.first, link?.second, onGroupLinkUpdated = null)
+                }
+              }
+            },
+            markRead = { range, unreadCountAfter ->
+              chatModel.markChatItemsRead(chat, range, unreadCountAfter)
+              ntfManager.cancelNotificationsForChat(chat.id)
+              withBGApi {
+                chatModel.controller.apiChatRead(
+                  chatRh,
+                  chat.chatInfo.chatType,
+                  chat.chatInfo.apiId,
+                  range
+                )
+              }
+            },
+            changeNtfsState = { enabled, currentValue -> toggleNotifications(chat, enabled, chatModel, currentValue) },
+            onSearchValueChanged = { value ->
+              if (searchText.value == value) return@ChatLayout
+              if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
+              withBGApi {
+                apiFindMessages(c, chatModel, value)
+                searchText.value = value
+              }
+            },
+            onComposed,
+            developerTools = chatModel.controller.appPrefs.developerTools.get(),
+            showViaProxy = chatModel.controller.appPrefs.showSentViaProxy.get(),
+          )
+        }
       }
       is ChatInfo.ContactConnection -> {
         val close = { chatModel.chatId.value = null }
@@ -533,6 +545,7 @@ fun ChatLayout(
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
   openDirectChat: (Long) -> Unit,
+  forwardItem: (ChatInfo, ChatItem) -> Unit,
   updateContactStats: (Contact) -> Unit,
   updateMemberStats: (GroupInfo, GroupMember) -> Unit,
   syncContactConnection: (Contact) -> Unit,
@@ -548,6 +561,7 @@ fun ChatLayout(
   onSearchValueChanged: (String) -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
   developerTools: Boolean,
+  showViaProxy: Boolean
 ) {
   val scope = rememberCoroutineScope()
   val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
@@ -596,17 +610,27 @@ fun ChatLayout(
           floatingActionButton = { floatingButton.value() },
           contentColor = LocalContentColor.current,
           drawerContentColor = LocalContentColor.current,
+          backgroundColor = Color.Unspecified
         ) { contentPadding ->
+          val wallpaperImage = MaterialTheme.wallpaper.type.image
+          val wallpaperType = MaterialTheme.wallpaper.type
+          val backgroundColor = MaterialTheme.wallpaper.background ?: wallpaperType.defaultBackgroundColor(CurrentColors.value.base, MaterialTheme.colors.background)
+          val tintColor = MaterialTheme.wallpaper.tint ?: wallpaperType.defaultTintColor(CurrentColors.value.base)
           BoxWithConstraints(Modifier
-            .fillMaxHeight()
+            .fillMaxSize()
+            .background(MaterialTheme.colors.background)
+            .then(if (wallpaperImage != null)
+              Modifier.drawBehind { chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor) }
+            else
+              Modifier)
             .padding(contentPadding)
           ) {
             ChatItemsList(
               chat, unreadCount, composeState, searchValue,
               useLinkPreviews, linkMode, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
-              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat,
+              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
               updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools,
+              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
             )
           }
         }
@@ -873,6 +897,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
   openDirectChat: (Long) -> Unit,
+  forwardItem: (ChatInfo, ChatItem) -> Unit,
   updateContactStats: (Contact) -> Unit,
   updateMemberStats: (GroupInfo, GroupMember) -> Unit,
   syncContactConnection: (Contact) -> Unit,
@@ -885,6 +910,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   setFloatingButton: (@Composable () -> Unit) -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
   developerTools: Boolean,
+  showViaProxy: Boolean
 ) {
   val listState = rememberLazyListState()
   val scope = rememberCoroutineScope()
@@ -975,7 +1001,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
           tryOrShowError("${cItem.id}ChatItem", error = {
             CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
           }) {
-            ChatItemView(chat.remoteHostId, chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
+            ChatItemView(chat.remoteHostId, chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools, showViaProxy = showViaProxy)
           }
         }
 
@@ -1259,7 +1285,7 @@ val MEMBER_IMAGE_SIZE: Dp = 38.dp
 
 @Composable
 fun MemberImage(member: GroupMember) {
-  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image)
+  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image, backgroundColor = MaterialTheme.colors.background)
 }
 
 @Composable
@@ -1528,6 +1554,7 @@ fun PreviewChatLayout() {
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
       openDirectChat = { _ -> },
+      forwardItem = { _, _ -> },
       updateContactStats = { },
       updateMemberStats = { _, _ -> },
       syncContactConnection = { },
@@ -1543,6 +1570,7 @@ fun PreviewChatLayout() {
       onSearchValueChanged = {},
       onComposed = {},
       developerTools = false,
+      showViaProxy = false,
     )
   }
 }
@@ -1600,6 +1628,7 @@ fun PreviewGroupChatLayout() {
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
       openDirectChat = { _ -> },
+      forwardItem = { _, _ -> },
       updateContactStats = { },
       updateMemberStats = { _, _ -> },
       syncContactConnection = { },
@@ -1615,6 +1644,7 @@ fun PreviewGroupChatLayout() {
       onSearchValueChanged = {},
       onComposed = {},
       developerTools = false,
+      showViaProxy = false,
     )
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextInvitingContactMemberView.kt

@@ -16,7 +16,7 @@ import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
 fun ComposeContextInvitingContactMemberView() {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
   Row(
     Modifier
       .height(60.dp)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeFileView.kt

@@ -16,7 +16,7 @@ import chat.simplex.res.MR
 
 @Composable
 fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
   Row(
     Modifier
       .height(60.dp)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeImageView.kt

@@ -20,7 +20,7 @@ import chat.simplex.common.views.helpers.UploadContent
 
 @Composable
 fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
   Row(
     Modifier
       .padding(top = 8.dp)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt

@@ -408,14 +408,15 @@ fun ComposeView(
       composeState.value = composeState.value.copy(inProgress = true)
     }
 
-    suspend fun forwardItem(rhId: Long?, forwardedItem: ChatItem, fromChatInfo: ChatInfo): ChatItem? {
+    suspend fun forwardItem(rhId: Long?, forwardedItem: ChatItem, fromChatInfo: ChatInfo, ttl: Int?): ChatItem? {
       val chatItem = controller.apiForwardChatItem(
         rh = rhId,
         toChatType = chat.chatInfo.chatType,
         toChatId = chat.chatInfo.apiId,
         fromChatType = fromChatInfo.chatType,
         fromChatId = fromChatInfo.apiId,
-        itemId = forwardedItem.id
+        itemId = forwardedItem.id,
+        ttl = ttl
       )
       if (chatItem != null) {
         chatModel.addChatItem(rhId, chat.chatInfo, chatItem)
@@ -490,9 +491,9 @@ fun ComposeView(
       sendMemberContactInvitation()
       sent = null
     } else if (cs.contextItem is ComposeContextItem.ForwardingItem) {
-      sent = forwardItem(chat.remoteHostId, cs.contextItem.chatItem, cs.contextItem.fromChatInfo)
+      sent = forwardItem(chat.remoteHostId, cs.contextItem.chatItem, cs.contextItem.fromChatInfo, ttl = ttl)
       if (cs.message.isNotEmpty()) {
-        sent = send(chat, checkLinkPreview(), quoted = sent?.id, live = false, ttl = null)
+        sent = send(chat, checkLinkPreview(), quoted = sent?.id, live = false, ttl = ttl)
       }
     } else if (cs.contextItem is ComposeContextItem.EditingItem) {
       val ei = cs.contextItem.chatItem
@@ -775,7 +776,7 @@ fun ComposeView(
 
   @Composable
   fun MsgNotAllowedView(reason: String, icon: Painter) {
-    val color = CurrentColors.collectAsState().value.appColors.receivedMessage
+    val color = MaterialTheme.appColors.receivedMessage
     Row(Modifier.padding(top = 5.dp).fillMaxWidth().background(color).padding(horizontal = DEFAULT_PADDING_HALF, vertical = DEFAULT_PADDING_HALF * 1.5f), verticalAlignment = Alignment.CenterVertically) {
       Icon(icon, null, tint = MaterialTheme.colors.secondary)
       Spacer(Modifier.width(DEFAULT_PADDING_HALF))
@@ -861,7 +862,7 @@ fun ComposeView(
       }
     }
     Row(
-      modifier = Modifier.padding(end = 8.dp),
+      modifier = Modifier.background(MaterialTheme.colors.background).padding(end = 8.dp),
       verticalAlignment = Alignment.Bottom,
     ) {
       val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
@@ -973,7 +974,7 @@ fun ComposeView(
       val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
       val sendButtonColor =
         if (chat.chatInfo.incognito)
-          if (isSystemInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
+          if (isInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
         else MaterialTheme.colors.primary
       SendMsgView(
         composeState,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeVoiceView.kt

@@ -35,7 +35,7 @@ fun ComposeVoiceView(
 ) {
   val progress = rememberSaveable { mutableStateOf(0) }
   val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
   Box {
     Box(
       Modifier

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContactPreferences.kt

@@ -32,8 +32,8 @@ fun ContactPreferencesView(
 ) {
   val contact = remember { derivedStateOf { (m.getContactChat(contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }
   val ct = contact.value ?: return
-  var featuresAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
-  var currentFeaturesAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
+  var featuresAllowed by rememberSaveable(ct, user, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
+  var currentFeaturesAllowed by rememberSaveable(ct, user, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
 
   fun savePrefs(afterSave: () -> Unit = {}) {
     withBGApi {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContextItemView.kt

@@ -30,8 +30,8 @@ fun ContextItemView(
   cancelContextItem: () -> Unit
 ) {
   val sent = contextItem.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
 
   @Composable
   fun MessageText(attachment: ImageResource?, lines: Int) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt

@@ -157,7 +157,7 @@ fun SendMsgView(
           fun MenuItems(): List<@Composable () -> Unit> {
             val menuItems = mutableListOf<@Composable () -> Unit>()
 
-            if (cs.liveMessage == null && !cs.editing && !cs.forwarding && !nextSendGrpInv || sendMsgEnabled) {
+            if (cs.liveMessage == null && !cs.editing && !nextSendGrpInv || sendMsgEnabled) {
               if (
                 cs.preview !is ComposePreview.VoicePreview &&
                 cs.contextItem is ComposeContextItem.NoContextItem &&

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt

@@ -9,7 +9,6 @@ import SectionSpacer
 import SectionTextFooter
 import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.material.*
@@ -233,6 +232,16 @@ fun GroupChatInfoLayout(
         } else {
           SendReceiptsOptionDisabled()
         }
+
+        WallpaperButton {
+          ModalManager.end.showModal {
+            val chat = remember { derivedStateOf { chatModel.chats.firstOrNull { it.id == chat.id } } }
+            val c = chat.value
+            if (c != null) {
+              ChatWallpaperEditorModal(c)
+            }
+          }
+        }
       }
       SectionTextFooter(stringResource(MR.strings.only_group_owners_can_change_prefs))
       SectionDividerSpaced(maxTopPadding = true)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupPreferences.kt

@@ -123,13 +123,12 @@ private fun GroupPreferencesLayout(
       applyPrefs(preferences.copy(files = RoleGroupPreference(enable = enable, role)))
     }
 
-    // TODO enable simplexLinks preference in 5.8
-//    SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowSimplexLinks = remember(preferences) { mutableStateOf(preferences.simplexLinks.enable) }
-//    val simplexLinksRole = remember(preferences) { mutableStateOf(preferences.simplexLinks.role) }
-//    FeatureSection(GroupFeature.SimplexLinks, allowSimplexLinks, simplexLinksRole, groupInfo, preferences, onTTLUpdated) { enable, role ->
-//      applyPrefs(preferences.copy(simplexLinks = RoleGroupPreference(enable = enable, role)))
-//    }
+    SectionDividerSpaced(true, maxBottomPadding = false)
+    val allowSimplexLinks = remember(preferences) { mutableStateOf(preferences.simplexLinks.enable) }
+    val simplexLinksRole = remember(preferences) { mutableStateOf(preferences.simplexLinks.role) }
+    FeatureSection(GroupFeature.SimplexLinks, allowSimplexLinks, simplexLinksRole, groupInfo, preferences, onTTLUpdated) { enable, role ->
+      applyPrefs(preferences.copy(simplexLinks = RoleGroupPreference(enable = enable, role)))
+    }
 
     SectionDividerSpaced(true, maxBottomPadding = false)
     val enableHistory = remember(preferences) { mutableStateOf(preferences.history.enable) }
@@ -189,8 +188,6 @@ private fun FeatureSection(
           generalGetString(MR.strings.feature_enabled_for),
           featureRoles,
           enableForRole,
-          // remove in v5.8
-          enabled = remember { mutableStateOf(false) },
           onSelected = { value ->
             onSelected(enableFeature.value, value)
           }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CICallItemView.kt

@@ -47,7 +47,7 @@ fun CICallItemView(
       CICallStatus.Error -> {}
     }
 
-    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false)
+    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false)
   }
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt

@@ -1,6 +1,6 @@
 package chat.simplex.common.views.chat.item
 
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -28,6 +28,7 @@ import java.net.URI
 fun CIFileView(
   file: CIFile?,
   edited: Boolean,
+  showMenu: MutableState<Boolean>,
   receiveFile: (Long) -> Unit
 ) {
   val saveFileLauncher = rememberSaveFileLauncher(ciFile = file)
@@ -62,7 +63,7 @@ fun CIFileView(
   fun fileAction() {
     if (file != null) {
       when {
-        file.fileStatus is CIFileStatus.RcvInvitation -> {
+        file.fileStatus is CIFileStatus.RcvInvitation || file.fileStatus is CIFileStatus.RcvAborted -> {
           if (fileSizeValid(file)) {
             receiveFile(file.fileId)
           } else {
@@ -86,7 +87,7 @@ fun CIFileView(
               )
             FileProtocol.LOCAL -> {}
           }
-        file.fileStatus is CIFileStatus.RcvComplete || (file.fileStatus is CIFileStatus.SndStored && file.fileProtocol == FileProtocol.LOCAL) -> {
+        file.forwardingAllowed() -> {
           withLongRunningApi(slow = 600_000) {
             var filePath = getLoadedFilePath(file)
             if (chatModel.connectedToRemote() && filePath == null) {
@@ -136,8 +137,7 @@ fun CIFileView(
     Box(
       Modifier
         .size(42.dp)
-        .clip(RoundedCornerShape(4.dp))
-        .clickable(onClick = { fileAction() }),
+        .clip(RoundedCornerShape(4.dp)),
       contentAlignment = Alignment.Center
     ) {
       if (file != null) {
@@ -154,7 +154,13 @@ fun CIFileView(
               FileProtocol.SMP -> progressIndicator()
               FileProtocol.LOCAL -> {}
             }
-          is CIFileStatus.SndComplete -> fileIcon(innerIcon = painterResource(MR.images.ic_check_filled))
+          is CIFileStatus.SndComplete -> {
+            if ((file.forwardingAllowed() || (chatModel.connectedToRemote() && CIFile.cachedRemoteFileRequests[file.fileSource] == true))) {
+              fileIcon()
+            } else {
+              fileIcon(innerIcon = painterResource(MR.images.ic_check_filled))
+            }
+          }
           is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
           is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
           is CIFileStatus.RcvInvitation ->
@@ -169,6 +175,8 @@ fun CIFileView(
             } else {
               progressIndicator()
             }
+          is CIFileStatus.RcvAborted ->
+            fileIcon(innerIcon = painterResource(MR.images.ic_sync_problem), color = MaterialTheme.colors.primary)
           is CIFileStatus.RcvComplete -> fileIcon()
           is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
           is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
@@ -181,7 +189,13 @@ fun CIFileView(
   }
 
   Row(
-    Modifier.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
+    Modifier
+      .combinedClickable(
+        onClick = { fileAction() },
+        onLongClick = { showMenu.value = true }
+      )
+      .padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
+    //Modifier.clickable(enabled = file?.fileSource != null) { if (file?.fileSource != null && getLoadedFilePath(file) != null) openFile(file.fileSource) }.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
     verticalAlignment = Alignment.Bottom,
     horizontalArrangement = Arrangement.spacedBy(2.dp)
   ) {