Revert "ui: comment smp proxy ui (#4204 )"

This reverts commit a0d6ae15ab.
2024-12-17 17:20:21 +01:00 · 2024-05-21 14:04:40 +00:00
202 changed files with 2138 additions and 13442 deletions
@@ -561,18 +561,6 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (Gro
    throw r
 }

-func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
-    let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
-    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
-}
-
-func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
-    let r = await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
-    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
-}
-
 func apiSwitchContact(contactId: Int64) throws -> ConnectionStats {
    let r = chatSendCmdSync(.apiSwitchContact(contactId: contactId))
    if case let .contactSwitchStarted(_, _, connectionStats) = r { return connectionStats }
@@ -1277,7 +1265,7 @@ func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
    return ChatModel.shared.chats
        .compactMap{ $0.chatInfo.contact }
-        .filter{ c in c.sendMsgEnabled && !c.nextSendGrpInv && !memberContactIds.contains(c.apiId) }
+        .filter{ c in c.ready && c.active && !memberContactIds.contains(c.apiId) }
        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }

@@ -1847,7 +1835,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case let .sndFileCompleteXFTP(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
-    case let .sndFileError(user, aChatItem, _, _):
+    case let .sndFileError(user, aChatItem, _):
        if let aChatItem = aChatItem {
            await chatItemSimpleUpdate(user, aChatItem)
            Task { cleanupFile(aChatItem) }
@@ -110,7 +110,6 @@ struct ChatInfoView: View {
        case switchAddressAlert
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
-        case queueInfo(info: String)
        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")

        var id: String {
@@ -120,7 +119,6 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case let .queueInfo(info): return "queueInfo \(info)"
            case let .error(title, _): return "error \(title)"
            }
        }
@@ -226,18 +224,6 @@ struct ChatInfoView: View {
                    Section(header: Text("For console")) {
                        infoRow("Local name", chat.chatInfo.localDisplayName)
                        infoRow("Database ID", "\(chat.chatInfo.apiId)")
-                        Button ("Debug delivery") {
-                            Task {
-                                do {
-                                    let info = queueInfoText(try await apiContactQueueInfo(chat.chatInfo.apiId))
-                                    await MainActor.run { alert = .queueInfo(info: info) }
-                                } catch let e {
-                                    logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                    let a = getErrorAlert(e, "Error")
-                                    await MainActor.run { alert = .error(title: a.title, error: a.message) }
-                                }
-                            }
-                        }
                    }
                }
            }
@@ -257,7 +243,6 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
-            case let .queueInfo(info): return queueInfoAlert(info)
            case let .error(title, error): return mkAlert(title: title, message: error)
            }
        }
@@ -592,22 +577,6 @@ func syncConnectionForceAlert(_ syncConnectionForce: @escaping () -> Void) -> Al
    )
 }

-func queueInfoText(_ info: (RcvMsgInfo?, QueueInfo)) -> String {
-    let (rcvMsgInfo, qInfo) = info
-    var msgInfo: String
-    if let rcvMsgInfo { msgInfo = encodeJSON(rcvMsgInfo) } else { msgInfo = "none" }
-    return String.localizedStringWithFormat(NSLocalizedString("server queue info: %@\n\nlast received msg: %@", comment: "queue info"), encodeJSON(qInfo), msgInfo)
-}
-
-func queueInfoAlert(_ info: String) -> Alert {
-    Alert(
-        title: Text("Message queue info"),
-        message: Text(info),
-        primaryButton: .default(Text("Ok")),
-        secondaryButton: .default(Text("Copy")) { UIPasteboard.general.string = info }
-    )
-}
-
 struct ChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoView(
@@ -54,7 +54,7 @@ struct CIFileView: View {
            switch (file.fileStatus) {
            case .sndStored: return file.fileProtocol == .local
            case .sndTransfer: return false
-            case .sndComplete: return true
+            case .sndComplete: return false
            case .sndCancelled: return false
            case .sndError: return false
            case .rcvInvitation: return true
@@ -113,11 +113,6 @@ struct CIFileView: View {
                if file.fileProtocol == .local, let fileSource = getLoadedFileSource(file) {
                    saveCryptoFile(fileSource)
                }
-            case .sndComplete:
-                logger.debug("CIFileView fileAction - in .sndComplete")
-                if let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
-                }
            default: break
            }
        }
@@ -24,7 +24,7 @@ struct CIInvalidJSONView: View {
        .cornerRadius(18)
        .textSelection(.disabled)
        .onTapGesture { showJSON = true }
-        .appSheet(isPresented: $showJSON) {
+        .sheet(isPresented: $showJSON) {
            invalidJSONView(json)
        }
    }
@@ -131,7 +131,7 @@ struct ChatView: View {
                    } label: {
                        ChatInfoToolbar(chat: chat)
                    }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: {
+                    .sheet(isPresented: $showChatInfoSheet, onDismiss: {
                        connectionStats = nil
                        customUserProfile = nil
                        connectionCode = nil
@@ -35,7 +35,6 @@ struct GroupMemberInfoView: View {
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
        case planAndConnectAlert(alert: PlanAndConnectAlert)
-        case queueInfo(info: String)
        case error(title: LocalizedStringKey, error: LocalizedStringKey)

        var id: String {
@@ -50,7 +49,6 @@ struct GroupMemberInfoView: View {
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
-            case let .queueInfo(info): return "queueInfo \(info)"
            case let .error(title, _): return "error \(title)"
            }
        }
@@ -180,18 +178,6 @@ struct GroupMemberInfoView: View {
                        Section("For console") {
                            infoRow("Local name", member.localDisplayName)
                            infoRow("Database ID", "\(member.groupMemberId)")
-                            Button ("Debug delivery") {
-                                Task {
-                                    do {
-                                        let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
-                                        await MainActor.run { alert = .queueInfo(info: info) }
-                                    } catch let e {
-                                        logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                        let a = getErrorAlert(e, "Error")
-                                        await MainActor.run { alert = .error(title: a.title, error: a.message) }
-                                    }
-                                }
-                            }
                        }
                    }
                }
@@ -237,7 +223,6 @@ struct GroupMemberInfoView: View {
                case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
-                case let .queueInfo(info): return queueInfoAlert(info)
                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
                }
            }
@@ -34,7 +34,8 @@ struct GroupPreferencesView: View {
                featureSection(.reactions, $preferences.reactions.enable)
                featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
                featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                // TODO enable simplexLinks preference in 5.8
+                // featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
                featureSection(.history, $preferences.history.enable)

                if groupInfo.canEdit {
@@ -101,6 +102,8 @@ struct GroupPreferencesView: View {
                        }
                    }
                    .frame(height: 36)
+                    // remove in v5.8
+                    .disabled(true)
                }
            } else {
                settingsRow(icon, color: color) {
@@ -349,12 +349,10 @@ struct ChatListNavLink: View {
            .tint(.accentColor)
        }
        .frame(height: rowHeights[dynamicTypeSize])
-        .appSheet(isPresented: $showContactConnectionInfo) {
-            Group {
-                if case let .contactConnection(contactConnection) = chat.chatInfo {
-                    ContactConnectionInfo(contactConnection: contactConnection)
-                        .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
-                }
+        .sheet(isPresented: $showContactConnectionInfo) {
+            if case let .contactConnection(contactConnection) = chat.chatInfo {
+                ContactConnectionInfo(contactConnection: contactConnection)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
        }
        .onTapGesture {
@@ -469,7 +467,7 @@ struct ChatListNavLink: View {
            .padding(4)
            .frame(height: rowHeights[dynamicTypeSize])
            .onTapGesture { showInvalidJSON = true }
-            .appSheet(isPresented: $showInvalidJSON) {
+            .sheet(isPresented: $showInvalidJSON) {
                invalidJSONView(json)
                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
@@ -406,28 +406,7 @@ 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
@@ -123,7 +123,7 @@ struct UserProfilesView: View {
            deleteModeButton("Profile and server connections", true)
            deleteModeButton("Local profile data only", false)
        }
-        .appSheet(item: $selectedUser) { user in
+        .sheet(item: $selectedUser) { user in
            HiddenProfileView(user: user, profileHidden: $profileHidden)
        }
        .onChange(of: profileHidden) { _ in
@@ -131,7 +131,7 @@ struct UserProfilesView: View {
                withAnimation { profileHidden = false }
            }
        }
-        .appSheet(item: $profileAction) { action in
+        .sheet(item: $profileAction) { action in
            profileActionView(action)
        }
        .alert(item: $alert) { alert in
@@ -713,10 +713,6 @@
        <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>
@@ -812,10 +808,6 @@
        <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>
@@ -1096,10 +1088,6 @@
        <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>
@@ -1296,10 +1284,6 @@
        <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>
@@ -1717,10 +1701,6 @@ This is your own one-time link!</source>
        <target>Базата данни ще бъде мигрирана, когато приложението се рестартира</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Децентрализиран</target>
@@ -1968,10 +1948,6 @@ 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>
@@ -2077,19 +2053,11 @@ 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>
@@ -2653,7 +2621,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Грешка: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2745,10 +2713,6 @@ 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>
@@ -2854,16 +2818,6 @@ 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>
@@ -3679,19 +3633,11 @@ 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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Реакции на съобщения</target>
@@ -3707,14 +3653,6 @@ 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>
@@ -3845,6 +3783,11 @@ 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>
@@ -3875,10 +3818,6 @@ 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>
@@ -4420,23 +4359,11 @@ 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>
@@ -4517,20 +4444,11 @@ 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>
@@ -4636,6 +4554,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4871,10 +4794,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5100,14 +5019,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5213,10 +5124,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5232,10 +5139,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5356,19 +5259,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5691,10 +5586,6 @@ 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>
@@ -5880,10 +5771,6 @@ 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>
@@ -5976,6 +5863,11 @@ 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>
@@ -6021,10 +5913,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="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>
@@ -6172,14 +6060,6 @@ 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>
@@ -6415,23 +6295,11 @@ To connect, please ask your contact to create another connection link and check
        <target>С намален разход на батерията.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="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>
@@ -7547,12 +7415,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>изпрати лично съобщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>зададен нов адрес за контакт</target>
@@ -7593,19 +7455,11 @@ last received msg: %2$@</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>
@@ -7671,10 +7525,6 @@ last received msg: %2$@</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>
@@ -690,10 +690,6 @@
        <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>
@@ -786,10 +782,6 @@
        <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>
@@ -1055,10 +1047,6 @@
        <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>
@@ -1250,10 +1238,6 @@
        <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>
@@ -1647,10 +1631,6 @@ This is your own one-time link!</source>
        <target>Databáze bude přenesena po restartu aplikace</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Decentralizované</target>
@@ -1890,10 +1870,6 @@ 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>
@@ -1997,19 +1973,11 @@ 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>
@@ -2551,7 +2519,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Chyba: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2640,10 +2608,6 @@ 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>
@@ -2742,16 +2706,6 @@ 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>
@@ -3536,19 +3490,11 @@ 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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reakce na zprávy</target>
@@ -3564,14 +3510,6 @@ 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>
@@ -3689,6 +3627,11 @@ 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>
@@ -3718,10 +3661,6 @@ 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>
@@ -4242,22 +4181,10 @@ 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>
@@ -4334,20 +4261,11 @@ 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>
@@ -4450,6 +4368,10 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4677,10 +4599,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4899,14 +4817,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5011,10 +4921,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5030,10 +4936,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5149,19 +5051,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5475,10 +5369,6 @@ 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>
@@ -5655,10 +5545,6 @@ 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>
@@ -5745,6 +5631,11 @@ 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>
@@ -5790,10 +5681,6 @@ 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>
@@ -5934,14 +5821,6 @@ 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>
@@ -6159,23 +6038,11 @@ 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>
@@ -7255,12 +7122,6 @@ Servery SimpleX nevidí váš profil.</target>
        <target>odeslat přímou zprávu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <note>profile update event chat item</note>
@@ -7297,18 +7158,10 @@ last received msg: %2$@</source>
        <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>
@@ -7372,10 +7225,6 @@ last received msg: %2$@</source>
        <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>
@@ -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-Relais hochgeladen.</target>
+        <target>Alle Ihre Kontakte, Unterhaltungen und Dateien werden sicher verschlüsselt und in Daten-Paketen auf die konfigurierten XTFP-Server hochgeladen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
@@ -713,11 +713,6 @@
        <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>
-        <target>Herabstufung erlauben</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>Erlauben Sie das unwiederbringliche Löschen von Nachrichten nur dann, wenn es Ihnen Ihr Kontakt ebenfalls erlaubt. (24 Stunden)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Sie nutzen immer privates 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>Über ein Relais verbinden</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Kapazität überschritten - der Empfänger hat die zuvor gesendeten Nachrichten nicht empfangen.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Zellulär</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Dateien von unbekannten Servern bestätigen.</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>Bestätigen Sie die Netzwerkeinstellungen</target>
@@ -1721,10 +1701,6 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Die Datenbank wird beim nächsten Start der App migriert</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Dezentral</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Zielserver-Fehler: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Entwicklung</target>
@@ -2082,19 +2053,9 @@ 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>
-        <target>Nachrichten werden nicht direkt versendet, selbst wenn Ihr oder der Zielserver kein privates Routing unterstützt.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
        <source>Do NOT use SimpleX for emergency calls.</source>
-        <target>SimpleX NICHT für Notrufe nutzen.</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>Sie nutzen KEIN privates Routing.</target>
+        <target>Nutzen Sie SimpleX nicht für Notrufe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do it later" xml:space="preserve">
@@ -2660,7 +2621,7 @@ Das kann nicht rückgängig gemacht werden!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Fehler: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Dateien</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>Dateien &amp; Medien</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Weiterleitungsserver: %1$@
-Zielserver Fehler: %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>Weiterleitungsserver: %1$@
-Fehler: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Gefundener Desktop</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Warnung bei der Nachrichtenzustellung</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Nachrichtenentwurf</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reaktionen auf Nachrichten</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Fallback für das Nachrichten-Routing</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>Modus für das Nachrichten-Routing</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>Die Nachrichtenquelle bleibt privat.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Netzwerk-Fehler - die Nachricht ist nach vielen Sende-Versuchen abgelaufen.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Netzwerk-Verwaltung</target>
@@ -4081,12 +4004,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 diese Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.</target>
+        <target>Für die 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>Wenn Onion-Hosts verfügbar sind, werden sie verwendet. Dies erfordert die Aktivierung eines VPNs.</target>
+        <target>Onion-Hosts werden verwendet, sobald sie verfügbar sind. 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">
@@ -4436,26 +4359,11 @@ 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>
-        <target>Privates Nachrichten-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>Privates Nachrichten-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 Notizen</target>
        <note>name of notes to self</note>
      </trans-unit>
-      <trans-unit id="Private routing" xml:space="preserve">
-        <source>Private routing</source>
-        <target>Privates 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>Profil und Serververbindungen</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>IP-Adresse schützen</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>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>
-        <target>Schützen Sie Ihre IP-Adresse vor den Nachrichten-Relais , die Ihre Kontakte ausgewählt haben.
-Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>Ihre Chat-Profile mit einem Passwort schützen!</target>
@@ -4658,6 +4554,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
@@ -4893,11 +4794,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
-        <target>Dateien sicher empfangen</target>
-        <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>
@@ -5123,16 +5019,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
-        <target>Nachrichten werden direkt versendet, wenn die IP-Adresse geschützt ist, und Ihr oder der Zielserver kein privates Routing unterstützt.</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>Nachrichten werden direkt versendet, wenn Ihr oder der Zielserver kein privates Routing unterstützt.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
-        <target>Die Server-Adresse ist nicht mit den Netzwerk-Einstellungen kompatibel.</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>Um Warteschlangen zu erzeugen benötigt der Server eine Authentifizierung. Bitte überprüfen Sie das Passwort</target>
@@ -5258,11 +5139,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
-        <target>Die Server-Version ist nicht mit den Netzwerk-Einstellungen kompatibel.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Server</target>
@@ -5383,21 +5259,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</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>
-        <target>Nachrichtenstatus anzeigen</target>
-        <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>
-        <target>Bei Nachrichten, die über privates Routing versendet wurden, → anzeigen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Anzeigen:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>Die App wird eine Bestätigung bei Downloads von unbekannten Datei-Servern anfordern (außer bei .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>Die Änderung des Datenbank-Passworts konnte nicht abgeschlossen werden.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Zum Schutz Ihrer IP-Adresse, wird für die Nachrichten-Auslieferung privates Routing über Ihre konfigurierten SMP-Server genutzt.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Unbekannte Server!</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>Aktivieren Sie den Modus "Bitte nicht stören", um Unterbrechungen zu vermeiden, es sei denn, Sie verwenden die iOS Anrufschnittstelle.</target>
@@ -6176,7 +6032,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
      </trans-unit>
      <trans-unit id="Use current profile" xml:space="preserve">
        <source>Use current profile</source>
-        <target>Aktuelles Profil nutzen</target>
+        <target>Das aktuelle Profil nutzen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
@@ -6196,7 +6052,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
      </trans-unit>
      <trans-unit id="Use new incognito profile" xml:space="preserve">
        <source>Use new incognito profile</source>
-        <target>Neues Inkognito-Profil nutzen</target>
+        <target>Ein neues Inkognito-Profil nutzen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Use only local notifications?" xml:space="preserve">
@@ -6204,16 +6060,6 @@ 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>
-        <target>Sie nutzen privates Routing mit unbekannten Servern, wenn Ihre IP-Adresse nicht geschützt ist.</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>Sie nutzen privates Routing mit unbekannten Servern.</target>
-        <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>
@@ -6449,26 +6295,11 @@ 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>
-        <target>Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für Datei-Server sichtbar sein.</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>Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für diese XFTP-Relais sichtbar sein: %@.</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>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>
-        <target>Falscher Schlüssel oder unbekannte Verbindung - höchstwahrscheinlich ist diese Verbindung gelöscht worden.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Falsches Passwort!</target>
@@ -7584,12 +7415,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
        <target>Direktnachricht senden</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>Es wurde eine neue Kontaktadresse festgelegt</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>Unbekannt</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>Unbekannte Relais</target>
-        <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>
-        <target>Ungeschützt</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>Aktualisiertes Gruppenprofil</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>Wochen</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>Wenn die IP-Adresse versteckt ist</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>Ja</target>
@@ -7851,7 +7661,7 @@ last received msg: %2$@</source>
      </trans-unit>
      <trans-unit id="NSHumanReadableCopyright" xml:space="preserve">
        <source>Copyright © 2022 SimpleX Chat. All rights reserved.</source>
-        <target>Copyright © 2024 SimpleX Chat. All rights reserved.</target>
+        <target>Copyright © 2022 SimpleX Chat. All rights reserved.</target>
        <note>Copyright (human-readable)</note>
      </trans-unit>
    </body>
@@ -713,11 +713,6 @@
        <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>
@@ -813,11 +808,6 @@
        <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>
@@ -1098,11 +1088,6 @@
        <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>
@@ -1299,11 +1284,6 @@
        <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>
@@ -1721,11 +1701,6 @@ This is your own one-time link!</target>
        <target>Database will be migrated when the app restarts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <target>Debug delivery</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Decentralized</target>
@@ -1973,11 +1948,6 @@ 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>
@@ -2083,21 +2053,11 @@ 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>
@@ -2661,7 +2621,7 @@ This cannot be undone!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Error: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2753,11 +2713,6 @@ 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>
@@ -2863,20 +2818,6 @@ 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>
@@ -3692,21 +3633,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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <target>Message queue info</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Message reactions</target>
@@ -3722,16 +3653,6 @@ 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>
@@ -3862,6 +3783,11 @@ 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>
@@ -3892,11 +3818,6 @@ 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>
@@ -4438,26 +4359,11 @@ 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>
@@ -4538,23 +4444,11 @@ 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>
@@ -4660,6 +4554,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4895,11 +4794,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5125,16 +5019,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5240,11 +5124,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5260,11 +5139,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5385,21 +5259,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5722,11 +5586,6 @@ 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>
@@ -5912,11 +5771,6 @@ 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>
@@ -6009,6 +5863,11 @@ 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>
@@ -6054,11 +5913,6 @@ 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>
@@ -6206,16 +6060,6 @@ 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>
@@ -6451,26 +6295,11 @@ 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>
@@ -7586,15 +7415,6 @@ SimpleX servers cannot see your profile.</target>
        <target>send direct message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <target>server queue info: %1$@
-
-last received msg: %2$@</target>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>set new contact address</target>
@@ -7635,21 +7455,11 @@ last received msg: %2$@</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>
@@ -7715,11 +7525,6 @@ last received msg: %2$@</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>
@@ -713,11 +713,6 @@
        <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>
-        <target>Permitir versión anterior</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>Se permite la eliminación irreversible de mensajes pero sólo si tu contacto también la permite para tí. (24 horas)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Usar siempre enrutamiento privado.</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>Usar siempre retransmisor</target>
@@ -1050,7 +1040,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 (predeterminado) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
+        <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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Call already ended!" xml:space="preserve">
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Capacidad excedida - el destinatario no ha recibido los mensajes previos.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Móvil</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Confirma archivos de servidores desconocidos.</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>Confirmar configuración de red</target>
@@ -1721,10 +1701,6 @@ This is your own one-time link!</source>
        <target>La base de datos migrará cuando se reinicie la aplicación</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Descentralizada</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Error del servidor de destino: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Desarrollo</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>NO enviar mensajes directamente incluso si tu servidor o el de destino no soportan enrutamiento privado.</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>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>
-        <target>NO usar enrutamiento privado.</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>Hacer más tarde</target>
@@ -2244,7 +2205,7 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="Enabled for" xml:space="preserve">
        <source>Enabled for</source>
-        <target>Activado para</target>
+        <target>Activar para</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Encrypt" xml:space="preserve">
@@ -2660,7 +2621,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Error: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Archivos</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>Archivos y multimedia</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Servidor de reenvío: %1$@
-Error del servidor de destino: %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>Servidor de reenvío: %1$@
-Error: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Ordenador encontrado</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Aviso de entrega de mensaje</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Borrador de mensaje</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reacciones a mensajes</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Enrutamiento de mensajes alternativo</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>Modo de enrutamiento de mensajes</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>El autor del mensaje se mantiene privado.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Problema en la red - el mensaje ha expirado tras muchos intentos de envío.</target>
-        <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>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Enrutamiento privado de mensajes</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>Enrutamiento privado de mensajes 🚀</target>
-        <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>
-        <target>Enrutamiento privado</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>Datos del perfil y conexiones</target>
@@ -4468,7 +4376,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
-        <target>Forma de los perfiles</target>
+        <target>Imágenes del perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -4536,23 +4444,11 @@ 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>
-        <target>Proteger dirección IP</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>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>
-        <target>Protege tu dirección IP de los servidores de retransmisión elegidos por tus contactos.
-Actívalo en ajustes de *Servidores y Redes*.</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>¡Protege tus perfiles con contraseña!</target>
@@ -4658,6 +4554,11 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
@@ -4725,7 +4626,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
        <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
-        <target>El servidor de retransmisión sólo se usa en caso de necesidad. Un tercero podría ver tu IP.</target>
+        <target>El retransmisor sólo se usa en caso de necesidad. Un tercero podría ver tu IP.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Relay server protects your IP address, but it can observe the duration of the call." xml:space="preserve">
@@ -4815,7 +4716,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Reset to defaults" xml:space="preserve">
        <source>Reset to defaults</source>
-        <target>Restablecer valores predetarminados</target>
+        <target>Restablecer valores por defecto</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">
@@ -4893,11 +4794,6 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
-        <target>Recibe archivos de forma segura</target>
-        <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>
@@ -5105,7 +5001,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Send direct message to connect" xml:space="preserve">
        <source>Send direct message to connect</source>
-        <target>Envia un mensaje para conectar</target>
+        <target>Enviar mensaje directo para conectar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -5123,16 +5019,6 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
-        <target>Enviar mensajes directamente cuando tu dirección IP está protegida y tu servidor o el de destino no admitan enrutamiento privado.</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>Enviar mensajes directamente cuando tu servidor o el de destino no admitan enrutamiento privado.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
-        <target>La dirección del servidor es incompatible con la configuración de la red.</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>El servidor requiere autorización para crear colas, comprueba la contraseña</target>
@@ -5258,11 +5139,6 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
-        <target>La versión del servidor es incompatible con la configuración de red.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Servidores</target>
@@ -5383,21 +5259,11 @@ Actívalo en ajustes de *Servidores y Redes*.</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>
-        <target>Estado del mensaje</target>
-        <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>
-        <target>Mostrar → en mensajes con enrutamiento privado.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Mostrar:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .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>El intento de cambiar la contraseña de la base de datos no se ha completado.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Para proteger tu dirección IP, el enrutamiento privado usa tus servidores SMP para enviar mensajes.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>¡Servidores desconocidos!</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>A menos que utilices la interfaz de llamadas de iOS, activa el modo No molestar para evitar interrupciones.</target>
@@ -6205,16 +6061,6 @@ 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>
-        <target>Usar enrutamiento privado con servidores desconocidos cuando la dirección IP no está protegida.</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>Usar enrutamiento privado con servidores desconocidos.</target>
-        <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>
@@ -6450,26 +6296,11 @@ 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>
-        <target>Sin Tor o VPN, tu dirección IP será visible para los servidores de archivos.</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>Sin Tor o VPN, tu dirección IP será visible para estos servidores XFTP: %@.</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>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>
-        <target>Clave incorrecta o conexión desconocida - probablemente esta conexión fue eliminada.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>¡Contraseña incorrecta!</target>
@@ -7155,17 +6986,17 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
      </trans-unit>
      <trans-unit id="default (%@)" xml:space="preserve">
        <source>default (%@)</source>
-        <target>predeterminado (%@)</target>
+        <target>por defecto (%@)</target>
        <note>pref value</note>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
-        <target>predeterminado (no)</target>
+        <target>por defecto (no)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
-        <target>predeterminado (sí)</target>
+        <target>por defecto (sí)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -7585,12 +7416,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
        <target>Enviar mensaje directo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>nueva dirección de contacto</target>
@@ -7631,21 +7456,11 @@ last received msg: %2$@</source>
        <target>desconocido</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>servidor de retransmisión desconocido</target>
-        <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>
-        <target>desprotegido</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>ha actualizado el perfil del grupo</target>
@@ -7711,11 +7526,6 @@ last received msg: %2$@</source>
        <target>semanas</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>con IP oculta</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>sí</target>
@@ -685,10 +685,6 @@
        <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>
@@ -781,10 +777,6 @@
        <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>
@@ -1048,10 +1040,6 @@
        <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>
@@ -1243,10 +1231,6 @@
        <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>
@@ -1640,10 +1624,6 @@ This is your own one-time link!</source>
        <target>Tietokanta siirretään, kun sovellus käynnistyy uudelleen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Hajautettu</target>
@@ -1883,10 +1863,6 @@ 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>
@@ -1990,19 +1966,11 @@ 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>
@@ -2541,7 +2509,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Virhe: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2630,10 +2598,6 @@ 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>
@@ -2732,16 +2696,6 @@ 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>
@@ -3526,19 +3480,11 @@ 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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Viestireaktiot</target>
@@ -3554,14 +3500,6 @@ 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>
@@ -3679,6 +3617,11 @@ 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>
@@ -3708,10 +3651,6 @@ 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>
@@ -4230,22 +4169,10 @@ 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>
@@ -4322,20 +4249,11 @@ 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>
@@ -4438,6 +4356,10 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4665,10 +4587,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4886,14 +4804,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4998,10 +4908,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5017,10 +4923,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5136,19 +5038,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5461,10 +5355,6 @@ 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>
@@ -5641,10 +5531,6 @@ 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>
@@ -5730,6 +5616,11 @@ 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>
@@ -5775,10 +5666,6 @@ 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>
@@ -5919,14 +5806,6 @@ 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>
@@ -6144,23 +6023,11 @@ 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>
@@ -7239,12 +7106,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <source>send direct message</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <note>profile update event chat item</note>
@@ -7281,18 +7142,10 @@ last received msg: %2$@</source>
        <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>
@@ -7356,10 +7209,6 @@ last received msg: %2$@</source>
        <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>
@@ -713,11 +713,6 @@
        <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>
-        <target>Autoriser la rétrogradation</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>Autoriser la suppression irréversible des messages uniquement si votre contact vous l'autorise. (24 heures)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Toujours utiliser le routage privé.</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>Se connecter via relais</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Capacité dépassée - le destinataire n'a pas pu recevoir les messages envoyés précédemment.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Cellulaire</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Confirmer les fichiers provenant de serveurs inconnus.</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>Confirmer les paramètres réseau</target>
@@ -1721,10 +1701,6 @@ Il s'agit de votre propre lien unique !</target>
        <target>La base de données sera migrée lors du redémarrage de l'app</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Décentralisé</target>
@@ -1949,7 +1925,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">
@@ -1972,11 +1948,6 @@ 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>
-        <target>Erreur du serveur de destination : %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Développer</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>Ne pas envoyer de messages directement, même si votre serveur ou le serveur de destination ne prend pas en charge le routage privé.</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>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>
-        <target>Ne pas utiliser de routage privé.</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>Faites-le plus tard</target>
@@ -2660,7 +2621,7 @@ Cette opération ne peut être annulée !</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Erreur : %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Fichiers</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>Fichiers &amp; médias</target>
@@ -2819,7 +2775,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">
@@ -2862,20 +2818,6 @@ 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>
-        <target>Serveur de transfert : %1$@
-Erreur du serveur de destination : %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>Serveur de transfert : %1$@
-Erreur : %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Bureau trouvé</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Avertissement sur la distribution des messages</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Brouillon de message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Réactions aux messages</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Rabattement du routage des messages</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>Mode de routage des messages</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>La source du message reste privée.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Problèmes de réseau - le message a expiré après plusieurs tentatives d'envoi.</target>
-        <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>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Routage privé des messages</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>Routage privé des messages 🚀</target>
-        <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>
-        <target>Routage privé</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>Profil et connexions au serveur</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>Protéger l'adresse IP</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>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>
-        <target>Protégez votre adresse IP des relais de messagerie choisis par vos contacts.
-Activez-le dans les paramètres *Réseau et serveurs*.</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>Protégez vos profils de chat par un mot de passe !</target>
@@ -4658,6 +4554,11 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
@@ -4690,7 +4591,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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">
@@ -4765,7 +4666,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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">
@@ -4893,11 +4794,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
-        <target>Réception de fichiers en toute sécurité</target>
-        <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>
@@ -5123,16 +5019,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
-        <target>Envoyer les messages de manière directe lorsque l'adresse IP est protégée et que votre serveur ou le serveur de destination ne prend pas en charge le routage privé.</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>Envoyez les messages de manière directe lorsque votre serveur ou le serveur de destination ne prend pas en charge le routage privé.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
-        <target>L'adresse du serveur est incompatible avec les paramètres du réseau.</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>Le serveur requiert une autorisation pour créer des files d'attente, vérifiez le mot de passe</target>
@@ -5258,11 +5139,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
-        <target>La version du serveur est incompatible avec les paramètres du réseau.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Serveurs</target>
@@ -5383,21 +5259,11 @@ Activez-le dans les paramètres *Réseau et serveurs*.</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>
-        <target>Afficher le statut du message</target>
-        <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>
-        <target>Afficher → sur les messages envoyés via le routage privé.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Afficher :</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>L'application demandera de confirmer les téléchargements à partir de serveurs de fichiers inconnus (sauf .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>La tentative de modification de la phrase secrète de la base de données n'a pas abouti.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Pour protéger votre adresse IP, le routage privé utilise vos serveurs SMP pour délivrer les 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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Serveurs inconnus !</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>À moins que vous utilisiez l'interface d'appel d'iOS, activez le mode "Ne pas déranger" pour éviter les interruptions.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>Utiliser le routage privé avec des serveurs inconnus lorsque l'adresse IP n'est pas protégée.</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>Utiliser le routage privé avec des serveurs inconnus.</target>
-        <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>
@@ -6366,7 +6212,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">
@@ -6449,26 +6295,11 @@ 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>
-        <target>Sans Tor ou un VPN, votre adresse IP sera visible par les serveurs de fichiers.</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>Sans Tor ni VPN, votre adresse IP sera visible par ces relais XFTP : %@.</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>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>
-        <target>Clé erronée ou connexion non identifiée - il est très probable que cette connexion soit supprimée.</target>
-        <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>
@@ -7584,12 +7415,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
        <target>envoyer un message direct</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>a changé d'adresse de contact</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>inconnu</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>relais inconnus</target>
-        <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>
-        <target>non protégé</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>mise à jour du profil de groupe</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>semaines</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>lorsque l'IP est masquée</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>oui</target>
@@ -349,7 +349,7 @@
      </trans-unit>
      <trans-unit id="**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." xml:space="preserve">
        <source>**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app).</source>
-        <target>**Legprivátabb**: ne használja a SimpleX Chat értesítési kiszolgálót, rendszeresen ellenőrizze az üzeneteket a háttérben (attól függően, hogy milyen gyakran használja az alkalmazást).</target>
+        <target>**Legprivátabb**: ne használja a SimpleX Chat értesítési szervert, rendszeresen ellenőrizze az üzeneteket a háttérben (attól függően, hogy milyen gyakran használja az alkalmazást).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve">
@@ -364,7 +364,7 @@
      </trans-unit>
      <trans-unit id="**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." xml:space="preserve">
        <source>**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from.</source>
-        <target>**Javasolt**: az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.</target>
+        <target>**Javasolt**: az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési szerverre, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -570,7 +570,7 @@
      </trans-unit>
      <trans-unit id="Accept connection request?" xml:space="preserve">
        <source>Accept connection request?</source>
-        <target>Kapcsolódási kérelem elfogadása?</target>
+        <target>Kapcsolatfelvétel elfogadása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -705,27 +705,22 @@
      </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>A hívások kezdeményezése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>Hívások engedélyezése kizárólag abban az esetben, ha 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>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>
-        <target>Korábbi verzióra történő visszatérés engedélyezése</target>
+        <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>
        <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>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>
+        <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>
        <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>Az üzenetreakciók küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>Üzenetreakciók engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow message reactions." xml:space="preserve">
@@ -740,7 +735,7 @@
      </trans-unit>
      <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
        <source>Allow sending disappearing messages.</source>
-        <target>Az eltűnő üzenetek küldése engedélyezve van.</target>
+        <target>Eltűnő üzenetek küldésének engedélyezése.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -765,7 +760,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>A hangüzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>Hangüzenetek küldésének engedélyezése kizárólag abban az esetben, ha ismerőse is engedélyezi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow voice messages?" xml:space="preserve">
@@ -775,27 +770,27 @@
      </trans-unit>
      <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve">
        <source>Allow your contacts adding message reactions.</source>
-        <target>Az üzenetreakciók küldése engedélyezve van az ismerősei számára.</target>
+        <target>Ismerősök általi üzenetreakciók hozzáadásának engedélyezése.</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>A hívások kezdeményezése engedélyezve van az ismerősei számára.</target>
+        <target>Hívások engedélyezése ismerősök 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>Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)</target>
+        <target>Elküldött üzenetek végleges törlésének engedélyezése az ismerősök 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>Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.</target>
+        <target>Eltűnő üzenetek engedélyezése ismerősök 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>A hangüzenetek küldése engedélyezve van az ismerősei számára.</target>
+        <target>Hangüzenetek küldésének engedélyezése ismerősök számára.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Already connected?" xml:space="preserve">
@@ -813,11 +808,6 @@
        <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>
-        <target>Mindig használjon privát útválasztást.</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>Mindig használjon átjátszó kiszolgálót</target>
@@ -915,12 +905,12 @@
      </trans-unit>
      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
        <source>Audio/video calls are prohibited.</source>
-        <target>A hívások kezdeményezése le van tiltva ebben a csevegésben.</target>
+        <target>A hang- és videóhívások le vannak tiltva.</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 visszavonva</target>
+        <target>Hitelesítés megszakítva</target>
        <note>PIN entry</note>
      </trans-unit>
      <trans-unit id="Authentication failed" xml:space="preserve">
@@ -945,7 +935,7 @@
      </trans-unit>
      <trans-unit id="Auto-accept contact requests" xml:space="preserve">
        <source>Auto-accept contact requests</source>
-        <target>Kapcsolódási kérelmek automatikus elfogadása</target>
+        <target>Ismerős jelölések automatikus elfogadása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Auto-accept images" xml:space="preserve">
@@ -1005,7 +995,7 @@
      </trans-unit>
      <trans-unit id="Block member for all?" xml:space="preserve">
        <source>Block member for all?</source>
-        <target>Mindenki számára letiltja ezt a tagot?</target>
+        <target>Tag letiltása mindenki számára?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block member?" xml:space="preserve">
@@ -1030,7 +1020,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 kezdeményezni.</target>
+        <target>Mindkét fél tud hívásokat indítani.</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">
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Kapacitás túllépés - a címzett nem kapta meg a korábban elküldött üzeneteket.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Mobilhálózat</target>
@@ -1226,7 +1211,7 @@
      </trans-unit>
      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve">
        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
-        <target>Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközön és olvassa be a QR-kódot.</target>
+        <target>Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközön és szkennelje be a QR-kódot.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Choose file" xml:space="preserve">
@@ -1246,17 +1231,17 @@
      </trans-unit>
      <trans-unit id="Clear conversation" xml:space="preserve">
        <source>Clear conversation</source>
-        <target>Üzenetek kiürítése</target>
+        <target>Beszélgetés kiürítése</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear conversation?" xml:space="preserve">
        <source>Clear conversation?</source>
-        <target>Üzenetek kiürítése?</target>
+        <target>Beszélgetés kiürítése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear private notes?" xml:space="preserve">
        <source>Clear private notes?</source>
-        <target>Privát jegyzetek kiürítése?</target>
+        <target>Privát jegyzetek törlése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear verification" xml:space="preserve">
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Ismeretlen kiszolgálókról származó fájlok jóváhagyása.</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>Hálózati beállítások megerősítése</target>
@@ -1485,7 +1465,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ősei törlésre jelölhetnek üzeneteket; ön majd meg tudja nézni azokat.</target>
+        <target>Az ismerősök törlésre jelölhetnek üzeneteket ; megtekintheti őket.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Continue" xml:space="preserve">
@@ -1721,10 +1701,6 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Az adatbázis az alkalmazás újraindításakor migrálásra kerül</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Decentralizált</target>
@@ -1762,7 +1738,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 ennyi idő után</target>
+        <target>Törlés miután</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete all files" xml:space="preserve">
@@ -1889,7 +1865,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 ennyi idő után</target>
+        <target>Üzenetek törlése miután</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete old database" xml:space="preserve">
@@ -1972,11 +1948,6 @@ 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>
-        <target>Célkiszolgáló hiba: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Fejlesztés</target>
@@ -2014,7 +1985,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>A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.</target>
+        <target>Ebben a csoportban tiltott a tagok közötti közvetlen üzenetek küldése.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2044,7 +2015,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 küldése le van tiltva ebben a csevegésben.</target>
+        <target>Az eltűnő üzenetek le vannak 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">
@@ -2082,21 +2053,11 @@ 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>
-        <target>Ne küldjön üzeneteket közvetlenül, még akkor sem, ha az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</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>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>
-        <target>Ne használjon privát útválasztást.</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>Későbbre halaszt</target>
@@ -2660,7 +2621,7 @@ Ez a művelet nem vonható vissza!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Hiba: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Fájlok</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>Fájlok és média</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Továbbító kiszolgáló: %1$@
-Célkiszolgáló hiba:%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>Továbbító kiszolgáló: %1$@
-Hiba: %2$@</target>
-        <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>
@@ -3148,7 +3090,7 @@ Hiba: %2$@</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 megadja az önmegsemmisítő jelkódot:</target>
+        <target>Ha az alkalmazás megnyitásakor az önmegsemmisítő jelkódot megadásra kerül:</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">
@@ -3395,12 +3337,12 @@ Hiba: %2$@</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>Az üzenetek végleges törlése le van tiltva ebben a csevegésben.</target>
+        <target>Ebben a csevegésben az üzenetek végleges törlése le van tiltva.</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>Az üzenetek végleges törlése le van tiltva ebben a csoportban.</target>
+        <target>Ebben a csoportban az üzenetek végleges törlése le van tiltva.</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">
@@ -3528,7 +3470,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Leave" xml:space="preserve">
        <source>Leave</source>
-        <target>Elhagyás</target>
+        <target>Elhagy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
@@ -3623,7 +3565,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." xml:space="preserve">
        <source>Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@).</source>
-        <target>Győződjön meg arról, hogy a %@ kiszolgálócímek megfelelő formátumúak, sorszeparáltak és nem duplikáltak (%@).</target>
+        <target>Győződjön meg arról, hogy a %@ szervercímek megfelelő formátumúak, sorszeparáltak és nem duplikáltak (%@).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve">
@@ -3643,12 +3585,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>Olvasottnak jelölés</target>
+        <target>Megjelölés olvasottként</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Mark verified" xml:space="preserve">
        <source>Mark verified</source>
-        <target>Hitelesítés</target>
+        <target>Ellenőrzöttként jelölve</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Markdown in messages" xml:space="preserve">
@@ -3691,20 +3633,11 @@ 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>
-        <target>Üzenet kézbesítési figyelmeztetés</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Üzenetvázlat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Üzenetreakciók</target>
@@ -3712,22 +3645,12 @@ 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 küldése le van tiltva ebben a csevegésben.</target>
+        <target>Az üzenetreakciók ebben a csevegésben le vannak tiltva.</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>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>
-        <target>Üzenet útválasztási tartalék</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>Üzenet útválasztási mód</target>
+        <target>Ebben a csoportban az üzenetreakciók le vannak tiltva.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -3762,12 +3685,12 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
        <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.</target>
+        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással** és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
        <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.</target>
+        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással** és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migrate device" xml:space="preserve">
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Hálózati problémák - az üzenet többszöri elküldési kísérlet után lejárt.</target>
-        <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>
@@ -4156,7 +4079,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őse tud eltűnő üzeneteket küldeni.</target>
+        <target>Csak az ismerős 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">
@@ -4436,26 +4359,11 @@ 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>
-        <target>Privát üzenet útválasztá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>
-        <target>Privát üzenet útválasztás 🚀</target>
-        <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>
-        <target>Privát útválasztás</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>Profil és kiszolgálókapcsolatok</target>
@@ -4493,7 +4401,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit audio/video calls." xml:space="preserve">
        <source>Prohibit audio/video calls.</source>
-        <target>A hívások kezdeményezése le van tiltva.</target>
+        <target>Hang- és videóhívások tiltása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit irreversible message deletion." xml:space="preserve">
@@ -4503,7 +4411,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit message reactions." xml:space="preserve">
        <source>Prohibit message reactions.</source>
-        <target>Az üzenetreakciók küldése le van tiltva.</target>
+        <target>Üzenetreakciók tiltása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit messages reactions." xml:space="preserve">
@@ -4518,12 +4426,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>A közvetlen üzenetek küldése le van tiltva a tagok között.</target>
+        <target>Közvetlen üzenetek küldésének letiltása a tagok számára.</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>Az eltűnő üzenetek küldése le van tiltva.</target>
+        <target>Eltűnő üzenetek küldésének letiltása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending files and media." xml:space="preserve">
@@ -4533,12 +4441,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
        <source>Prohibit sending voice messages.</source>
-        <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>
-        <target>Az IP-cím védelme</target>
+        <target>Hangüzenetek küldésének letiltása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Protect app screen" xml:space="preserve">
@@ -4546,13 +4449,6 @@ 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>
-        <target>Védje IP-címét az ismerősei által kiválasztott üzenetküldő átjátszókkal szemben.
-Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.</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>Csevegési profiljok védelme jelszóval!</target>
@@ -4658,6 +4554,11 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
@@ -4740,12 +4641,12 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
      </trans-unit>
      <trans-unit id="Remove member" xml:space="preserve">
        <source>Remove member</source>
-        <target>Eltávolítás</target>
+        <target>Tag eltávolítása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Remove member?" xml:space="preserve">
        <source>Remove member?</source>
-        <target>Biztosan eltávolítja?</target>
+        <target>Tag eltávolítása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Remove passphrase from keychain?" xml:space="preserve">
@@ -4893,11 +4794,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
-        <target>Fájlok biztonságos fogadása</target>
-        <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>
@@ -5015,7 +4911,7 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
-        <target>Beolvasás</target>
+        <target>Kód beolvasása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Scan security code from your contact's app." xml:space="preserve">
@@ -5123,16 +5019,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
-        <target>Közvetlen üzenetküldés, ha az IP-cím védett és az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</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>Közvetlen üzenetküldés, ha az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
-        <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>
@@ -5165,7 +5051,7 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
-        <target>A fájl küldője visszavonta az átvitelt.</target>
+        <target>A küldő megszakította a fájl átvitelt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
@@ -5238,11 +5124,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
-        <target>A kiszolgáló címe nem kompatibilis a hálózati beállításokkal.</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>A kiszolgálónak engedélyre van szüksége a várólisták létrehozásához, ellenőrizze jelszavát</target>
@@ -5258,11 +5139,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
-        <target>A kiszolgáló verziója nem kompatibilis a hálózati beállításokkal.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Kiszolgálók</target>
@@ -5383,21 +5259,11 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
        <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>
-        <target>Üzenet állapot megjelenítése</target>
-        <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>
-        <target>Egy „→” jel megjelenítése a privát útválasztáson keresztül küldött üzeneteknél.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Megjelenítés:</target>
@@ -5460,7 +5326,7 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
      </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 le van tiltva ebben a csoportban.</target>
+        <target>A SimpleX hivatkozások küldése ebben a csoportban le van tiltva.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -5720,11 +5586,6 @@ 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>
-        <target>Az alkalmazás kérni fogja az ismeretlen fájlkiszolgálókról (kivéve .onion) történő letöltések megerősítését.</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>Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.</target>
@@ -5737,7 +5598,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 vissza lesz vonva!</target>
+        <target>Az ön által elfogadott kapcsolat megszakad!</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">
@@ -5910,11 +5771,6 @@ 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>
-        <target>Az IP-címe védelme érdekében a privát útválasztás az SMP-kiszolgálókat használja az üzenetek kézbesítéséhez.</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>
@@ -5939,7 +5795,7 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
      </trans-unit>
      <trans-unit id="To verify end-to-end encryption with your contact compare (or scan) the code on your devices." xml:space="preserve">
        <source>To verify end-to-end encryption with your contact compare (or scan) the code on your devices.</source>
-        <target>A végpontok közötti titkosítás ellenőrzéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) az ismerőse eszközén lévő kóddal.</target>
+        <target>A végpontok közötti titkosítás ellenőrzéséhez ismerősével hasonlítsa össze (vagy szkennelje be) az eszközén lévő kódot.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Ismeretlen kiszolgálók!</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>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>
@@ -6131,7 +5987,7 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
      </trans-unit>
      <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
        <source>Updating settings will re-connect the client to all servers.</source>
-        <target>A beállítások frissítése a kiszolgálókhoz való újra kapcsolódással jár.</target>
+        <target>A beállítások frissítése a szerverekhez újra kapcsolódással jár.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Updating this setting will re-connect the client to all servers." xml:space="preserve">
@@ -6204,16 +6060,6 @@ 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>
-        <target>Privát útválasztás használata ismeretlen kiszolgálókkal, ha az IP-cím nem védett.</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>Használjon privát útválasztást ismeretlen kiszolgálókkal.</target>
-        <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>
@@ -6321,7 +6167,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 küldése le van tiltva ebben a csevegésben.</target>
+        <target>A hangüzenetek le vannak 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">
@@ -6449,26 +6295,11 @@ 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>
-        <target>Tor vagy VPN nélkül az IP-címe látható lesz a fájlkiszolgálók számára.</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>Tor vagy VPN nélkül az IP-címe látható lesz ezen XFTP átjátszók számára: %@.</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>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>
-        <target>Rossz kulcs vagy ismeretlen kapcsolat - valószínűleg ez a kapcsolat törlődött.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Téves jelmondat!</target>
@@ -6643,7 +6474,7 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." xml:space="preserve">
        <source>You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them.</source>
-        <target>Ön szabályozhatja, hogy mely kiszogál(ók)ón keresztül **kapja** az üzeneteket, az ismerősöket - az üzenetküldéshez használt kiszolgálókon.</target>
+        <target>Ön szabályozhatja, hogy mely kiszogál(ók)ón keresztül **kapja** az üzeneteket, az ismerősöket - az üzenetküldéshez használt szervereken.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You could not be verified; please try again." xml:space="preserve">
@@ -6811,8 +6642,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ő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>
+        <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>
        <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">
@@ -7019,7 +6850,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>%@ visszavonva</target>
+        <target>%@ törölve</target>
        <note>feature offered item</note>
      </trans-unit>
      <trans-unit id="changed address for you" xml:space="preserve">
@@ -7134,7 +6965,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>készítő</target>
+        <target>szerző</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="custom" xml:space="preserve">
@@ -7354,12 +7185,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íva</target>
+        <target>meghívta</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">
@@ -7369,7 +7200,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íva az ön csoport hivatkozásán keresztül</target>
+        <target>meghívta a csoport hivatkozásán keresztül</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="italic" xml:space="preserve">
@@ -7584,12 +7415,6 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
        <target>közvetlen üzenet küldése</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>új kapcsolattartási azonosító beállítása</target>
@@ -7630,24 +7455,14 @@ last received msg: %2$@</source>
        <target>ismeretlen</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>ismeretlen átjátszók</target>
-        <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>
-        <target>nem védett</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>frissítette a csoport profilját</target>
+        <target>módosított csoport profil</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="updated profile" xml:space="preserve">
@@ -7692,7 +7507,7 @@ last received msg: %2$@</source>
      </trans-unit>
      <trans-unit id="waiting for answer…" xml:space="preserve">
        <source>waiting for answer…</source>
-        <target>várakozás a válaszra…</target>
+        <target>várakozás válaszra…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="waiting for confirmation…" xml:space="preserve">
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>hét</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>ha az IP-cím rejtett</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>igen</target>
@@ -713,11 +713,6 @@
        <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>
-        <target>Consenti 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>Consenti l'eliminazione irreversibile dei messaggi solo se il contatto la consente a te. (24 ore)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Usa sempre l'instradamento privato.</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>Connetti via relay</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Quota superata - il destinatario non ha ricevuto i messaggi precedentemente inviati.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Mobile</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Conferma i file da server sconosciuti.</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>Conferma le impostazioni di rete</target>
@@ -1721,10 +1701,6 @@ Questo è il tuo link una tantum!</target>
        <target>Il database verrà migrato al riavvio dell'app</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Decentralizzato</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Errore del server di destinazione: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Sviluppa</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>NON inviare messaggi direttamente, anche se il tuo server o quello di destinazione non supporta l'instradamento privato.</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>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>
-        <target>NON usare l'instradamento privato.</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>Fallo dopo</target>
@@ -2660,7 +2621,7 @@ Non è reversibile!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Errore: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>File</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>File e multimediali</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Server di inoltro: %1$@
-Errore del server di destinazione: %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>Server di inoltro: %1$@
-Errore: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Desktop trovato</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Avviso di consegna del messaggio</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Bozza dei messaggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reazioni ai messaggi</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Ripiego instradamento messaggio</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>Modalità instradamento messaggio</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>La fonte del messaggio resta privata.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Problemi di rete - messaggio scaduto dopo molti tentativi di inviarlo.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Gestione della rete</target>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Instradamento privato messaggi</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>Instradamento privato dei messaggi 🚀</target>
-        <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>
-        <target>Instradamento privato</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>Profilo e connessioni al server</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>Proteggi l'indirizzo IP</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>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>
-        <target>Proteggi il tuo indirizzo IP dai relay di messaggistica scelti dai tuoi contatti.
-Attivalo nelle impostazioni *Rete e server*.</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>Proteggi i tuoi profili di chat con una password!</target>
@@ -4658,6 +4554,11 @@ Attivalo nelle impostazioni *Rete e server*.</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>
@@ -4893,11 +4794,6 @@ Attivalo nelle impostazioni *Rete e server*.</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>
-        <target>Ricevi i file in sicurezza</target>
-        <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>
@@ -5123,16 +5019,6 @@ Attivalo nelle impostazioni *Rete e server*.</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>
-        <target>Invia messaggi direttamente quando l'indirizzo IP è protetto e il tuo server o quello di destinazione non supporta l'instradamento privato.</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>Invia messaggi direttamente quando il tuo server o quello di destinazione non supporta l'instradamento privato.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Attivalo nelle impostazioni *Rete e server*.</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>
-        <target>L'indirizzo del server non è compatibile con le impostazioni di rete.</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>Il server richiede l'autorizzazione di creare code, controlla la password</target>
@@ -5258,11 +5139,6 @@ Attivalo nelle impostazioni *Rete e server*.</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>
-        <target>La versione del server non è compatibile con le impostazioni di rete.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Server</target>
@@ -5383,21 +5259,11 @@ Attivalo nelle impostazioni *Rete e server*.</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>
-        <target>Mostra stato del messaggio</target>
-        <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>
-        <target>Mostra → nei messaggi inviati via instradamento privato.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Mostra:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>L'app chiederà di confermare i download da server di file sconosciuti (eccetto .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>Il tentativo di cambiare la password del database non è stato completato.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Per proteggere il tuo indirizzo IP, l'instradamento privato usa i tuoi server SMP per consegnare i messaggi.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Server sconosciuti!</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>A meno che non utilizzi l'interfaccia di chiamata iOS, attiva la modalità Non disturbare per evitare interruzioni.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>Usa l'instradamento privato con server sconosciuti quando l'indirizzo IP non è protetto.</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>Usa l'instradamento privato con server sconosciuti.</target>
-        <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>
@@ -6449,26 +6295,11 @@ 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>
-        <target>Senza Tor o VPN, il tuo indirizzo IP sarà visibile ai server di file.</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>Senza Tor o VPN, il tuo indirizzo IP sarà visibile a questi relay XFTP: %@.</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>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>
-        <target>Chiave sbagliata o connessione sconosciuta - molto probabilmente questa connessione è stata eliminata.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Password sbagliata!</target>
@@ -7584,12 +7415,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
        <target>invia messaggio diretto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>impostato nuovo indirizzo di contatto</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>sconosciuto</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>relay sconosciuti</target>
-        <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>
-        <target>non protetto</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>ha aggiornato il profilo del gruppo</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>settimane</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>quando l'IP è nascosto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>sì</target>
@@ -703,10 +703,6 @@
        <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>
@@ -802,10 +798,6 @@
        <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>
@@ -1072,10 +1064,6 @@
        <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>
@@ -1267,10 +1255,6 @@
        <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>
@@ -1664,10 +1648,6 @@ This is your own one-time link!</source>
        <target>データベースはアプリ再起動時に移行されます</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>分散型</target>
@@ -1907,10 +1887,6 @@ 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>
@@ -2014,19 +1990,11 @@ 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>
@@ -2566,7 +2534,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>エラー : %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2655,10 +2623,6 @@ 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>
@@ -2757,16 +2721,6 @@ 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>
@@ -3550,19 +3504,11 @@ 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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>メッセージへのリアクション</target>
@@ -3578,14 +3524,6 @@ 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>
@@ -3703,6 +3641,11 @@ 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>
@@ -3732,10 +3675,6 @@ 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>
@@ -4256,22 +4195,10 @@ 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>
@@ -4348,20 +4275,11 @@ 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>
@@ -4463,6 +4381,10 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4690,10 +4612,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4911,14 +4829,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5016,10 +4926,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5035,10 +4941,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5154,19 +5056,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5480,10 +5374,6 @@ 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>
@@ -5659,10 +5549,6 @@ 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>
@@ -5748,6 +5634,11 @@ 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>
@@ -5793,10 +5684,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="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>
@@ -5937,14 +5824,6 @@ 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>
@@ -6162,23 +6041,11 @@ 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>
@@ -7257,12 +7124,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
        <source>send direct message</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <note>profile update event chat item</note>
@@ -7299,18 +7160,10 @@ last received msg: %2$@</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>
@@ -7374,10 +7227,6 @@ last received msg: %2$@</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>
@@ -713,11 +713,6 @@
        <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>
-        <target>Downgraden toestaan</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>Sta het onomkeerbaar verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Gebruik altijd privéroutering.</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>Altijd relay gebruiken</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Capaciteit overschreden - ontvanger heeft eerder verzonden berichten niet ontvangen.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Mobiel</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Bevestig bestanden van onbekende 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>Bevestig netwerk instellingen</target>
@@ -1721,10 +1701,6 @@ Dit is uw eigen eenmalige link!</target>
        <target>De database wordt gemigreerd wanneer de app opnieuw wordt opgestart</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Gedecentraliseerd</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Bestemmingsserverfout: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Ontwikkelen</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>Stuur GEEN berichten rechtstreeks, zelfs als uw of de bestemmingsserver geen privéroutering ondersteunt.</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>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>
-        <target>Gebruik GEEN privéroutering.</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>Doe het later</target>
@@ -2660,7 +2621,7 @@ Dit kan niet ongedaan gemaakt worden!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Fout: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Bestanden</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>Bestanden en media</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Doorstuurserver: %1$@
-Bestemmingsserverfout: %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>Doorstuurserver: %1$@
-Fout: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Desktop gevonden</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Waarschuwing voor berichtbezorging</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Concept bericht</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reacties op berichten</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Terugval op berichtroutering</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>Berichtrouteringsmodus</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>Berichtbron blijft privé.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Netwerkproblemen - bericht is verlopen na vele pogingen om het te verzenden.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Netwerkbeheer</target>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Routering van privéberichten</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>Routing van privéberichten🚀</target>
-        <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>
-        <target>Privéroutering</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>Profiel- en serververbindingen</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>Bescherm het IP-adres</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>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>
-        <target>Bescherm uw IP-adres tegen de berichtenrelais die door uw contacten zijn gekozen.
-Schakel dit in in *Netwerk en servers*-instellingen.</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>Bescherm je chat profielen met een wachtwoord!</target>
@@ -4658,6 +4554,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
@@ -4893,11 +4794,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>Veilig bestanden ontvangen</target>
-        <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>
@@ -5123,16 +5019,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
-        <target>Stuur berichten rechtstreeks als het IP-adres beschermd is en uw of bestemmingsserver geen privéroutering ondersteunt.</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>Stuur berichten rechtstreeks wanneer uw of de doelserver geen privéroutering ondersteunt.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
-        <target>Serveradres is niet compatibel met netwerkinstellingen.</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 vereist autorisatie om wachtrijen te maken, controleer wachtwoord</target>
@@ -5258,11 +5139,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
-        <target>Serverversie is incompatibel met netwerkinstellingen.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Servers</target>
@@ -5383,21 +5259,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
-        <target>Toon berichtstatus</target>
-        <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>
-        <target>Toon → bij berichten verzonden via privéroutering.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Toon:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>De app vraagt om downloads van onbekende bestandsservers (behalve .onion) te bevestigen.</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>De poging om het wachtwoord van de database te wijzigen is niet voltooid.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Om uw IP-adres te beschermen, gebruikt privéroutering uw SMP-servers om berichten te bezorgen.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Onbekende 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>Schakel de modus Niet storen in om onderbrekingen te voorkomen, tenzij u de iOS-oproepinterface gebruikt.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>Gebruik privéroutering met onbekende servers wanneer het IP-adres niet beveiligd is.</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>Gebruik privéroutering met onbekende servers.</target>
-        <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>
@@ -6449,26 +6295,11 @@ 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>
-        <target>Zonder Tor of VPN is uw IP-adres zichtbaar voor bestandsservers.</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>Zonder Tor of VPN zal uw IP-adres zichtbaar zijn voor deze 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>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>
-        <target>Verkeerde sleutel of onbekende verbinding - hoogstwaarschijnlijk is deze verbinding verwijderd.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Verkeerd wachtwoord!</target>
@@ -7584,12 +7415,6 @@ SimpleX servers kunnen uw profiel niet zien.</target>
        <target>stuur een direct bericht</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>nieuw contactadres instellen</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>onbekend</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>onbekende relays</target>
-        <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>
-        <target>onbeschermd</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>bijgewerkt groep profiel</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>weken</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>wanneer IP verborgen is</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>Ja</target>
@@ -713,11 +713,6 @@
        <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>
-        <target>Zezwól na obniżenie wersji</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>Zezwalaj na nieodwracalne usuwanie wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli. (24 godziny)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Zawsze używaj prywatnego trasowania.</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>Zawsze używaj przekaźnika</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Przekroczono pojemność - odbiorca nie otrzymał wcześniej wysłanych wiadomości.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Sieć komórkowa</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Potwierdzaj pliki z nieznanych serwerów.</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>Potwierdź ustawienia sieciowe</target>
@@ -1721,10 +1701,6 @@ To jest twój jednorazowy link!</target>
        <target>Baza danych zostanie zmigrowana po ponownym uruchomieniu aplikacji</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Zdecentralizowane</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Błąd docelowego serwera: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Deweloperskie</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>NIE wysyłaj wiadomości bezpośrednio, nawet jeśli serwer docelowy nie obsługuje prywatnego trasowania.</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>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>
-        <target>NIE używaj prywatnego trasowania.</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>Zrób to później</target>
@@ -2660,7 +2621,7 @@ To nie może być cofnięte!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Błąd: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Pliki</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>Pliki i media</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Serwer przekazujący: %1$@
-Błąd serwera docelowego: %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>Serwer przekazujący: %1$@
-Błąd: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Znaleziono komputer</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Ostrzeżenie dostarczenia wiadomości</target>
-        <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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Reakcje wiadomości</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Rezerwowe trasowania wiadomości</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>Tryb trasowania wiadomości</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>Źródło wiadomości pozostaje prywatne.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Błąd sieciowy - wiadomość wygasła po wielu próbach wysłania jej.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Zarządzenie sieciowe</target>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Trasowanie prywatnych wiadomości</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>Trasowanie prywatnych wiadomości🚀</target>
-        <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>
-        <target>Prywatne trasowanie</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>Profil i połączenia z serwerem</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>Chroń adres IP</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>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>
-        <target>Chroni Twój adres IP przed przekaźnikami wiadomości wybranych przez Twoje kontakty.
-Włącz w ustawianiach *Sieć i serwery* .</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>Chroń swoje profile czatu hasłem!</target>
@@ -4658,6 +4554,11 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
@@ -4893,11 +4794,6 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
-        <target>Bezpiecznie otrzymuj pliki</target>
-        <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>
@@ -5123,16 +5019,6 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
-        <target>Wysyłaj wiadomości bezpośrednio, gdy adres IP jest chroniony i Twój lub docelowy serwer nie obsługuje prywatnego trasowania.</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>Wysyłaj wiadomości bezpośrednio, gdy Twój lub docelowy serwer nie obsługuje prywatnego trasowania.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
-        <target>Adres serwera jest niekompatybilny z ustawieniami sieciowymi.</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>Serwer wymaga autoryzacji do tworzenia kolejek, sprawdź hasło</target>
@@ -5258,11 +5139,6 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
-        <target>Wersja serwera jest niekompatybilna z ustawieniami sieciowymi.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Serwery</target>
@@ -5383,21 +5259,11 @@ Włącz w ustawianiach *Sieć i serwery* .</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>
-        <target>Pokaż status wiadomości</target>
-        <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>
-        <target>Pokaż → na wiadomościach wysłanych przez prywatne trasowanie.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Pokaż:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>Aplikacja zapyta o potwierdzenie pobierania od nieznanych serwerów plików (poza .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>Próba zmiany hasła bazy danych nie została zakończona.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Aby chronić Twój adres IP, prywatne trasowanie używa Twoich serwerów SMP, aby dostarczyć wiadomości.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Nieznane serwery!</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>O ile nie korzystasz z interfejsu połączeń systemu iOS, włącz tryb Nie przeszkadzać, aby uniknąć przerywania.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>Używaj prywatnego trasowania z nieznanymi serwerami, gdy adres IP nie jest chroniony.</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>Używaj prywatnego trasowania z nieznanymi serwerami.</target>
-        <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>
@@ -6449,26 +6295,11 @@ 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>
-        <target>Bez Tor lub VPN, Twój adres IP będzie widoczny do serwerów plików.</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>Bez Tor lub VPN, Twój adres IP będzie widoczny dla tych przekaźników XFTP: %@.</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>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>
-        <target>Zły klucz lub nieznane połączenie - najprawdopodobniej to połączenie jest usunięte.</target>
-        <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>
@@ -7584,12 +7415,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
        <target>wyślij wiadomość bezpośrednią</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>ustaw nowy adres kontaktu</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>nieznany</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>nieznane przekaźniki</target>
-        <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>
-        <target>niezabezpieczony</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>zaktualizowano profil grupy</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>tygodnie</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>gdy IP ukryty</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>tak</target>
@@ -713,11 +713,6 @@
        <target>Разрешить исчезающие сообщения, только если Ваш контакт разрешает их Вам.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow downgrade" xml:space="preserve">
-        <source>Allow downgrade</source>
-        <target>Разрешить прямую доставку</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>Разрешить необратимое удаление сообщений, только если Ваш контакт разрешает это Вам. (24 часа)</target>
@@ -813,11 +808,6 @@
        <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>
-        <target>Всегда использовать конфиденциальную доставку.</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>Всегда соединяться через relay</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Превышено количество сообщений - предыдущие сообщения не доставлены.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Мобильная сеть</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Подтверждать файлы с неизвестных серверов.</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>Подтвердите настройки сети</target>
@@ -1721,10 +1701,6 @@ This is your own one-time link!</source>
        <target>Данные чата будут мигрированы при перезапуске</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Децентрализованный</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Ошибка сервера получателя: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Для разработчиков</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>Не отправлять сообщения напрямую, даже если сервер получателя не поддерживает конфиденциальную доставку.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
        <source>Do NOT use SimpleX for emergency calls.</source>
        <target>Не используйте SimpleX для экстренных звонков.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Do NOT use private routing." xml:space="preserve">
-        <source>Do NOT use private routing.</source>
-        <target>Не использовать конфиденциальную доставку.</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>Отложить</target>
@@ -2660,7 +2621,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Ошибка: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Файлы</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>Файлы и медиа</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Пересылающий сервер: %1$@
-Ошибка сервера получателя: %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>Пересылающий сервер: %1$@
-Ошибка: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Компьютер найден</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Предупреждение доставки сообщения</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Черновик сообщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Реакции на сообщения</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Прямая доставка сообщений</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>Режим доставки сообщений</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>Источник сообщения остаётся конфиденциальным.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Ошибка сети - сообщение не было отправлено после многократных попыток.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Статус сети</target>
@@ -4436,26 +4359,11 @@ 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>
-        <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>
-        <target>Конфиденциальная доставка сообщений 🚀</target>
-        <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>
-        <target>Конфиденциальная доставка</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>Профиль и соединения на сервере</target>
@@ -4536,23 +4444,11 @@ 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>
-        <target>Защитить IP адрес</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>Защитить экран приложения</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>Защитите ваш IP адрес от серверов сообщений, выбранных Вашими контактами.
-Включите в настройках *Сеть и серверы*.</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>Защитите Ваши профили чата паролем!</target>
@@ -4658,6 +4554,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4893,11 +4794,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Получайте файлы безопасно</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Safer groups" xml:space="preserve">
        <source>Safer groups</source>
        <target>Более безопасные группы</target>
@@ -5123,16 +5019,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Отправлять сообщения напрямую, когда IP адрес защищен, и Ваш сервер или сервер получателя не поддерживает конфиденциальную доставку.</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>Отправлять сообщения напрямую, когда Ваш сервер или сервер получателя не поддерживает конфиденциальную доставку.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Send notifications" xml:space="preserve">
        <source>Send notifications</source>
        <target>Отправлять уведомления</target>
@@ -5238,11 +5124,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Адрес сервера несовместим с настройками сети.</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>Сервер требует авторизации для создания очередей, проверьте пароль</target>
@@ -5258,11 +5139,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Версия сервера несовместима с настройками сети.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Серверы</target>
@@ -5383,21 +5259,11 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Показать статус сообщения</target>
-        <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>
-        <target>Показать → на сообщениях доставленных конфиденциально.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Показать:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>Приложение будет запрашивать подтверждение загрузки с неизвестных серверов (за исключением .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>Попытка поменять пароль базы данных не была завершена.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>Чтобы защитить ваш IP адрес, приложение использует Ваши SMP серверы для конфиденциальной доставки сообщений.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,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="Unknown servers!" xml:space="preserve">
-        <source>Unknown servers!</source>
-        <target>Неизвестные серверы!</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>Если Вы не используете интерфейс iOS, включите режим Не отвлекать, чтобы звонок не прерывался.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>Использовать конфиденциальную доставку с неизвестными серверами, когда IP адрес не защищен.</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>Использовать конфиденциальную доставку с неизвестными серверами.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Использовать сервер</target>
@@ -6449,26 +6295,11 @@ To connect, please ask your contact to create another connection link and check
        <target>С уменьшенным потреблением батареи.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="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>Без Тора или ВПН, Ваш IP адрес будет доступен серверам файлов.</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>Без Тора или ВПН, Ваш IP адрес будет доступен этим серверам файлов: %@.</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>Неправильный пароль базы данных</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>Неверный ключ или неизвестное соединение - скорее всего, это соединение удалено.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Неправильный пароль!</target>
@@ -7584,12 +7415,6 @@ SimpleX серверы не могут получить доступ к Ваше
        <target>отправьте сообщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>установлен новый адрес контакта</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>неизвестно</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>неизвестные серверы</target>
-        <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>
-        <target>незащищённый</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>обновил(а) профиль группы</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>недель</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>когда IP защищен</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>да</target>
@@ -677,10 +677,6 @@
        <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>
@@ -773,10 +769,6 @@
        <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>
@@ -1040,10 +1032,6 @@
        <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>
@@ -1235,10 +1223,6 @@
        <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>
@@ -1629,10 +1613,6 @@ This is your own one-time link!</source>
        <target>ระบบจะย้ายฐานข้อมูลเมื่อแอปรีสตาร์ท</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>กระจายอำนาจแล้ว</target>
@@ -1871,10 +1851,6 @@ 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>
@@ -1977,19 +1953,11 @@ 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>
@@ -2526,7 +2494,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>ข้อผิดพลาด: % @</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2615,10 +2583,6 @@ 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>
@@ -2717,16 +2681,6 @@ 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>
@@ -3509,19 +3463,11 @@ 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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>ปฏิกิริยาของข้อความ</target>
@@ -3537,14 +3483,6 @@ 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>
@@ -3661,6 +3599,11 @@ 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>
@@ -3690,10 +3633,6 @@ 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>
@@ -4211,22 +4150,10 @@ 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>
@@ -4303,20 +4230,11 @@ 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>
@@ -4418,6 +4336,10 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4644,10 +4566,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4865,14 +4783,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4975,10 +4885,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4994,10 +4900,6 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5112,19 +5014,11 @@ Enable in *Network &amp; servers* settings.</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>
@@ -5437,10 +5331,6 @@ 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>
@@ -5615,10 +5505,6 @@ 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>
@@ -5704,6 +5590,11 @@ 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>
@@ -5749,10 +5640,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="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>
@@ -5891,14 +5778,6 @@ 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>
@@ -6116,23 +5995,11 @@ 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>
@@ -7207,12 +7074,6 @@ SimpleX servers cannot see your profile.</source>
        <source>send direct message</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <note>profile update event chat item</note>
@@ -7249,18 +7110,10 @@ last received msg: %2$@</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>
@@ -7324,10 +7177,6 @@ last received msg: %2$@</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>
@@ -445,7 +445,7 @@
      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
-        <target>0sn</target>
+        <target>0 saniye</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="1 day" xml:space="preserve">
@@ -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>Tüm kişileriniz, konuşmalarınız ve dosyalarınız güvenli bir şekilde şifrelenir ve yapılandırılmış XFTP yönlendiricilerine parçalar halinde yüklenir.</target>
+        <target>Tüm kişileriniz, sohbetleriniz ve dosyalarınız güvenli bir şekilde şifrelenecek ve parçalar halinde yapılandırılmış XFTP rölelerine yüklenecektir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
@@ -713,11 +713,6 @@
        <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>
-        <target>Sürüm düşürmeye izin ver</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>Konuştuğun kişi, kalıcı olarak silinebilen mesajlara izin veriyorsa sen de ver. (24 saat içinde)</target>
@@ -735,7 +730,7 @@
      </trans-unit>
      <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
        <source>Allow sending direct messages to members.</source>
-        <target>Üyelere doğrudan mesaj göndermeye izin ver.</target>
+        <target>Üyelere direkt mesaj göndermeye izin ver.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
@@ -813,11 +808,6 @@
        <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>
-        <target>Her zaman gizli yönlendirme kullan.</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>Her zaman yönlendirici kullan</target>
@@ -1098,11 +1088,6 @@
        <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>
-        <target>Kapasite aşıldı - alıcı önceden gönderilen mesajları almadı.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
        <target>Hücresel Veri</target>
@@ -1299,11 +1284,6 @@
        <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>
-        <target>Bilinmeyen sunuculardan gelen dosyaları onayla.</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>Ağ ayarlarını onaylayın</target>
@@ -1721,10 +1701,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Uygulama yeniden başlatıldığında veritabanı taşınacaktır</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Merkezi Olmayan</target>
@@ -1972,11 +1948,6 @@ 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>
-        <target>Hedef sunucu hatası: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Geliştir</target>
@@ -2082,21 +2053,11 @@ 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>
-        <target>Sizin veya hedef sunucunun özel yönlendirmeyi desteklememesi durumunda bile mesajları doğrudan GÖNDERMEYİN.</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>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>
-        <target>Gizli yönlendirmeyi KULLANMA.</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>Sonra yap</target>
@@ -2660,7 +2621,7 @@ Bu geri alınamaz!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Hata: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2713,6 @@ 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>
-        <target>Dosyalar</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>Dosyalar &amp; medya</target>
@@ -2862,20 +2818,6 @@ 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>
-        <target>Yönlendirme sunucusu: %1$@
-Hedef sunucu hatası: %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>Yönlendirme sunucusu: %1$@
-Hata: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Bilgisayar bulundu</target>
@@ -3691,20 +3633,11 @@ 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>
-        <target>Mesaj iletimi uyarısı</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Mesaj taslağı</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Mesaj tepkileri</target>
@@ -3720,16 +3653,6 @@ 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>
-        <target>Mesaj yönlendirme yedeklemesi</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>Mesaj yönlendirme modu</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>Mesaj kaynağı gizli kalır.</target>
@@ -3860,6 +3783,11 @@ 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>
@@ -3890,11 +3818,6 @@ 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>
-        <target>Ağ sorunları - birçok gönderme denemesinden sonra mesajın süresi doldu.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
        <target>Ağ yönetimi</target>
@@ -4436,26 +4359,11 @@ 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>
-        <target>Gizli mesaj yönlendirme</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>Gizli mesaj yönlendirme 🚀</target>
-        <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>
-        <target>Gizli yönlendirme</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>Profil ve sunucu bağlantıları</target>
@@ -4518,7 +4426,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
        <source>Prohibit sending direct messages to members.</source>
-        <target>Üyelere doğrudan mesaj göndermeyi yasakla.</target>
+        <target>Geri dönülmez mesaj silme işlemini yasakla.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending disappearing messages." xml:space="preserve">
@@ -4536,23 +4444,11 @@ 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>
-        <target>IP adresini koru</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>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>
-        <target>IP adresinizi kişileriniz tarafından seçilen mesajlaşma yönlendiricilerinden koruyun.
-*Ağ ve sunucular* ayarlarında etkinleştirin.</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>Bir parolayla birlikte sohbet profillerini koru!</target>
@@ -4658,6 +4554,11 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
@@ -4725,12 +4626,12 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
        <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
-        <target>Yönlendirici sunucusu yalnızca gerekli olduğunda kullanılır. Başka bir taraf IP adresinizi gözlemleyebilir.</target>
+        <target>Aktarma sunucusu yalnızca gerekli olduğunda kullanılır. Başka bir taraf IP adresinizi gözlemleyebilir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Relay server protects your IP address, but it can observe the duration of the call." xml:space="preserve">
        <source>Relay server protects your IP address, but it can observe the duration of the call.</source>
-        <target>Yönlendirici sunucu IP adresinizi korur, ancak aramanın süresini gözlemleyebilir.</target>
+        <target>Aktarıcı sunucu IP adresinizi korur, ancak aramanın süresini gözlemleyebilir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Remove" xml:space="preserve">
@@ -4893,11 +4794,6 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
-        <target>Dosyaları güvenle alın</target>
-        <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>
@@ -5123,16 +5019,6 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
-        <target>IP adresi korumalı olduğunda ve sizin veya hedef sunucunun özel yönlendirmeyi desteklemediği durumlarda mesajları doğrudan gönderin.</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>Sizin veya hedef sunucunun özel yönlendirmeyi desteklemediği durumlarda mesajları doğrudan gönderin.</target>
-        <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>
@@ -5238,11 +5124,6 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
-        <target>Sunucu adresi ağ ayarlarıyla uyumlu değil.</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>Sunucunun sıra oluşturması için yetki gereklidir, şifreyi kontrol edin</target>
@@ -5258,11 +5139,6 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
-        <target>Sunucu sürümü ağ ayarlarıyla uyumlu değil.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Sunucular</target>
@@ -5383,21 +5259,11 @@ Enable in *Network &amp; servers* settings.</source>
        <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>
-        <target>Mesaj durumunu göster</target>
-        <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>
-        <target>Gizli yönlendirme yoluyla gönderilen mesajlarda → işaretini göster.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Göster:</target>
@@ -5720,11 +5586,6 @@ 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>
-        <target>Uygulama bilinmeyen dosya sunucularından indirmeleri onaylamanızı isteyecektir (.onion hariç).</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>Veritabanı parolasını değiştirme girişimi tamamlanmadı.</target>
@@ -5910,11 +5771,6 @@ 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>
-        <target>IP adresinizi korumak için,gizli yönlendirme mesajları iletmek için SMP sunucularınızı kullanır.</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>
@@ -6007,6 +5863,11 @@ 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>
@@ -6052,11 +5913,6 @@ 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>
-        <target>Bilinmeyen sunucular!</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>iOS arama arayüzünü kullanmadığınız sürece, kesintileri önlemek için Rahatsız Etmeyin modunu etkinleştirin.</target>
@@ -6204,16 +6060,6 @@ 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>
-        <target>IP adresi korunmadığında bilinmeyen sunucularla gizli yönlendirme kullan.</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>Bilinmeyen sunucularla gizli yönlendirme kullan.</target>
-        <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>
@@ -6449,26 +6295,11 @@ 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>
-        <target>Tor veya VPN olmadan, IP adresiniz dosya sunucularına görülebilir.</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>Tor veya VPN olmadan, IP adresiniz bu XFTP aktarıcıları tarafından görülebilir: %@.</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>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>
-        <target>Yanlış anahtar veya bilinmeyen bağlantı - büyük olasılıkla bu bağlantı silinmiştir.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Yanlış parola!</target>
@@ -7584,12 +7415,6 @@ SimpleX sunucuları profilinizi göremez.</target>
        <target>doğrudan mesaj gönder</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>yeni kişi adresi ayarla</target>
@@ -7630,21 +7455,11 @@ last received msg: %2$@</source>
        <target>bilinmeyen</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>bilinmeyen yönlendiriciler</target>
-        <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>
-        <target>korumasız</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>grup profili güncellendi</target>
@@ -7710,11 +7525,6 @@ last received msg: %2$@</source>
        <target>haftalar</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>IP gizliyken</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>evet</target>
@@ -713,11 +713,6 @@
        <target>Дозволяйте зникати повідомленням, тільки якщо контакт дозволяє вам це робити.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow downgrade" xml:space="preserve">
-        <source>Allow downgrade</source>
-        <target>Дозволити пониження версії</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>Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити. (24 години)</target>
@@ -750,7 +745,6 @@
      </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">
@@ -813,11 +807,6 @@
        <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>
-        <target>Завжди використовуйте приватну маршрутизацію.</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>Завжди використовуйте реле</target>
@@ -1098,14 +1087,8 @@
        <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>
-        <target>Перевищено ліміт - одержувач не отримав раніше надіслані повідомлення.</target>
-        <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">
@@ -1299,11 +1282,6 @@
        <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>
-        <target>Підтвердити файли з невідомих серверів.</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>Підтвердьте налаштування мережі</target>
@@ -1721,10 +1699,6 @@ This is your own one-time link!</source>
        <target>База даних буде перенесена під час перезапуску програми</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Debug delivery" xml:space="preserve">
-        <source>Debug delivery</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
        <source>Decentralized</source>
        <target>Децентралізований</target>
@@ -1972,11 +1946,6 @@ 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>
-        <target>Помилка сервера призначення: %@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Розробник</target>
@@ -2082,21 +2051,11 @@ 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>
-        <target>НЕ надсилайте повідомлення напряму, навіть якщо ваш сервер або сервер призначення не підтримує приватну маршрутизацію.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
        <source>Do NOT use SimpleX for emergency calls.</source>
        <target>НЕ використовуйте SimpleX для екстрених викликів.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Do NOT use private routing." xml:space="preserve">
-        <source>Do NOT use private routing.</source>
-        <target>НЕ використовуйте приватну маршрутизацію.</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>Зробіть це пізніше</target>
@@ -2129,7 +2088,6 @@ 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">
@@ -2244,7 +2202,6 @@ 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">
@@ -2660,7 +2617,7 @@ This cannot be undone!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Помилка: %@</target>
-        <note>snd error text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2752,11 +2709,6 @@ 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>
-        <target>Файли</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>Файли та медіа</target>
@@ -2774,7 +2726,6 @@ 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">
@@ -2844,38 +2795,20 @@ 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>
-        <target>Сервер переадресації: %1$@
-Помилка сервера призначення: %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>Сервер переадресації: %1$@
-Помилка: %2$@</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <target>Знайдено робочий стіл</target>
@@ -2988,7 +2921,6 @@ Error: %2$@</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">
@@ -3233,7 +3165,6 @@ Error: %2$@</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">
@@ -3691,20 +3622,11 @@ 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>
-        <target>Попередження про доставку повідомлення</target>
-        <note>item status text</note>
-      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
        <source>Message draft</source>
        <target>Чернетка повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message queue info" xml:space="preserve">
-        <source>Message queue info</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message reactions" xml:space="preserve">
        <source>Message reactions</source>
        <target>Реакції на повідомлення</target>
@@ -3720,19 +3642,8 @@ 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>
-        <target>Запасний варіант маршрутизації повідомлень</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>Режим маршрутизації повідомлень</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>Джерело повідомлення залишається приватним.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3852,7 +3763,6 @@ 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">
@@ -3860,6 +3770,11 @@ 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>
@@ -3887,17 +3802,10 @@ 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>
-        <target>Проблеми з мережею - термін дії повідомлення закінчився після багатьох спроб надіслати його.</target>
-        <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">
@@ -4012,7 +3920,6 @@ 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">
@@ -4231,7 +4138,6 @@ 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">
@@ -4436,26 +4342,11 @@ 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>
-        <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>
-        <target>Маршрутизація приватних повідомлень 🚀</target>
-        <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>
-        <target>Приватна маршрутизація</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>З'єднання профілю та сервера</target>
@@ -4468,7 +4359,6 @@ 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">
@@ -4513,7 +4403,6 @@ Error: %@</source>
      </trans-unit>
      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
        <source>Prohibit sending SimpleX links.</source>
-        <target>Заборонити надсилання посилань SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -4536,23 +4425,11 @@ 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>
-        <target>Захист IP-адреси</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>Захистіть екран програми</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>Захистіть свою IP-адресу від ретрансляторів повідомлень, обраних вашими контактами.
-Увімкніть у налаштуваннях *Мережа та сервери*.</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>Захистіть свої профілі чату паролем!</target>
@@ -4658,6 +4535,10 @@ Enable in *Network &amp; servers* settings.</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>
@@ -4675,7 +4556,6 @@ Enable in *Network &amp; servers* settings.</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">
@@ -4893,11 +4773,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Безпечне отримання файлів</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Safer groups" xml:space="preserve">
        <source>Safer groups</source>
        <target>Безпечніші групи</target>
@@ -4985,7 +4860,6 @@ Enable in *Network &amp; servers* settings.</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">
@@ -4995,7 +4869,6 @@ Enable in *Network &amp; servers* settings.</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">
@@ -5123,16 +4996,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Надсилайте повідомлення напряму, якщо IP-адреса захищена, а ваш сервер або сервер призначення не підтримує приватну маршрутизацію.</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>Надсилайте повідомлення напряму, якщо ваш сервер або сервер призначення не підтримує приватну маршрутизацію.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Send notifications" xml:space="preserve">
        <source>Send notifications</source>
        <target>Надсилати сповіщення</target>
@@ -5238,11 +5101,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Адреса сервера несумісна з налаштуваннями мережі.</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>Сервер вимагає авторизації для створення черг, перевірте пароль</target>
@@ -5258,11 +5116,6 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Серверна версія несумісна з мережевими налаштуваннями.</target>
-        <note>srv error text</note>
-      </trans-unit>
      <trans-unit id="Servers" xml:space="preserve">
        <source>Servers</source>
        <target>Сервери</target>
@@ -5325,7 +5178,6 @@ Enable in *Network &amp; servers* settings.</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">
@@ -5383,21 +5235,11 @@ Enable in *Network &amp; servers* settings.</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>
-        <target>Показати статус повідомлення</target>
-        <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>
-        <target>Показувати → у повідомленнях, надісланих через приватну маршрутизацію.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show:" xml:space="preserve">
        <source>Show:</source>
        <target>Показати:</target>
@@ -5460,12 +5302,10 @@ Enable in *Network &amp; servers* settings.</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">
@@ -5505,7 +5345,6 @@ Enable in *Network &amp; servers* settings.</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">
@@ -5720,11 +5559,6 @@ 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>
-        <target>Програма попросить підтвердити завантаження з невідомих файлових серверів (крім .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>Спроба змінити пароль до бази даних не була завершена.</target>
@@ -5910,11 +5744,6 @@ 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>
-        <target>Щоб захистити вашу IP-адресу, приватна маршрутизація використовує ваші SMP-сервери для доставки повідомлень.</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>
@@ -6007,6 +5836,11 @@ 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>
@@ -6052,11 +5886,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="Unknown servers!" xml:space="preserve">
-        <source>Unknown servers!</source>
-        <target>Невідомі сервери!</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>Якщо ви не користуєтеся інтерфейсом виклику iOS, увімкніть режим "Не турбувати", щоб уникнути переривань.</target>
@@ -6204,16 +6033,6 @@ 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>
-        <target>Використовуйте приватну маршрутизацію з невідомими серверами, якщо IP-адреса не захищена.</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>Використовуйте приватну маршрутизацію з невідомими серверами.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Використовувати сервер</target>
@@ -6331,7 +6150,6 @@ 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">
@@ -6406,7 +6224,6 @@ 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">
@@ -6421,17 +6238,14 @@ 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>Дротова мережа Ethernet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="With encrypted files and media." xml:space="preserve">
@@ -6449,26 +6263,11 @@ To connect, please ask your contact to create another connection link and check
        <target>З меншим споживанням заряду акумулятора.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="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>Без Tor або VPN ваша IP-адреса буде видимою для файлових серверів.</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>Без Tor або VPN ваша IP-адреса буде видимою для цих XFTP-ретрансляторів: %@.</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>Неправильний пароль до бази даних</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>Неправильний ключ або невідоме з'єднання - швидше за все, це з'єднання видалено.</target>
-        <note>snd error text</note>
-      </trans-unit>
      <trans-unit id="Wrong passphrase!" xml:space="preserve">
        <source>Wrong passphrase!</source>
        <target>Неправильний пароль!</target>
@@ -6934,7 +6733,6 @@ SimpleX servers cannot see your profile.</source>
      </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">
@@ -6949,7 +6747,6 @@ SimpleX servers cannot see your profile.</source>
      </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">
@@ -7284,7 +7081,6 @@ SimpleX servers cannot see your profile.</source>
      </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">
@@ -7496,7 +7292,6 @@ SimpleX servers cannot see your profile.</source>
      </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">
@@ -7551,12 +7346,10 @@ SimpleX servers cannot see your profile.</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 from %@" xml:space="preserve">
        <source>saved from %@</source>
-        <target>збережено з %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
@@ -7584,12 +7377,6 @@ SimpleX servers cannot see your profile.</source>
        <target>надіслати пряме повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="server queue info: %@&#10;&#10;last received msg: %@" xml:space="preserve">
-        <source>server queue info: %1$@
-
-last received msg: %2$@</source>
-        <note>queue info</note>
-      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
        <target>встановити нову контактну адресу</target>
@@ -7630,21 +7417,11 @@ last received msg: %2$@</source>
        <target>невідомий</target>
        <note>connection info</note>
      </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
-        <target>невідомі реле</target>
-        <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>
-        <target>незахищені</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>оновлений профіль групи</target>
@@ -7710,11 +7487,6 @@ last received msg: %2$@</source>
        <target>тижнів</target>
        <note>time unit</note>
      </trans-unit>
-      <trans-unit id="when IP hidden" xml:space="preserve">
-        <source>when IP hidden</source>
-        <target>коли IP приховано</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="yes" xml:space="preserve">
        <source>yes</source>
        <target>так</target>
@@ -7722,7 +7494,6 @@ last received msg: %2$@</source>
      </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">
@@ -5,5 +5,5 @@
 "CFBundleName" = "SimpleX NSE";

 /* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. All rights reserved.";
+"NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";

@@ -24,11 +24,6 @@
 		5C029EAA283942EA004A9677 /* CallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C029EA9283942EA004A9677 /* CallController.swift */; };
 		5C05DF532840AA1D00C683F9 /* CallSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C05DF522840AA1D00C683F9 /* CallSettings.swift */; };
 		5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C063D2627A4564100AEC577 /* ChatPreviewView.swift */; };
-		5C0EA13B2C0B176B00AD2E5E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1362C0B176B00AD2E5E /* libgmp.a */; };
-		5C0EA13C2C0B176B00AD2E5E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */; };
-		5C0EA13D2C0B176B00AD2E5E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1382C0B176B00AD2E5E /* libffi.a */; };
-		5C0EA13E2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */; };
-		5C0EA13F2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */; };
 		5C10D88828EED12E00E58BF0 /* ContactConnectionInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */; };
 		5C10D88A28F187F300E58BF0 /* FullScreenMediaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C10D88928F187F300E58BF0 /* FullScreenMediaView.swift */; };
 		5C116CDC27AABE0400E66D01 /* ContactRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */; };
@@ -81,6 +76,11 @@
 		5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */; };
 		5C9D13A3282187BB00AB8B43 /* WebRTC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D13A2282187BB00AB8B43 /* WebRTC.swift */; };
 		5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */; };
+		5C9F3DD62BFBCDD90003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F3DD12BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a */; };
+		5C9F3DD72BFBCDD90003B86B /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F3DD22BFBCDD80003B86B /* libffi.a */; };
+		5C9F3DD82BFBCDD90003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F3DD32BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.a */; };
+		5C9F3DD92BFBCDD90003B86B /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F3DD42BFBCDD90003B86B /* libgmpxx.a */; };
+		5C9F3DDA2BFBCDD90003B86B /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F3DD52BFBCDD90003B86B /* libgmp.a */; };
 		5C9FD96E27A5D6ED0075386C /* SendMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */; };
 		5CA059DC279559F40002BEB4 /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CA059DB279559F40002BEB4 /* Tests_iOS.swift */; };
 		5CA059DE279559F40002BEB4 /* Tests_iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CA059DD279559F40002BEB4 /* Tests_iOSLaunchTests.swift */; };
@@ -273,11 +273,6 @@
 		5C029EA9283942EA004A9677 /* CallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallController.swift; sourceTree = "<group>"; };
 		5C05DF522840AA1D00C683F9 /* CallSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallSettings.swift; sourceTree = "<group>"; };
 		5C063D2627A4564100AEC577 /* ChatPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatPreviewView.swift; sourceTree = "<group>"; };
-		5C0EA1362C0B176B00AD2E5E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C0EA1382C0B176B00AD2E5E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a"; sourceTree = "<group>"; };
 		5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactConnectionInfo.swift; sourceTree = "<group>"; };
 		5C10D88928F187F300E58BF0 /* FullScreenMediaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenMediaView.swift; sourceTree = "<group>"; };
 		5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactRequestView.swift; sourceTree = "<group>"; };
@@ -359,6 +354,11 @@
 		5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseEncryptionView.swift; sourceTree = "<group>"; };
 		5C9D13A2282187BB00AB8B43 /* WebRTC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebRTC.swift; sourceTree = "<group>"; };
 		5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoFile.swift; sourceTree = "<group>"; };
+		5C9F3DD12BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5C9F3DD22BFBCDD80003B86B /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C9F3DD32BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.a"; sourceTree = "<group>"; };
+		5C9F3DD42BFBCDD90003B86B /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C9F3DD52BFBCDD90003B86B /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 		5C9FD96A27A56D4D0075386C /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
 		5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMessageView.swift; sourceTree = "<group>"; };
 		5CA059C3279559F40002BEB4 /* SimpleXApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXApp.swift; sourceTree = "<group>"; };
@@ -529,13 +529,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C0EA13C2C0B176B00AD2E5E /* libgmpxx.a in Frameworks */,
+				5C9F3DD92BFBCDD90003B86B /* libgmpxx.a in Frameworks */,
+				5C9F3DDA2BFBCDD90003B86B /* libgmp.a in Frameworks */,
+				5C9F3DD82BFBCDD90003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C0EA13B2C0B176B00AD2E5E /* libgmp.a in Frameworks */,
-				5C0EA13D2C0B176B00AD2E5E /* libffi.a in Frameworks */,
-				5C0EA13F2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a in Frameworks */,
+				5C9F3DD62BFBCDD90003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C0EA13E2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a in Frameworks */,
+				5C9F3DD72BFBCDD90003B86B /* libffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -601,11 +601,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C0EA1382C0B176B00AD2E5E /* libffi.a */,
-				5C0EA1362C0B176B00AD2E5E /* libgmp.a */,
-				5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */,
-				5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */,
-				5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */,
+				5C9F3DD22BFBCDD80003B86B /* libffi.a */,
+				5C9F3DD52BFBCDD90003B86B /* libgmp.a */,
+				5C9F3DD42BFBCDD90003B86B /* libgmpxx.a */,
+				5C9F3DD12BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf-ghc9.6.3.a */,
+				5C9F3DD32BFBCDD80003B86B /* libHSsimplex-chat-5.8.0.2-8RkLdmy05dJBsgWrGV50Uf.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 = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1601,7 +1601,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1687,7 +1687,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1724,7 +1724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1761,7 +1761,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1812,7 +1812,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 218;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -82,8 +82,6 @@ public enum ChatCommand {
    case apiSetMemberSettings(groupId: Int64, groupMemberId: Int64, memberSettings: GroupMemberSettings)
    case apiContactInfo(contactId: Int64)
    case apiGroupMemberInfo(groupId: Int64, groupMemberId: Int64)
-    case apiContactQueueInfo(contactId: Int64)
-    case apiGroupMemberQueueInfo(groupId: Int64, groupMemberId: Int64)
    case apiSwitchContact(contactId: Int64)
    case apiSwitchGroupMember(groupId: Int64, groupMemberId: Int64)
    case apiAbortSwitchContact(contactId: Int64)
@@ -230,8 +228,6 @@ public enum ChatCommand {
            case let .apiSetMemberSettings(groupId, groupMemberId, memberSettings): return "/_member settings #\(groupId) \(groupMemberId) \(encodeJSON(memberSettings))"
            case let .apiContactInfo(contactId): return "/_info @\(contactId)"
            case let .apiGroupMemberInfo(groupId, groupMemberId): return "/_info #\(groupId) \(groupMemberId)"
-            case let .apiContactQueueInfo(contactId): return "/_queue info @\(contactId)"
-            case let .apiGroupMemberQueueInfo(groupId, groupMemberId): return "/_queue info #\(groupId) \(groupMemberId)"
            case let .apiSwitchContact(contactId): return "/_switch @\(contactId)"
            case let .apiSwitchGroupMember(groupId, groupMemberId): return "/_switch #\(groupId) \(groupMemberId)"
            case let .apiAbortSwitchContact(contactId): return "/_abort switch @\(contactId)"
@@ -379,8 +375,6 @@ public enum ChatCommand {
            case .apiSetMemberSettings: return "apiSetMemberSettings"
            case .apiContactInfo: return "apiContactInfo"
            case .apiGroupMemberInfo: return "apiGroupMemberInfo"
-            case .apiContactQueueInfo: return "apiContactQueueInfo"
-            case .apiGroupMemberQueueInfo: return "apiGroupMemberQueueInfo"
            case .apiSwitchContact: return "apiSwitchContact"
            case .apiSwitchGroupMember: return "apiSwitchGroupMember"
            case .apiAbortSwitchContact: return "apiAbortSwitchContact"
@@ -522,7 +516,6 @@ public enum ChatResponse: Decodable, Error {
    case networkConfig(networkConfig: NetCfg)
    case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
    case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
-    case queueInfo(user: UserRef, rcvMsgInfo: RcvMsgInfo?, queueInfo: QueueInfo)
    case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
    case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
    case contactSwitchAborted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
@@ -635,7 +628,7 @@ public enum ChatResponse: Decodable, Error {
    case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
    case sndStandaloneFileComplete(user: UserRef, fileTransferMeta: FileTransferMeta, rcvURIs: [String])
    case sndFileCancelledXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
-    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
+    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
    // call events
    case callInvitation(callInvitation: RcvCallInvitation)
    case callOffer(user: UserRef, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
@@ -685,7 +678,6 @@ public enum ChatResponse: Decodable, Error {
            case .networkConfig: return "networkConfig"
            case .contactInfo: return "contactInfo"
            case .groupMemberInfo: return "groupMemberInfo"
-            case .queueInfo: return "queueInfo"
            case .contactSwitchStarted: return "contactSwitchStarted"
            case .groupMemberSwitchStarted: return "groupMemberSwitchStarted"
            case .contactSwitchAborted: return "contactSwitchAborted"
@@ -844,9 +836,6 @@ public enum ChatResponse: Decodable, Error {
            case let .networkConfig(networkConfig): return String(describing: networkConfig)
            case let .contactInfo(u, contact, connectionStats_, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats_: \(String(describing: connectionStats_))\ncustomUserProfile: \(String(describing: customUserProfile))")
            case let .groupMemberInfo(u, groupInfo, member, connectionStats_): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats_: \(String(describing: connectionStats_))")
-            case let .queueInfo(u, rcvMsgInfo, queueInfo):
-                let msgInfo = if let info = rcvMsgInfo { encodeJSON(rcvMsgInfo) } else { "none" }
-                return withUser(u, "rcvMsgInfo: \(msgInfo)\nqueueInfo: \(encodeJSON(queueInfo))")
            case let .contactSwitchStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
            case let .groupMemberSwitchStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
            case let .contactSwitchAborted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
@@ -956,7 +945,7 @@ public enum ChatResponse: Decodable, Error {
            case let .sndFileCompleteXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
            case let .sndStandaloneFileComplete(u, _, rcvURIs): return withUser(u, String(rcvURIs.count))
            case let .sndFileCancelledXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileError(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
+            case let .sndFileError(u, chatItem, _): return withUser(u, String(describing: chatItem))
            case let .callInvitation(inv): return String(describing: inv)
            case let .callOffer(u, contact, callType, offer, sharedKey, askConfirmation): return withUser(u, "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")\naskConfirmation: \(askConfirmation)\noffer: \(String(describing: offer))")
            case let .callAnswer(u, contact, answer): return withUser(u, "contact: \(contact.id)\nanswer: \(String(describing: answer))")
@@ -1754,6 +1743,7 @@ 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)
@@ -2181,42 +2171,3 @@ public enum UserNetworkType: String, Codable {
        }
    }
 }
-
-public struct RcvMsgInfo: Codable {
-    var msgId: Int64
-    var msgDeliveryId: Int64
-    var msgDeliveryStatus: String
-    var agentMsgId: Int64
-    var agentMsgMeta: String
-}
-
-public struct QueueInfo: Codable {
-    var qiSnd: Bool
-    var qiNtf: Bool
-    var qiSub: QSub?
-    var qiSize: Int
-    var qiMsg: MsgInfo?
-}
-
-public struct QSub: Codable {
-    var qSubThread: QSubThread
-    var qDelivered: String?
-}
-
-public enum QSubThread: String, Codable {
-    case noSub
-    case subPending
-    case subThread
-    case prohibitSub
-}
-
-public struct MsgInfo: Codable {
-    var msgId: String
-    var msgTs: Date
-    var msgType: MsgType
-}
-
-public enum MsgType: String, Codable {
-    case message
-    case quota
-}
@@ -1779,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Грешка: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Грешка: %@";

 /* No comment provided by engineer. */
@@ -2568,6 +2568,9 @@
 /* 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" = "Множество профили за чат";

@@ -3074,6 +3077,9 @@
 /* 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." = "Получаващият се файл ще бъде спрян.";

@@ -3914,6 +3920,9 @@
 /* rcv group event chat item */
 "unblocked %@" = "отблокиран %@";

+/* item status description */
+"Unexpected error: %@" = "Неочаквана грешка: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неочаквано състояние на миграция";

@@ -1461,7 +1461,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Chyba: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Chyba: %@";

 /* No comment provided by engineer. */
@@ -2082,6 +2082,9 @@
 /* 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ů";

@@ -3176,6 +3179,9 @@
 /* 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í";

@@ -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-Relais 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-Server hochgeladen.";

 /* No comment provided by engineer. */
 "Allow" = "Erlauben";
@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Erlauben Sie verschwindende Nachrichten nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Herabstufung erlauben";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Erlauben Sie das unwiederbringliche Löschen von Nachrichten nur dann, wenn es Ihnen Ihr Kontakt ebenfalls erlaubt. (24 Stunden)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "Immer";

-/* No comment provided by engineer. */
-"Always use private routing." = "Sie nutzen immer privates Routing.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Über ein Relais verbinden";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Datei kann nicht empfangen werden";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Kapazität überschritten - der Empfänger hat die zuvor gesendeten Nachrichten nicht empfangen.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Zellulär";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Datenbank-Aktualisierungen bestätigen";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Dateien von unbekannten Servern bestätigen.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Bestätigen Sie die Netzwerkeinstellungen";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Desktop-Geräte";

-/* snd error text */
-"Destination server error: %@" = "Zielserver-Fehler: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Entwicklung";

@@ -1414,13 +1399,7 @@
 "Do not send history to new members." = "Den Nachrichtenverlauf nicht an neue Mitglieder senden.";

 /* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Nachrichten werden nicht direkt versendet, selbst wenn Ihr oder der Zielserver kein privates Routing unterstützt.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Sie nutzen KEIN privates Routing.";
-
-/* No comment provided by engineer. */
-"Do NOT use SimpleX for emergency calls." = "SimpleX NICHT für Notrufe nutzen.";
+"Do NOT use SimpleX for emergency calls." = "Nutzen Sie SimpleX nicht für Notrufe.";

 /* No comment provided by engineer. */
 "Don't create address" = "Keine Adresse erstellt";
@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Fehler: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Fehler: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Datei: %@";

-/* No comment provided by engineer. */
-"Files" = "Dateien";
-
 /* No comment provided by engineer. */
 "Files & media" = "Dateien & Medien";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Weitergeleitet aus";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Weiterleitungsserver: %1$@\nZielserver Fehler: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Weiterleitungsserver: %1$@\nFehler: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Gefundener Desktop";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Empfangsbestätigungen für Nachrichten!";

-/* item status text */
-"Message delivery warning" = "Warnung bei der Nachrichtenzustellung";
-
 /* No comment provided by engineer. */
 "Message draft" = "Nachrichtenentwurf";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "Nachricht empfangen";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Fallback für das Nachrichten-Routing";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Modus für das Nachrichten-Routing";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Die Nachrichtenquelle bleibt privat.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Netzwerkverbindung";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Netzwerk-Fehler - die Nachricht ist nach vielen Sende-Versuchen abgelaufen.";
-
 /* No comment provided by engineer. */
 "Network management" = "Netzwerk-Verwaltung";

@@ -2769,10 +2730,10 @@
 "One-time invitation link" = "Einmal-Einladungslink";

 /* No comment provided by engineer. */
-"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.";
+"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.";

 /* No comment provided by engineer. */
-"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.";
+"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.";

 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion-Hosts werden nicht verwendet.";
@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Neutrale Dateinamen";

-/* No comment provided by engineer. */
-"Private message routing" = "Privates Nachrichten-Routing";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Privates Nachrichten-Routing 🚀";
-
 /* name of notes to self */
 "Private notes" = "Private Notizen";

-/* No comment provided by engineer. */
-"Private routing" = "Privates Routing";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil und Serververbindungen";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "App-Bildschirm schützen";

-/* No comment provided by engineer. */
-"Protect IP address" = "IP-Adresse schützen";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Ihre Chat-Profile mit einem Passwort schützen!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Schützen Sie Ihre IP-Adresse vor den Nachrichten-Relais , die Ihre Kontakte ausgewählt haben.\nAktivieren Sie es in den *Netzwerk & Server* Einstellungen.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protokollzeitüberschreitung";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Chat starten";

-/* No comment provided by engineer. */
-"Safely receive files" = "Dateien sicher empfangen";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Sicherere Gruppen";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Live Nachricht senden";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Nachrichten werden direkt versendet, wenn die IP-Adresse geschützt ist, und Ihr oder der Zielserver kein privates Routing unterstützt.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Nachrichten werden direkt versendet, wenn Ihr oder der Zielserver kein privates Routing unterstützt.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Benachrichtigungen senden";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Gesendete Nachrichten werden nach der eingestellten Zeit gelöscht.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Die Server-Adresse ist nicht mit den Netzwerk-Einstellungen kompatibel.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Um Warteschlangen zu erzeugen benötigt der Server eine Authentifizierung. Bitte überprüfen Sie das Passwort";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Server Test ist fehlgeschlagen!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Die Server-Version ist nicht mit den Netzwerk-Einstellungen kompatibel.";
-
 /* No comment provided by engineer. */
 "Servers" = "Server";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Mit Kontakten teilen";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Bei Nachrichten, die über privates Routing versendet wurden, → anzeigen.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Anrufliste anzeigen";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Letzte Nachrichten anzeigen";

-/* No comment provided by engineer. */
-"Show message status" = "Nachrichtenstatus anzeigen";
-
 /* No comment provided by engineer. */
 "Show preview" = "Vorschau anzeigen";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Wenn sie Nachrichten oder Kontaktanfragen empfangen, kann Sie die App benachrichtigen - Um dies zu aktivieren, öffnen Sie bitte die Einstellungen.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Die App wird eine Bestätigung bei Downloads von unbekannten Datei-Servern anfordern (außer bei .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Die Änderung des Datenbank-Passworts konnte nicht abgeschlossen werden.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Um Ihre Informationen zu schützen, schalten Sie die SimpleX-Sperre ein.\nSie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Zum Schutz Ihrer IP-Adresse, wird für die Nachrichten-Auslieferung privates Routing über Ihre konfigurierten SMP-Server genutzt.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Bitte erlauben Sie die Nutzung des Mikrofons, um Sprachnachrichten aufnehmen zu können.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Unbekannter Fehler";

-/* No comment provided by engineer. */
-"unknown relays" = "Unbekannte Relais";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Unbekannte Server!";
-
 /* No comment provided by engineer. */
 "unknown status" = "unbekannter Gruppenmitglieds-Status";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Stummschaltung aufheben";

-/* No comment provided by engineer. */
-"unprotected" = "Ungeschützt";
-
 /* No comment provided by engineer. */
 "Unread" = "Ungelesen";

@@ -4113,7 +4029,7 @@
 "Use chat" = "Verwenden Sie Chat";

 /* No comment provided by engineer. */
-"Use current profile" = "Aktuelles Profil nutzen";
+"Use current profile" = "Das aktuelle Profil nutzen";

 /* No comment provided by engineer. */
 "Use for new connections" = "Für neue Verbindungen nutzen";
@@ -4125,17 +4041,11 @@
 "Use iOS call interface" = "iOS Anrufschnittstelle nutzen";

 /* No comment provided by engineer. */
-"Use new incognito profile" = "Neues Inkognito-Profil nutzen";
+"Use new incognito profile" = "Ein neues Inkognito-Profil nutzen";

 /* No comment provided by engineer. */
 "Use only local notifications?" = "Nur lokale Benachrichtigungen nutzen?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Sie nutzen privates Routing mit unbekannten Servern, wenn Ihre IP-Adresse nicht geschützt ist.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Sie nutzen privates Routing mit unbekannten Servern.";
-
 /* No comment provided by engineer. */
 "Use server" = "Server nutzen";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Bei der Verbindung über Audio- und Video-Anrufe.";

-/* No comment provided by engineer. */
-"when IP hidden" = "Wenn die IP-Adresse versteckt ist";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Wenn Personen eine Verbindung anfordern, können Sie diese annehmen oder ablehnen.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Mit reduziertem Akkuverbrauch.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für Datei-Server sichtbar sein.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für diese XFTP-Relais sichtbar sein: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Falsches Datenbank-Passwort";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Falscher Schlüssel oder unbekannte Verbindung - höchstwahrscheinlich ist diese Verbindung gelöscht worden.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Falsches Passwort!";

@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Se permiten los mensajes temporales pero sólo si tu contacto también los permite para tí.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Permitir versión anterior";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Se permite la eliminación irreversible de mensajes pero sólo si tu contacto también la permite para tí. (24 horas)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "siempre";

-/* No comment provided by engineer. */
-"Always use private routing." = "Usar siempre enrutamiento privado.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Usar siempre retransmisor";

@@ -681,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 (predeterminado) 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 (por defecto) 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!";
@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "No se puede recibir el archivo";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Capacidad excedida - el destinatario no ha recibido los mensajes previos.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Móvil";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Confirmar actualizaciones de la bases de datos";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Confirma archivos de servidores desconocidos.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Confirmar configuración de red";

@@ -1174,13 +1162,13 @@
 "Decryption error" = "Error descifrado";

 /* pref value */
-"default (%@)" = "predeterminado (%@)";
+"default (%@)" = "por defecto (%@)";

 /* No comment provided by engineer. */
-"default (no)" = "predeterminado (no)";
+"default (no)" = "por defecto (no)";

 /* No comment provided by engineer. */
-"default (yes)" = "predeterminado (sí)";
+"default (yes)" = "por defecto (sí)";

 /* chat item action */
 "Delete" = "Eliminar";
@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Ordenadores";

-/* snd error text */
-"Destination server error: %@" = "Error del servidor de destino: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Desarrollo";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "No enviar historial a miembros nuevos.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "NO enviar mensajes directamente incluso si tu servidor o el de destino no soportan enrutamiento privado.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "NO usar enrutamiento privado.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NO uses SimpleX para llamadas de emergencia.";

@@ -1513,7 +1492,7 @@
 "enabled" = "activado";

 /* No comment provided by engineer. */
-"Enabled for" = "Activado para";
+"Enabled for" = "Activar para";

 /* enabled status */
 "enabled for contact" = "activado para el contacto";
@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Error: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Error: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Archivo: %@";

-/* No comment provided by engineer. */
-"Files" = "Archivos";
-
 /* No comment provided by engineer. */
 "Files & media" = "Archivos y multimedia";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Reenviado por";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Servidor de reenvío: %1$@\nError del servidor de destino: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Servidor de reenvío: %1$@\nError: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Ordenador encontrado";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "¡Confirmación de entrega de mensajes!";

-/* item status text */
-"Message delivery warning" = "Aviso de entrega de mensaje";
-
 /* No comment provided by engineer. */
 "Message draft" = "Borrador de mensaje";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "mensaje recibido";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Enrutamiento de mensajes alternativo";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Modo de enrutamiento de mensajes";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "El autor del mensaje se mantiene privado.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Conexión de red";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Problema en la red - el mensaje ha expirado tras muchos intentos de envío.";
-
 /* No comment provided by engineer. */
 "Network management" = "Gestión de la red";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Nombres de archivos privados";

-/* No comment provided by engineer. */
-"Private message routing" = "Enrutamiento privado de mensajes";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Enrutamiento privado de mensajes 🚀";
-
 /* name of notes to self */
 "Private notes" = "Notas privadas";

-/* No comment provided by engineer. */
-"Private routing" = "Enrutamiento privado";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Datos del perfil y conexiones";

@@ -3009,7 +2961,7 @@
 "Profile image" = "Imagen del perfil";

 /* No comment provided by engineer. */
-"Profile images" = "Forma de los perfiles";
+"Profile images" = "Imágenes del perfil";

 /* No comment provided by engineer. */
 "Profile name" = "Nombre del perfil";
@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Proteger la pantalla de la aplicación";

-/* No comment provided by engineer. */
-"Protect IP address" = "Proteger dirección IP";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "¡Protege tus perfiles con contraseña!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Protege tu dirección IP de los servidores de retransmisión elegidos por tus contactos.\nActívalo en ajustes de *Servidores y Redes*.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Tiempo de espera del protocolo";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3174,7 +3123,7 @@
 "rejected call" = "llamada rechazada";

 /* No comment provided by engineer. */
-"Relay server is only used if necessary. Another party can observe your IP address." = "El servidor de retransmisión sólo se usa en caso de necesidad. Un tercero podría ver tu IP.";
+"Relay server is only used if necessary. Another party can observe your IP address." = "El retransmisor sólo se usa en caso de necesidad. Un tercero podría ver tu IP.";

 /* No comment provided by engineer. */
 "Relay server protects your IP address, but it can observe the duration of the call." = "El servidor de retransmisión protege tu IP pero puede ver la duración de la llamada.";
@@ -3243,7 +3192,7 @@
 "Reset colors" = "Restablecer colores";

 /* No comment provided by engineer. */
-"Reset to defaults" = "Restablecer valores predetarminados";
+"Reset to defaults" = "Restablecer valores por defecto";

 /* No comment provided by engineer. */
 "Restart the app to create a new chat profile" = "Reinicia la aplicación para crear un perfil nuevo";
@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Ejecutar chat";

-/* No comment provided by engineer. */
-"Safely receive files" = "Recibe archivos de forma segura";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Grupos más seguros";

@@ -3435,7 +3381,7 @@
 "Send direct message" = "Enviar mensaje directo";

 /* No comment provided by engineer. */
-"Send direct message to connect" = "Envia un mensaje para conectar";
+"Send direct message to connect" = "Enviar mensaje directo para conectar";

 /* No comment provided by engineer. */
 "Send disappearing message" = "Enviar mensaje temporal";
@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Mensaje en vivo";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Enviar mensajes directamente cuando tu dirección IP está protegida y tu servidor o el de destino no admitan enrutamiento privado.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Enviar mensajes directamente cuando tu servidor o el de destino no admitan enrutamiento privado.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Enviar notificaciones";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Los mensajes enviados se eliminarán una vez transcurrido el tiempo establecido.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "La dirección del servidor es incompatible con la configuración de la red.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "El servidor requiere autorización para crear colas, comprueba la contraseña";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "¡Error en prueba del servidor!";

-/* srv error text */
-"Server version is incompatible with network settings." = "La versión del servidor es incompatible con la configuración de red.";
-
 /* No comment provided by engineer. */
 "Servers" = "Servidores";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Compartir con contactos";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Mostrar → en mensajes con enrutamiento privado.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Mostrar llamadas en el historial del teléfono";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Mostrar último mensaje";

-/* No comment provided by engineer. */
-"Show message status" = "Estado del mensaje";
-
 /* No comment provided by engineer. */
 "Show preview" = "Mostrar vista previa";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "La aplicación puede notificarte cuando recibas mensajes o solicitudes de contacto: por favor, abre la configuración para activarlo.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "El intento de cambiar la contraseña de la base de datos no se ha completado.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Para proteger tu información, activa el Bloqueo SimpleX.\nSe te pedirá que completes la autenticación antes de activar esta función.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Para proteger tu dirección IP, el enrutamiento privado usa tus servidores SMP para enviar mensajes.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Para grabar el mensaje de voz concede permiso para usar el micrófono.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Error desconocido";

-/* No comment provided by engineer. */
-"unknown relays" = "servidor de retransmisión desconocido";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "¡Servidores desconocidos!";
-
 /* No comment provided by engineer. */
 "unknown status" = "estado desconocido";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Activar audio";

-/* No comment provided by engineer. */
-"unprotected" = "desprotegido";
-
 /* No comment provided by engineer. */
 "Unread" = "No leído";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "¿Usar sólo notificaciones locales?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Usar enrutamiento privado con servidores desconocidos cuando la dirección IP no está protegida.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Usar enrutamiento privado con servidores desconocidos.";
-
 /* No comment provided by engineer. */
 "Use server" = "Usar servidor";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Al iniciar llamadas de audio y vídeo.";

-/* No comment provided by engineer. */
-"when IP hidden" = "con IP oculta";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Cuando alguien solicite conectarse podrás aceptar o rechazar la solicitud.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Con uso reducido de batería.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Sin Tor o VPN, tu dirección IP será visible para los servidores de archivos.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Sin Tor o VPN, tu dirección IP será visible para estos servidores XFTP: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Contraseña de base de datos incorrecta";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Clave incorrecta o conexión desconocida - probablemente esta conexión fue eliminada.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "¡Contraseña incorrecta!";

@@ -1434,7 +1434,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Virhe: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Virhe: %@";

 /* No comment provided by engineer. */
@@ -2058,6 +2058,9 @@
 /* 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";

@@ -3134,6 +3137,9 @@
 /* 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";

@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Autorise les messages éphémères seulement si votre contact vous l’autorise.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Autoriser la rétrogradation";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Autoriser la suppression irréversible des messages uniquement si votre contact vous l'autorise. (24 heures)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "toujours";

-/* No comment provided by engineer. */
-"Always use private routing." = "Toujours utiliser le routage privé.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Se connecter via relais";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Impossible de recevoir le fichier";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Capacité dépassée - le destinataire n'a pas pu recevoir les messages envoyés précédemment.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Cellulaire";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Confirmer la mise à niveau de la base de données";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Confirmer les fichiers provenant de serveurs inconnus.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Confirmer les paramètres réseau";

@@ -1318,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";
@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Appareils de bureau";

-/* snd error text */
-"Destination server error: %@" = "Erreur du serveur de destination : %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Développer";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Ne pas envoyer d'historique aux nouveaux membres.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Ne pas envoyer de messages directement, même si votre serveur ou le serveur de destination ne prend pas en charge le routage privé.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Ne pas utiliser de routage privé.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "N'utilisez PAS SimpleX pour les appels d'urgence.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Erreur : ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Erreur : %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Fichier : %@";

-/* No comment provided by engineer. */
-"Files" = "Fichiers";
-
 /* No comment provided by engineer. */
 "Files & media" = "Fichiers & médias";

@@ -1900,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.";
@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Transféré depuis";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Serveur de transfert : %1$@\nErreur du serveur de destination : %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Serveur de transfert : %1$@\nErreur : %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Bureau trouvé";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Accusés de réception des messages !";

-/* item status text */
-"Message delivery warning" = "Avertissement sur la distribution des messages";
-
 /* No comment provided by engineer. */
 "Message draft" = "Brouillon de message";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "message reçu";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Rabattement du routage des messages";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Mode de routage des messages";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "La source du message reste privée.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Connexion au réseau";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Problèmes de réseau - le message a expiré après plusieurs tentatives d'envoi.";
-
 /* No comment provided by engineer. */
 "Network management" = "Gestion du réseau";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Noms de fichiers privés";

-/* No comment provided by engineer. */
-"Private message routing" = "Routage privé des messages";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Routage privé des messages 🚀";
-
 /* name of notes to self */
 "Private notes" = "Notes privées";

-/* No comment provided by engineer. */
-"Private routing" = "Routage privé";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil et connexions au serveur";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Protéger l'écran de l'app";

-/* No comment provided by engineer. */
-"Protect IP address" = "Protéger l'adresse IP";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Protégez vos profils de chat par un mot de passe !";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Protégez votre adresse IP des relais de messagerie choisis par vos contacts.\nActivez-le dans les paramètres *Réseau et serveurs*.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Délai du protocole";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3150,7 +3099,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";
@@ -3213,7 +3162,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 ?";
@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Exécuter le chat";

-/* No comment provided by engineer. */
-"Safely receive files" = "Réception de fichiers en toute sécurité";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Groupes plus sûrs";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Envoyer un message dynamique";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Envoyer les messages de manière directe lorsque l'adresse IP est protégée et que votre serveur ou le serveur de destination ne prend pas en charge le routage privé.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Envoyez les messages de manière directe lorsque votre serveur ou le serveur de destination ne prend pas en charge le routage privé.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Envoi de notifications";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Les messages envoyés seront supprimés après une durée déterminée.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "L'adresse du serveur est incompatible avec les paramètres du réseau.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Le serveur requiert une autorisation pour créer des files d'attente, vérifiez le mot de passe";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Échec du test du serveur !";

-/* srv error text */
-"Server version is incompatible with network settings." = "La version du serveur est incompatible avec les paramètres du réseau.";
-
 /* No comment provided by engineer. */
 "Servers" = "Serveurs";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Partager avec vos contacts";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Afficher → sur les messages envoyés via le routage privé.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Afficher les appels dans l'historique du téléphone";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Voir les derniers messages";

-/* No comment provided by engineer. */
-"Show message status" = "Afficher le statut du message";
-
 /* No comment provided by engineer. */
 "Show preview" = "Afficher l'aperçu";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "L'application peut vous avertir lorsque vous recevez des messages ou des demandes de contact - veuillez ouvrir les paramètres pour les activer.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "L'application demandera de confirmer les téléchargements à partir de serveurs de fichiers inconnus (sauf .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "La tentative de modification de la phrase secrète de la base de données n'a pas abouti.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Pour protéger vos informations, activez la fonction SimpleX Lock.\nVous serez invité à confirmer l'authentification avant que cette fonction ne soit activée.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Pour protéger votre adresse IP, le routage privé utilise vos serveurs SMP pour délivrer les messages.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Pour enregistrer un message vocal, veuillez accorder la permission d'utiliser le microphone.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Erreur inconnue";

-/* No comment provided by engineer. */
-"unknown relays" = "relais inconnus";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Serveurs inconnus !";
-
 /* No comment provided by engineer. */
 "unknown status" = "statut inconnu";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Démute";

-/* No comment provided by engineer. */
-"unprotected" = "non protégé";
-
 /* No comment provided by engineer. */
 "Unread" = "Non lu";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Utilisation de notifications locales uniquement ?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Utiliser le routage privé avec des serveurs inconnus lorsque l'adresse IP n'est pas protégée.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Utiliser le routage privé avec des serveurs inconnus.";
-
 /* No comment provided by engineer. */
 "Use server" = "Utiliser ce serveur";

@@ -4260,7 +4170,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 !";
@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Lors des appels audio et vidéo.";

-/* No comment provided by engineer. */
-"when IP hidden" = "lorsque l'IP est masquée";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Vous pouvez accepter ou refuser les demandes de contacts.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Consommation réduite de la batterie.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Sans Tor ou un VPN, votre adresse IP sera visible par les serveurs de fichiers.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Sans Tor ni VPN, votre adresse IP sera visible par ces relais XFTP : %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Mauvaise phrase secrète pour la base de données";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Clé erronée ou connexion non identifiée - il est très probable que cette connexion soit supprimée.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Mauvaise phrase secrète !";

@@ -83,7 +83,7 @@
 "**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." = "**Privátabb**: 20 percenként ellenőrzi az új üzeneteket. Az eszköztoken megosztásra kerül a SimpleX Chat kiszolgálóval, de az nem, hogy hány ismerőse vagy üzenete van.";

 /* No comment provided by engineer. */
-"**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." = "**Legprivátabb**: ne használja a SimpleX Chat értesítési kiszolgálót, rendszeresen ellenőrizze az üzeneteket a háttérben (attól függően, hogy milyen gyakran használja az alkalmazást).";
+"**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." = "**Legprivátabb**: ne használja a SimpleX Chat értesítési szervert, rendszeresen ellenőrizze az üzeneteket a háttérben (attól függően, hogy milyen gyakran használja az alkalmazást).";

 /* No comment provided by engineer. */
 "**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." = "**Megjegyzés**: ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja a kapcsolataiból érkező üzenetek visszafejtését.";
@@ -92,7 +92,7 @@
 "**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Figyelem**: NEM tudja visszaállítani vagy megváltoztatni jelmondatát, ha elveszíti azt.";

 /* No comment provided by engineer. */
-"**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." = "**Javasolt**: az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.";
+"**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." = "**Javasolt**: az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési szerverre, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.";

 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Figyelmeztetés**: Az azonnali push-értesítésekhez a kulcstárolóban tárolt jelmondat megadása szükséges.";
@@ -345,7 +345,7 @@
 "Accept" = "Elfogadás";

 /* No comment provided by engineer. */
-"Accept connection request?" = "Kapcsolódási kérelem elfogadása?";
+"Accept connection request?" = "Kapcsolatfelvétel elfogadása?";

 /* notification body */
 "Accept contact request from %@?" = "Elfogadja %@ kapcsolat kérését?";
@@ -444,19 +444,16 @@
 "Allow" = "Engedélyezés";

 /* No comment provided by engineer. */
-"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.";
+"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.";

 /* No comment provided by engineer. */
-"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.";
+"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.";

 /* No comment provided by engineer. */
-"Allow downgrade" = "Korábbi verzióra történő visszatérés engedélyezése";
+"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)";

 /* No comment provided by engineer. */
-"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." = "Az üzenetreakciók küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
+"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.";

 /* No comment provided by engineer. */
 "Allow message reactions." = "Üzenetreakciók engedélyezése.";
@@ -465,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." = "Az eltűnő üzenetek küldése engedélyezve van.";
+"Allow sending disappearing messages." = "Eltűnő üzenetek küldésének engedélyezése.";

 /* 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)";
@@ -480,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." = "A hangüzenetek küldése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
+"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.";

 /* No comment provided by engineer. */
 "Allow voice messages?" = "Hangüzenetek engedélyezése?";

 /* No comment provided by engineer. */
-"Allow your contacts adding message reactions." = "Az üzenetreakciók küldése engedélyezve van az ismerősei számára.";
+"Allow your contacts adding message reactions." = "Ismerősök általi üzenetreakciók hozzáadásának engedélyezése.";

 /* No comment provided by engineer. */
-"Allow your contacts to call you." = "A hívások kezdeményezése engedélyezve van az ismerősei számára.";
+"Allow your contacts to call you." = "Hívások engedélyezése ismerősök számára.";

 /* No comment provided by engineer. */
-"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)";
+"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)";

 /* No comment provided by engineer. */
-"Allow your contacts to send disappearing messages." = "Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.";
+"Allow your contacts to send disappearing messages." = "Eltűnő üzenetek engedélyezése ismerősök számára.";

 /* No comment provided by engineer. */
-"Allow your contacts to send voice messages." = "A hangüzenetek küldése engedélyezve van az ismerősei számára.";
+"Allow your contacts to send voice messages." = "Hangüzenetek küldésének engedélyezése ismerősök számára.";

 /* No comment provided by engineer. */
 "Already connected?" = "Már kapcsolódott?";
@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "mindig";

-/* No comment provided by engineer. */
-"Always use private routing." = "Mindig használjon privát útválasztást.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Mindig használjon átjátszó kiszolgálót";

@@ -579,10 +573,10 @@
 "Audio/video calls" = "Hang-/videóhívások";

 /* No comment provided by engineer. */
-"Audio/video calls are prohibited." = "A hívások kezdeményezése le van tiltva ebben a csevegésben.";
+"Audio/video calls are prohibited." = "A hang- és videóhívások le vannak tiltva.";

 /* PIN entry */
-"Authentication cancelled" = "Hitelesítés visszavonva";
+"Authentication cancelled" = "Hitelesítés megszakítva";

 /* No comment provided by engineer. */
 "Authentication failed" = "Sikertelen hitelesítés";
@@ -600,7 +594,7 @@
 "Auto-accept" = "Automatikus elfogadás";

 /* No comment provided by engineer. */
-"Auto-accept contact requests" = "Kapcsolódási kérelmek automatikus elfogadása";
+"Auto-accept contact requests" = "Ismerős jelölések automatikus elfogadása";

 /* No comment provided by engineer. */
 "Auto-accept images" = "Fotók automatikus elfogadása";
@@ -642,7 +636,7 @@
 "Block member" = "Tag blokkolása";

 /* No comment provided by engineer. */
-"Block member for all?" = "Mindenki számára letiltja ezt a tagot?";
+"Block member for all?" = "Tag letiltása mindenki számára?";

 /* No comment provided by engineer. */
 "Block member?" = "Tag blokkolása?";
@@ -669,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 kezdeményezni.";
+"Both you and your contact can make calls." = "Mindkét fél tud hívásokat indítani.";

 /* No comment provided by engineer. */
 "Both you and your contact can send disappearing messages." = "Mindkét fél küldhet eltűnő üzeneteket.";
@@ -714,7 +708,7 @@
 "Cancel migration" = "Átköltöztetés visszavonása";

 /* feature offered item */
-"cancelled %@" = "%@ visszavonva";
+"cancelled %@" = "%@ törölve";

 /* 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";
@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Nem lehet fogadni a fájlt";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Kapacitás túllépés - a címzett nem kapta meg a korábban elküldött üzeneteket.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Mobilhálózat";

@@ -814,7 +805,7 @@
 "Chinese and Spanish interface" = "Kínai és spanyol kezelőfelület";

 /* No comment provided by engineer. */
-"Choose _Migrate from another device_ on the new device and scan QR code." = "Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközön és olvassa be a QR-kódot.";
+"Choose _Migrate from another device_ on the new device and scan QR code." = "Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközön és szkennelje be a QR-kódot.";

 /* No comment provided by engineer. */
 "Choose file" = "Fájl kiválasztása";
@@ -826,13 +817,13 @@
 "Clear" = "Kiürítés";

 /* No comment provided by engineer. */
-"Clear conversation" = "Üzenetek kiürítése";
+"Clear conversation" = "Beszélgetés kiürítése";

 /* No comment provided by engineer. */
-"Clear conversation?" = "Üzenetek kiürítése?";
+"Clear conversation?" = "Beszélgetés kiürítése?";

 /* No comment provided by engineer. */
-"Clear private notes?" = "Privát jegyzetek kiürítése?";
+"Clear private notes?" = "Privát jegyzetek törlése?";

 /* No comment provided by engineer. */
 "Clear verification" = "Hitelesítés törlése";
@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Adatbázis frissítés megerősítése";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Ismeretlen kiszolgálókról származó fájlok jóváhagyása.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Hálózati beállítások megerősítése";

@@ -1018,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ősei törlésre jelölhetnek üzeneteket; ön majd meg tudja nézni azokat.";
+"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.";

 /* No comment provided by engineer. */
 "Continue" = "Folytatás";
@@ -1087,7 +1075,7 @@
 "Creating link…" = "Hivatkozás létrehozása…";

 /* No comment provided by engineer. */
-"creator" = "készítő";
+"creator" = "szerző";

 /* No comment provided by engineer. */
 "Current Passcode" = "Jelenlegi jelkód";
@@ -1195,7 +1183,7 @@
 "Delete address?" = "Azonosító törlése?";

 /* No comment provided by engineer. */
-"Delete after" = "Törlés ennyi idő után";
+"Delete after" = "Törlés miután";

 /* No comment provided by engineer. */
 "Delete all files" = "Minden fájl törlése";
@@ -1273,7 +1261,7 @@
 "Delete messages" = "Üzenetek törlése";

 /* No comment provided by engineer. */
-"Delete messages after" = "Üzenetek törlése ennyi idő után";
+"Delete messages after" = "Üzenetek törlése miután";

 /* No comment provided by engineer. */
 "Delete old database" = "Régi adatbázis törlése";
@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Számítógépek";

-/* snd error text */
-"Destination server error: %@" = "Célkiszolgáló hiba: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Fejlesztés";

@@ -1363,7 +1348,7 @@
 "Direct messages" = "Közvetlen üzenetek";

 /* No comment provided by engineer. */
-"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.";
+"Direct messages between members are prohibited in this group." = "Ebben a csoportban tiltott a tagok közötti közvetlen üzenetek küldése.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Letiltás (felülírások megtartásával)";
@@ -1384,7 +1369,7 @@
 "Disappearing messages" = "Eltűnő üzenetek";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited in this chat." = "Az eltűnő üzenetek küldése le van tiltva ebben a csevegésben.";
+"Disappearing messages are prohibited in this chat." = "Az eltűnő üzenetek le vannak 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.";
@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Az előzmények ne kerüljenek elküldésre az új tagok számára.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Ne küldjön üzeneteket közvetlenül, még akkor sem, ha az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Ne használjon privát útválasztást.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NE használja a SimpleX-et segélyhívásokhoz.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Hiba: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Hiba: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Fájl: %@";

-/* No comment provided by engineer. */
-"Files" = "Fájlok";
-
 /* No comment provided by engineer. */
 "Files & media" = "Fájlok és média";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Továbbítva innen:";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Továbbító kiszolgáló: %1$@\nCélkiszolgáló hiba:%2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Továbbító kiszolgáló: %1$@\nHiba: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Megtalált számítógép";

@@ -2107,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 megadja az önmegsemmisítő jelkódot:";
+"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:";

 /* 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).";
@@ -2275,16 +2245,16 @@
 "Invite to group" = "Meghívás a csoportba";

 /* No comment provided by engineer. */
-"invited" = "meghíva";
+"invited" = "meghívta";

 /* 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íva az ön csoport hivatkozásán keresztül";
+"invited via your group link" = "meghívta a 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.";
@@ -2296,10 +2266,10 @@
 "Irreversible message deletion" = "Végleges üzenettörlés";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited in this chat." = "Az üzenetek végleges törlése le van tiltva ebben a csevegésben.";
+"Irreversible message deletion is prohibited in this chat." = "Ebben a csevegésben az üzenetek végleges törlése le van tiltva.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited in this group." = "Az üzenetek végleges törlése le van tiltva ebben a csoportban.";
+"Irreversible message deletion is prohibited in this group." = "Ebben a csoportban az üzenetek végleges törlése le van tiltva.";

 /* 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.";
@@ -2374,7 +2344,7 @@
 "Learn more" = "Tudjon meg többet";

 /* No comment provided by engineer. */
-"Leave" = "Elhagyás";
+"Leave" = "Elhagy";

 /* No comment provided by engineer. */
 "Leave group" = "Csoport elhagyása";
@@ -2437,7 +2407,7 @@
 "Make profile private!" = "Tegye priváttá a profilját!";

 /* No comment provided by engineer. */
-"Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." = "Győződjön meg arról, hogy a %@ kiszolgálócímek megfelelő formátumúak, sorszeparáltak és nem duplikáltak (%@).";
+"Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." = "Győződjön meg arról, hogy a %@ szervercímek megfelelő formátumúak, sorszeparáltak és nem duplikáltak (%@).";

 /* No comment provided by engineer. */
 "Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." = "Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nem duplikáltak.";
@@ -2449,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" = "Olvasottnak jelölés";
+"Mark read" = "Megjelölés olvasottként";

 /* No comment provided by engineer. */
-"Mark verified" = "Hitelesítés";
+"Mark verified" = "Ellenőrzöttként jelölve";

 /* No comment provided by engineer. */
 "Markdown in messages" = "Markdown az üzenetekben";
@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Üzenetkézbesítési bizonylatok!";

-/* item status text */
-"Message delivery warning" = "Üzenet kézbesítési figyelmeztetés";
-
 /* No comment provided by engineer. */
 "Message draft" = "Üzenetvázlat";

@@ -2500,20 +2467,14 @@
 "Message reactions" = "Üzenetreakciók";

 /* No comment provided by engineer. */
-"Message reactions are prohibited in this chat." = "Az üzenetreakciók küldése le van tiltva ebben a csevegésben.";
+"Message reactions are prohibited in this chat." = "Az üzenetreakciók ebben a csevegésben le vannak tiltva.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited in this group." = "Az üzenetreakciók küldése le van tiltva ebben a csoportban.";
+"Message reactions are prohibited in this group." = "Ebben a csoportban az üzenetreakciók le vannak tiltva.";

 /* notification */
 "message received" = "üzenet érkezett";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Üzenet útválasztási tartalék";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Üzenet útválasztási mód";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Az üzenet forrása titokban marad.";

@@ -2533,10 +2494,10 @@
 "Messages from %@ will be shown!" = "A(z) %@ által írt üzenetek megjelennek!";

 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.";
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással** és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.";

 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.";
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással** és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.";

 /* No comment provided by engineer. */
 "Migrate device" = "Eszköz átköltöztetése";
@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Internetkapcsolat";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Hálózati problémák - az üzenet többszöri elküldési kísérlet után lejárt.";
-
 /* No comment provided by engineer. */
 "Network management" = "Hálózatkezelés";

@@ -2814,7 +2775,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őse tud eltűnő üzeneteket küldeni.";
+"Only your contact can send disappearing messages." = "Csak az ismerős 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.";
@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Privát fájl nevek";

-/* No comment provided by engineer. */
-"Private message routing" = "Privát üzenet útválasztás";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Privát üzenet útválasztás 🚀";
-
 /* name of notes to self */
 "Private notes" = "Privát jegyzetek";

-/* No comment provided by engineer. */
-"Private routing" = "Privát útválasztás";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil és kiszolgálókapcsolatok";

@@ -3024,22 +2976,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." = "A hívások kezdeményezése le van tiltva.";
+"Prohibit audio/video calls." = "Hang- és videóhívások tiltása.";

 /* 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." = "Az üzenetreakciók küldése le van tiltva.";
+"Prohibit message reactions." = "Üzenetreakciók tiltása.";

 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Az üzenetreakciók tiltása.";

 /* No comment provided by engineer. */
-"Prohibit sending direct messages to members." = "A közvetlen üzenetek küldése le van tiltva a tagok között.";
+"Prohibit sending direct messages to members." = "Közvetlen üzenetek küldésének letiltása a tagok számára.";

 /* No comment provided by engineer. */
-"Prohibit sending disappearing messages." = "Az eltűnő üzenetek küldése le van tiltva.";
+"Prohibit sending disappearing messages." = "Eltűnő üzenetek küldésének letiltása.";

 /* No comment provided by engineer. */
 "Prohibit sending files and media." = "Fájlok- és a médiatartalom küldés letiltása.";
@@ -3048,20 +3000,14 @@
 "Prohibit sending SimpleX links." = "A SimpleX hivatkozások küldése le van tiltva.";

 /* No comment provided by engineer. */
-"Prohibit sending voice messages." = "A hangüzenetek küldése le van tiltva.";
+"Prohibit sending voice messages." = "Hangüzenetek küldésének letiltása.";

 /* No comment provided by engineer. */
 "Protect app screen" = "Alkalmazás képernyőjének védelme";

-/* No comment provided by engineer. */
-"Protect IP address" = "Az IP-cím védelme";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Csevegési profiljok védelme jelszóval!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje IP-címét az ismerősei által kiválasztott üzenetküldő átjátszókkal szemben.\nEngedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protokoll időtúllépés";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3183,10 +3132,10 @@
 "Remove" = "Eltávolítás";

 /* No comment provided by engineer. */
-"Remove member" = "Eltávolítás";
+"Remove member" = "Tag eltávolítása";

 /* No comment provided by engineer. */
-"Remove member?" = "Biztosan eltávolítja?";
+"Remove member?" = "Tag eltávolítása?";

 /* No comment provided by engineer. */
 "Remove passphrase from keychain?" = "Jelmondat eltávolítása a kulcstárolóból?";
@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Csevegési szolgáltatás indítása";

-/* No comment provided by engineer. */
-"Safely receive files" = "Fájlok biztonságos fogadása";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Biztonságosabb csoportok";

@@ -3360,7 +3306,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" = "Beolvasás";
+"Scan code" = "Kód beolvasása";

 /* No comment provided by engineer. */
 "Scan QR code" = "QR-kód beolvasása";
@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Élő üzenet küldése";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha az IP-cím védett és az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha az ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Értesítések küldése";

@@ -3471,7 +3411,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 fájl küldője visszavonta az átvitelt.";
+"Sender cancelled file transfer." = "A küldő megszakította a fájl á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.";
@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Az elküldött üzenetek törlésre kerülnek a beállított idő után.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "A kiszolgáló címe nem kompatibilis a hálózati beállításokkal.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "A kiszolgálónak engedélyre van szüksége a várólisták létrehozásához, ellenőrizze jelszavát";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Sikertelen kiszolgáló-teszt!";

-/* srv error text */
-"Server version is incompatible with network settings." = "A kiszolgáló verziója nem kompatibilis a hálózati beállításokkal.";
-
 /* No comment provided by engineer. */
 "Servers" = "Kiszolgálók";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Megosztás ismerősökkel";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Egy „→” jel megjelenítése a privát útválasztáson keresztül küldött üzeneteknél.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Hívások megjelenítése a híváslistában";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Utolsó üzenetek megjelenítése";

-/* No comment provided by engineer. */
-"Show message status" = "Üzenet állapot megjelenítése";
-
 /* No comment provided by engineer. */
 "Show preview" = "Előnézet megjelenítése";

@@ -3642,7 +3570,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 le van tiltva ebben a csoportban.";
+"SimpleX links are prohibited in this group." = "A SimpleX hivatkozások küldése ebben a csoportban le van tiltva.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "A SimpleX hivatkozások küldése le van tiltva";
@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "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.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Az alkalmazás kérni fogja az ismeretlen fájlkiszolgálókról (kivéve .onion) történő letöltések megerősítését.";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.";

@@ -3828,7 +3753,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 vissza lesz vonva!";
+"The connection you accepted will be cancelled!" = "Az ön által elfogadott kapcsolat megszakad!";

 /* 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!";
@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Az adatavédelem érdekében kapcsolja be a SimpleX zárolás funkciót.\nA funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befejezésére.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Az IP-címe védelme érdekében a privát útválasztás az SMP-kiszolgálókat használja az üzenetek kézbesítéséhez.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Hangüzenet rögzítéséhez adjon engedélyt a mikrofon használathoz.";

@@ -3954,7 +3876,7 @@
 "To support instant push notifications the chat database has to be migrated." = "Az azonnali push értesítések támogatásához a csevegési adatbázis migrálása szükséges.";

 /* No comment provided by engineer. */
-"To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "A végpontok közötti titkosítás ellenőrzéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) az ismerőse eszközén lévő kóddal.";
+"To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "A végpontok közötti titkosítás ellenőrzéséhez ismerősével hasonlítsa össze (vagy szkennelje be) az eszközén lévő kódot.";

 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Inkognitó mód kapcsolódáskor.";
@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Ismeretlen hiba";

-/* No comment provided by engineer. */
-"unknown relays" = "ismeretlen átjátszók";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Ismeretlen kiszolgálók!";
-
 /* No comment provided by engineer. */
 "unknown status" = "ismeretlen státusz";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Némítás feloldása";

-/* No comment provided by engineer. */
-"unprotected" = "nem védett";
-
 /* No comment provided by engineer. */
 "Unread" = "Olvasatlan";

@@ -4083,13 +3999,13 @@
 "Update transport isolation mode?" = "Kapcsolat izolációs mód frissítése?";

 /* rcv group event chat item */
-"updated group profile" = "frissítette a csoport profilját";
+"updated group profile" = "módosított csoport profil";

 /* profile update event chat item */
 "updated profile" = "frissített profil";

 /* No comment provided by engineer. */
-"Updating settings will re-connect the client to all servers." = "A beállítások frissítése a kiszolgálókhoz való újra kapcsolódással jár.";
+"Updating settings will re-connect the client to all servers." = "A beállítások frissítése a szerverekhez újra kapcsolódással jár.";

 /* No comment provided by engineer. */
 "Updating this setting will re-connect the client to all servers." = "A beállítás frissítésével a kliens újrakapcsolódik az összes kiszolgálóhoz.";
@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Csak helyi értesítések használata?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Privát útválasztás használata ismeretlen kiszolgálókkal, ha az IP-cím nem védett.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Használjon privát útválasztást ismeretlen kiszolgálókkal.";
-
 /* No comment provided by engineer. */
 "Use server" = "Kiszolgáló használata";

@@ -4227,7 +4137,7 @@
 "Voice messages" = "Hangüzenetek";

 /* No comment provided by engineer. */
-"Voice messages are prohibited in this chat." = "A hangüzenetek küldése le van tiltva ebben a csevegésben.";
+"Voice messages are prohibited in this chat." = "A hangüzenetek le vannak 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.";
@@ -4239,7 +4149,7 @@
 "Voice messages prohibited!" = "A hangüzenetek le vannak tilva!";

 /* No comment provided by engineer. */
-"waiting for answer…" = "várakozás a válaszra…";
+"waiting for answer…" = "várakozás válaszra…";

 /* No comment provided by engineer. */
 "waiting for confirmation…" = "várakozás a visszaigazolásra…";
@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Amikor egy bejövő hang- vagy videóhívás érkezik.";

-/* No comment provided by engineer. */
-"when IP hidden" = "ha az IP-cím rejtett";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Amikor az emberek kapcsolódást kérelmeznek, ön elfogadhatja vagy elutasíthatja azokat.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Csökkentett akkumulátorhasználattal.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Tor vagy VPN nélkül az IP-címe látható lesz a fájlkiszolgálók számára.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Tor vagy VPN nélkül az IP-címe látható lesz ezen XFTP átjátszók számára: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Téves adatbázis jelmondat";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Rossz kulcs vagy ismeretlen kapcsolat - valószínűleg ez a kapcsolat törlődött.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Téves jelmondat!";

@@ -4458,7 +4356,7 @@
 "you changed role of %@ to %@" = "%1$@ szerepkörét megváltoztatta erre: %@";

 /* No comment provided by engineer. */
-"You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Ön szabályozhatja, hogy mely kiszogál(ók)ón keresztül **kapja** az üzeneteket, az ismerősöket - az üzenetküldéshez használt kiszolgálókon.";
+"You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Ön szabályozhatja, hogy mely kiszogál(ók)ón keresztül **kapja** az üzeneteket, az ismerősöket - az üzenetküldéshez használt szervereken.";

 /* No comment provided by engineer. */
 "You could not be verified; please try again." = "Nem lehetett ellenőrizni; próbálja meg újra.";
@@ -4563,7 +4461,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ő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).";
+"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).";

 /* 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 (%@).";
@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Consenti i messaggi a tempo solo se il contatto li consente a te.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Consenti downgrade";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Consenti l'eliminazione irreversibile dei messaggi solo se il contatto la consente a te. (24 ore)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "sempre";

-/* No comment provided by engineer. */
-"Always use private routing." = "Usa sempre l'instradamento privato.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Connetti via relay";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Impossibile ricevere il file";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Quota superata - il destinatario non ha ricevuto i messaggi precedentemente inviati.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Mobile";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Conferma aggiornamenti database";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Conferma i file da server sconosciuti.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Conferma le impostazioni di rete";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Dispositivi desktop";

-/* snd error text */
-"Destination server error: %@" = "Errore del server di destinazione: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Sviluppa";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Non inviare la cronologia ai nuovi membri.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "NON inviare messaggi direttamente, anche se il tuo server o quello di destinazione non supporta l'instradamento privato.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "NON usare l'instradamento privato.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NON usare SimpleX per chiamate di emergenza.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Errore: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Errore: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "File: %@";

-/* No comment provided by engineer. */
-"Files" = "File";
-
 /* No comment provided by engineer. */
 "Files & media" = "File e multimediali";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Inoltrato da";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Server di inoltro: %1$@\nErrore del server di destinazione: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Server di inoltro: %1$@\nErrore: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Desktop trovato";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Ricevute di consegna dei messaggi!";

-/* item status text */
-"Message delivery warning" = "Avviso di consegna del messaggio";
-
 /* No comment provided by engineer. */
 "Message draft" = "Bozza dei messaggi";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "messaggio ricevuto";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Ripiego instradamento messaggio";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Modalità instradamento messaggio";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "La fonte del messaggio resta privata.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Connessione di rete";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Problemi di rete - messaggio scaduto dopo molti tentativi di inviarlo.";
-
 /* No comment provided by engineer. */
 "Network management" = "Gestione della rete";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Nomi di file privati";

-/* No comment provided by engineer. */
-"Private message routing" = "Instradamento privato messaggi";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Instradamento privato dei messaggi 🚀";
-
 /* name of notes to self */
 "Private notes" = "Note private";

-/* No comment provided by engineer. */
-"Private routing" = "Instradamento privato";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profilo e connessioni al server";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Proteggi la schermata dell'app";

-/* No comment provided by engineer. */
-"Protect IP address" = "Proteggi l'indirizzo IP";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Proteggi i tuoi profili di chat con una password!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Proteggi il tuo indirizzo IP dai relay di messaggistica scelti dai tuoi contatti.\nAttivalo nelle impostazioni *Rete e server*.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Scadenza del protocollo";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Avvia chat";

-/* No comment provided by engineer. */
-"Safely receive files" = "Ricevi i file in sicurezza";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Gruppi più sicuri";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Invia messaggio in diretta";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Invia messaggi direttamente quando l'indirizzo IP è protetto e il tuo server o quello di destinazione non supporta l'instradamento privato.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Invia messaggi direttamente quando il tuo server o quello di destinazione non supporta l'instradamento privato.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Invia notifiche";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "I messaggi inviati verranno eliminati dopo il tempo impostato.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "L'indirizzo del server non è compatibile con le impostazioni di rete.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Il server richiede l'autorizzazione di creare code, controlla la password";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Test del server fallito!";

-/* srv error text */
-"Server version is incompatible with network settings." = "La versione del server non è compatibile con le impostazioni di rete.";
-
 /* No comment provided by engineer. */
 "Servers" = "Server";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Condividi con i contatti";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Mostra → nei messaggi inviati via instradamento privato.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Mostra le chiamate nella cronologia del telefono";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Mostra ultimi messaggi";

-/* No comment provided by engineer. */
-"Show message status" = "Mostra stato del messaggio";
-
 /* No comment provided by engineer. */
 "Show preview" = "Mostra anteprima";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "L'app può avvisarti quando ricevi messaggi o richieste di contatto: apri le impostazioni per attivare.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "L'app chiederà di confermare i download da server di file sconosciuti (eccetto .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Il tentativo di cambiare la password del database non è stato completato.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Per proteggere le tue informazioni, attiva SimpleX Lock.\nTi verrà chiesto di completare l'autenticazione prima di attivare questa funzionalità.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Per proteggere il tuo indirizzo IP, l'instradamento privato usa i tuoi server SMP per consegnare i messaggi.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Per registrare un messaggio vocale, concedi l'autorizzazione all'uso del microfono.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Errore sconosciuto";

-/* No comment provided by engineer. */
-"unknown relays" = "relay sconosciuti";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Server sconosciuti!";
-
 /* No comment provided by engineer. */
 "unknown status" = "stato sconosciuto";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Riattiva notifiche";

-/* No comment provided by engineer. */
-"unprotected" = "non protetto";
-
 /* No comment provided by engineer. */
 "Unread" = "Non letto";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Usare solo notifiche locali?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Usa l'instradamento privato con server sconosciuti quando l'indirizzo IP non è protetto.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Usa l'instradamento privato con server sconosciuti.";
-
 /* No comment provided by engineer. */
 "Use server" = "Usa il server";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Quando si connettono le chiamate audio e video.";

-/* No comment provided by engineer. */
-"when IP hidden" = "quando l'IP è nascosto";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Quando le persone chiedono di connettersi, puoi accettare o rifiutare.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Con consumo di batteria ridotto.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Senza Tor o VPN, il tuo indirizzo IP sarà visibile ai server di file.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Senza Tor o VPN, il tuo indirizzo IP sarà visibile a questi relay XFTP: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Password del database sbagliata";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Chiave sbagliata o connessione sconosciuta - molto probabilmente questa connessione è stata eliminata.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Password sbagliata!";

@@ -1509,7 +1509,7 @@
 /* No comment provided by engineer. */
 "Error: " = "エラー : ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "エラー : %@";

 /* No comment provided by engineer. */
@@ -2130,6 +2130,9 @@
 /* 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" = "複数チャットのプロフィール";

@@ -3188,6 +3191,9 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "音声メッセージを録音できません";

+/* item status description */
+"Unexpected error: %@" = "予期しないエラー: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "予期しない移行状態";

@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Sta verdwijnende berichten alleen toe als uw contact dit toestaat.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Downgraden toestaan";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Sta het onomkeerbaar verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "altijd";

-/* No comment provided by engineer. */
-"Always use private routing." = "Gebruik altijd privéroutering.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Altijd relay gebruiken";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Kan bestand niet ontvangen";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Capaciteit overschreden - ontvanger heeft eerder verzonden berichten niet ontvangen.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Mobiel";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Bevestig database upgrades";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Bevestig bestanden van onbekende servers.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Bevestig netwerk instellingen";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Desktop apparaten";

-/* snd error text */
-"Destination server error: %@" = "Bestemmingsserverfout: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Ontwikkelen";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Stuur geen geschiedenis naar nieuwe leden.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Stuur GEEN berichten rechtstreeks, zelfs als uw of de bestemmingsserver geen privéroutering ondersteunt.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Gebruik GEEN privéroutering.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "Gebruik SimpleX NIET voor noodoproepen.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Fout: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Fout: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Bestand: %@";

-/* No comment provided by engineer. */
-"Files" = "Bestanden";
-
 /* No comment provided by engineer. */
 "Files & media" = "Bestanden en media";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Doorgestuurd vanuit";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Doorstuurserver: %1$@\nBestemmingsserverfout: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Doorstuurserver: %1$@\nFout: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Desktop gevonden";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Ontvangst bevestiging voor berichten!";

-/* item status text */
-"Message delivery warning" = "Waarschuwing voor berichtbezorging";
-
 /* No comment provided by engineer. */
 "Message draft" = "Concept bericht";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "bericht ontvangen";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Terugval op berichtroutering";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Berichtrouteringsmodus";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Berichtbron blijft privé.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Netwerkverbinding";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Netwerkproblemen - bericht is verlopen na vele pogingen om het te verzenden.";
-
 /* No comment provided by engineer. */
 "Network management" = "Netwerkbeheer";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Privé bestandsnamen";

-/* No comment provided by engineer. */
-"Private message routing" = "Routering van privéberichten";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Routing van privéberichten🚀";
-
 /* name of notes to self */
 "Private notes" = "Privé notities";

-/* No comment provided by engineer. */
-"Private routing" = "Privéroutering";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profiel- en serververbindingen";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "App scherm verbergen";

-/* No comment provided by engineer. */
-"Protect IP address" = "Bescherm het IP-adres";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Bescherm je chat profielen met een wachtwoord!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Bescherm uw IP-adres tegen de berichtenrelais die door uw contacten zijn gekozen.\nSchakel dit in in *Netwerk en servers*-instellingen.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protocol timeout";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Chat uitvoeren";

-/* No comment provided by engineer. */
-"Safely receive files" = "Veilig bestanden ontvangen";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Veiligere groepen";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Stuur een livebericht";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Stuur berichten rechtstreeks als het IP-adres beschermd is en uw of bestemmingsserver geen privéroutering ondersteunt.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Stuur berichten rechtstreeks wanneer uw of de doelserver geen privéroutering ondersteunt.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Meldingen verzenden";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Verzonden berichten worden na ingestelde tijd verwijderd.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Serveradres is niet compatibel met netwerkinstellingen.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Server vereist autorisatie om wachtrijen te maken, controleer wachtwoord";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Servertest mislukt!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Serverversie is incompatibel met netwerkinstellingen.";
-
 /* No comment provided by engineer. */
 "Servers" = "Servers";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Delen met contacten";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Toon → bij berichten verzonden via privéroutering.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Toon oproepen in de telefoongeschiedenis";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Laat laatste berichten zien";

-/* No comment provided by engineer. */
-"Show message status" = "Toon berichtstatus";
-
 /* No comment provided by engineer. */
 "Show preview" = "Toon voorbeeld";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "De app kan u op de hoogte stellen wanneer u berichten of contact verzoeken ontvangt - open de instellingen om dit in te schakelen.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "De app vraagt om downloads van onbekende bestandsservers (behalve .onion) te bevestigen.";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "De poging om het wachtwoord van de database te wijzigen is niet voltooid.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Schakel SimpleX Vergrendelen om uw informatie te beschermen.\nU wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingeschakeld.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Om uw IP-adres te beschermen, gebruikt privéroutering uw SMP-servers om berichten te bezorgen.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Geef toestemming om de microfoon te gebruiken om een spraakbericht op te nemen.";

@@ -3998,6 +3920,9 @@
 /* rcv group event chat item */
 "unblocked %@" = "gedeblokkeerd %@";

+/* item status description */
+"Unexpected error: %@" = "Onverwachte fout: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Onverwachte migratiestatus";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Onbekende fout";

-/* No comment provided by engineer. */
-"unknown relays" = "onbekende relays";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Onbekende servers!";
-
 /* No comment provided by engineer. */
 "unknown status" = "onbekende status";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Dempen opheffen";

-/* No comment provided by engineer. */
-"unprotected" = "onbeschermd";
-
 /* No comment provided by engineer. */
 "Unread" = "Ongelezen";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Alleen lokale meldingen gebruiken?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Gebruik privéroutering met onbekende servers wanneer het IP-adres niet beveiligd is.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Gebruik privéroutering met onbekende servers.";
-
 /* No comment provided by engineer. */
 "Use server" = "Gebruik server";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Bij het verbinden van audio- en video-oproepen.";

-/* No comment provided by engineer. */
-"when IP hidden" = "wanneer IP verborgen is";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Wanneer mensen vragen om verbinding te maken, kunt u dit accepteren of weigeren.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Met verminderd batterijgebruik.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Zonder Tor of VPN is uw IP-adres zichtbaar voor bestandsservers.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Zonder Tor of VPN zal uw IP-adres zichtbaar zijn voor deze XFTP-relays: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Verkeerd wachtwoord voor de database";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Verkeerde sleutel of onbekende verbinding - hoogstwaarschijnlijk is deze verbinding verwijderd.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Verkeerd wachtwoord!";

@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Zezwól na znikające wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Zezwól na obniżenie wersji";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Zezwalaj na nieodwracalne usuwanie wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli. (24 godziny)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "zawsze";

-/* No comment provided by engineer. */
-"Always use private routing." = "Zawsze używaj prywatnego trasowania.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Zawsze używaj przekaźnika";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Nie można odebrać pliku";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Przekroczono pojemność - odbiorca nie otrzymał wcześniej wysłanych wiadomości.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Sieć komórkowa";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Potwierdź aktualizacje bazy danych";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Potwierdzaj pliki z nieznanych serwerów.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Potwierdź ustawienia sieciowe";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Urządzenia komputerowe";

-/* snd error text */
-"Destination server error: %@" = "Błąd docelowego serwera: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Deweloperskie";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Nie wysyłaj historii do nowych członków.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "NIE wysyłaj wiadomości bezpośrednio, nawet jeśli serwer docelowy nie obsługuje prywatnego trasowania.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "NIE używaj prywatnego trasowania.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NIE używaj SimpleX do połączeń alarmowych.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Błąd: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Błąd: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Plik: %@";

-/* No comment provided by engineer. */
-"Files" = "Pliki";
-
 /* No comment provided by engineer. */
 "Files & media" = "Pliki i media";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Przekazane dalej od";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Serwer przekazujący: %1$@\nBłąd serwera docelowego: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Serwer przekazujący: %1$@\nBłąd: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Znaleziono komputer";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Potwierdzenia dostarczenia wiadomości!";

-/* item status text */
-"Message delivery warning" = "Ostrzeżenie dostarczenia wiadomości";
-
 /* No comment provided by engineer. */
 "Message draft" = "Wersja robocza wiadomości";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "wiadomość otrzymana";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Rezerwowe trasowania wiadomości";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Tryb trasowania wiadomości";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Źródło wiadomości pozostaje prywatne.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Połączenie z siecią";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Błąd sieciowy - wiadomość wygasła po wielu próbach wysłania jej.";
-
 /* No comment provided by engineer. */
 "Network management" = "Zarządzenie sieciowe";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Prywatne nazwy plików";

-/* No comment provided by engineer. */
-"Private message routing" = "Trasowanie prywatnych wiadomości";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Trasowanie prywatnych wiadomości🚀";
-
 /* name of notes to self */
 "Private notes" = "Prywatne notatki";

-/* No comment provided by engineer. */
-"Private routing" = "Prywatne trasowanie";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil i połączenia z serwerem";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Chroń ekran aplikacji";

-/* No comment provided by engineer. */
-"Protect IP address" = "Chroń adres IP";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Chroń swoje profile czatu hasłem!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Chroni Twój adres IP przed przekaźnikami wiadomości wybranych przez Twoje kontakty.\nWłącz w ustawianiach *Sieć i serwery* .";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Limit czasu protokołu";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Uruchom czat";

-/* No comment provided by engineer. */
-"Safely receive files" = "Bezpiecznie otrzymuj pliki";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Bezpieczniejsze grupy";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Wyślij wiadomość na żywo";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Wysyłaj wiadomości bezpośrednio, gdy adres IP jest chroniony i Twój lub docelowy serwer nie obsługuje prywatnego trasowania.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Wysyłaj wiadomości bezpośrednio, gdy Twój lub docelowy serwer nie obsługuje prywatnego trasowania.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Wyślij powiadomienia";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Wysłane wiadomości zostaną usunięte po ustawionym czasie.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Adres serwera jest niekompatybilny z ustawieniami sieciowymi.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Serwer wymaga autoryzacji do tworzenia kolejek, sprawdź hasło";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Test serwera nie powiódł się!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Wersja serwera jest niekompatybilna z ustawieniami sieciowymi.";
-
 /* No comment provided by engineer. */
 "Servers" = "Serwery";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Udostępnij kontaktom";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Pokaż → na wiadomościach wysłanych przez prywatne trasowanie.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Pokaż połączenia w historii telefonu";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Pokaż ostatnie wiadomości";

-/* No comment provided by engineer. */
-"Show message status" = "Pokaż status wiadomości";
-
 /* No comment provided by engineer. */
 "Show preview" = "Pokaż podgląd";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Aplikacja może powiadamiać Cię, gdy otrzymujesz wiadomości lub prośby o kontakt — otwórz ustawienia, aby włączyć.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Aplikacja zapyta o potwierdzenie pobierania od nieznanych serwerów plików (poza .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Próba zmiany hasła bazy danych nie została zakończona.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Aby chronić swoje informacje, włącz funkcję blokady SimpleX.\nPrzed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Aby chronić Twój adres IP, prywatne trasowanie używa Twoich serwerów SMP, aby dostarczyć wiadomości.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Aby nagrać wiadomość głosową należy udzielić zgody na użycie Mikrofonu.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Nieznany błąd";

-/* No comment provided by engineer. */
-"unknown relays" = "nieznane przekaźniki";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Nieznane serwery!";
-
 /* No comment provided by engineer. */
 "unknown status" = "nieznany status";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Wyłącz wyciszenie";

-/* No comment provided by engineer. */
-"unprotected" = "niezabezpieczony";
-
 /* No comment provided by engineer. */
 "Unread" = "Nieprzeczytane";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Używać tylko lokalnych powiadomień?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Używaj prywatnego trasowania z nieznanymi serwerami, gdy adres IP nie jest chroniony.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Używaj prywatnego trasowania z nieznanymi serwerami.";
-
 /* No comment provided by engineer. */
 "Use server" = "Użyj serwera";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Podczas łączenia połączeń audio i wideo.";

-/* No comment provided by engineer. */
-"when IP hidden" = "gdy IP ukryty";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Kiedy ludzie proszą o połączenie, możesz je zaakceptować lub odrzucić.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Ze zmniejszonym zużyciem baterii.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Bez Tor lub VPN, Twój adres IP będzie widoczny do serwerów plików.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Bez Tor lub VPN, Twój adres IP będzie widoczny dla tych przekaźników XFTP: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Nieprawidłowe hasło bazy danych";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Zły klucz lub nieznane połączenie - najprawdopodobniej to połączenie jest usunięte.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Nieprawidłowe hasło!";

@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Разрешить исчезающие сообщения, только если Ваш контакт разрешает их Вам.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Разрешить прямую доставку";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Разрешить необратимое удаление сообщений, только если Ваш контакт разрешает это Вам. (24 часа)";

@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "всегда";

-/* No comment provided by engineer. */
-"Always use private routing." = "Всегда использовать конфиденциальную доставку.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Всегда соединяться через relay";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Невозможно получить файл";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Превышено количество сообщений - предыдущие сообщения не доставлены.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Мобильная сеть";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Подтвердить обновление базы данных";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Подтверждать файлы с неизвестных серверов.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Подтвердите настройки сети";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Компьютеры";

-/* snd error text */
-"Destination server error: %@" = "Ошибка сервера получателя: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Для разработчиков";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Не отправлять историю новым членам.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Не отправлять сообщения напрямую, даже если сервер получателя не поддерживает конфиденциальную доставку.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Не использовать конфиденциальную доставку.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "Не используйте SimpleX для экстренных звонков.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Ошибка: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Ошибка: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Файл: %@";

-/* No comment provided by engineer. */
-"Files" = "Файлы";
-
 /* No comment provided by engineer. */
 "Files & media" = "Файлы и медиа";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Переслано из";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Пересылающий сервер: %1$@\nОшибка сервера получателя: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Пересылающий сервер: %1$@\nОшибка: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Компьютер найден";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Отчеты о доставке сообщений!";

-/* item status text */
-"Message delivery warning" = "Предупреждение доставки сообщения";
-
 /* No comment provided by engineer. */
 "Message draft" = "Черновик сообщения";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "получено сообщение";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Прямая доставка сообщений";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Режим доставки сообщений";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Источник сообщения остаётся конфиденциальным.";

@@ -2607,6 +2568,9 @@
 /* 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" = "Много профилей чата";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Интернет-соединение";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Ошибка сети - сообщение не было отправлено после многократных попыток.";
-
 /* No comment provided by engineer. */
 "Network management" = "Статус сети";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Защищенные имена файлов";

-/* No comment provided by engineer. */
-"Private message routing" = "Конфиденциальная доставка сообщений";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Конфиденциальная доставка сообщений 🚀";
-
 /* name of notes to self */
 "Private notes" = "Личные заметки";

-/* No comment provided by engineer. */
-"Private routing" = "Конфиденциальная доставка";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Профиль и соединения на сервере";

@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Защитить экран приложения";

-/* No comment provided by engineer. */
-"Protect IP address" = "Защитить IP адрес";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Защитите Ваши профили чата паролем!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Защитите ваш IP адрес от серверов сообщений, выбранных Вашими контактами.\nВключите в настройках *Сеть и серверы*.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Таймаут протокола";

@@ -3131,6 +3077,9 @@
 /* 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." = "Приём файла будет прекращён.";

@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Запустить chat";

-/* No comment provided by engineer. */
-"Safely receive files" = "Получайте файлы безопасно";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Более безопасные группы";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Отправить живое сообщение";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Отправлять сообщения напрямую, когда IP адрес защищен, и Ваш сервер или сервер получателя не поддерживает конфиденциальную доставку.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Отправлять сообщения напрямую, когда Ваш сервер или сервер получателя не поддерживает конфиденциальную доставку.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Отправлять уведомления";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Отправленные сообщения будут удалены через заданное время.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Адрес сервера несовместим с настройками сети.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Сервер требует авторизации для создания очередей, проверьте пароль";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Ошибка теста сервера!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Версия сервера несовместима с настройками сети.";
-
 /* No comment provided by engineer. */
 "Servers" = "Серверы";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Поделиться с контактами";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Показать → на сообщениях доставленных конфиденциально.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Показать звонки в истории телефона";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Показывать последние сообщения";

-/* No comment provided by engineer. */
-"Show message status" = "Показать статус сообщения";
-
 /* No comment provided by engineer. */
 "Show preview" = "Показывать уведомления";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Приложение может посылать Вам уведомления о сообщениях и запросах на соединение - уведомления можно включить в Настройках.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Приложение будет запрашивать подтверждение загрузки с неизвестных серверов (за исключением .onion адресов).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Попытка поменять пароль базы данных не была завершена.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Чтобы защитить Вашу информацию, включите блокировку SimpleX Chat.\nВам будет нужно пройти аутентификацию для включения блокировки.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Чтобы защитить ваш IP адрес, приложение использует Ваши SMP серверы для конфиденциальной доставки сообщений.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Для записи голосового сообщения, пожалуйста разрешите доступ к микрофону.";

@@ -3998,6 +3920,9 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ разблокирован";

+/* item status description */
+"Unexpected error: %@" = "Неожиданная ошибка: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неожиданная ошибка при перемещении данных чата";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Неизвестная ошибка";

-/* No comment provided by engineer. */
-"unknown relays" = "неизвестные серверы";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Неизвестные серверы!";
-
 /* No comment provided by engineer. */
 "unknown status" = "неизвестный статус";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Уведомлять";

-/* No comment provided by engineer. */
-"unprotected" = "незащищённый";
-
 /* No comment provided by engineer. */
 "Unread" = "Не прочитано";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Использовать только локальные нотификации?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Использовать конфиденциальную доставку с неизвестными серверами, когда IP адрес не защищен.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Использовать конфиденциальную доставку с неизвестными серверами.";
-
 /* No comment provided by engineer. */
 "Use server" = "Использовать сервер";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Во время соединения аудио и видео звонков.";

-/* No comment provided by engineer. */
-"when IP hidden" = "когда IP защищен";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Когда Вы получите запрос на соединение, Вы можете принять или отклонить его.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "С уменьшенным потреблением батареи.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Без Тора или ВПН, Ваш IP адрес будет доступен серверам файлов.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Без Тора или ВПН, Ваш IP адрес будет доступен этим серверам файлов: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Неправильный пароль базы данных";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Неверный ключ или неизвестное соединение - скорее всего, это соединение удалено.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Неправильный пароль!";

@@ -1386,7 +1386,7 @@
 /* No comment provided by engineer. */
 "Error: " = "ผิดพลาด: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "ข้อผิดพลาด: % @";

 /* No comment provided by engineer. */
@@ -1998,6 +1998,9 @@
 /* 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" = "โปรไฟล์การแชทหลายรายการ";

@@ -3047,6 +3050,9 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "ไม่สามารถบันทึกข้อความเสียง";

+/* item status description */
+"Unexpected error: %@" = "ข้อผิดพลาดที่ไม่คาดคิด: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "สถานะการย้ายข้อมูลที่ไม่คาดคิด";

@@ -275,7 +275,7 @@
 "0 sec" = "0 saniye";

 /* No comment provided by engineer. */
-"0s" = "0sn";
+"0s" = "0 saniye";

 /* time interval */
 "1 day" = "1 gün";
@@ -438,7 +438,7 @@
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "Tüm kişileriniz bağlı kalacaktır. Profil güncellemesi kişilerinize gönderilecektir.";

 /* No comment provided by engineer. */
-"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Tüm kişileriniz, konuşmalarınız ve dosyalarınız güvenli bir şekilde şifrelenir ve yapılandırılmış XFTP yönlendiricilerine parçalar halinde yüklenir.";
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Tüm kişileriniz, sohbetleriniz ve dosyalarınız güvenli bir şekilde şifrelenecek ve parçalar halinde yapılandırılmış XFTP rölelerine yüklenecektir.";

 /* No comment provided by engineer. */
 "Allow" = "İzin ver";
@@ -449,9 +449,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Eğer kişide izin verirse kaybolan mesajlara izin ver.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Sürüm düşürmeye izin ver";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Konuştuğun kişi, kalıcı olarak silinebilen mesajlara izin veriyorsa sen de ver. (24 saat içinde)";

@@ -462,7 +459,7 @@
 "Allow message reactions." = "Mesaj tepkilerine izin ver.";

 /* No comment provided by engineer. */
-"Allow sending direct messages to members." = "Üyelere doğrudan mesaj göndermeye izin ver.";
+"Allow sending direct messages to members." = "Üyelere direkt mesaj göndermeye izin ver.";

 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Kendiliğinden yok olan mesajlar göndermeye izin ver.";
@@ -512,9 +509,6 @@
 /* pref value */
 "always" = "her zaman";

-/* No comment provided by engineer. */
-"Always use private routing." = "Her zaman gizli yönlendirme kullan.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Her zaman yönlendirici kullan";

@@ -722,9 +716,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Dosya alınamıyor";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Kapasite aşıldı - alıcı önceden gönderilen mesajları almadı.";
-
 /* No comment provided by engineer. */
 "Cellular" = "Hücresel Veri";

@@ -861,9 +852,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Veritabanı geliştirmelerini onayla";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Bilinmeyen sunuculardan gelen dosyaları onayla.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Ağ ayarlarını onaylayın";

@@ -1332,9 +1320,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Bilgisayar cihazları";

-/* snd error text */
-"Destination server error: %@" = "Hedef sunucu hatası: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Geliştir";

@@ -1413,12 +1398,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Yeni üyelere geçmişi gönderme.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Sizin veya hedef sunucunun özel yönlendirmeyi desteklememesi durumunda bile mesajları doğrudan GÖNDERMEYİN.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "Gizli yönlendirmeyi KULLANMA.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "Acil aramalar için SimpleX'i KULLANMAYIN.";

@@ -1800,7 +1779,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Hata: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Hata: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1839,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Dosya: %@";

-/* No comment provided by engineer. */
-"Files" = "Dosyalar";
-
 /* No comment provided by engineer. */
 "Files & media" = "Dosyalar & medya";

@@ -1929,12 +1905,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Şuradan iletildi";

-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Yönlendirme sunucusu: %1$@\nHedef sunucu hatası: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Yönlendirme sunucusu: %1$@\nHata: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Bilgisayar bulundu";

@@ -2490,9 +2460,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Mesaj alındı bilgisi!";

-/* item status text */
-"Message delivery warning" = "Mesaj iletimi uyarısı";
-
 /* No comment provided by engineer. */
 "Message draft" = "Mesaj taslağı";

@@ -2508,12 +2475,6 @@
 /* notification */
 "message received" = "mesaj alındı";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Mesaj yönlendirme yedeklemesi";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Mesaj yönlendirme modu";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Mesaj kaynağı gizli kalır.";

@@ -2607,6 +2568,9 @@
 /* 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";

@@ -2625,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Network connection" = "Ağ bağlantısı";

-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Ağ sorunları - birçok gönderme denemesinden sonra mesajın süresi doldu.";
-
 /* No comment provided by engineer. */
 "Network management" = "Ağ yönetimi";

@@ -2990,18 +2951,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Gizli dosya adları";

-/* No comment provided by engineer. */
-"Private message routing" = "Gizli mesaj yönlendirme";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Gizli mesaj yönlendirme 🚀";
-
 /* name of notes to self */
 "Private notes" = "Gizli notlar";

-/* No comment provided by engineer. */
-"Private routing" = "Gizli yönlendirme";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil ve sunucu bağlantıları";

@@ -3036,7 +2988,7 @@
 "Prohibit messages reactions." = "Mesajlarda tepkileri yasakla.";

 /* No comment provided by engineer. */
-"Prohibit sending direct messages to members." = "Üyelere doğrudan mesaj göndermeyi yasakla.";
+"Prohibit sending direct messages to members." = "Geri dönülmez mesaj silme işlemini yasakla.";

 /* No comment provided by engineer. */
 "Prohibit sending disappearing messages." = "Kaybolan mesajların gönderimini yasakla.";
@@ -3053,15 +3005,9 @@
 /* No comment provided by engineer. */
 "Protect app screen" = "Uygulama ekranını koru";

-/* No comment provided by engineer. */
-"Protect IP address" = "IP adresini koru";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Bir parolayla birlikte sohbet profillerini koru!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "IP adresinizi kişileriniz tarafından seçilen mesajlaşma yönlendiricilerinden koruyun.\n*Ağ ve sunucular* ayarlarında etkinleştirin.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protokol zaman aşımı";

@@ -3131,6 +3077,9 @@
 /* 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.";

@@ -3174,10 +3123,10 @@
 "rejected call" = "geri çevrilmiş çağrı";

 /* No comment provided by engineer. */
-"Relay server is only used if necessary. Another party can observe your IP address." = "Yönlendirici sunucusu yalnızca gerekli olduğunda kullanılır. Başka bir taraf IP adresinizi gözlemleyebilir.";
+"Relay server is only used if necessary. Another party can observe your IP address." = "Aktarma sunucusu yalnızca gerekli olduğunda kullanılır. Başka bir taraf IP adresinizi gözlemleyebilir.";

 /* No comment provided by engineer. */
-"Relay server protects your IP address, but it can observe the duration of the call." = "Yönlendirici sunucu IP adresinizi korur, ancak aramanın süresini gözlemleyebilir.";
+"Relay server protects your IP address, but it can observe the duration of the call." = "Aktarıcı sunucu IP adresinizi korur, ancak aramanın süresini gözlemleyebilir.";

 /* No comment provided by engineer. */
 "Remove" = "Sil";
@@ -3287,9 +3236,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Sohbeti çalıştır";

-/* No comment provided by engineer. */
-"Safely receive files" = "Dosyaları güvenle alın";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Daha güvenli gruplar";

@@ -3446,12 +3392,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Canlı mesaj gönder";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "IP adresi korumalı olduğunda ve sizin veya hedef sunucunun özel yönlendirmeyi desteklemediği durumlarda mesajları doğrudan gönderin.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Sizin veya hedef sunucunun özel yönlendirmeyi desteklemediği durumlarda mesajları doğrudan gönderin.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Bildirimler gönder";

@@ -3515,9 +3455,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Gönderilen mesajlar ayarlanan süreden sonra silinecektir.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Sunucu adresi ağ ayarlarıyla uyumlu değil.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Sunucunun sıra oluşturması için yetki gereklidir, şifreyi kontrol edin";

@@ -3527,9 +3464,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Sunucu testinde hata oluştu!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Sunucu sürümü ağ ayarlarıyla uyumlu değil.";
-
 /* No comment provided by engineer. */
 "Servers" = "Sunucular";

@@ -3596,9 +3530,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Kişilerle paylaş";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Gizli yönlendirme yoluyla gönderilen mesajlarda → işaretini göster.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Telefon geçmişinde aramaları göster";

@@ -3608,9 +3539,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Son mesajları göster";

-/* No comment provided by engineer. */
-"Show message status" = "Mesaj durumunu göster";
-
 /* No comment provided by engineer. */
 "Show preview" = "Ön gösterimi göser";

@@ -3818,9 +3746,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Uygulama, mesaj veya iletişim isteği aldığınızda sizi bilgilendirebilir - etkinleştirmek için lütfen ayarları açın.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Uygulama bilinmeyen dosya sunucularından indirmeleri onaylamanızı isteyecektir (.onion hariç).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Veritabanı parolasını değiştirme girişimi tamamlanmadı.";

@@ -3941,9 +3866,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Bilgilerinizi korumak için SimpleX Lock özelliğini açın.\nBu özellik etkinleştirilmeden önce kimlik doğrulamayı tamamlamanız istenecektir.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "IP adresinizi korumak için,gizli yönlendirme mesajları iletmek için SMP sunucularınızı kullanır.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Sesli mesaj kaydetmek için lütfen Mikrofon kullanım izni verin.";

@@ -3998,6 +3920,9 @@
 /* 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";

@@ -4028,12 +3953,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Bilinmeyen hata";

-/* No comment provided by engineer. */
-"unknown relays" = "bilinmeyen yönlendiriciler";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Bilinmeyen sunucular!";
-
 /* No comment provided by engineer. */
 "unknown status" = "bilinmeyen durum";

@@ -4058,9 +3977,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Susturmayı kaldır";

-/* No comment provided by engineer. */
-"unprotected" = "korumasız";
-
 /* No comment provided by engineer. */
 "Unread" = "Okunmamış";

@@ -4130,12 +4046,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Sadece yerel bildirimler kullanılsın mı?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "IP adresi korunmadığında bilinmeyen sunucularla gizli yönlendirme kullan.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Bilinmeyen sunucularla gizli yönlendirme kullan.";
-
 /* No comment provided by engineer. */
 "Use server" = "Sunucu kullan";

@@ -4289,9 +4199,6 @@
 /* No comment provided by engineer. */
 "When connecting audio and video calls." = "Sesli ve görüntülü aramalara bağlanırken.";

-/* No comment provided by engineer. */
-"when IP hidden" = "IP gizliyken";
-
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "İnsanlar bağlantı talebinde bulunduğunda, kabul edebilir veya reddedebilirsiniz.";

@@ -4316,18 +4223,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "Azaltılmış pil kullanımı ile birlikte.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Tor veya VPN olmadan, IP adresiniz dosya sunucularına görülebilir.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Tor veya VPN olmadan, IP adresiniz bu XFTP aktarıcıları tarafından görülebilir: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Yanlış veritabanı parolası";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Yanlış anahtar veya bilinmeyen bağlantı - büyük olasılıkla bu bağlantı silinmiştir.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Yanlış parola!";

@@ -389,9 +389,6 @@
 /* member role */
 "admin" = "адмін";

-/* feature role */
-"admins" = "адміністратори";
-
 /* No comment provided by engineer. */
 "Admins can block a member for all." = "Адміністратори можуть заблокувати користувача для всіх.";

@@ -419,9 +416,6 @@
 /* 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!" = "Усі повідомлення будуть видалені - цю дію не можна скасувати!";

@@ -449,9 +443,6 @@
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Дозволяйте зникати повідомленням, тільки якщо контакт дозволяє вам це робити.";

-/* No comment provided by engineer. */
-"Allow downgrade" = "Дозволити пониження версії";
-
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити. (24 години)";

@@ -473,9 +464,6 @@
 /* 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." = "Дозволити надсилати голосові повідомлення.";

@@ -512,9 +500,6 @@
 /* pref value */
 "always" = "завжди";

-/* No comment provided by engineer. */
-"Always use private routing." = "Завжди використовуйте приватну маршрутизацію.";
-
 /* No comment provided by engineer. */
 "Always use relay" = "Завжди використовуйте реле";

@@ -722,12 +707,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Не вдається отримати файл";

-/* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Перевищено ліміт - одержувач не отримав раніше надіслані повідомлення.";
-
-/* No comment provided by engineer. */
-"Cellular" = "Стільниковий";
-
 /* No comment provided by engineer. */
 "Change" = "Зміна";

@@ -861,9 +840,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Підтвердити оновлення бази даних";

-/* No comment provided by engineer. */
-"Confirm files from unknown servers." = "Підтвердити файли з невідомих серверів.";
-
 /* No comment provided by engineer. */
 "Confirm network settings" = "Підтвердьте налаштування мережі";

@@ -1332,9 +1308,6 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Настільні пристрої";

-/* snd error text */
-"Destination server error: %@" = "Помилка сервера призначення: %@";
-
 /* No comment provided by engineer. */
 "Develop" = "Розробник";

@@ -1413,12 +1386,6 @@
 /* No comment provided by engineer. */
 "Do not send history to new members." = "Не надсилайте історію новим користувачам.";

-/* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "НЕ надсилайте повідомлення напряму, навіть якщо ваш сервер або сервер призначення не підтримує приватну маршрутизацію.";
-
-/* No comment provided by engineer. */
-"Do NOT use private routing." = "НЕ використовуйте приватну маршрутизацію.";
-
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "НЕ використовуйте SimpleX для екстрених викликів.";

@@ -1434,9 +1401,6 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Пониження та відкритий чат";

-/* chat item action */
-"Download" = "Завантажити";
-
 /* No comment provided by engineer. */
 "Download failed" = "Не вдалося завантажити";

@@ -1512,9 +1476,6 @@
 /* enabled status */
 "enabled" = "увімкнено";

-/* No comment provided by engineer. */
-"Enabled for" = "Увімкнено для";
-
 /* enabled status */
 "enabled for contact" = "увімкнено для контакту";

@@ -1800,7 +1761,7 @@
 /* No comment provided by engineer. */
 "Error: " = "Помилка: ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "Помилка: %@";

 /* No comment provided by engineer. */
@@ -1860,9 +1821,6 @@
 /* No comment provided by engineer. */
 "File: %@" = "Файл: %@";

-/* No comment provided by engineer. */
-"Files" = "Файли";
-
 /* No comment provided by engineer. */
 "Files & media" = "Файли та медіа";

@@ -1872,9 +1830,6 @@
 /* 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!" = "Файли та медіа заборонені!";

@@ -1914,27 +1869,6 @@
 /* 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" = "Переслано з";
-
-/* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Сервер переадресації: %1$@\nПомилка сервера призначення: %2$@";
-
-/* snd error text */
-"Forwarding server: %@\nError: %@" = "Сервер переадресації: %1$@\nПомилка: %2$@";
-
 /* No comment provided by engineer. */
 "Found desktop" = "Знайдено робочий стіл";

@@ -2013,9 +1947,6 @@
 /* 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." = "Учасники групи можуть надсилати голосові повідомлення.";

@@ -2157,9 +2088,6 @@
 /* No comment provided by engineer. */
 "In reply to" = "У відповідь на";

-/* No comment provided by engineer. */
-"In-call sounds" = "Звуки вхідного дзвінка";
-
 /* No comment provided by engineer. */
 "Incognito" = "Інкогніто";

@@ -2490,9 +2418,6 @@
 /* No comment provided by engineer. */
 "Message delivery receipts!" = "Підтвердження доставки повідомлення!";

-/* item status text */
-"Message delivery warning" = "Попередження про доставку повідомлення";
-
 /* No comment provided by engineer. */
 "Message draft" = "Чернетка повідомлення";

@@ -2508,15 +2433,6 @@
 /* notification */
 "message received" = "повідомлення отримано";

-/* No comment provided by engineer. */
-"Message routing fallback" = "Запасний варіант маршрутизації повідомлень";
-
-/* No comment provided by engineer. */
-"Message routing mode" = "Режим маршрутизації повідомлень";
-
-/* No comment provided by engineer. */
-"Message source remains private." = "Джерело повідомлення залишається приватним.";
-
 /* No comment provided by engineer. */
 "Message text" = "Текст повідомлення";

@@ -2601,12 +2517,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" = "Кілька профілів чату";

@@ -2622,15 +2538,6 @@
 /* No comment provided by engineer. */
 "Network & servers" = "Мережа та сервери";

-/* No comment provided by engineer. */
-"Network connection" = "Підключення до мережі";
-
-/* snd error text */
-"Network issues - message expired after many attempts to send it." = "Проблеми з мережею - термін дії повідомлення закінчився після багатьох спроб надіслати його.";
-
-/* No comment provided by engineer. */
-"Network management" = "Керування мережею";
-
 /* No comment provided by engineer. */
 "Network settings" = "Налаштування мережі";

@@ -2709,9 +2616,6 @@
 /* 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" = "Немає дозволу на запис голосового повідомлення";

@@ -2858,15 +2762,9 @@
 /* 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" = "Пароль";

@@ -2990,27 +2888,15 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Приватні імена файлів";

-/* No comment provided by engineer. */
-"Private message routing" = "Маршрутизація приватних повідомлень";
-
-/* No comment provided by engineer. */
-"Private message routing 🚀" = "Маршрутизація приватних повідомлень 🚀";
-
 /* name of notes to self */
 "Private notes" = "Приватні нотатки";

-/* No comment provided by engineer. */
-"Private routing" = "Приватна маршрутизація";
-
 /* No comment provided by engineer. */
 "Profile and server connections" = "З'єднання профілю та сервера";

 /* No comment provided by engineer. */
 "Profile image" = "Зображення профілю";

-/* No comment provided by engineer. */
-"Profile images" = "Зображення профілю";
-
 /* No comment provided by engineer. */
 "Profile name" = "Назва профілю";

@@ -3044,24 +2930,15 @@
 /* No comment provided by engineer. */
 "Prohibit sending files and media." = "Заборонити надсилання файлів і медіа.";

-/* No comment provided by engineer. */
-"Prohibit sending SimpleX links." = "Заборонити надсилання посилань SimpleX.";
-
 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "Заборонити надсилання голосових повідомлень.";

 /* No comment provided by engineer. */
 "Protect app screen" = "Захистіть екран програми";

-/* No comment provided by engineer. */
-"Protect IP address" = "Захист IP-адреси";
-
 /* No comment provided by engineer. */
 "Protect your chat profiles with a password!" = "Захистіть свої профілі чату паролем!";

-/* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Захистіть свою IP-адресу від ретрансляторів повідомлень, обраних вашими контактами.\nУвімкніть у налаштуваннях *Мережа та сервери*.";
-
 /* No comment provided by engineer. */
 "Protocol timeout" = "Тайм-аут протоколу";

@@ -3140,9 +3017,6 @@
 /* No comment provided by engineer. */
 "Recent history and improved [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)." = "Нещодавня історія та покращення [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).";

-/* 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." = "Одержувачі бачать оновлення, коли ви їх вводите.";

@@ -3287,9 +3161,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "Запустити чат";

-/* No comment provided by engineer. */
-"Safely receive files" = "Безпечне отримання файлів";
-
 /* No comment provided by engineer. */
 "Safer groups" = "Безпечніші групи";

@@ -3341,18 +3212,6 @@
 /* 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" = "Збережено з";
-
-/* No comment provided by engineer. */
-"saved from %@" = "збережено з %@";
-
 /* message info title */
 "Saved message" = "Збережене повідомлення";

@@ -3446,12 +3305,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Надіслати живе повідомлення";

-/* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Надсилайте повідомлення напряму, якщо IP-адреса захищена, а ваш сервер або сервер призначення не підтримує приватну маршрутизацію.";
-
-/* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Надсилайте повідомлення напряму, якщо ваш сервер або сервер призначення не підтримує приватну маршрутизацію.";
-
 /* No comment provided by engineer. */
 "Send notifications" = "Надсилати сповіщення";

@@ -3515,9 +3368,6 @@
 /* No comment provided by engineer. */
 "Sent messages will be deleted after set time." = "Надіслані повідомлення будуть видалені через встановлений час.";

-/* srv error text. */
-"Server address is incompatible with network settings." = "Адреса сервера несумісна з налаштуваннями мережі.";
-
 /* server test error */
 "Server requires authorization to create queues, check password" = "Сервер вимагає авторизації для створення черг, перевірте пароль";

@@ -3527,9 +3377,6 @@
 /* No comment provided by engineer. */
 "Server test failed!" = "Тест сервера завершився невдало!";

-/* srv error text */
-"Server version is incompatible with network settings." = "Серверна версія несумісна з мережевими налаштуваннями.";
-
 /* No comment provided by engineer. */
 "Servers" = "Сервери";

@@ -3572,9 +3419,6 @@
 /* No comment provided by engineer. */
 "Settings" = "Налаштування";

-/* No comment provided by engineer. */
-"Shape profile images" = "Сформуйте зображення профілю";
-
 /* chat item action */
 "Share" = "Поділіться";

@@ -3596,9 +3440,6 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Поділіться з контактами";

-/* No comment provided by engineer. */
-"Show → on messages sent via private routing." = "Показувати → у повідомленнях, надісланих через приватну маршрутизацію.";
-
 /* No comment provided by engineer. */
 "Show calls in phone history" = "Показувати дзвінки в історії дзвінків";

@@ -3608,9 +3449,6 @@
 /* No comment provided by engineer. */
 "Show last messages" = "Показати останні повідомлення";

-/* No comment provided by engineer. */
-"Show message status" = "Показати статус повідомлення";
-
 /* No comment provided by engineer. */
 "Show preview" = "Показати попередній перегляд";

@@ -3641,12 +3479,6 @@
 /* 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 Lock";

@@ -3683,9 +3515,6 @@
 /* notification title */
 "Somebody" = "Хтось";

-/* No comment provided by engineer. */
-"Square, circle, or anything in between." = "Квадрат, коло або щось середнє між ними.";
-
 /* chat item text */
 "standard end-to-end encryption" = "стандартне наскрізне шифрування";

@@ -3818,9 +3647,6 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Додаток може сповіщати вас, коли ви отримуєте повідомлення або запити на контакт - будь ласка, відкрийте налаштування, щоб увімкнути цю функцію.";

-/* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "Програма попросить підтвердити завантаження з невідомих файлових серверів (крім .onion).";
-
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Спроба змінити пароль до бази даних не була завершена.";

@@ -3941,9 +3767,6 @@
 /* No comment provided by engineer. */
 "To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Щоб захистити вашу інформацію, увімкніть SimpleX Lock.\nПеред увімкненням цієї функції вам буде запропоновано пройти автентифікацію.";

-/* No comment provided by engineer. */
-"To protect your IP address, private routing uses your SMP servers to deliver messages." = "Щоб захистити вашу IP-адресу, приватна маршрутизація використовує ваші SMP-сервери для доставки повідомлень.";
-
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Щоб записати голосове повідомлення, будь ласка, надайте дозвіл на використання мікрофону.";

@@ -3998,6 +3821,9 @@
 /* rcv group event chat item */
 "unblocked %@" = "розблоковано %@";

+/* item status description */
+"Unexpected error: %@" = "Неочікувана помилка: %@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неочікуваний стан міграції";

@@ -4028,12 +3854,6 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Невідома помилка";

-/* No comment provided by engineer. */
-"unknown relays" = "невідомі реле";
-
-/* No comment provided by engineer. */
-"Unknown servers!" = "Невідомі сервери!";
-
 /* No comment provided by engineer. */
 "unknown status" = "невідомий статус";

@@ -4058,9 +3878,6 @@
 /* No comment provided by engineer. */
 "Unmute" = "Увімкнути звук";

-/* No comment provided by engineer. */
-"unprotected" = "незахищені";
-
 /* No comment provided by engineer. */
 "Unread" = "Непрочитане";

@@ -4130,12 +3947,6 @@
 /* No comment provided by engineer. */
 "Use only local notifications?" = "Використовувати лише локальні сповіщення?";

-/* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Використовуйте приватну маршрутизацію з невідомими серверами, якщо IP-адреса не захищена.";
-
-/* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Використовуйте приватну маршрутизацію з невідомими серверами.";
-
 /* No comment provided by engineer. */
 "Use server" = "Використовувати сервер";

@@ -4232,9 +4043,6 @@
 /* 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!" = "Голосові повідомлення заборонені!";

@@ -4286,27 +4094,12 @@
 /* No comment provided by engineer. */
 "When available" = "За наявності";

-/* No comment provided by engineer. */
-"When connecting audio and video calls." = "При підключенні аудіо та відеодзвінків.";
-
-/* No comment provided by engineer. */
-"when IP hidden" = "коли IP приховано";
-
 /* 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" = "Дротова мережа Ethernet";
-
 /* No comment provided by engineer. */
 "With encrypted files and media." = "З зашифрованими файлами та медіа.";

@@ -4316,18 +4109,9 @@
 /* No comment provided by engineer. */
 "With reduced battery usage." = "З меншим споживанням заряду акумулятора.";

-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Без Tor або VPN ваша IP-адреса буде видимою для файлових серверів.";
-
-/* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Без Tor або VPN ваша IP-адреса буде видимою для цих XFTP-ретрансляторів: %@.";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Неправильний пароль до бази даних";

-/* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Неправильний ключ або невідоме з'єднання - швидше за все, це з'єднання видалено.";
-
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Неправильний пароль!";

@@ -4337,9 +4121,6 @@
 /* pref value */
 "yes" = "так";

-/* No comment provided by engineer. */
-"you" = "ти";
-
 /* No comment provided by engineer. */
 "You" = "Ти";

@@ -353,12 +353,6 @@
 /* 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." = "管理员可以创建链接以加入群组。";

@@ -383,9 +377,6 @@
 /* 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!" = "所有消息都将被删除 - 这无法被撤销！";

@@ -398,9 +389,6 @@
 /* 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" = "允许";

@@ -431,9 +419,6 @@
 /* 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." = "允许发送语音消息。";

@@ -482,9 +467,6 @@
 /* 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)." = "应用程序为新的本地文件（视频除外）加密。";

@@ -506,15 +488,6 @@
 /* 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" = "附件";

@@ -662,9 +635,6 @@
 /* No comment provided by engineer. */
 "Cancel" = "取消";

-/* No comment provided by engineer. */
-"Cancel migration" = "取消迁移";
-
 /* feature offered item */
 "cancelled %@" = "已取消 %@";

@@ -674,9 +644,6 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "无法接收文件";

-/* No comment provided by engineer. */
-"Cellular" = "移动网络";
-
 /* No comment provided by engineer. */
 "Change" = "更改";

@@ -747,9 +714,6 @@
 /* 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" = "聊天偏好设置";

@@ -807,9 +771,6 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "确认数据库升级";

-/* No comment provided by engineer. */
-"Confirm network settings" = "确认网络设置";
-
 /* No comment provided by engineer. */
 "Confirm new passphrase…" = "确认新密码……";

@@ -819,12 +780,6 @@
 /* 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" = "连接";

@@ -1002,9 +957,6 @@
 /* No comment provided by engineer. */
 "Created on %@" = "创建于 %@";

-/* No comment provided by engineer. */
-"Creating archive link" = "正在创建存档链接";
-
 /* No comment provided by engineer. */
 "Creating link…" = "创建链接中…";

@@ -1146,9 +1098,6 @@
 /* No comment provided by engineer. */
 "Delete database" = "删除数据库";

-/* No comment provided by engineer. */
-"Delete database from this device" = "从这部设备上删除数据库";
-
 /* server test step */
 "Delete file" = "删除文件";

@@ -1338,21 +1287,9 @@
 /* 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!" = "重复的显示名！";

@@ -1386,9 +1323,6 @@
 /* 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?" = "启用即时通知？";

@@ -1416,9 +1350,6 @@
 /* enabled status */
 "enabled" = "已启用";

-/* No comment provided by engineer. */
-"Enabled for" = "启用对象";
-
 /* enabled status */
 "enabled for contact" = "已为联系人启用";

@@ -1500,9 +1431,6 @@
 /* No comment provided by engineer. */
 "Enter Passcode" = "输入密码";

-/* No comment provided by engineer. */
-"Enter passphrase" = "输入密码短语";
-
 /* No comment provided by engineer. */
 "Enter passphrase…" = "输入密码……";

@@ -1593,9 +1521,6 @@
 /* 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!" = "启用送达回执出错！";

@@ -1638,9 +1563,6 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "保存密码到钥匙串错误";

-/* when migrating */
-"Error saving settings" = "保存设置出错";
-
 /* No comment provided by engineer. */
 "Error saving user password" = "保存用户密码时出错";

@@ -1680,16 +1602,10 @@
 /* No comment provided by engineer. */
 "Error updating user privacy" = "更新用户隐私时出错";

-/* No comment provided by engineer. */
-"Error uploading the archive" = "上传存档出错";
-
-/* No comment provided by engineer. */
-"Error verifying passphrase:" = "验证密码短语出错：";
-
 /* No comment provided by engineer. */
 "Error: " = "错误： ";

-/* snd error text */
+/* No comment provided by engineer. */
 "Error: %@" = "错误： ％@";

 /* No comment provided by engineer. */
@@ -1719,9 +1635,6 @@
 /* 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…" = "导出数据库档案中…";

@@ -1758,21 +1671,12 @@
 /* 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! 🚀" = "终于我们有它们了！ 🚀";

@@ -1800,21 +1704,6 @@
 /* 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" = "找到了桌面";

@@ -1890,9 +1779,6 @@
 /* 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." = "群组成员可以发送语音消息。";

@@ -2010,12 +1896,6 @@
 /* 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" = "改进了消息传递";

@@ -2025,15 +1905,9 @@
 /* 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" = "隐身聊天";

@@ -2112,12 +1986,6 @@
 /* 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!" = "无效名称！";

@@ -2364,45 +2232,18 @@
 /* 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:" = "迁移错误：";

@@ -2442,12 +2283,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" = "多个聊天资料";

@@ -2463,12 +2304,6 @@
 /* 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" = "网络设置";

@@ -2547,9 +2382,6 @@
 /* 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" = "没有录制语音消息的权限";

@@ -2678,27 +2510,15 @@
 /* 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" = "密码";

@@ -2741,9 +2561,6 @@
 /* message decrypt error item */
 "Permanent decryption error" = "解密错误";

-/* No comment provided by engineer. */
-"Picture-in-picture calls" = "画中画通话";
-
 /* No comment provided by engineer. */
 "PING count" = "PING 次数";

@@ -2762,9 +2579,6 @@
 /* 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." = "请联系群组管理员。";

@@ -2825,9 +2639,6 @@
 /* No comment provided by engineer. */
 "Profile image" = "资料图片";

-/* No comment provided by engineer. */
-"Profile images" = "个人资料图";
-
 /* No comment provided by engineer. */
 "Profile name:" = "显示名：";

@@ -2876,12 +2687,6 @@
 /* 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" = "评价此应用程序";

@@ -2939,9 +2744,6 @@
 /* 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." = "对方会在您键入时看到更新。";

@@ -3017,18 +2819,9 @@
 /* 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" = "回复";

@@ -3086,9 +2879,6 @@
 /* No comment provided by engineer. */
 "Run chat" = "运行聊天程序";

-/* No comment provided by engineer. */
-"Safer groups" = "更安全的群组";
-
 /* chat item action */
 "Save" = "保存";

@@ -3137,15 +2927,6 @@
 /* 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" = "已保存的消息";

@@ -3338,9 +3119,6 @@
 /* No comment provided by engineer. */
 "Set passcode" = "设置密码";

-/* No comment provided by engineer. */
-"Set passphrase" = "设置密码短语";
-
 /* No comment provided by engineer. */
 "Set passphrase to export" = "设置密码来导出";

@@ -3353,9 +3131,6 @@
 /* No comment provided by engineer. */
 "Settings" = "设置";

-/* No comment provided by engineer. */
-"Shape profile images" = "改变个人资料图形状";
-
 /* chat item action */
 "Share" = "分享";

@@ -3389,9 +3164,6 @@
 /* No comment provided by engineer. */
 "Show preview" = "显示预览";

-/* No comment provided by engineer. */
-"Show QR code" = "显示二维码";
-
 /* No comment provided by engineer. */
 "Show:" = "显示：";

@@ -3416,12 +3188,6 @@
 /* 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 锁定";

@@ -3458,12 +3224,6 @@
 /* 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" = "开始聊天";

@@ -3479,9 +3239,6 @@
 /* No comment provided by engineer. */
 "Stop" = "停止";

-/* No comment provided by engineer. */
-"Stop chat" = "停止聊天程序";
-
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "停止聊天以启用数据库操作";

@@ -3509,9 +3266,6 @@
 /* authentication reason */
 "Stop SimpleX" = "停止 SimpleX";

-/* No comment provided by engineer. */
-"Stopping chat" = "正在停止聊天";
-
 /* No comment provided by engineer. */
 "strike" = "删去";

@@ -3662,12 +3416,6 @@
 /* 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" = "这个联系人";

@@ -3761,6 +3509,9 @@
 /* No comment provided by engineer. */
 "Unblock member?" = "解封成员吗？";

+/* item status description */
+"Unexpected error: %@" = "意外错误： ％@";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "未预料的迁移状态";

@@ -3851,15 +3602,9 @@
 /* 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 主机";

@@ -3887,9 +3632,6 @@
 /* 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" = "用户资料";

@@ -3914,12 +3656,6 @@
 /* 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" = "验证安全码";

@@ -3974,9 +3710,6 @@
 /* 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!" = "语音消息禁止发送！";

@@ -3998,9 +3731,6 @@
 /* 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!" = "警告：您可能会丢失部分数据！";

@@ -4016,33 +3746,18 @@
 /* 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." = "加密的文件和媒体。";

@@ -4064,9 +3779,6 @@
 /* pref value */
 "yes" = "是";

-/* No comment provided by engineer. */
-"you" = "您";
-
 /* No comment provided by engineer. */
 "You" = "您";

@@ -4112,9 +3824,6 @@
 /* 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." = "您可以隐藏或静音用户个人资料——只需向右滑动。";

@@ -88,7 +88,6 @@ android {
        "cs",
        "de",
        "es",
-        "fa",
        "fi",
        "fr",
        "hu",
@@ -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.initChatControllerOnStart
+import chat.simplex.common.platform.initChatControllerAndRunMigrations
 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) {
-        initChatControllerOnStart()
+        initChatControllerAndRunMigrations()
      }
      withTimeout(durationSeconds * 1000L) {
        val chatController = ChatController
@@ -6,6 +6,7 @@ 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
@@ -65,7 +66,6 @@ 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) {
-      initChatControllerOnStart()
+      initChatControllerAndRunMigrations()
    }
    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_THEME_NAME) {
+        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM.name) {
          null
        } else {
          CurrentColors.value.colors.isLight
@@ -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) {
-        initChatControllerOnStart()
+        initChatControllerAndRunMigrations()
      }
    }
  }
@@ -77,7 +77,7 @@ object NtfManager {
    val msgNtfs = manager.activeNotifications.filter { ntf ->
      ntf.notification.channelId == MessageChannel
    }
-    if (msgNtfs.size <= 1) {
+    if (msgNtfs.count() == 1) {
      // Have a group notification with no children so cancel it
      manager.cancel(0)
    }
@@ -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.59.0")
+        api("com.charleskorn.kaml:kaml:0.58.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,9 +53,6 @@ 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 {
@@ -17,6 +17,6 @@ val NotificationsMode.requiresIgnoringBattery

 lateinit var APPLICATION_ID: String

-fun Uri.toURI(): URI = URI(toString().replace("\n", ""))
+fun Uri.toURI(): URI = URI(toString())

 fun URI.toUri(): Uri = Uri.parse(toString())
@@ -15,10 +15,8 @@ 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"
@@ -7,8 +7,6 @@ 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
@@ -16,11 +14,9 @@ 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

@@ -55,6 +51,3 @@ 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()
@@ -11,7 +11,6 @@ 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
@@ -671,43 +670,37 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
  Box(Modifier.fillMaxSize()) {
    AndroidView(
      factory = { AndroidViewContext ->
-        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()
-                }
+        (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
-            }
          }
-        } 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)
+          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
+          }
        }
      }
    ) { /* WebView */ }
@@ -19,10 +19,14 @@ 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.*
@@ -30,6 +34,7 @@ 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
@@ -41,8 +46,9 @@ enum class AppIcon(val image: ImageResource) {
 }

@Composable
-actual fun AppearanceView(m: ChatModel) {
+actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)) {
  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()}")
@@ -59,11 +65,18 @@ actual fun AppearanceView(m: ChatModel) {

    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)
+      }
+    },
  )
 }

@@ -73,6 +86,8 @@ fun AppearanceScope.AppearanceLayout(
  languagePref: SharedPreference<String?>,
  systemDarkTheme: SharedPreference<String?>,
  changeIcon: (AppIcon) -> Unit,
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  editColor: (ThemeColor, Color) -> Unit,
 ) {
  ColumnWithScrollBar(
    Modifier.fillMaxWidth(),
@@ -105,13 +120,6 @@ 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)) {
@@ -137,6 +145,11 @@ fun AppearanceScope.AppearanceLayout(
      }
    }

+    SectionDividerSpaced(maxTopPadding = true)
+    ProfileImageSection()
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ThemesSection(systemDarkTheme, showSettingsModal, editColor)
    SectionBottomSpacer()
  }
 }
@@ -156,6 +169,8 @@ fun PreviewAppearanceSettings() {
      languagePref = SharedPreference({ null }, {}),
      systemDarkTheme = SharedPreference({ null }, {}),
      changeIcon = {},
+      showSettingsModal = { {} },
+      editColor = { _, _ -> },
    )
  }
 }
@@ -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.*
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
@@ -399,18 +399,6 @@ 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) {
@@ -694,8 +682,7 @@ data class User(
  override val showNtfs: Boolean,
  val sendRcptsContacts: Boolean,
  val sendRcptsSmallGroups: Boolean,
-  val viewPwdHash: UserPwdHash?,
-  val uiThemes: ThemeModeOverrides? = null,
+  val viewPwdHash: UserPwdHash?
 ): NamedChat, UserLike {
  override val displayName: String get() = profile.displayName
  override val fullName: String get() = profile.fullName
@@ -722,7 +709,6 @@ data class User(
      sendRcptsContacts = true,
      sendRcptsSmallGroups = false,
      viewPwdHash = null,
-      uiThemes = null,
    )
  }
 }
@@ -1055,8 +1041,7 @@ data class Contact(
  override val updatedAt: Instant,
  val chatTs: Instant?,
  val contactGroupMemberId: Long? = null,
-  val contactGrpInvSent: Boolean,
-  val uiThemes: ThemeModeOverrides? = null,
+  val contactGrpInvSent: Boolean
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Direct
  override val id get() = "@$contactId"
@@ -1128,8 +1113,7 @@ data class Contact(
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now(),
      chatTs = Clock.System.now(),
-      contactGrpInvSent = false,
-      uiThemes = null,
+      contactGrpInvSent = false
    )
  }
 }
@@ -1269,8 +1253,7 @@ data class GroupInfo (
  val chatSettings: ChatSettings,
  override val createdAt: Instant,
  override val updatedAt: Instant,
-  val chatTs: Instant?,
-  val uiThemes: ThemeModeOverrides? = null,
+  val chatTs: Instant?
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Group
  override val id get() = "#$groupId"
@@ -1312,8 +1295,7 @@ data class GroupInfo (
      chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now(),
-      chatTs = Clock.System.now(),
-      uiThemes = null,
+      chatTs = Clock.System.now()
    )
  }
 }
@@ -1933,13 +1915,12 @@ data class ChatItem (
      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, sentViaProxy, itemForwarded, itemDeleted, itemEdited, itemTimed, itemLive, deletable, editable),
+        meta = CIMeta.getSample(id, ts, text, status, sentViaProxy, itemForwarded, itemDeleted, itemEdited, itemTimed, deletable, editable),
        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
        quotedItem = quotedItem,
        reactions = listOf(),
@@ -26,7 +26,8 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
-import kotlinx.serialization.builtins.*
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.*
 import java.util.Date

@@ -167,20 +168,13 @@ 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_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 = {
+  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 = {
    json.encodeToString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
  }, decode = {
-    jsonCoerceInputValues.decodeFromString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
+    json.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)
@@ -275,12 +269,6 @@ 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"
@@ -357,10 +345,8 @@ 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_OLD = "Themes"
-    private const val SHARED_PREFS_THEME_OVERRIDES = "ThemeOverrides"
+    private const val SHARED_PREFS_THEMES = "Themes"
    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"
@@ -375,8 +361,6 @@ class AppPreferences {

    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
  }
 }

@@ -461,13 +445,8 @@ object ChatController {
    Log.d(TAG, "startChatWithTemporaryDatabase")
    val migrationActiveUser = apiGetActiveUser(null, ctrl) ?: apiCreateActiveUser(null, Profile(displayName = "Temp", fullName = ""), ctrl = ctrl)
    apiSetNetworkConfig(netCfg, ctrl)
-    apiSetAppFilePaths(
-      getMigrationTempFilesDirectory().absolutePath,
-      getMigrationTempFilesDirectory().absolutePath,
-      wallpapersDir.parentFile.absolutePath,
-      remoteHostsDir.absolutePath,
-      ctrl
-    )
+    apiSetTempFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
+    apiSetFilesFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
    apiStartChat(ctrl)
    return migrationActiveUser
  }
@@ -686,10 +665,22 @@ object ChatController {
    }
  }

-  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)
+  suspend fun apiSetTempFolder(tempFolder: String, ctrl: ChatCtrl? = null) {
+    val r = sendCmd(null, CC.SetTempFolder(tempFolder), ctrl)
    if (r is CR.CmdOk) return
-    throw Exception("failed to set app file paths: ${r.responseType} ${r.details}")
+    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}")
  }

  suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetEncryptLocalFiles(enable))
@@ -931,20 +922,6 @@ object ChatController {
    return null
  }

-  suspend fun apiContactQueueInfo(rh: Long?, contactId: Long): Pair<RcvMsgInfo?, QueueInfo>? {
-    val r = sendCmd(rh, CC.APIContactQueueInfo(contactId))
-    if (r is CR.QueueInfoR) return Pair(r.rcvMsgInfo, r.queueInfo)
-    apiErrorAlert("apiContactQueueInfo", generalGetString(MR.strings.error), r)
-    return null
-  }
-
-  suspend fun apiGroupMemberQueueInfo(rh: Long?, groupId: Long, groupMemberId: Long): Pair<RcvMsgInfo?, QueueInfo>? {
-    val r = sendCmd(rh, CC.APIGroupMemberQueueInfo(groupId, groupMemberId))
-    if (r is CR.QueueInfoR) return Pair(r.rcvMsgInfo, r.queueInfo)
-    apiErrorAlert("apiGroupMemberQueueInfo", generalGetString(MR.strings.error), r)
-    return null
-  }
-
  suspend fun apiSwitchContact(rh: Long?, contactId: Long): ConnectionStats? {
    val r = sendCmd(rh, CC.APISwitchContact(contactId))
    if (r is CR.ContactSwitchStarted) return r.connectionStats
@@ -1189,20 +1166,6 @@ 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))
@@ -2474,8 +2437,9 @@ sealed class CC {
  class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean, val viewPwd: String?): CC()
  class StartChat(val mainApp: Boolean): CC()
  class ApiStopChat: CC()
-  @Serializable
-  class ApiSetAppFilePaths(val appFilesFolder: String, val appTempFolder: String, val appAssetsFolder: String, val appRemoteHostsFolder: String): CC()
+  class SetTempFolder(val tempFolder: String): CC()
+  class SetFilesFolder(val filesFolder: String): CC()
+  class SetRemoteHostsFolder(val remoteHostsFolder: String): CC()
  class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
  class ApiExportArchive(val config: ArchiveConfig): CC()
  class ApiImportArchive(val config: ArchiveConfig): CC()
@@ -2521,8 +2485,6 @@ sealed class CC {
  class ApiSetMemberSettings(val groupId: Long, val groupMemberId: Long, val memberSettings: GroupMemberSettings): CC()
  class APIContactInfo(val contactId: Long): CC()
  class APIGroupMemberInfo(val groupId: Long, val groupMemberId: Long): CC()
-  class APIContactQueueInfo(val contactId: Long): CC()
-  class APIGroupMemberQueueInfo(val groupId: Long, val groupMemberId: Long): CC()
  class APISwitchContact(val contactId: Long): CC()
  class APISwitchGroupMember(val groupId: Long, val groupMemberId: Long): CC()
  class APIAbortSwitchContact(val contactId: Long): CC()
@@ -2545,8 +2507,6 @@ 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()
@@ -2614,7 +2574,9 @@ sealed class CC {
    is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}${maybePwd(viewPwd)}"
    is StartChat -> "/_start main=${onOff(mainApp)}"
    is ApiStopChat -> "/_stop"
-    is ApiSetAppFilePaths -> "/set file paths ${json.encodeToString(this)}"
+    is SetTempFolder -> "/_temp_folder $tempFolder"
+    is SetFilesFolder -> "/_files_folder $filesFolder"
+    is SetRemoteHostsFolder -> "/remote_hosts_folder $remoteHostsFolder"
    is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
    is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
    is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
@@ -2668,8 +2630,6 @@ sealed class CC {
    is ApiSetMemberSettings -> "/_member settings #$groupId $groupMemberId ${json.encodeToString(memberSettings)}"
    is APIContactInfo -> "/_info @$contactId"
    is APIGroupMemberInfo -> "/_info #$groupId $groupMemberId"
-    is APIContactQueueInfo -> "/_queue info @$contactId"
-    is APIGroupMemberQueueInfo -> "/_queue info #$groupId $groupMemberId"
    is APISwitchContact -> "/_switch @$contactId"
    is APISwitchGroupMember -> "/_switch #$groupId $groupMemberId"
    is APIAbortSwitchContact -> "/_abort switch @$contactId"
@@ -2696,8 +2656,6 @@ 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"
@@ -2762,7 +2720,9 @@ sealed class CC {
    is ApiDeleteUser -> "apiDeleteUser"
    is StartChat -> "startChat"
    is ApiStopChat -> "apiStopChat"
-    is ApiSetAppFilePaths -> "apiSetAppFilePaths"
+    is SetTempFolder -> "setTempFolder"
+    is SetFilesFolder -> "setFilesFolder"
+    is SetRemoteHostsFolder -> "setRemoteHostsFolder"
    is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
    is ApiExportArchive -> "apiExportArchive"
    is ApiImportArchive -> "apiImportArchive"
@@ -2808,8 +2768,6 @@ sealed class CC {
    is ApiSetMemberSettings -> "apiSetMemberSettings"
    is APIContactInfo -> "apiContactInfo"
    is APIGroupMemberInfo -> "apiGroupMemberInfo"
-    is APIContactQueueInfo -> "apiContactQueueInfo"
-    is APIGroupMemberQueueInfo -> "apiGroupMemberQueueInfo"
    is APISwitchContact -> "apiSwitchContact"
    is APISwitchGroupMember -> "apiSwitchGroupMember"
    is APIAbortSwitchContact -> "apiAbortSwitchContact"
@@ -2832,8 +2790,6 @@ 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"
@@ -4105,15 +4061,6 @@ 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
@@ -4124,8 +4071,6 @@ 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
@@ -4217,7 +4162,6 @@ sealed class CR {
  @Serializable @SerialName("networkConfig") class NetworkConfig(val networkConfig: NetCfg): CR()
  @Serializable @SerialName("contactInfo") class ContactInfo(val user: UserRef, val contact: Contact, val connectionStats_: ConnectionStats? = null, val customUserProfile: Profile? = null): CR()
  @Serializable @SerialName("groupMemberInfo") class GroupMemberInfo(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val connectionStats_: ConnectionStats? = null): CR()
-  @Serializable @SerialName("queueInfo") class QueueInfoR(val user: UserRef, val rcvMsgInfo: RcvMsgInfo?, val queueInfo: QueueInfo): CR()
  @Serializable @SerialName("contactSwitchStarted") class ContactSwitchStarted(val user: UserRef, val contact: Contact, val connectionStats: ConnectionStats): CR()
  @Serializable @SerialName("groupMemberSwitchStarted") class GroupMemberSwitchStarted(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val connectionStats: ConnectionStats): CR()
  @Serializable @SerialName("contactSwitchAborted") class ContactSwitchAborted(val user: UserRef, val contact: Contact, val connectionStats: ConnectionStats): CR()
@@ -4389,7 +4333,6 @@ sealed class CR {
    is NetworkConfig -> "networkConfig"
    is ContactInfo -> "contactInfo"
    is GroupMemberInfo -> "groupMemberInfo"
-    is QueueInfoR -> "queueInfo"
    is ContactSwitchStarted -> "contactSwitchStarted"
    is GroupMemberSwitchStarted -> "groupMemberSwitchStarted"
    is ContactSwitchAborted -> "contactSwitchAborted"
@@ -4551,7 +4494,6 @@ sealed class CR {
    is NetworkConfig -> json.encodeToString(networkConfig)
    is ContactInfo -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionStats: ${json.encodeToString(connectionStats_)}")
    is GroupMemberInfo -> withUser(user, "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionStats: ${json.encodeToString(connectionStats_)}")
-    is QueueInfoR -> withUser(user, "rcvMsgInfo: ${json.encodeToString(rcvMsgInfo)}\nqueueInfo: ${json.encodeToString(queueInfo)}\n")
    is ContactSwitchStarted -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionStats: ${json.encodeToString(connectionStats)}")
    is GroupMemberSwitchStarted -> withUser(user, "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionStats: ${json.encodeToString(connectionStats)}")
    is ContactSwitchAborted -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionStats: ${json.encodeToString(connectionStats)}")
@@ -4965,6 +4907,7 @@ sealed class ChatErrorType {
      is GroupMemberNotActive -> "groupMemberNotActive"
      is GroupMemberUserRemoved -> "groupMemberUserRemoved"
      is GroupMemberNotFound -> "groupMemberNotFound"
+      is GroupMemberIntroNotFound -> "groupMemberIntroNotFound"
      is GroupCantResendInvitation -> "groupCantResendInvitation"
      is GroupInternal -> "groupInternal"
      is FileNotFound -> "fileNotFound"
@@ -5044,6 +4987,7 @@ 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()
@@ -5577,11 +5521,6 @@ 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()
@@ -5606,11 +5545,6 @@ 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
  }

@@ -5643,11 +5577,6 @@ 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 {
@@ -5672,12 +5601,7 @@ data class AppSettings(
        confirmDBUpgrades = false,
        androidCallOnLockScreen = AppSettingsLockScreenCalls.SHOW,
        iosCallKitEnabled = true,
-        iosCallKitCallsInRecents = false,
-        uiProfileImageCornerRadius = 22.5f,
-        uiColorScheme = DefaultTheme.SYSTEM_THEME_NAME,
-        uiDarkColorScheme = DefaultTheme.SIMPLEX.themeName,
-        uiCurrentThemeIds = null,
-        uiThemes = null,
+        iosCallKitCallsInRecents = false
      )

    val current: AppSettings
@@ -5704,11 +5628,6 @@ 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(),
        )
    }
  }
@@ -5809,52 +5728,3 @@ enum class UserNetworkType {
      OTHER -> generalGetString(MR.strings.network_type_other)
    }
 }
-
-@Serializable
-data class RcvMsgInfo (
-  val msgId: Long,
-  val msgDeliveryId: Long,
-  val msgDeliveryStatus: String,
-  val agentMsgId: Long,
-  val agentMsgMeta: String
-)
-
-@Serializable
-data class QueueInfo (
-  val qiSnd: Boolean,
-  val qiNtf: Boolean,
-  val qiSub: QSub? = null,
-  val qiSize: Int,
-  val qiMsg: MsgInfo? = null
-)
-
-@Serializable
-data class QSub (
-  val qSubThread: QSubThread,
-  val qDelivered: String? = null
-)
-
-enum class QSubThread {
-  @SerialName("noSub")
-  NO_SUB,
-  @SerialName("subPending")
-  SUB_PENDING,
-  @SerialName("subThread")
-  SUB_THREAD,
-  @SerialName("prohibitSub")
-  PROHIBIT_SUB
-}
-
-@Serializable
-data class MsgInfo (
-  val msgId: String,
-  val msgTs: Instant,
-  val msgType: MsgType,
-)
-
-enum class MsgType {
-  @SerialName("message")
-  MESSAGE,
-  @SerialName("quota")
-  QUOTA
-}
@@ -2,6 +2,7 @@ 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
@@ -11,7 +12,6 @@ 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 (isInDarkTheme()) {
+  get() = (if (isSystemInDarkTheme()) {
    Color.White
  } else {
    Color.Black
@@ -42,12 +42,6 @@ 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
@@ -43,13 +43,14 @@ val appPreferences: AppPreferences

 val chatController: ChatController = ChatController

-fun initChatControllerOnStart() {
+fun initChatControllerAndRunMigrations() {
  withLongRunningApi {
    if (appPreferences.chatStopped.get() && appPreferences.storeDBPassphrase.get() && ksDatabasePassword.get() != null) {
      initChatController(startChat = ::showStartChatAfterRestartAlert)
    } else {
      initChatController()
    }
+    runMigrations()
  }
 }

@@ -87,13 +88,11 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
      return
    }
    platform.androidRestartNetworkObserver()
-    controller.apiSetAppFilePaths(
-      appFilesDir.absolutePath,
-      coreTmpDir.absolutePath,
-      wallpapersDir.parentFile.absolutePath,
-      remoteHostsDir.absolutePath,
-      ctrl
-    )
+    controller.apiSetTempFolder(coreTmpDir.absolutePath)
+    controller.apiSetFilesFolder(appFilesDir.absolutePath)
+    if (appPlatform.isDesktop) {
+      controller.apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
+    }
    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)
@@ -1,12 +1,10 @@
 package chat.simplex.common.platform

 import androidx.compose.runtime.Composable
-import chat.simplex.common.model.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.common.model.CIFile
+import chat.simplex.common.model.CryptoFile
 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
@@ -16,10 +14,8 @@ 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
@@ -82,20 +78,6 @@ 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) {
@@ -116,42 +98,6 @@ 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
@@ -1,13 +1,11 @@
 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
@@ -33,5 +31,3 @@ expect fun windowWidth(): Dp
 expect fun desktopExpandWindowToWidth(width: Dp)

 expect fun isRtl(text: CharSequence): Boolean
-
-expect fun ImageResource.toComposeImageBitmap(): ImageBitmap?
@@ -31,6 +31,17 @@ 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() = MaterialTheme.appColors.primaryVariant2
+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
+  }
+}
+
@@ -6,136 +6,53 @@ 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.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.platform.isInNightMode
 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 {
-  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
+  SYSTEM, LIGHT, DARK, SIMPLEX;

  // Call it only with base theme, not SYSTEM
-  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)
-  }
-}
-
-@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(")")
+  fun hasChangedAnyColor(colors: Colors, appColors: AppColors): Boolean {
+    val palette = when (this) {
+      SYSTEM -> return false
+      LIGHT -> LightColorPalette
+      DARK -> DarkColorPalette
+      SIMPLEX -> SimplexColorPalette
    }
-  }
-}
-
-@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(")")
+    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
  }
 }

+data class AppColors(
+  val title: Color,
+  val sentMessage: Color,
+  val receivedMessage: Color
+)
+
 enum class ThemeColor {
-  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, SENT_QUOTE, RECEIVED_MESSAGE, RECEIVED_QUOTE, PRIMARY_VARIANT2, WALLPAPER_BACKGROUND, WALLPAPER_TINT;
+  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, RECEIVED_MESSAGE;

-  fun fromColors(colors: Colors, appColors: AppColors, appWallpaper: AppWallpaper): Color? {
+  fun fromColors(colors: Colors, appColors: AppColors): Color {
    return when (this) {
      PRIMARY -> colors.primary
      PRIMARY_VARIANT -> colors.primaryVariant
@@ -144,13 +61,8 @@ 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
    }
  }

@@ -163,13 +75,8 @@ 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)
    }
 }

@@ -185,232 +92,45 @@ 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,
 ) {
-  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 {
+  fun toColors(base: DefaultTheme): Colors {
    val baseColors = when (base) {
      DefaultTheme.LIGHT -> LightColorPalette
      DefaultTheme.DARK -> DarkColorPalette
      DefaultTheme.SIMPLEX -> SimplexColorPalette
-      DefaultTheme.BLACK -> BlackColorPalette
+      // shouldn't be here
+      DefaultTheme.SYSTEM -> LightColorPalette
    }
    return baseColors.copy(
-      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,
+      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,
    )
  }

-  fun toAppColors(base: DefaultTheme, perChatTheme: ThemeColors?, perChatWallpaperType: WallpaperType?, perUserTheme: ThemeColors?, perUserWallpaperType: WallpaperType?, presetWallpaperTheme: ThemeColors?): AppColors {
+  fun toAppColors(base: DefaultTheme): AppColors {
    val baseColors = when (base) {
      DefaultTheme.LIGHT -> LightColorPaletteApp
      DefaultTheme.DARK -> DarkColorPaletteApp
      DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
-      DefaultTheme.BLACK -> BlackColorPaletteApp
+      // shouldn't be here
+      DefaultTheme.SYSTEM -> LightColorPaletteApp
    }
-
-    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 = 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,
+      title = title?.colorFromReadableHex() ?: baseColors.title,
+      sentMessage = sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage,
+      receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
    )
  }

-  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)
+  fun withFilledColors(base: DefaultTheme): ThemeColors {
+    val c = toColors(base)
+    val ac = toAppColors(base)
    return ThemeColors(
      primary = c.primary.toReadableHex(),
      primaryVariant = c.primaryVariant.toReadableHex(),
@@ -419,71 +139,23 @@ data class ThemeOverrides (
      background = c.background.toReadableHex(),
      surface = c.surface.toReadableHex(),
      title = ac.title.toReadableHex(),
-      primaryVariant2 = ac.primaryVariant2.toReadableHex(),
      sentMessage = ac.sentMessage.toReadableHex(),
-      sentQuote = ac.sentQuote.toReadableHex(),
-      receivedMessage = ac.receivedMessage.toReadableHex(),
-      receivedQuote = ac.receivedQuote.toReadableHex(),
+      receivedMessage = ac.receivedMessage.toReadableHex()
    )
  }
 }

-fun List<ThemeOverrides>.getTheme(themeId: String?): ThemeOverrides? =
-  firstOrNull { it.themeId == themeId }
+private fun String.colorFromReadableHex(): Color =
+  Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())

-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
-}
+private fun Color.toReadableHex(): String = "#" + Integer.toHexString(toArgb())

@Serializable
-data class ThemeModeOverrides (
-  val light: ThemeModeOverride? = null,
-  val dark: ThemeModeOverride? = null
+data class ThemeOverrides (
+  val base: DefaultTheme,
+  val colors: ThemeColors
 ) {
-  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 {
+  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)
@@ -492,97 +164,9 @@ data class ThemeModeOverride (
      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)
-      )
+    })
  }
 }

@@ -620,6 +204,7 @@ val DarkColorPalette = darkColors(
 //  background = Color.Black,
  surface = Color(0xFF222222),
 //  background = Color(0xFF121212),
+//  surface = Color(0xFF121212),
  error = Color.Red,
  onBackground = Color(0xFFFFFBFA),
  onSurface = Color(0xFFFFFBFA),
@@ -627,11 +212,8 @@ val DarkColorPalette = darkColors(
 )
 val DarkColorPaletteApp = AppColors(
  title = SimplexBlue,
-  primaryVariant2 = Color(0xFF18262E),
-  sentMessage = Color(0xFF18262E),
-  sentQuote = Color(0xFF1D3847),
-  receivedMessage = Color(0xff262627),
-  receivedQuote = Color(0xff373739),
+  sentMessage = SentMessageColor,
+  receivedMessage = Color(0x20B1B0B5)
 )

 val LightColorPalette = lightColors(
@@ -649,11 +231,8 @@ val LightColorPalette = lightColors(
 )
 val LightColorPaletteApp = AppColors(
  title = SimplexBlue,
-  primaryVariant2 = Color(0xFFE9F7FF),
-  sentMessage = Color(0xFFE9F7FF),
-  sentQuote = Color(0xFFD6F0FF),
-  receivedMessage = Color(0xfff5f5f6),
-  receivedQuote = Color(0xffececee),
+  sentMessage = SentMessageColor,
+  receivedMessage = Color(0x20B1B0B5)
 )

 val SimplexColorPalette = darkColors(
@@ -672,39 +251,11 @@ val SimplexColorPalette = darkColors(
 )
 val SimplexColorPaletteApp = AppColors(
  title = Color(0xFF267BE5),
-  primaryVariant2 = Color(0xFF172941),
-  sentMessage = Color(0xFF172941),
-  sentQuote = Color(0xFF1C3A57),
-  receivedMessage = Color(0xff25283a),
-  receivedQuote = Color(0xff36394a),
+  sentMessage = SentMessageColor,
+  receivedMessage = Color(0x20B1B0B5)
 )

-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()))
+val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))

@Composable
 fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLight
@@ -712,113 +263,31 @@ 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) {
-  systemInDarkThemeCurrently = isDark
-  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.value.colors.isLight == isDark) {
+  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM.name && CurrentColors.value.colors.isLight == isDark) {
    // Change active colors from light to dark and back based on system theme
-    ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
+    ThemeManager.applyTheme(DefaultTheme.SYSTEM.name, isDark)
  }
 }

@Composable
 fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
-// 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)
-      }
+  LaunchedEffect(darkTheme) {
+    // For preview
+    if (darkTheme != null)
+      CurrentColors.value = ThemeManager.currentColors(darkTheme)
+  }
+  val systemDark = isSystemInDarkTheme()
+  LaunchedEffect(systemDark) {
+    reactOnDarkThemeChanges(systemDark)
  }
  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 = {
-      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)
+      CompositionLocalProvider(LocalContentColor provides MaterialTheme.colors.onBackground, content = content)
    }
  )
 }
@@ -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.common.model.*
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.helpers.*
-import java.io.File
+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

 // 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,215 +18,140 @@ 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, val wallpaper: AppWallpaper = AppWallpaper())
+  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors)

  private fun systemDarkThemeColors(): Pair<Colors, DefaultTheme> = when (appPrefs.systemDarkTheme.get()) {
-    DefaultTheme.DARK.themeName -> DarkColorPalette to DefaultTheme.DARK
-    DefaultTheme.SIMPLEX.themeName -> SimplexColorPalette to DefaultTheme.SIMPLEX
-    DefaultTheme.BLACK.themeName -> BlackColorPalette to DefaultTheme.BLACK
+    DefaultTheme.DARK.name -> DarkColorPalette to DefaultTheme.DARK
+    DefaultTheme.SIMPLEX.name -> SimplexColorPalette to DefaultTheme.SIMPLEX
    else -> SimplexColorPalette to DefaultTheme.SIMPLEX
  }

-  private fun nonSystemThemeName(): String {
+  fun currentColors(darkForSystemTheme: Boolean): ActiveTheme {
    val themeName = appPrefs.currentTheme.get()!!
-    return if (themeName != DefaultTheme.SYSTEM_THEME_NAME) {
+    val themeOverrides = appPrefs.themeOverrides.get()
+
+    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
      themeName
    } else {
-      if (systemInDarkThemeCurrently) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.themeName
+      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
    }
-  }
-
-  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 theme = themeOverrides[nonSystemThemeName]
    val baseTheme = when (nonSystemThemeName) {
-      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)))
+      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)
    }
-
-    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)
+    if (theme == null) {
+      return ActiveTheme(themeName, baseTheme.first, baseTheme.second, baseTheme.third)
    }
-    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)
-    )
+    return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.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
-    )
+  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 applyTheme(theme: String) {
+  // 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) {
    appPrefs.currentTheme.set(theme)
-    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+    CurrentColors.value = currentColors(darkForSystemTheme)
    platform.androidSetNightModeIfSupported()
  }

-  fun changeDarkTheme(theme: String) {
+  fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {
    appPrefs.systemDarkTheme.set(theme)
-    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+    CurrentColors.value = currentColors(darkForSystemTheme)
  }

-  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
+  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
    }
-    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
+    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
      }
    }
-    val prevValue = pref.value
-    pref.value = prevValue.copy(
-      colors = ThemeColors(),
-      wallpaper = ThemeWallpaper.from(type, null, null).copy(scale = null, scaleType = null)
-    )
-    return true
+    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)
  }

-  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 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 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"
+  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
    }
+    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())
@@ -29,7 +29,6 @@ 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.*
@@ -42,8 +41,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
-import kotlinx.serialization.encodeToString
-import java.io.File

@Composable
 fun ChatInfoView(
@@ -340,16 +337,6 @@ 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)
        //      }
@@ -419,19 +406,6 @@ fun ChatInfoLayout(
      SectionView(title = stringResource(MR.strings.section_title_for_console)) {
        InfoRow(stringResource(MR.strings.info_row_local_name), chat.chatInfo.localDisplayName)
        InfoRow(stringResource(MR.strings.info_row_database_id), chat.chatInfo.apiId.toString())
-        SectionItemView({
-          withBGApi {
-            val info = controller.apiContactQueueInfo(chat.remoteHostId, chat.chatInfo.apiId)
-            if (info != null) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(MR.strings.message_queue_info),
-                text = queueInfoText(info)
-              )
-            }
-          }
-        }) {
-          Text(stringResource(MR.strings.info_row_debug_delivery))
-        }
      }
    }
    SectionBottomSpacer()
@@ -668,15 +642,6 @@ 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(
@@ -710,72 +675,6 @@ 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 {
@@ -812,12 +711,6 @@ fun showSyncConnectionForceAlert(syncConnectionForce: () -> Unit) {
  )
 }

-fun queueInfoText(info: Pair<RcvMsgInfo?, QueueInfo>): String {
-  val (rcvMsgInfo, qInfo) = info
-  val msgInfo: String = if (rcvMsgInfo != null) json.encodeToString(rcvMsgInfo) else generalGetString(MR.strings.message_queue_info_none)
-  return generalGetString(MR.strings.message_queue_info_server_info).format(json.encodeToString(qInfo), msgInfo)
-}
-
@Preview
@Composable
 fun PreviewChatInfoLayout() {
@@ -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 = MaterialTheme.appColors
+  val appColors = CurrentColors.collectAsState().value.appColors
  val uriHandler = LocalUriHandler.current
  val selection = remember { mutableStateOf<CIInfoTab>(CIInfoTab.History) }

@@ -5,25 +5,25 @@ 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.drawBehind
-import androidx.compose.ui.draw.drawWithCache
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 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,381 +118,369 @@ 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 -> {
-        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
+        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
              ) {
-                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() } }
+                Text(
+                  generalGetString(MR.strings.contact_connection_pending),
+                  Modifier.padding(top = 4.dp),
+                  fontSize = 14.sp,
+                  color = MaterialTheme.colors.secondary
                )
              }
-            },
-            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
+              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)
              }
-              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)
-                }
-                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()
-                    }
+              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
                  }
-                }
-              }
-            },
-            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)
+                  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)
                }
              }
-            },
-            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)
+            }
+          },
+          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)
                }
              }
-            },
-            deleteMessage = { itemId, mode ->
+            }
+          },
+          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 {
-                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)
-                }
+                apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
              }
-            },
-            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,
+            }
+          },
+          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 = cItem.id,
-                  add = add,
-                  reaction = reaction
+                  itemId = itemId,
+                  mode = mode
                )
-                if (updatedCI != null) {
-                  chatModel.updateChatItem(cInfo, updatedCI)
-                }
+                deletedChatItem = r?.deletedChatItem?.chatItem
+                toChatItem = r?.toChatItem?.chatItem
              }
-            },
-            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
+              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 {
-                var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
-                ModalManager.end.closeModals()
-                ModalManager.end.showModalCloseable(endButtons = {
-                  ShareButton {
-                    clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
+                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)
                  }
-                }) { 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
-                        }
+                }
+                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) {
+                  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()
-                  }
+                }
+                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)
-                }
+            }
+          },
+          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)
-                }
+            }
+          },
+          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(),
-          )
-        }
+            }
+          },
+          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 }
@@ -546,7 +534,6 @@ 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,
@@ -611,25 +598,15 @@ 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
-            .fillMaxSize()
-            .background(MaterialTheme.colors.background)
-            .then(if (wallpaperImage != null)
-              Modifier.drawWithCache { chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor) }
-            else
-              Modifier)
+            .fillMaxHeight()
            .padding(contentPadding)
          ) {
            ChatItemsList(
              chat, unreadCount, composeState, searchValue,
              useLinkPreviews, linkMode, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
-              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
+              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat,
              updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
            )
@@ -898,7 +875,6 @@ 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,
@@ -1002,7 +978,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, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools, showViaProxy = showViaProxy)
+            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, showViaProxy = showViaProxy)
          }
        }

@@ -1286,7 +1262,7 @@ val MEMBER_IMAGE_SIZE: Dp = 38.dp

@Composable
 fun MemberImage(member: GroupMember) {
-  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image, backgroundColor = MaterialTheme.colors.background)
+  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image)
 }

@Composable
@@ -1555,7 +1531,6 @@ fun PreviewChatLayout() {
      acceptCall = { _ -> },
      acceptFeature = { _, _, _ -> },
      openDirectChat = { _ -> },
-      forwardItem = { _, _ -> },
      updateContactStats = { },
      updateMemberStats = { _, _ -> },
      syncContactConnection = { },
@@ -1629,7 +1604,6 @@ fun PreviewGroupChatLayout() {
      acceptCall = { _ -> },
      acceptFeature = { _, _, _ -> },
      openDirectChat = { _ -> },
-      forwardItem = { _, _ -> },
      updateContactStats = { },
      updateMemberStats = { _, _ -> },
      syncContactConnection = { },
@@ -16,7 +16,7 @@ import dev.icerock.moko.resources.compose.stringResource

@Composable
 fun ComposeContextInvitingContactMemberView() {
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
  Row(
    Modifier
      .height(60.dp)
@@ -16,7 +16,7 @@ import chat.simplex.res.MR

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

@Composable
 fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
  Row(
    Modifier
      .padding(top = 8.dp)
@@ -776,7 +776,7 @@ fun ComposeView(

  @Composable
  fun MsgNotAllowedView(reason: String, icon: Painter) {
-    val color = MaterialTheme.appColors.receivedMessage
+    val color = CurrentColors.collectAsState().value.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))
@@ -862,7 +862,7 @@ fun ComposeView(
      }
    }
    Row(
-      modifier = Modifier.background(MaterialTheme.colors.background).padding(end = 8.dp),
+      modifier = Modifier.padding(end = 8.dp),
      verticalAlignment = Alignment.Bottom,
    ) {
      val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
@@ -974,7 +974,7 @@ fun ComposeView(
      val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
      val sendButtonColor =
        if (chat.chatInfo.incognito)
-          if (isInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
+          if (isSystemInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
        else MaterialTheme.colors.primary
      SendMsgView(
        composeState,
@@ -35,7 +35,7 @@ fun ComposeVoiceView(
 ) {
  val progress = rememberSaveable { mutableStateOf(0) }
  val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
  Box {
    Box(
      Modifier
@@ -30,8 +30,8 @@ fun ContextItemView(
  cancelContextItem: () -> Unit
 ) {
  val sent = contextItem.chatDir.sent
-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage

  @Composable
  fun MessageText(attachment: ImageResource?, lines: Int) {
@@ -86,7 +86,7 @@ fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
    .map { it.chatInfo }
    .filterIsInstance<ChatInfo.Direct>()
    .map { it.contact }
-    .filter { c -> c.sendMsgEnabled && !c.nextSendGrpInv && c.contactId !in memberContactIds && c.chatViewName.lowercase().contains(s) }
+    .filter { c -> c.ready && c.active && c.contactId !in memberContactIds && c.chatViewName.lowercase().contains(s) }
    .sortedBy { it.displayName.lowercase() }
    .toList()
 }
@@ -9,6 +9,7 @@ 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.*
@@ -203,7 +204,7 @@ fun GroupChatInfoLayout(
    scope.launch { listState.scrollToItem(0) }
  }
  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue()) }
-  val filteredMembers = remember(members) { derivedStateOf { members.filter { it.chatViewName.lowercase().contains(searchText.value.text.trim().lowercase()) } } }
+  val filteredMembers = remember(members) { derivedStateOf { members.filter { it.chatViewName.lowercase().contains(searchText.value.text.trim()) } } }
  // LALAL strange scrolling
  LazyColumnWithScrollBar(
    Modifier
@@ -232,16 +233,6 @@ 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)
@@ -3,7 +3,6 @@ package chat.simplex.common.views.chat.group
 import InfoRow
 import SectionBottomSpacer
 import SectionDividerSpaced
-import SectionItemView
 import SectionSpacer
 import SectionTextFooter
 import SectionView
@@ -28,7 +27,6 @@ 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.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
 import chat.simplex.common.views.helpers.*
@@ -60,7 +58,6 @@ fun GroupMemberInfoView(
  if (chat != null) {
    val newRole = remember { mutableStateOf(member.memberRole) }
    GroupMemberInfoLayout(
-      rhId = rhId,
      groupInfo,
      member,
      connStats,
@@ -222,7 +219,6 @@ fun removeMemberDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, c

@Composable
 fun GroupMemberInfoLayout(
-  rhId: Long?,
  groupInfo: GroupInfo,
  member: GroupMember,
  connStats: MutableState<ConnectionStats?>,
@@ -401,19 +397,6 @@ fun GroupMemberInfoLayout(
      SectionView(title = stringResource(MR.strings.section_title_for_console)) {
        InfoRow(stringResource(MR.strings.info_row_local_name), member.localDisplayName)
        InfoRow(stringResource(MR.strings.info_row_database_id), member.groupMemberId.toString())
-        SectionItemView({
-          withBGApi {
-            val info = controller.apiGroupMemberQueueInfo(rhId, groupInfo.apiId, member.groupMemberId)
-            if (info != null) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(MR.strings.message_queue_info),
-                text = queueInfoText(info)
-              )
-            }
-          }
-        }) {
-          Text(stringResource(MR.strings.info_row_debug_delivery))
-        }
      }
    }
    SectionBottomSpacer()
@@ -661,7 +644,6 @@ fun blockMemberForAll(rhId: Long?, gInfo: GroupInfo, member: GroupMember, blocke
 fun PreviewGroupMemberInfoLayout() {
  SimpleXTheme {
    GroupMemberInfoLayout(
-      rhId = null,
      groupInfo = GroupInfo.sampleData,
      member = GroupMember.sampleData,
      connStats = remember { mutableStateOf(null) },
@@ -123,12 +123,13 @@ private fun GroupPreferencesLayout(
      applyPrefs(preferences.copy(files = 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)))
-    }
+    // 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 enableHistory = remember(preferences) { mutableStateOf(preferences.history.enable) }
@@ -188,6 +189,8 @@ 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)
          }
@@ -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 ->
@@ -83,8 +83,8 @@ fun CIGroupInvitationView(
    }
  }

-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    modifier = if (action && !inProgress.value) Modifier.clickable(onClick = {
      inProgress.value = true
@@ -110,7 +110,6 @@ fun CIGroupInvitationView(
            .padding(bottom = 4.dp),
        ) {
          groupInfoView()
-          val secondaryColor = MaterialTheme.colors.secondary
          Column(Modifier.padding(top = 2.dp, start = 5.dp)) {
            Divider(Modifier.fillMaxWidth().padding(bottom = 4.dp))
            if (action) {
@@ -118,7 +117,7 @@ fun CIGroupInvitationView(
              Text(
                buildAnnotatedString {
                  append(generalGetString(if (chatIncognito) MR.strings.group_invitation_tap_to_join_incognito else MR.strings.group_invitation_tap_to_join))
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor)) }
+                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false)) }
                },
                color = if (inProgress.value)
                  MaterialTheme.colors.secondary
@@ -129,7 +128,7 @@ fun CIGroupInvitationView(
              Text(
                buildAnnotatedString {
                  append(groupInvitationStr())
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor)) }
+                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false)) }
                }
              )
            }
@@ -12,6 +12,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.isInDarkTheme
 import chat.simplex.res.MR
@@ -85,7 +86,7 @@ private fun CIMetaText(
    Spacer(Modifier.width(4.dp))
  }
  if (showViaProxy && meta.sentViaProxy == true) {
-    Icon(painterResource(MR.images.ic_arrow_forward), null, Modifier.height(17.dp), tint = MaterialTheme.colors.secondary)
+    Icon(painterResource(MR.images.ic_arrow_forward), null, Modifier.height(17.dp), tint = CurrentColors.value.colors.secondary)
  }
  if (showStatus) {
    val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color, paleColor)
@@ -114,7 +115,6 @@ fun reserveSpaceForMeta(
  meta: CIMeta,
  chatTTL: Int?,
  encrypted: Boolean?,
-  secondaryColor: Color,
  showStatus: Boolean = true,
  showEdited: Boolean = true,
  showViaProxy: Boolean = false
@@ -132,7 +132,7 @@ fun reserveSpaceForMeta(
  if (showViaProxy && meta.sentViaProxy == true) {
    res += iconSpace
  }
-  if (showStatus && (meta.statusIcon(secondaryColor) != null || !meta.disappearing)) {
+  if (showStatus && (meta.statusIcon(CurrentColors.value.colors.secondary) != null || !meta.disappearing)) {
    res += iconSpace
  }
  if (encrypted != null) {
@@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.CurrentColors
-import chat.simplex.common.ui.theme.appColors
 import chat.simplex.common.views.helpers.AlertManager
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
@@ -138,7 +137,7 @@ fun DecryptionErrorItemFixButton(
  onClick: () -> Unit,
  syncSupported: Boolean
 ) {
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -165,11 +164,10 @@ fun DecryptionErrorItemFixButton(
            tint = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
          )
          Spacer(Modifier.padding(2.dp))
-          val secondaryColor = MaterialTheme.colors.secondary
          Text(
            buildAnnotatedString {
              append(generalGetString(MR.strings.fix_connection))
-              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor)) }
+              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null)) }
              withStyle(reserveTimestampStyle) { append("    ") } // for icon
            },
            color = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
@@ -186,7 +184,7 @@ fun DecryptionErrorItem(
  ci: ChatItem,
  onClick: () -> Unit
 ) {
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -197,11 +195,10 @@ fun DecryptionErrorItem(
      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
      contentAlignment = Alignment.BottomEnd,
    ) {
-      val secondaryColor = MaterialTheme.colors.secondary
      Text(
        buildAnnotatedString {
          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-          withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor)) }
+          withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null)) }
        },
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
      )
@@ -154,8 +154,8 @@ private fun VoiceLayout(
  }
  when {
    hasText -> {
-      val sentColor = MaterialTheme.appColors.sentMessage
-      val receivedColor = MaterialTheme.appColors.receivedMessage
+      val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+      val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
      Spacer(Modifier.width(6.dp))
      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
      Row(verticalAlignment = Alignment.CenterVertically) {
@@ -224,8 +224,8 @@ private fun PlayPauseButton(
  longClick: () -> Unit,
  icon: ImageResource = MR.images.ic_play_arrow_filled,
 ) {
-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
    color = if (sent) sentColor else receivedColor,
@@ -59,7 +59,6 @@ fun ChatItemView(
  scrollToItem: (Long) -> Unit,
  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
  openDirectChat: (Long) -> Unit,
-  forwardItem: (ChatInfo, ChatItem) -> Unit,
  updateContactStats: (Contact) -> Unit,
  updateMemberStats: (GroupInfo, GroupMember) -> Unit,
  syncContactConnection: (Contact) -> Unit,
@@ -69,8 +68,7 @@ fun ChatItemView(
  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  developerTools: Boolean,
-  showViaProxy: Boolean,
-  preview: Boolean = false,
+  showViaProxy: Boolean
 ) {
  val uriHandler = LocalUriHandler.current
  val sent = cItem.chatDir.sent
@@ -262,7 +260,8 @@ fun ChatItemView(
                  !cItem.isLiveDummy && !live
                  ) {
                  ItemAction(stringResource(MR.strings.forward_chat_item), painterResource(MR.images.ic_forward), onClick = {
-                    forwardItem(cInfo, cItem)
+                    chatModel.chatId.value = null
+                    chatModel.sharedContent.value = SharedContent.Forward(cItem, cInfo)
                    showMenu.value = false
                  })
                }
@@ -273,7 +272,7 @@ fun ChatItemView(
                if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null && !cItem.localNote) {
                  CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
                }
-                if (!(live && cItem.meta.isLive) && !preview) {
+                if (!(live && cItem.meta.isLive)) {
                  DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
                }
                val groupInfo = cItem.memberToModerate(cInfo)?.first
@@ -820,40 +819,40 @@ expect fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager)

@Preview
@Composable
-fun PreviewChatItemView(
-  chatItem: ChatItem = ChatItem.getSampleData(1, CIDirection.DirectSnd(), Clock.System.now(), "hello")
-) {
-  ChatItemView(
-    rhId = null,
-    ChatInfo.Direct.sampleData,
-    chatItem,
-    useLinkPreviews = true,
-    linkMode = SimplexLinkMode.DESCRIPTION,
-    composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-    revealed = remember { mutableStateOf(false) },
-    range = 0..1,
-    deleteMessage = { _, _ -> },
-    deleteMessages = { _ -> },
-    receiveFile = { _ -> },
-    cancelFile = {},
-    joinGroup = { _, _ -> },
-    acceptCall = { _ -> },
-    scrollToItem = {},
-    acceptFeature = { _, _, _ -> },
-    openDirectChat = { _ -> },
-    forwardItem = { _, _ -> },
-    updateContactStats = { },
-    updateMemberStats = { _, _ -> },
-    syncContactConnection = { },
-    syncMemberConnection = { _, _ -> },
-    findModelChat = { null },
-    findModelMember = { null },
-    setReaction = { _, _, _, _ -> },
-    showItemDetails = { _, _ -> },
-    developerTools = false,
-    showViaProxy = false,
-    preview = true,
-  )
+fun PreviewChatItemView() {
+  SimpleXTheme {
+    ChatItemView(
+      rhId = null,
+      ChatInfo.Direct.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
+      ),
+      useLinkPreviews = true,
+      linkMode = SimplexLinkMode.DESCRIPTION,
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
+      revealed = remember { mutableStateOf(false) },
+      range = 0..1,
+      deleteMessage = { _, _ -> },
+      deleteMessages = { _ -> },
+      receiveFile = { _ -> },
+      cancelFile = {},
+      joinGroup = { _, _ -> },
+      acceptCall = { _ -> },
+      scrollToItem = {},
+      acceptFeature = { _, _, _ -> },
+      openDirectChat = { _ -> },
+      updateContactStats = { },
+      updateMemberStats = { _, _ -> },
+      syncContactConnection = { },
+      syncMemberConnection = { _, _ -> },
+      findModelChat = { null },
+      findModelMember = { null },
+      setReaction = { _, _, _, _ -> },
+      showItemDetails = { _, _ -> },
+      developerTools = false,
+      showViaProxy = false
+    )
+  }
 }

@Preview
@@ -878,7 +877,6 @@ fun PreviewChatItemViewDeletedContent() {
      scrollToItem = {},
      acceptFeature = { _, _, _ -> },
      openDirectChat = { _ -> },
-      forwardItem = { _, _ -> },
      updateContactStats = { },
      updateMemberStats = { _, _ -> },
      syncContactConnection = { },
@@ -888,8 +886,7 @@ fun PreviewChatItemViewDeletedContent() {
      setReaction = { _, _, _, _ -> },
      showItemDetails = { _, _ -> },
      developerTools = false,
-      showViaProxy = false,
-      preview = true,
+      showViaProxy = false
    )
  }
 }
@@ -18,8 +18,8 @@ import chat.simplex.common.ui.theme.*
@Composable
 fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean) {
  val sent = ci.chatDir.sent
-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
    color = if (sent) sentColor else receivedColor,
@@ -46,6 +46,9 @@ fun FramedItemView(
    return if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.membership else null
  }

+  @Composable
+  fun Color.toQuote(): Color = if (isInDarkTheme()) lighter(0.12f) else darker(0.12f)
+
  @Composable
  fun ciQuotedMsgTextView(qi: CIQuote, lines: Int) {
    MarkdownText(
@@ -86,11 +89,11 @@ fun FramedItemView(

  @Composable
  fun FramedItemHeader(caption: String, italic: Boolean, icon: Painter? = null, pad: Boolean = false) {
-    val sentColor = MaterialTheme.appColors.sentQuote
-    val receivedColor = MaterialTheme.appColors.receivedQuote
+    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
    Row(
      Modifier
-        .background(if (sent) sentColor else receivedColor)
+        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
        .fillMaxWidth()
        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (pad || (ci.quotedItem == null && ci.meta.itemForwarded == null)) 6.dp else 0.dp),
      horizontalArrangement = Arrangement.spacedBy(4.dp),
@@ -119,11 +122,11 @@ fun FramedItemView(

  @Composable
  fun ciQuoteView(qi: CIQuote) {
-    val sentColor = MaterialTheme.appColors.sentQuote
-    val receivedColor = MaterialTheme.appColors.receivedQuote
+    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
    Row(
      Modifier
-        .background(if (sent) sentColor else receivedColor)
+        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
        .fillMaxWidth()
        .combinedClickable(
          onLongClick = { showMenu.value = true },
@@ -185,17 +188,10 @@ fun FramedItemView(
  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null && ci.meta.itemForwarded == null

-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Box(Modifier
    .clip(RoundedCornerShape(18.dp))
-    .background(
-      when {
-        transparentBackground -> Color.Transparent
-        sent -> MaterialTheme.colors.background
-        else -> MaterialTheme.colors.background
-      }
-    )
    .background(
      when {
        transparentBackground -> Color.Transparent
@@ -17,7 +17,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatItem
 import chat.simplex.common.model.MsgErrorType
-import chat.simplex.common.ui.theme.*
+import chat.simplex.common.ui.theme.CurrentColors
+import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.helpers.AlertManager
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
@@ -50,7 +51,7 @@ fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, timedMessagesTT

@Composable
 fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, onClick: () -> Unit) {
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -21,8 +21,8 @@ import kotlinx.datetime.Clock

@Composable
 fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, revealed: MutableState<Boolean>, showViaProxy: Boolean) {
-  val sentColor = MaterialTheme.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
    color = if (ci.chatDir.sent) sentColor else receivedColor,
@@ -78,7 +78,7 @@ fun MarkdownText (
  val reserve = if (textLayoutDirection != LocalLayoutDirection.current && meta != null) {
    "\n"
  } else if (meta != null) {
-    reserveSpaceForMeta(meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy)
+    reserveSpaceForMeta(meta, chatTTL, null, showViaProxy = showViaProxy)
  } else {
    "    "
  }
@@ -486,8 +486,6 @@ fun deleteChatDatabaseFilesAndState() {
  tmpDir.deleteRecursively()
  getMigrationTempFilesDirectory().deleteRecursively()
  tmpDir.mkdir()
-  wallpapersDir.deleteRecursively()
-  wallpapersDir.mkdirs()
  DatabaseUtils.ksDatabasePassword.remove()
  controller.appPrefs.storeDBPassphrase.set(true)
  controller.ctrl = null
@@ -537,7 +535,6 @@ suspend fun exportChatArchive(
  if (!m.chatDbChanged.value) {
    controller.apiSaveAppSettings(AppSettings.current.prepareForExport())
  }
-  wallpapersDir.mkdirs()
  m.controller.apiExportArchive(config)
  if (storagePath == null) {
    deleteOldArchive(m)
@@ -593,7 +590,6 @@ private fun importArchive(
    withLongRunningApi {
      try {
        m.controller.apiDeleteStorage()
-        wallpapersDir.mkdirs()
        try {
          val config = ArchiveConfig(archivePath, parentTempDirectory = databaseExportDir.toString())
          val archiveErrors = m.controller.apiImportArchive(config)
@@ -2,14 +2,12 @@ package chat.simplex.common.views.helpers

 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.*
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Size
@@ -53,8 +51,7 @@ fun ProfileImage(
  size: Dp,
  image: String? = null,
  icon: ImageResource = MR.images.ic_account_circle_filled,
-  color: Color = MaterialTheme.colors.secondaryVariant,
-  backgroundColor: Color? = null
+  color: Color = MaterialTheme.colors.secondaryVariant
 ) {
  Box(Modifier.size(size)) {
    if (image == null) {
@@ -64,9 +61,6 @@ fun ProfileImage(
        else -> null
      }
      if (iconToReplace != null) {
-        if (backgroundColor != null) {
-          Box(Modifier.size(size * 0.7f).align(Alignment.Center).background(backgroundColor, CircleShape))
-        }
        Icon(
          iconToReplace,
          contentDescription = stringResource(MR.strings.icon_descr_profile_image_placeholder),
@@ -1,447 +0,0 @@
-package chat.simplex.common.views.helpers
-
-import androidx.compose.ui.draw.CacheDrawScope
-import androidx.compose.ui.draw.DrawResult
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.drawscope.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.unit.*
-import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.platform.*
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.ImageResource
-import dev.icerock.moko.resources.StringResource
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.io.File
-import kotlin.math.*
-
-enum class PresetWallpaper(
-  val res: ImageResource,
-  val filename: String,
-  val scale: Float,
-  val background: Map<DefaultTheme, Color>,
-  val tint: Map<DefaultTheme, Color>,
-  val colors: Map<DefaultTheme, ThemeColors>,
-) {
-  CATS(MR.images.wallpaper_cats, "cats", 0.63f,
-    wallpaperBackgrounds(light = "#ffF8F6EA"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#ffefdca6".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff4b3b0e".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff51400f".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff4b3b0e".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#fffffaed",
-        sentQuote = "#fffaf0d6",
-        receivedMessage = "#ffF8F7F4",
-        receivedQuote = "#ffefede9",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff2f2919",
-        sentQuote = "#ff473a1d",
-        receivedMessage = "#ff272624",
-        receivedQuote = "#ff373633",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff41371b",
-        sentQuote = "#ff654f1c",
-        receivedMessage = "#ff272624",
-        receivedQuote = "#ff373633",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff41371b",
-        sentQuote = "#ff654f1c",
-        receivedMessage = "#ff1f1e1b",
-        receivedQuote = "#ff2f2d27",
-      ),
-    )
-  ),
-  FLOWERS(MR.images.wallpaper_flowers, "flowers", 0.53f,
-    wallpaperBackgrounds(light = "#ffE2FFE4"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#ff9CEA59".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff31560D".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff36600f".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff31560D".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#fff1ffe5",
-        sentQuote = "#ffdcf9c4",
-        receivedMessage = "#ffF4F8F2",
-        receivedQuote = "#ffe7ece7",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff163521",
-        sentQuote = "#ff1B5330",
-        receivedMessage = "#ff242523",
-        receivedQuote = "#ff353733",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff184739",
-        sentQuote = "#ff1F6F4B",
-        receivedMessage = "#ff242523",
-        receivedQuote = "#ff353733",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff184739",
-        sentQuote = "#ff1F6F4B",
-        receivedMessage = "#ff1c1f1a",
-        receivedQuote = "#ff282b25",
-      ),
-    )
-  ),
-  HEARTS(MR.images.wallpaper_hearts, "hearts", 0.59f,
-    wallpaperBackgrounds(light = "#ffFDECEC"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#fffde0e0".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff3c0f0f".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff411010".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff3C0F0F".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#fffff4f4",
-        sentQuote = "#ffffdfdf",
-        receivedMessage = "#fff8f6f6",
-        receivedQuote = "#ffefebeb",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff301515",
-        sentQuote = "#ff4C1818",
-        receivedMessage = "#ff242121",
-        receivedQuote = "#ff3b3535",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff491A28",
-        sentQuote = "#ff761F29",
-        receivedMessage = "#ff242121",
-        receivedQuote = "#ff3b3535",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff491A28",
-        sentQuote = "#ff761F29",
-        receivedMessage = "#ff1f1b1b",
-        receivedQuote = "#ff2e2626",
-      ),
-    )
-  ),
-  KIDS(MR.images.wallpaper_kids, "kids", 0.53f,
-    wallpaperBackgrounds(light = "#ffdbfdfb"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#ffadeffc".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff16404B".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff184753".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff16404B".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffeafeff",
-        sentQuote = "#ffcbf4f7",
-        receivedMessage = "#fff3fafa",
-        receivedQuote = "#ffe4efef",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff16302F",
-        sentQuote = "#ff1a4a49",
-        receivedMessage = "#ff252626",
-        receivedQuote = "#ff373A39",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff1a4745",
-        sentQuote = "#ff1d6b69",
-        receivedMessage = "#ff252626",
-        receivedQuote = "#ff373a39",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff1a4745",
-        sentQuote = "#ff1d6b69",
-        receivedMessage = "#ff1e1f1f",
-        receivedQuote = "#ff262b29",
-      ),
-    )
-  ),
-  SCHOOL(MR.images.wallpaper_school, "school", 0.53f,
-    wallpaperBackgrounds(light = "#ffE7F5FF"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#ffCEEBFF".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff0F293B".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff112f43".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff0F293B".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffeef9ff",
-        sentQuote = "#ffD6EDFA",
-        receivedMessage = "#ffF3F5F9",
-        receivedQuote = "#ffe4e8ee",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff172833",
-        sentQuote = "#ff1C3E4F",
-        receivedMessage = "#ff26282c",
-        receivedQuote = "#ff393c40",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff1A3C5D",
-        sentQuote = "#ff235b80",
-        receivedMessage = "#ff26282c",
-        receivedQuote = "#ff393c40",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff1A3C5D",
-        sentQuote = "#ff235b80",
-        receivedMessage = "#ff1d1e22",
-        receivedQuote = "#ff292b2f",
-      ),
-    )
-  ),
-  TRAVEL(MR.images.wallpaper_travel, "travel", 0.68f,
-    wallpaperBackgrounds(light = "#fff9eeff"),
-    tint = mapOf(
-      DefaultTheme.LIGHT to "#ffeedbfe".colorFromReadableHex(),
-      DefaultTheme.DARK to "#ff311E48".colorFromReadableHex(),
-      DefaultTheme.SIMPLEX to "#ff35204e".colorFromReadableHex(),
-      DefaultTheme.BLACK to "#ff311E48".colorFromReadableHex()
-    ),
-    mapOf(
-      DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#fffcf6ff",
-        sentQuote = "#fff2e0fc",
-        receivedMessage = "#ffF6F4F7",
-        receivedQuote = "#ffede9ee",
-      ),
-      DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff33263B",
-        sentQuote = "#ff53385E",
-        receivedMessage = "#ff272528",
-        receivedQuote = "#ff3B373E",
-      ),
-      DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff3C255D",
-        sentQuote = "#ff623485",
-        receivedMessage = "#ff26273B",
-        receivedQuote = "#ff3A394F",
-      ),
-      DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff3C255D",
-        sentQuote = "#ff623485",
-        receivedMessage = "#ff231f23",
-        receivedQuote = "#ff2c2931",
-      ),
-    )
-  );
-
-  fun toType(base: DefaultTheme, scale: Float? = null): WallpaperType =
-    WallpaperType.Preset(
-      filename,
-      scale ?: appPrefs.themeOverrides.get().firstOrNull { it.wallpaper != null && it.wallpaper.preset == filename && it.base == base }?.wallpaper?.scale ?: 1f
-    )
-
-  companion object {
-    fun from(filename: String): PresetWallpaper? =
-      entries.firstOrNull { it.filename == filename }
-  }
-}
-
-fun wallpaperBackgrounds(light: String): Map<DefaultTheme, Color> =
-  mapOf(
-    DefaultTheme.LIGHT to light.colorFromReadableHex(),
-    DefaultTheme.DARK to "#ff121212".colorFromReadableHex(),
-    DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(),
-    DefaultTheme.BLACK to "#ff070707".colorFromReadableHex()
-  )
-
-@Serializable
-enum class WallpaperScaleType(val contentScale: ContentScale, val text: StringResource) {
-  @SerialName("fill") FILL(ContentScale.Crop, MR.strings.wallpaper_scale_fill),
-  @SerialName("fit") FIT(ContentScale.Fit, MR.strings.wallpaper_scale_fit),
-  @SerialName("repeat") REPEAT(ContentScale.Fit, MR.strings.wallpaper_scale_repeat),
-}
-
-sealed class WallpaperType {
-  abstract val scale: Float?
-
-  val image by lazy {
-    val filename = when (this) {
-      is Preset -> filename
-      is Image -> filename
-      else -> return@lazy null
-    }
-    if (filename == "") return@lazy null
-    if (cachedImages[filename] != null) {
-      cachedImages[filename]
-    } else {
-      val res = if (this is Preset) {
-        (PresetWallpaper.from(filename) ?: PresetWallpaper.CATS).res.toComposeImageBitmap()!!
-      } else {
-        try {
-          // In case of unintentional image deletion don't crash the app
-          File(getWallpaperFilePath(filename)).inputStream().use { loadImageBitmap(it) }
-        } catch (e: Exception) {
-          Log.e(TAG, "Error while loading wallpaper file: ${e.stackTraceToString()}")
-          null
-        }
-      }
-      res?.prepareToDraw()
-      cachedImages[filename] = res ?: return@lazy null
-      res
-    }
-  }
-
-  fun sameType(other: WallpaperType?): Boolean =
-    if (this is Preset && other is Preset) this.filename == other.filename
-    else this.javaClass == other?.javaClass
-
-  fun samePreset(other: PresetWallpaper?): Boolean = this is Preset && filename == other?.filename
-
-  data class Preset(
-    val filename: String,
-    override val scale: Float?,
-  ): WallpaperType() {
-    val predefinedImageScale = PresetWallpaper.from(filename)?.scale ?: 1f
-  }
-
-  data class Image(
-    val filename: String,
-    override val scale: Float?,
-    val scaleType: WallpaperScaleType?,
-  ): WallpaperType()
-
-  object Empty: WallpaperType() {
-    override val scale: Float?
-      get() = null
-  }
-
-  fun defaultBackgroundColor(theme: DefaultTheme, materialBackground: Color): Color =
-    if (this is Preset) {
-      (PresetWallpaper.from(filename) ?: PresetWallpaper.CATS).background[theme]!!
-    } else {
-      materialBackground
-    }
-
-  fun defaultTintColor(theme: DefaultTheme): Color =
-    if (this is Preset) {
-      (PresetWallpaper.from(filename) ?: PresetWallpaper.CATS).tint[theme]!!
-    } else if (this is Image && scaleType == WallpaperScaleType.REPEAT) {
-      Color.Transparent
-    } else {
-      Color.Transparent
-    }
-
-  companion object {
-    var cachedImages: MutableMap<String, ImageBitmap> = mutableMapOf()
-
-    fun from(wallpaper: ThemeWallpaper?): WallpaperType? {
-      return if (wallpaper == null) {
-        null
-      } else if (wallpaper.preset != null) {
-        Preset(wallpaper.preset, wallpaper.scale)
-      } else if (wallpaper.imageFile != null) {
-        Image(wallpaper.imageFile, wallpaper.scale, wallpaper.scaleType)
-      } else {
-        Empty
-      }
-    }
-  }
-}
-
-private fun drawToBitmap(image: ImageBitmap, imageScale: Float, tint: Color, size: Size, density: Float, layoutDirection: LayoutDirection): ImageBitmap {
-  val quality = if (appPlatform.isAndroid) FilterQuality.High else FilterQuality.Low
-  val drawScope = CanvasDrawScope()
-  val bitmap = ImageBitmap(size.width.toInt(), size.height.toInt())
-  val canvas = Canvas(bitmap)
-  drawScope.draw(
-    density = Density(density),
-    layoutDirection = layoutDirection,
-    canvas = canvas,
-    size = size,
-  ) {
-    val scale = imageScale * density
-    for (h in 0..(size.height / image.height / scale).roundToInt()) {
-      for (w in 0..(size.width / image.width / scale).roundToInt()) {
-        drawImage(
-          image,
-          dstOffset = IntOffset(x = (w * image.width * scale).roundToInt(), y = (h * image.height * scale).roundToInt()),
-          dstSize = IntSize((image.width * scale).roundToInt(), (image.height * scale).roundToInt()),
-          colorFilter = ColorFilter.tint(tint, BlendMode.SrcIn),
-          filterQuality = quality
-        )
-      }
-    }
-  }
-  return bitmap
-}
-
-fun CacheDrawScope.chatViewBackground(image: ImageBitmap, imageType: WallpaperType, background: Color, tint: Color): DrawResult {
-  val imageScale = if (imageType is WallpaperType.Preset) {
-    (imageType.scale ?: 1f) * imageType.predefinedImageScale
-  } else if (imageType is WallpaperType.Image && imageType.scaleType == WallpaperScaleType.REPEAT) {
-    imageType.scale ?: 1f
-  } else {
-    1f
-  }
-  val image = if (imageType is WallpaperType.Preset || (imageType is WallpaperType.Image && imageType.scaleType == WallpaperScaleType.REPEAT)) {
-    drawToBitmap(image, imageScale, tint, size, density, layoutDirection)
-  } else {
-    image
-  }
-
-  return onDrawBehind {
-    val quality = if (appPlatform.isAndroid) FilterQuality.High else FilterQuality.Low
-    drawRect(background)
-    when (imageType) {
-      is WallpaperType.Preset -> drawImage(image)
-      is WallpaperType.Image -> when (val scaleType = imageType.scaleType ?: WallpaperScaleType.FILL) {
-        WallpaperScaleType.REPEAT -> drawImage(image)
-        WallpaperScaleType.FILL, WallpaperScaleType.FIT -> {
-          clipRect {
-            val scale = scaleType.contentScale.computeScaleFactor(Size(image.width.toFloat(), image.height.toFloat()), Size(size.width, size.height))
-            val scaledWidth = (image.width * scale.scaleX).roundToInt()
-            val scaledHeight = (image.height * scale.scaleY).roundToInt()
-            // Large image will cause freeze
-            if (image.width > 4320 || image.height > 4320) return@clipRect
-
-            drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
-            if (scaleType == WallpaperScaleType.FIT) {
-              if (scaledWidth < size.width) {
-                // has black lines at left and right sides
-                var x = (size.width - scaledWidth) / 2
-                while (x > 0) {
-                  drawImage(image, dstOffset = IntOffset(x = (x - scaledWidth).roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
-                  x -= scaledWidth
-                }
-                x = size.width - (size.width - scaledWidth) / 2
-                while (x < size.width) {
-                  drawImage(image, dstOffset = IntOffset(x = x.roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
-                  x += scaledWidth
-                }
-              } else {
-                // has black lines at top and bottom sides
-                var y = (size.height - scaledHeight) / 2
-                while (y > 0) {
-                  drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = (y - scaledHeight).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
-                  y -= scaledHeight
-                }
-                y = size.height - (size.height - scaledHeight) / 2
-                while (y < size.height) {
-                  drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = y.roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
-                  y += scaledHeight
-                }
-              }
-            }
-          }
-          drawRect(tint)
-        }
-      }
-      is WallpaperType.Empty -> {}
-    }
-  }
-}
@@ -51,7 +51,7 @@ fun CloseSheetBar(close: (() -> Unit)?, showClose: Boolean = true, tintColor: Co
@Composable
 fun AppBarTitle(title: String, hostDevice: Pair<Long?, String>? = null,  withPadding: Boolean = true, bottomPadding: Dp = DEFAULT_PADDING * 1.5f) {
  val theme = CurrentColors.collectAsState()
-  val titleColor = MaterialTheme.appColors.title
+  val titleColor = CurrentColors.collectAsState().value.appColors.title
  val brush = if (theme.value.base == DefaultTheme.SIMPLEX)
    Brush.linearGradient(listOf(titleColor.darker(0.2f), titleColor.lighter(0.35f)), Offset(0f, Float.POSITIVE_INFINITY), Offset(Float.POSITIVE_INFINITY, 0f))
  else // color is not updated when changing themes if I pass null here
@@ -76,7 +76,7 @@ suspend fun getLinkPreview(url: String): LinkPreview? {

@Composable
 fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
  Row(
    Modifier.fillMaxWidth().padding(top = 8.dp).background(sentColor),
    verticalAlignment = Alignment.CenterVertically
@@ -41,12 +41,9 @@ enum class ModalPlacement {
 }

 class ModalData {
-  private val state = mutableMapOf<String, MutableState<Any?>>()
+  private val state = mutableMapOf<String, MutableState<Any>>()
  fun <T> stateGetOrPut (key: String, default: () -> T): MutableState<T> =
    state.getOrPut(key) { mutableStateOf(default() as Any) } as MutableState<T>
-
-  fun <T> stateGetOrPutNullable (key: String, default: () -> T?): MutableState<T?> =
-    state.getOrPut(key) { mutableStateOf(default() as Any?) } as MutableState<T?>
 }

 class ModalManager(private val placement: ModalPlacement? = null) {
@@ -1,5 +1,6 @@
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -12,15 +13,12 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
-import chat.simplex.common.model.NotificationsMode
 import chat.simplex.common.platform.onRightClick
 import chat.simplex.common.platform.windowWidth
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.onboarding.SelectableCard
 import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
 import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.stringResource

@Composable
 fun SectionView(title: String? = null, padding: PaddingValues = PaddingValues(), content: (@Composable ColumnScope.() -> Unit)) {
@@ -78,26 +76,6 @@ fun <T> SectionViewSelectable(
  SectionTextFooter(values.first { it.value == currentValue.value }.description)
 }

-@Composable
-fun <T> SectionViewSelectableCards(
-  title: String?,
-  currentValue: State<T>,
-  values: List<ValueTitleDesc<T>>,
-  onSelected: (T) -> Unit,
-) {
-  SectionView(title) {
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-      if (title != null) {
-        Text(title, Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
-        Spacer(Modifier.height(DEFAULT_PADDING * 2f))
-      }
-      values.forEach { item ->
-        SelectableCard(currentValue, item.value, item.title, item.description, onSelected)
-      }
-    }
-  }
-}
-
@Composable
 fun SectionItemView(
  click: (() -> Unit)? = null,
@@ -1,520 +0,0 @@
-package chat.simplex.common.views.helpers
-
-import SectionBottomSpacer
-import SectionItemView
-import SectionSpacer
-import SectionView
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.MaterialTheme.colors
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.yaml
-import chat.simplex.common.platform.*
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.usersettings.*
-import chat.simplex.common.views.usersettings.AppearanceScope.WallpaperPresetSelector
-import chat.simplex.common.views.usersettings.AppearanceScope.editColor
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.serialization.encodeToString
-import java.net.URI
-
-@Composable
-fun ModalData.UserWallpaperEditor(
-  theme: ThemeModeOverride,
-  applyToMode: DefaultThemeMode?,
-  globalThemeUsed: MutableState<Boolean>,
-  save: suspend (applyToMode: DefaultThemeMode?, ThemeModeOverride?) -> Unit
-) {
-  ColumnWithScrollBar(
-    Modifier
-      .fillMaxSize()
-  ) {
-    val applyToMode = remember { stateGetOrPutNullable("applyToMode") { applyToMode } }
-    var showMore by remember { stateGetOrPut("showMore") { false } }
-    val themeModeOverride = remember { stateGetOrPut("themeModeOverride") { theme } }
-    val currentTheme by CurrentColors.collectAsState()
-
-    AppBarTitle(stringResource(MR.strings.settings_section_title_user_theme))
-    val wallpaperImage = MaterialTheme.wallpaper.type.image
-    val wallpaperType = MaterialTheme.wallpaper.type
-
-    val onTypeCopyFromSameTheme = { type: WallpaperType? ->
-      if (type is WallpaperType.Image && chatModel.remoteHostId() != null) {
-        false
-      } else {
-        ThemeManager.copyFromSameThemeOverrides(type, null, themeModeOverride)
-        withBGApi { save(applyToMode.value, themeModeOverride.value) }
-        globalThemeUsed.value = false
-        true
-      }
-    }
-    val preApplyGlobalIfNeeded = { type: WallpaperType? ->
-      if (globalThemeUsed.value) {
-        onTypeCopyFromSameTheme(type)
-      }
-    }
-    val onTypeChange: (WallpaperType?) -> Unit = { type: WallpaperType? ->
-      if (globalThemeUsed.value) {
-        preApplyGlobalIfNeeded(type)
-        // Saves copied static image instead of original from global theme
-        ThemeManager.applyWallpaper(themeModeOverride.value.type, themeModeOverride)
-      } else {
-        ThemeManager.applyWallpaper(type, themeModeOverride)
-      }
-      withBGApi { save(applyToMode.value, themeModeOverride.value) }
-    }
-
-    val importWallpaperLauncher = rememberFileChooserLauncher(true) { to: URI? ->
-      if (to != null) {
-        val filename = saveWallpaperFile(to)
-        if (filename != null) {
-          onTypeChange(WallpaperType.Image(filename, 1f, WallpaperScaleType.FILL))
-        }
-      }
-    }
-
-    val currentColors = { type: WallpaperType? ->
-      // If applying for :
-      // - all themes: no overrides needed
-      // - specific user: only user overrides for currently selected theme are needed, because they will NOT be copied when other wallpaper is selected
-      val perUserOverride = if (wallpaperType.sameType(type)) chatModel.currentUser.value?.uiThemes else null
-      ThemeManager.currentColors(type, null, perUserOverride, appPrefs.themeOverrides.get())
-    }
-    val onChooseType: (WallpaperType?) -> Unit = { type: WallpaperType? ->
-      when {
-        // don't have image in parent or already selected wallpaper with custom image
-        type is WallpaperType.Image && chatModel.remoteHostId() != null -> { /* do nothing */ }
-        type is WallpaperType.Image && (wallpaperType is WallpaperType.Image || currentColors(type).wallpaper.type.image == null) -> withLongRunningApi { importWallpaperLauncher.launch("image/*") }
-        type is WallpaperType.Image -> onTypeCopyFromSameTheme(currentColors(type).wallpaper.type)
-        themeModeOverride.value.type != type || currentTheme.wallpaper.type != type -> onTypeCopyFromSameTheme(type)
-        else -> onTypeChange(type)
-      }
-    }
-
-    val editColor = { name: ThemeColor ->
-      editColor(
-        name,
-        wallpaperType,
-        wallpaperImage,
-        onColorChange = { color ->
-          preApplyGlobalIfNeeded(themeModeOverride.value.type)
-          ThemeManager.applyThemeColor(name, color, themeModeOverride)
-          withBGApi { save(applyToMode.value, themeModeOverride.value) }
-        }
-      )
-    }
-
-    WallpaperPresetSelector(
-      selectedWallpaper = wallpaperType,
-      baseTheme = currentTheme.base,
-      currentColors = { type ->
-        // If applying for :
-        // - all themes: no overrides needed
-        // - specific user: only user overrides for currently selected theme are needed, because they will NOT be copied when other wallpaper is selected
-        val perUserOverride = if (wallpaperType.sameType(type)) chatModel.currentUser.value?.uiThemes else null
-        ThemeManager.currentColors(type, null, perUserOverride, appPrefs.themeOverrides.get())
-      },
-      onChooseType = onChooseType
-    )
-
-    WallpaperSetupView(
-      themeModeOverride.value.type,
-      CurrentColors.collectAsState().value.base,
-      currentTheme.wallpaper,
-      currentTheme.appColors.sentMessage,
-      currentTheme.appColors.sentQuote,
-      currentTheme.appColors.receivedMessage,
-      currentTheme.appColors.receivedQuote,
-      editColor = { name -> editColor(name) },
-      onTypeChange = onTypeChange,
-    )
-
-    SectionSpacer()
-
-    if (!globalThemeUsed.value) {
-      ResetToGlobalThemeButton(true) {
-        themeModeOverride.value = ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
-        globalThemeUsed.value = true
-        withBGApi { save(applyToMode.value, null) }
-      }
-    }
-
-    SetDefaultThemeButton {
-      globalThemeUsed.value = false
-      val lightBase = DefaultTheme.LIGHT
-      val darkBase = if (CurrentColors.value.base != DefaultTheme.LIGHT) CurrentColors.value.base else if (appPrefs.systemDarkTheme.get() == DefaultTheme.DARK.themeName) DefaultTheme.DARK else if (appPrefs.systemDarkTheme.get() == DefaultTheme.BLACK.themeName) DefaultTheme.BLACK else DefaultTheme.SIMPLEX
-      val mode = themeModeOverride.value.mode
-      withBGApi {
-        // Saving for both modes in one place by changing mode once per save
-        if (applyToMode.value == null) {
-          val oppositeMode = if (mode == DefaultThemeMode.LIGHT) DefaultThemeMode.DARK else DefaultThemeMode.LIGHT
-          save(oppositeMode, ThemeModeOverride.withFilledAppDefaults(oppositeMode, if (oppositeMode == DefaultThemeMode.LIGHT) lightBase else darkBase))
-        }
-        themeModeOverride.value = ThemeModeOverride.withFilledAppDefaults(mode, if (mode == DefaultThemeMode.LIGHT) lightBase else darkBase)
-        save(themeModeOverride.value.mode, themeModeOverride.value)
-      }
-    }
-
-    KeyChangeEffect(theme.mode) {
-      themeModeOverride.value = theme
-      if (applyToMode.value != null) {
-        applyToMode.value = theme.mode
-      }
-    }
-
-    // Applies updated global theme if current one tracks global theme
-    KeyChangeEffect(CurrentColors.collectAsState().value) {
-      if (globalThemeUsed.value) {
-        themeModeOverride.value = ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
-        globalThemeUsed.value = true
-      }
-    }
-
-    SectionSpacer()
-
-    if (showMore) {
-      val values by remember { mutableStateOf(
-        listOf(
-          null to generalGetString(MR.strings.chat_theme_apply_to_all_modes),
-          DefaultThemeMode.LIGHT to generalGetString(MR.strings.chat_theme_apply_to_light_mode),
-          DefaultThemeMode.DARK to generalGetString(MR.strings.chat_theme_apply_to_dark_mode),
-        )
-      )
-      }
-      ExposedDropDownSettingRow(
-        generalGetString(MR.strings.chat_theme_apply_to_mode),
-        values,
-        applyToMode,
-        icon = null,
-        enabled = remember { mutableStateOf(true) },
-        onSelected = {
-          applyToMode.value = it
-          if (it != null && it != CurrentColors.value.base.mode) {
-            val lightBase = DefaultTheme.LIGHT
-            val darkBase = if (CurrentColors.value.base != DefaultTheme.LIGHT) CurrentColors.value.base else if (appPrefs.systemDarkTheme.get() == DefaultTheme.DARK.themeName) DefaultTheme.DARK else if (appPrefs.systemDarkTheme.get() == DefaultTheme.BLACK.themeName) DefaultTheme.BLACK else DefaultTheme.SIMPLEX
-            ThemeManager.applyTheme(if (it == DefaultThemeMode.LIGHT) lightBase.themeName else darkBase.themeName)
-          }
-        }
-      )
-
-      SectionSpacer()
-
-      AppearanceScope.CustomizeThemeColorsSection(currentTheme, editColor = editColor)
-
-      SectionSpacer()
-      ImportExportThemeSection(null, remember { chatModel.currentUser }.value?.uiThemes) {
-        withBGApi {
-          themeModeOverride.value = it
-          save(applyToMode.value, it)
-        }
-      }
-    } else {
-      AdvancedSettingsButton { showMore = true }
-    }
-
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun ModalData.ChatWallpaperEditor(
-  theme: ThemeModeOverride,
-  applyToMode: DefaultThemeMode?,
-  globalThemeUsed: MutableState<Boolean>,
-  save: suspend (applyToMode: DefaultThemeMode?, ThemeModeOverride?) -> Unit
-) {
-  ColumnWithScrollBar(
-    Modifier
-      .fillMaxSize()
-  ) {
-    val applyToMode = remember { stateGetOrPutNullable("applyToMode") { applyToMode } }
-    var showMore by remember { stateGetOrPut("showMore") { false } }
-    val themeModeOverride = remember { stateGetOrPut("themeModeOverride") { theme } }
-    val currentTheme by remember(themeModeOverride.value, CurrentColors.collectAsState().value) {
-      mutableStateOf(
-        ThemeManager.currentColors(null, if (globalThemeUsed.value) null else themeModeOverride.value, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
-      )
-    }
-
-    AppBarTitle(stringResource(MR.strings.settings_section_title_chat_theme))
-
-    val onTypeCopyFromSameTheme: (WallpaperType?) -> Boolean = { type ->
-      if (type is WallpaperType.Image && chatModel.remoteHostId() != null) {
-        false
-      } else {
-        val success = ThemeManager.copyFromSameThemeOverrides(type, chatModel.currentUser.value?.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight), themeModeOverride)
-        if (success) {
-          withBGApi { save(applyToMode.value, themeModeOverride.value) }
-          globalThemeUsed.value = false
-        }
-        success
-      }
-    }
-    val preApplyGlobalIfNeeded = { type: WallpaperType? ->
-      if (globalThemeUsed.value) {
-        onTypeCopyFromSameTheme(type)
-      }
-    }
-    val onTypeChange: (WallpaperType?) -> Unit = { type ->
-      if (globalThemeUsed.value) {
-        preApplyGlobalIfNeeded(type)
-        // Saves copied static image instead of original from global theme
-        ThemeManager.applyWallpaper(themeModeOverride.value.type, themeModeOverride)
-      } else {
-        ThemeManager.applyWallpaper(type, themeModeOverride)
-      }
-      withBGApi { save(applyToMode.value, themeModeOverride.value) }
-    }
-
-    val editColor: (ThemeColor) -> Unit = { name: ThemeColor ->
-      ModalManager.end.showModal {
-        val currentTheme by remember(themeModeOverride.value, CurrentColors.collectAsState().value) {
-          mutableStateOf(
-            ThemeManager.currentColors(null, themeModeOverride.value, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
-          )
-        }
-        val initialColor: Color = when (name) {
-          ThemeColor.WALLPAPER_BACKGROUND -> currentTheme.wallpaper.background ?: Color.Transparent
-          ThemeColor.WALLPAPER_TINT -> currentTheme.wallpaper.tint ?: Color.Transparent
-          ThemeColor.PRIMARY -> currentTheme.colors.primary
-          ThemeColor.PRIMARY_VARIANT -> currentTheme.colors.primaryVariant
-          ThemeColor.SECONDARY -> currentTheme.colors.secondary
-          ThemeColor.SECONDARY_VARIANT -> currentTheme.colors.secondaryVariant
-          ThemeColor.BACKGROUND -> currentTheme.colors.background
-          ThemeColor.SURFACE -> currentTheme.colors.surface
-          ThemeColor.TITLE -> currentTheme.appColors.title
-          ThemeColor.PRIMARY_VARIANT2 -> currentTheme.appColors.primaryVariant2
-          ThemeColor.SENT_MESSAGE -> currentTheme.appColors.sentMessage
-          ThemeColor.SENT_QUOTE -> currentTheme.appColors.sentQuote
-          ThemeColor.RECEIVED_MESSAGE -> currentTheme.appColors.receivedMessage
-          ThemeColor.RECEIVED_QUOTE -> currentTheme.appColors.receivedQuote
-        }
-        AppearanceScope.ColorEditor(
-          name,
-          initialColor,
-          CurrentColors.collectAsState().value.base,
-          themeModeOverride.value.type,
-          themeModeOverride.value.type?.image,
-          currentTheme.wallpaper.background,
-          currentTheme.wallpaper.tint,
-          currentColors = {
-            ThemeManager.currentColors(null, themeModeOverride.value, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
-          },
-          onColorChange = { color ->
-            preApplyGlobalIfNeeded(themeModeOverride.value.type)
-            ThemeManager.applyThemeColor(name, color, themeModeOverride)
-            withBGApi { save(applyToMode.value, themeModeOverride.value) }
-          }
-        )
-      }
-    }
-
-    val importWallpaperLauncher = rememberFileChooserLauncher(true) { to: URI? ->
-      if (to != null) {
-        val filename = saveWallpaperFile(to)
-        if (filename != null) {
-          // Delete only non-user image
-          if (!globalThemeUsed.value) {
-            removeWallpaperFile((themeModeOverride.value.type as? WallpaperType.Image)?.filename)
-          }
-          globalThemeUsed.value = false
-          onTypeChange(WallpaperType.Image(filename, 1f, WallpaperScaleType.FILL))
-        }
-      }
-    }
-
-    val currentColors = { type: WallpaperType? ->
-      ThemeManager.currentColors(type, if (type?.sameType(themeModeOverride.value.type) == true) themeModeOverride.value else null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
-    }
-
-    WallpaperPresetSelector(
-      selectedWallpaper = currentTheme.wallpaper.type,
-      activeBackgroundColor = currentTheme.wallpaper.background,
-      activeTintColor = currentTheme.wallpaper.tint,
-      baseTheme = CurrentColors.collectAsState().value.base,
-      currentColors = { type -> currentColors(type) },
-      onChooseType = { type ->
-        when {
-          type is WallpaperType.Image && chatModel.remoteHostId() != null -> { /* do nothing */ }
-          type is WallpaperType.Image && ((themeModeOverride.value.type is WallpaperType.Image && !globalThemeUsed.value) || currentColors(type).wallpaper.type.image == null) -> {
-            withLongRunningApi { importWallpaperLauncher.launch("image/*") }
-          }
-          type is WallpaperType.Image -> {
-            if (!onTypeCopyFromSameTheme(currentColors(type).wallpaper.type)) {
-              withLongRunningApi { importWallpaperLauncher.launch("image/*") }
-            }
-          }
-          globalThemeUsed.value || themeModeOverride.value.type != type -> {
-            onTypeCopyFromSameTheme(type)
-          }
-          else -> {
-            onTypeChange(type)
-          }
-        }
-      },
-    )
-
-    WallpaperSetupView(
-      themeModeOverride.value.type,
-      CurrentColors.collectAsState().value.base,
-      currentTheme.wallpaper,
-      currentTheme.appColors.sentMessage,
-      currentTheme.appColors.sentQuote,
-      currentTheme.appColors.receivedMessage,
-      currentTheme.appColors.receivedQuote,
-      editColor = editColor,
-      onTypeChange = onTypeChange,
-    )
-
-    SectionSpacer()
-
-    if (!globalThemeUsed.value) {
-      ResetToGlobalThemeButton(remember { chatModel.currentUser }.value?.uiThemes?.preferredMode(isInDarkTheme()) == null) {
-        themeModeOverride.value = ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
-        globalThemeUsed.value = true
-        withBGApi { save(applyToMode.value, null) }
-      }
-    }
-
-    SetDefaultThemeButton {
-      globalThemeUsed.value = false
-      val lightBase = DefaultTheme.LIGHT
-      val darkBase = if (CurrentColors.value.base != DefaultTheme.LIGHT) CurrentColors.value.base else if (appPrefs.systemDarkTheme.get() == DefaultTheme.DARK.themeName) DefaultTheme.DARK else if (appPrefs.systemDarkTheme.get() == DefaultTheme.BLACK.themeName) DefaultTheme.BLACK else DefaultTheme.SIMPLEX
-      val mode = themeModeOverride.value.mode
-      withBGApi {
-        // Saving for both modes in one place by changing mode once per save
-        if (applyToMode.value == null) {
-          val oppositeMode = if (mode == DefaultThemeMode.LIGHT) DefaultThemeMode.DARK else DefaultThemeMode.LIGHT
-          save(oppositeMode, ThemeModeOverride.withFilledAppDefaults(oppositeMode, if (oppositeMode == DefaultThemeMode.LIGHT) lightBase else darkBase))
-        }
-        themeModeOverride.value = ThemeModeOverride.withFilledAppDefaults(mode, if (mode == DefaultThemeMode.LIGHT) lightBase else darkBase)
-        save(themeModeOverride.value.mode, themeModeOverride.value)
-      }
-    }
-
-    KeyChangeEffect(theme.mode) {
-      themeModeOverride.value = theme
-      if (applyToMode.value != null) {
-        applyToMode.value = theme.mode
-      }
-    }
-
-    // Applies updated global theme if current one tracks global theme
-    KeyChangeEffect(CurrentColors.collectAsState()) {
-      if (globalThemeUsed.value) {
-        themeModeOverride.value = ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
-        globalThemeUsed.value = true
-      }
-    }
-
-    SectionSpacer()
-
-    if (showMore) {
-      val values by remember { mutableStateOf(
-        listOf(
-          null to generalGetString(MR.strings.chat_theme_apply_to_all_modes),
-          DefaultThemeMode.LIGHT to generalGetString(MR.strings.chat_theme_apply_to_light_mode),
-          DefaultThemeMode.DARK to generalGetString(MR.strings.chat_theme_apply_to_dark_mode),
-        )
-      )
-      }
-      ExposedDropDownSettingRow(
-        generalGetString(MR.strings.chat_theme_apply_to_mode),
-        values,
-        applyToMode,
-        icon = null,
-        enabled = remember { mutableStateOf(true) },
-        onSelected = {
-          applyToMode.value = it
-          if (it != null && it != CurrentColors.value.base.mode) {
-            val lightBase = DefaultTheme.LIGHT
-            val darkBase = if (CurrentColors.value.base != DefaultTheme.LIGHT) CurrentColors.value.base else if (appPrefs.systemDarkTheme.get() == DefaultTheme.DARK.themeName) DefaultTheme.DARK else if (appPrefs.systemDarkTheme.get() == DefaultTheme.BLACK.themeName) DefaultTheme.BLACK else DefaultTheme.SIMPLEX
-            ThemeManager.applyTheme(if (it == DefaultThemeMode.LIGHT) lightBase.themeName else darkBase.themeName)
-          }
-        }
-      )
-
-      SectionSpacer()
-
-      AppearanceScope.CustomizeThemeColorsSection(currentTheme, editColor = editColor)
-
-      SectionSpacer()
-      ImportExportThemeSection(themeModeOverride.value, remember { chatModel.currentUser }.value?.uiThemes) {
-        withBGApi {
-          themeModeOverride.value = it
-          save(applyToMode.value, it)
-        }
-      }
-    } else {
-      AdvancedSettingsButton { showMore = true }
-    }
-
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun ImportExportThemeSection(perChat: ThemeModeOverride?, perUser: ThemeModeOverrides?, save: (ThemeModeOverride) -> Unit) {
-  SectionView {
-    val theme = remember { mutableStateOf(null as String?) }
-    val exportThemeLauncher = rememberFileChooserLauncher(false) { to: URI? ->
-      val themeValue = theme.value
-      if (themeValue != null && to != null) {
-        copyBytesToFile(themeValue.byteInputStream(), to) {
-          theme.value = null
-        }
-      }
-    }
-    SectionItemView({
-      val overrides = ThemeManager.currentThemeOverridesForExport(perChat, perUser)
-      val lines = yaml.encodeToString<ThemeOverrides>(overrides).lines()
-      // Removing theme id without using custom serializer or data class
-      theme.value = lines.subList(1, lines.size).joinToString("\n")
-      withLongRunningApi { exportThemeLauncher.launch("simplex.theme") }
-    }) {
-      Text(generalGetString(MR.strings.export_theme), color = colors.primary)
-    }
-    val importThemeLauncher = rememberFileChooserLauncher(true) { to: URI? ->
-      if (to != null) {
-        val theme = getThemeFromUri(to)
-        if (theme != null) {
-          val res = ThemeModeOverride(mode = theme.base.mode, colors = theme.colors, wallpaper = theme.wallpaper?.importFromString()).removeSameColors(theme.base)
-          save(res)
-        }
-      }
-    }
-    // Can not limit to YAML mime type since it's unsupported by Android
-    SectionItemView({ withLongRunningApi { importThemeLauncher.launch("*/*") } }) {
-      Text(generalGetString(MR.strings.import_theme), color = colors.primary)
-    }
-  }
-}
-
-@Composable
-private fun ResetToGlobalThemeButton(app: Boolean, onClick: () -> Unit) {
-  SectionItemView(onClick) {
-    Text(stringResource(if (app) MR.strings.chat_theme_reset_to_app_theme else MR.strings.chat_theme_reset_to_user_theme), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-private fun SetDefaultThemeButton(onClick: () -> Unit) {
-  SectionItemView(onClick) {
-    Text(stringResource(MR.strings.chat_theme_set_default_theme), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-private fun AdvancedSettingsButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(MR.images.ic_arrow_downward),
-    stringResource(MR.strings.wallpaper_advanced_settings),
-    click = onClick
-  )
-}
@@ -19,7 +19,6 @@ import kotlinx.serialization.encodeToString
 import java.io.*
 import java.net.URI
 import java.nio.file.Files
-import java.nio.file.StandardCopyOption
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.Executors
@@ -146,7 +145,6 @@ fun getThemeFromUri(uri: URI, withAlertOnException: Boolean = true): ThemeOverri
    runCatching {
      return yaml.decodeFromStream<ThemeOverrides>(it!!)
    }.onFailure {
-      Log.e(TAG, "Error while decoding theme: ${it.stackTraceToString()}")
      if (withAlertOnException) {
        AlertManager.shared.showAlertMsg(
          title = generalGetString(MR.strings.import_theme_error),
@@ -282,38 +280,6 @@ fun saveFileFromUri(uri: URI, withAlertOnException: Boolean = true): CryptoFile?
  }
 }

-fun saveWallpaperFile(uri: URI): String? {
-  val destFileName = generateNewFileName("wallpaper", "jpg", File(getWallpaperFilePath("")))
-  val destFile = File(getWallpaperFilePath(destFileName))
-  try {
-    val inputStream = uri.inputStream()
-    Files.copy(inputStream!!, destFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
-  } catch (e: Exception) {
-    Log.e(TAG, "Error saving wallpaper file: ${e.stackTraceToString()}")
-    AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.stackTraceToString())
-    return null
-  }
-  return destFile.name
-}
-
-fun saveWallpaperFile(image: ImageBitmap): String {
-  val destFileName = generateNewFileName("wallpaper", "jpg", File(getWallpaperFilePath("")))
-  val destFile = File(getWallpaperFilePath(destFileName))
-  val dataResized = resizeImageToDataSize(image, false, maxDataSize = 5_000_000)
-  val output = FileOutputStream(destFile)
-  dataResized.use {
-    it.writeTo(output)
-  }
-  return destFile.name
-}
-
-fun removeWallpaperFile(fileName: String? = null) {
-  File(getWallpaperFilePath("_")).parentFile.listFiles()?.forEach {
-    if (it.name == fileName) it.delete()
-  }
-  WallpaperType.cachedImages.remove(fileName)
-}
-
 fun <T> createTmpFileAndDelete(onCreated: (File) -> T): T {
  val tmpFile = File(tmpDir, UUID.randomUUID().toString())
  tmpFile.deleteOnExit()
@@ -584,33 +550,10 @@ fun KeyChangeEffect(
  val initialKey = remember { key1 }
  val initialKey2 = remember { key2 }
  var anyChange by remember { mutableStateOf(false) }
-  LaunchedEffect(key1, key2) {
+  LaunchedEffect(key1) {
    if (anyChange || key1 != initialKey || key2 != initialKey2) {
      block()
      anyChange = true
    }
  }
 }
-
-/**
- * Runs the [block] only after initial value of the [key1], or [key2], or [key3] changes, not after initial launch
- * */
-@Composable
-@NonRestartableComposable
-fun KeyChangeEffect(
-  key1: Any?,
-  key2: Any?,
-  key3: Any?,
-  block: suspend CoroutineScope.() -> Unit
-) {
-  val initialKey = remember { key1 }
-  val initialKey2 = remember { key2 }
-  val initialKey3 = remember { key3 }
-  var anyChange by remember { mutableStateOf(false) }
-  LaunchedEffect(key1, key2, key3) {
-    if (anyChange || key1 != initialKey || key2 != initialKey2 || key3 != initialKey3) {
-      block()
-      anyChange = true
-    }
-  }
-}
--- a/Show More
+++ b/Show More