From f30dfa0be7e28a4c3cc6f072cc6b168ec803b495 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny@poberezkin.com>
Date: Sun, 4 Aug 2024 12:01:09 +0100
Subject: [PATCH] ios: move onion and private routing to advanced network
 settings, enable private routing by default (#4571)

* ios: move onion and private routing to advanced network settings, enable private routing by default

* update

* update labels

* update localizations
---
 .../AdvancedNetworkSettings.swift             | 191 +++++++++++++---
 .../UserSettings/NetworkAndServers.swift      | 206 +-----------------
 .../UserSettings/ProtocolServersView.swift    |   2 +-
 .../bg.xcloc/Localized Contents/bg.xliff      |  95 ++++----
 .../cs.xcloc/Localized Contents/cs.xliff      |  95 ++++----
 .../de.xcloc/Localized Contents/de.xliff      |  97 ++++-----
 .../en.xcloc/Localized Contents/en.xliff      | 109 ++++-----
 .../es.xcloc/Localized Contents/es.xliff      |  97 ++++-----
 .../fi.xcloc/Localized Contents/fi.xliff      |  95 ++++----
 .../fr.xcloc/Localized Contents/fr.xliff      |  97 ++++-----
 .../hu.xcloc/Localized Contents/hu.xliff      |  97 ++++-----
 .../it.xcloc/Localized Contents/it.xliff      |  97 ++++-----
 .../ja.xcloc/Localized Contents/ja.xliff      |  95 ++++----
 .../nl.xcloc/Localized Contents/nl.xliff      |  97 ++++-----
 .../pl.xcloc/Localized Contents/pl.xliff      |  97 ++++-----
 .../ru.xcloc/Localized Contents/ru.xliff      |  97 ++++-----
 .../th.xcloc/Localized Contents/th.xliff      |  89 ++++----
 .../tr.xcloc/Localized Contents/tr.xliff      |  97 ++++-----
 .../uk.xcloc/Localized Contents/uk.xliff      |  97 ++++-----
 .../Localized Contents/zh-Hans.xliff          |  89 ++++----
 apps/ios/SimpleXChat/APITypes.swift           |  30 ++-
 apps/ios/SimpleXChat/AppGroup.swift           |   8 +-
 apps/ios/bg.lproj/Localizable.strings         |  29 +--
 apps/ios/cs.lproj/Localizable.strings         |  27 +--
 apps/ios/de.lproj/Localizable.strings         |  37 +---
 apps/ios/es.lproj/Localizable.strings         |  37 +---
 apps/ios/fi.lproj/Localizable.strings         |  27 +--
 apps/ios/fr.lproj/Localizable.strings         |  37 +---
 apps/ios/hu.lproj/Localizable.strings         |  37 +---
 apps/ios/it.lproj/Localizable.strings         |  37 +---
 apps/ios/ja.lproj/Localizable.strings         |  27 +--
 apps/ios/nl.lproj/Localizable.strings         |  37 +---
 apps/ios/pl.lproj/Localizable.strings         |  37 +---
 apps/ios/ru.lproj/Localizable.strings         |  35 +--
 apps/ios/th.lproj/Localizable.strings         |  27 +--
 apps/ios/tr.lproj/Localizable.strings         |  37 +---
 apps/ios/uk.lproj/Localizable.strings         |  37 +---
 apps/ios/zh-Hans.lproj/Localizable.strings    |  29 +--
 38 files changed, 1080 insertions(+), 1528 deletions(-)

diff --git a/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift b/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift
index 6dda7bf799..99c0a588eb 100644
--- a/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift
@@ -24,34 +24,114 @@ enum NetworkSettingsAlert: Identifiable {
 }
 
 struct AdvancedNetworkSettings: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var theme: AppTheme
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
     @State private var netCfg = NetCfg.defaults
     @State private var currentNetCfg = NetCfg.defaults
     @State private var cfgLoaded = false
     @State private var enableKeepAlive = true
     @State private var keepAliveOpts = KeepAliveOpts.defaults
     @State private var showSettingsAlert: NetworkSettingsAlert?
+    @State private var onionHosts: OnionHosts = .no
+    @State private var showSaveDialog = false
 
     var body: some View {
         VStack {
             List {
                 Section {
-                    Button {
-                        updateNetCfgView(NetCfg.defaults)
-                        showSettingsAlert = .update
+                    NavigationLink {
+                        List {
+                            Section {
+                                SelectionListView(list: SMPProxyMode.values, selection: $netCfg.smpProxyMode) { mode in
+                                    netCfg.smpProxyMode = mode
+                                }
+                            } footer: {
+                                Text(proxyModeInfo(netCfg.smpProxyMode))
+                                    .font(.callout)
+                                    .foregroundColor(theme.colors.secondary)
+                            }
+                        }
+                        .navigationTitle("Private routing")
+                        .modifier(ThemedBackground(grouped: true))
+                        .navigationBarTitleDisplayMode(.inline)
                     } label: {
-                        Text("Reset to defaults")
+                        HStack {
+                            Text("Private routing")
+                            Spacer()
+                            Text(netCfg.smpProxyMode.label)
+                        }
                     }
-                    .disabled(currentNetCfg == NetCfg.defaults)
-
-                    Button {
-                        updateNetCfgView(NetCfg.proxyDefaults)
-                        showSettingsAlert = .update
+                    
+                    NavigationLink {
+                        List {
+                            Section {
+                                SelectionListView(list: SMPProxyFallback.values, selection: $netCfg.smpProxyFallback) { mode in
+                                    netCfg.smpProxyFallback = mode
+                                }
+                                .disabled(netCfg.smpProxyMode == .never)
+                            } footer: {
+                                Text(proxyFallbackInfo(netCfg.smpProxyFallback))
+                                    .font(.callout)
+                                    .foregroundColor(theme.colors.secondary)
+                            }
+                        }
+                        .navigationTitle("Allow downgrade")
+                        .modifier(ThemedBackground(grouped: true))
+                        .navigationBarTitleDisplayMode(.inline)
                     } label: {
-                        Text("Set timeouts for proxy/VPN")
+                        HStack {
+                            Text("Allow downgrade")
+                            Spacer()
+                            Text(netCfg.smpProxyFallback.label)
+                        }
                     }
-                    .disabled(currentNetCfg == NetCfg.proxyDefaults)
 
+                    Toggle("Show message status", isOn: $showSentViaProxy)
+                } header: {
+                    Text("Private message routing")
+                        .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
+                        if showSentViaProxy {
+                            Text("Show → on messages sent via private routing.")
+                        }
+                    }
+                    .foregroundColor(theme.colors.secondary)
+                }
+
+                Section {
+                    Picker("Use .onion hosts", selection: $onionHosts) {
+                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+                } footer: {
+                    Text(onionHostsInfo(onionHosts))
+                        .foregroundColor(theme.colors.secondary)
+                }
+                .onChange(of: onionHosts) { hosts in
+                    if hosts != OnionHosts(netCfg: currentNetCfg) {
+                        let (hostMode, requiredHostMode) = hosts.hostMode
+                        netCfg.hostMode = hostMode
+                        netCfg.requiredHostMode = requiredHostMode
+                    }
+                }
+                
+                if developerTools {
+                    Section {
+                        Picker("Transport isolation", selection: $netCfg.sessionMode) {
+                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
+                        }
+                        .frame(height: 36)
+                    } footer: {
+                        Text(sessionModeInfo(netCfg.sessionMode))
+                            .foregroundColor(theme.colors.secondary)
+                    }
+                }
+
+                Section("TCP connection") {
                     timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
@@ -72,24 +152,21 @@ struct AdvancedNetworkSettings: View {
                         }
                         .foregroundColor(theme.colors.secondary)
                     }
-                } header: {
-                        Text("")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    HStack {
-                        Button {
-                            updateNetCfgView(currentNetCfg)
-                        } label: {
-                            Label("Revert", systemImage: "arrow.counterclockwise").font(.callout)
-                        }
+                }
+                
+                Section {
+                    Button("Reset to defaults") {
+                        updateNetCfgView(NetCfg.defaults)
+                    }
+                    .disabled(netCfg == NetCfg.defaults)
 
-                        Spacer()
-
-                        Button {
-                            showSettingsAlert = .update
-                        } label: {
-                            Label("Save", systemImage: "checkmark").font(.callout)
-                        }
+                    Button("Set timeouts for proxy/VPN") {
+                        updateNetCfgView(netCfg.withProxyTimeouts)
+                    }
+                    .disabled(netCfg.hasProxyTimeouts)
+                    
+                    Button("Save and reconnect") {
+                        showSettingsAlert = .update
                     }
                     .disabled(netCfg == currentNetCfg)
                 }
@@ -111,10 +188,10 @@ struct AdvancedNetworkSettings: View {
             switch a {
             case .update:
                 return Alert(
-                    title: Text("Update network settings?"),
+                    title: Text("Update settings?"),
                     message: Text("Updating settings will re-connect the client to all servers."),
                     primaryButton: .default(Text("Ok")) {
-                        saveNetCfg()
+                        _ = saveNetCfg()
                     },
                     secondaryButton: .cancel()
                 )
@@ -125,23 +202,43 @@ struct AdvancedNetworkSettings: View {
                 )
             }
         }
+        .modifier(BackButton(disabled: Binding.constant(false)) {
+            if netCfg == currentNetCfg {
+                dismiss()
+                cfgLoaded = false
+            } else {
+                showSaveDialog = true
+            }
+        })
+        .confirmationDialog("Update network settings?", isPresented: $showSaveDialog, titleVisibility: .visible) {
+            Button("Save and reconnect") {
+                if saveNetCfg() {
+                    dismiss()
+                    cfgLoaded = false
+                }
+            }
+            Button("Exit without saving") { dismiss() }
+        }
     }
 
     private func updateNetCfgView(_ cfg: NetCfg) {
         netCfg = cfg
+        onionHosts = OnionHosts(netCfg: netCfg)
         enableKeepAlive = netCfg.enableKeepAlive
         keepAliveOpts = netCfg.tcpKeepAlive ?? KeepAliveOpts.defaults
     }
 
-    private func saveNetCfg() {
+    private func saveNetCfg() -> Bool {
         do {
             try setNetworkConfig(netCfg)
             currentNetCfg = netCfg
             setNetCfg(netCfg)
+            return true
         } catch let error {
             let err = responseError(error)
             showSettingsAlert = .error(err: err)
             logger.error("\(err)")
+            return false
         }
     }
 
@@ -164,6 +261,38 @@ struct AdvancedNetworkSettings: View {
         }
         .frame(height: 36)
     }
+    
+    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
+        switch hosts {
+        case .no: return "Onion hosts will not be used."
+        case .prefer: return "Onion hosts will be used when available.\nRequires compatible VPN."
+        case .require: return "Onion hosts will be **required** for connection.\nRequires compatible VPN."
+        }
+    }
+
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
+        switch mode {
+        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
+        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
+        }
+    }
+    
+    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
+        switch mode {
+        case .always: return "Always use private routing."
+        case .unknown: return "Use private routing with unknown servers."
+        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
+        case .never: return "Do NOT use private routing."
+        }
+    }
+    
+    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
+        switch proxyFallback {
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
+        }
+    }
 }
 
 struct AdvancedNetworkSettings_Previews: PreviewProvider {
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift
index 3d93a92e08..155a3956be 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift
@@ -10,18 +10,10 @@ import SwiftUI
 import SimpleXChat
 
 private enum NetworkAlert: Identifiable {
-    case updateOnionHosts(hosts: OnionHosts)
-    case updateSessionMode(mode: TransportSessionMode)
-    case updateSMPProxyMode(proxyMode: SMPProxyMode)
-    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
     case error(err: String)
 
     var id: String {
         switch self {
-        case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
-        case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
-        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
-        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
         case let .error(err): return "error \(err)"
         }
     }
@@ -30,16 +22,6 @@ private enum NetworkAlert: Identifiable {
 struct NetworkAndServers: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-    @State private var cfgLoaded = false
-    @State private var currentNetCfg = NetCfg.defaults
-    @State private var netCfg = NetCfg.defaults
-    @State private var onionHosts: OnionHosts = .no
-    @State private var sessionMode: TransportSessionMode = .user
-    @State private var proxyMode: SMPProxyMode = .never
-    @State private var proxyFallback: SMPProxyFallback = .allow
-    @State private var alert: NetworkAlert?
 
     var body: some View {
         VStack {
@@ -50,7 +32,7 @@ struct NetworkAndServers: View {
                             .navigationTitle("Your SMP servers")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
-                        Text("SMP servers")
+                        Text("Message servers")
                     }
 
                     NavigationLink {
@@ -58,24 +40,12 @@ struct NetworkAndServers: View {
                             .navigationTitle("Your XFTP servers")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
-                        Text("XFTP servers")
-                    }
-
-                    Picker("Use .onion hosts", selection: $onionHosts) {
-                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-
-                    if developerTools {
-                        Picker("Transport isolation", selection: $sessionMode) {
-                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
-                        }
-                        .frame(height: 36)
+                        Text("Media & file servers")
                     }
 
                     NavigationLink {
                         AdvancedNetworkSettings()
-                            .navigationTitle("Network settings")
+                            .navigationTitle("Advanced settings")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
                         Text("Advanced network settings")
@@ -83,35 +53,6 @@ struct NetworkAndServers: View {
                 } header: {
                     Text("Messages & files")
                         .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    Text("Using .onion hosts requires compatible VPN provider.")
-                        .foregroundColor(theme.colors.secondary)
-                }
-
-                Section {
-                    Picker("Private routing", selection: $proxyMode) {
-                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-
-                    Picker("Allow downgrade", selection: $proxyFallback) {
-                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
-                    }
-                    .disabled(proxyMode == .never)
-                    .frame(height: 36)
-
-                    Toggle("Show message status", isOn: $showSentViaProxy)
-                } header: {
-                    Text("Private message routing")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    VStack(alignment: .leading) {
-                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
-                        if showSentViaProxy {
-                            Text("Show → on messages sent via private routing.")
-                        }
-                    }
-                    .foregroundColor(theme.colors.secondary)
                 }
 
                 Section(header: Text("Calls").foregroundColor(theme.colors.secondary)) {
@@ -133,147 +74,6 @@ struct NetworkAndServers: View {
                 }
             }
         }
-        .onAppear {
-            if cfgLoaded { return }
-            cfgLoaded = true
-            currentNetCfg = getNetCfg()
-            resetNetCfgView()
-        }
-        .onChange(of: onionHosts) { hosts in
-            if hosts != OnionHosts(netCfg: currentNetCfg) {
-                alert = .updateOnionHosts(hosts: hosts)
-            }
-        }
-        .onChange(of: sessionMode) { mode in
-            if mode != netCfg.sessionMode {
-                alert = .updateSessionMode(mode: mode)
-            }
-        }
-        .onChange(of: proxyMode) { mode in
-            if mode != netCfg.smpProxyMode {
-                alert = .updateSMPProxyMode(proxyMode: mode)
-            }
-        }
-        .onChange(of: proxyFallback) { fallbackMode in
-            if fallbackMode != netCfg.smpProxyFallback {
-                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
-            }
-        }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .updateOnionHosts(hosts):
-                return Alert(
-                    title: Text("Update .onion hosts setting?"),
-                    message: Text(onionHostsInfo(hosts)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        let (hostMode, requiredHostMode) = hosts.hostMode
-                        netCfg.hostMode = hostMode
-                        netCfg.requiredHostMode = requiredHostMode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSessionMode(mode):
-                return Alert(
-                    title: Text("Update transport isolation mode?"),
-                    message: Text(sessionModeInfo(mode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.sessionMode = mode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSMPProxyMode(proxyMode):
-                return Alert(
-                    title: Text("Message routing mode"),
-                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyMode = proxyMode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSMPProxyFallback(proxyFallback):
-                return Alert(
-                    title: Text("Message routing fallback"),
-                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyFallback = proxyFallback
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .error(err):
-                return Alert(
-                    title: Text("Error updating settings"),
-                    message: Text(err)
-                )
-            }
-        }
-    }
-
-    private func saveNetCfg() {
-        do {
-            let def = netCfg.hostMode == .onionHost ? NetCfg.proxyDefaults : NetCfg.defaults
-            netCfg.tcpConnectTimeout = def.tcpConnectTimeout
-            netCfg.tcpTimeout = def.tcpTimeout
-            try setNetworkConfig(netCfg)
-            currentNetCfg = netCfg
-            setNetCfg(netCfg)
-        } catch let error {
-            let err = responseError(error)
-            resetNetCfgView()
-            alert = .error(err: err)
-            logger.error("\(err)")
-        }
-    }
-
-    private func resetNetCfgView() {
-        netCfg = currentNetCfg
-        onionHosts = OnionHosts(netCfg: netCfg)
-        sessionMode = netCfg.sessionMode
-        proxyMode = netCfg.smpProxyMode
-        proxyFallback = netCfg.smpProxyFallback
-    }
-
-    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
-        switch hosts {
-        case .no: return "Onion hosts will not be used."
-        case .prefer: return "Onion hosts will be used when available. Requires enabling VPN."
-        case .require: return "Onion hosts will be required for connection. Requires enabling VPN."
-        }
-    }
-
-    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
-        switch mode {
-        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
-        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
-        }
-    }
-    
-    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
-        switch mode {
-        case .always: return "Always use private routing."
-        case .unknown: return "Use private routing with unknown servers."
-        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
-        case .never: return "Do NOT use private routing."
-        }
-    }
-
-    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
-        switch proxyFallback {
-        case .allow: return "Send messages directly when your or destination server does not support private routing."
-        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
-        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
-        }
     }
 }
 
diff --git a/apps/ios/Shared/Views/UserSettings/ProtocolServersView.swift b/apps/ios/Shared/Views/UserSettings/ProtocolServersView.swift
index ea1953e4ac..0fb37d5c49 100644
--- a/apps/ios/Shared/Views/UserSettings/ProtocolServersView.swift
+++ b/apps/ios/Shared/Views/UserSettings/ProtocolServersView.swift
@@ -130,7 +130,7 @@ struct ProtocolServersView: View {
                 showSaveDialog = true
             }
         })
-        .confirmationDialog("Save servers?", isPresented: $showSaveDialog) {
+        .confirmationDialog("Save servers?", isPresented: $showSaveDialog, titleVisibility: .visible) {
             Button("Save") {
                 saveServers()
                 dismiss()
diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff
index 6f1ed52623..b8875610fc 100644
--- a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
+++ b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
@@ -1234,6 +1234,10 @@
         <target>Базата данни на чата е изтрита</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Базата данни на чат е импортирана</target>
@@ -3899,6 +3903,10 @@ This is your link for group %@!</source>
         <target>Макс. 30 секунди, получено незабавно.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3981,12 +3989,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4365,14 +4369,18 @@ This is your link for group %@!</source>
         <target>Линк за еднократна покана</target>
         <note>No comment provided by engineer.</note>
       </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>За свързване ще са необходими Onion хостове. Изисква се активиране на VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>За свързване ще са **необходими** Onion хостове.
+Изисква се активиране на VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Ще се използват Onion хостове, когато са налични. Изисква се активиране на VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Ще се използват Onion хостове, когато са налични.
+Изисква се активиране на VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5231,11 +5239,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Покажи</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Отмени промените</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Отзови</target>
@@ -5265,11 +5268,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5299,6 +5297,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Запази и уведоми членовете на групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Запази и актуализирай профила на групата</target>
@@ -5959,11 +5961,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Някои не-фатални грешки са възникнали по време на импортиране - може да видите конзолата за повече подробности.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Някой</target>
@@ -6093,6 +6103,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Системна идентификация</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Времето на изчакване за установяване на TCP връзка</target>
@@ -6623,11 +6637,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Актуализиране на настройката за .onion хостове?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Актуализирай паролата на базата данни</target>
@@ -6638,9 +6647,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Актуализиране на режима на изолация на транспорта?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6648,11 +6656,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Актуализирането на тази настройка ще свърже повторно клиента към всички сървъри.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Актуализирай и отвори чата</target>
@@ -6757,11 +6760,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Използването на .onion хостове изисква съвместим VPN доставчик.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Използват се сървърите на SimpleX Chat.</target>
@@ -7015,11 +7013,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP сървъри</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Вие</target>
@@ -7233,6 +7226,14 @@ Repeat connection request?</source>
         <target>Вие се присъединихте към тази група. Свързване с поканващия член на групата.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Трябва да използвате най-новата версия на вашата чат база данни САМО на едно устройство, в противен случай може да спрете да получавате съобщения от някои контакти.</target>
@@ -8203,8 +8204,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff
index 15d80de7b5..ce0c5d6970 100644
--- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
+++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
@@ -1192,6 +1192,10 @@
         <target>Databáze chatu odstraněna</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Importovaná databáze chatu</target>
@@ -3756,6 +3760,10 @@ This is your link for group %@!</source>
         <target>Max 30 vteřin, přijato okamžitě.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3838,12 +3846,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4203,14 +4207,18 @@ This is your link for group %@!</source>
         <target>Jednorázový zvací odkaz</target>
         <note>No comment provided by engineer.</note>
       </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>Pro připojení budou vyžadováni Onion hostitelé. Vyžaduje povolení sítě VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Pro připojení budou vyžadováni Onion hostitelé.
+Vyžaduje povolení sítě VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion hostitelé budou použiti, pokud jsou k dispozici. Vyžaduje povolení sítě VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion hostitelé budou použiti, pokud jsou k dispozici.
+Vyžaduje povolení sítě VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5037,11 +5045,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Odhalit</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Vrátit</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Odvolat</target>
@@ -5071,11 +5074,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5104,6 +5102,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Uložit a upozornit členy skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Uložit a aktualizovat profil skupiny</target>
@@ -5750,11 +5752,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Někdo</target>
@@ -5880,6 +5890,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Ověření systému</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Časový limit připojení TCP</target>
@@ -6389,11 +6403,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Aktualizovat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Aktualizovat nastavení hostitelů .onion?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Aktualizovat přístupovou frázi databáze</target>
@@ -6404,9 +6413,8 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Aktualizovat nastavení sítě?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Aktualizovat režim dopravní izolace?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6414,11 +6422,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Aktualizací nastavení se klient znovu připojí ke všem serverům.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Aktualizace tohoto nastavení znovu připojí klienta ke všem serverům.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Zvýšit a otevřít chat</target>
@@ -6518,11 +6521,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Použití hostitelů .onion vyžaduje kompatibilního poskytovatele VPN.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Používat servery SimpleX Chat.</target>
@@ -6759,11 +6757,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP servery</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Vy</target>
@@ -6962,6 +6955,14 @@ Repeat connection request?</source>
         <target>Připojili jste se k této skupině. Připojení k pozvání člena skupiny.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Nejnovější verzi databáze chatu musíte používat POUZE v jednom zařízení, jinak se může stát, že přestanete přijímat zprávy od některých kontaktů.</target>
@@ -7907,8 +7908,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
index 95df9edf6d..e44b4f02d7 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
+++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
@@ -1252,6 +1252,10 @@
         <target>Chat-Datenbank gelöscht</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Chat-Datenbank importiert</target>
@@ -3966,6 +3970,10 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Max. 30 Sekunden, sofort erhalten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Nachrichtenempfang</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Einmal-Einladungslink</target>
         <note>No comment provided by engineer.</note>
       </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>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Für diese Verbindung werden Onion-Hosts benötigt.
+Dies erfordert die Aktivierung eines VPNs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Wenn Onion-Hosts verfügbar sind, werden sie verwendet. Dies erfordert die Aktivierung eines VPNs.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Wenn Onion-Hosts verfügbar sind, werden sie verwendet.
+Dies erfordert die Aktivierung eines VPNs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Aufdecken</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Zurückkehren</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Widerrufen</target>
@@ -5379,11 +5380,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="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <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>
@@ -5414,6 +5410,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Speichern und Gruppenmitglieder benachrichtigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Gruppen-Profil sichern und aktualisieren</target>
@@ -6101,11 +6101,19 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Während des Imports sind einige nicht schwerwiegende Fehler aufgetreten - in der Chat-Konsole finden Sie weitere Einzelheiten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Jemand</target>
@@ -6240,6 +6248,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>System-Authentifizierung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Timeout der TCP-Verbindung</target>
@@ -6779,11 +6791,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Aktualisieren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Einstellung für .onion-Hosts aktualisieren?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Datenbank-Passwort aktualisieren</target>
@@ -6794,9 +6801,8 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Netzwerkeinstellungen aktualisieren?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Transport-Isolations-Modus aktualisieren?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Die Aktualisierung der Einstellungen wird den Client wieder mit allen Servern verbinden.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Die Aktualisierung dieser Einstellung wird den Client wieder mit allen Servern verbinden.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Aktualisieren und den Chat öffnen</target>
@@ -6919,11 +6920,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Benutzer-Auswahl</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Für die Nutzung von .onion-Hosts sind kompatible VPN-Anbieter erforderlich.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Verwendung von SimpleX-Chat-Servern.</target>
@@ -7184,11 +7180,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>XFTP-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP-Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Profil</target>
@@ -7403,6 +7394,14 @@ Verbindungsanfrage wiederholen?</target>
         <target>Sie sind dieser Gruppe beigetreten. Sie werden mit dem einladenden Gruppenmitglied verbunden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Sie dürfen die neueste Version Ihrer Chat-Datenbank NUR auf einem Gerät verwenden, andernfalls erhalten Sie möglicherweise keine Nachrichten mehr von einigen Ihrer Kontakte.</target>
@@ -8383,8 +8382,8 @@ Zuletzt empfangene Nachricht: %2$@</target>
         <target>Unbekannt</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>Unbekannte Relais</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
index 3fc3e6037b..d416dc9138 100644
--- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
+++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
@@ -1254,6 +1254,11 @@
         <target>Chat database deleted</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <target>Chat database exported</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Chat database imported</target>
@@ -3978,6 +3983,11 @@ This is your link for group %@!</target>
         <target>Max 30 seconds, received instantly.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <target>Media &amp; file servers</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <target>Medium</target>
@@ -4068,14 +4078,9 @@ This is your link for group %@!</target>
         <target>Message reception</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
+        <target>Message servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4462,14 +4467,18 @@ This is your link for group %@!</target>
         <target>One-time invitation link</target>
         <note>No comment provided by engineer.</note>
       </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>Onion hosts will be required for connection. Requires enabling VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Onion hosts will be **required** for connection.
+Requires compatible VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion hosts will be used when available. Requires enabling VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion hosts will be used when available.
+Requires compatible VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5358,11 +5367,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Reveal</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Revert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Revoke</target>
@@ -5393,11 +5397,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>SMP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <target>SMP servers</target>
-        <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>
@@ -5428,6 +5427,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Save and notify group members</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <target>Save and reconnect</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Save and update group profile</target>
@@ -6118,11 +6122,21 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Soft</target>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <target>Some file(s) were not exported:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Some non-fatal errors occurred during import - you may see Chat console for more details.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <target>Some non-fatal errors occurred during import:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Somebody</target>
@@ -6258,6 +6272,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>System authentication</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <target>TCP connection</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP connection timeout</target>
@@ -6799,11 +6818,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Update</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Update .onion hosts setting?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Update database passphrase</target>
@@ -6814,9 +6828,9 @@ To connect, please ask your contact to create another connection link and check
         <target>Update network settings?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Update transport isolation mode?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
+        <target>Update settings?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6824,11 +6838,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Updating settings will re-connect the client to all servers.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Updating this setting will re-connect the client to all servers.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Upgrade and open chat</target>
@@ -6939,11 +6948,6 @@ To connect, please ask your contact to create another connection link and check
         <target>User selection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Using .onion hosts requires compatible VPN provider.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Using SimpleX Chat servers.</target>
@@ -7204,11 +7208,6 @@ To connect, please ask your contact to create another connection link and check
         <target>XFTP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP servers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>You</target>
@@ -7423,6 +7422,16 @@ Repeat connection request?</target>
         <target>You joined this group. Connecting to inviting group member.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <target>You may migrate the exported database.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <target>You may save the exported archive.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</target>
@@ -8403,9 +8412,9 @@ 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>
+      <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="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff
index 3e33bb5d39..e908c8a69e 100644
--- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
+++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
@@ -1252,6 +1252,10 @@
         <target>Base de datos eliminada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Base de datos importada</target>
@@ -3966,6 +3970,10 @@ This is your link for group %@!</source>
         <target>Máximo 30 segundos, recibido al instante.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ This is your link for group %@!</source>
         <target>Recepción de mensaje</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ This is your link for group %@!</source>
         <target>Enlace de invitación de un solo uso</target>
         <note>No comment provided by engineer.</note>
       </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>Se requieren hosts .onion para la conexión. Requiere activación de la VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Se **requieren** hosts .onion para la conexión.
+Requiere activación de la VPN.</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>Se usarán hosts .onion si están disponibles. Requiere activación de la VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Se usarán hosts .onion si están disponibles.
+Requiere activación de la VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Revelar</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Revertir</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Revocar</target>
@@ -5379,11 +5380,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Servidor SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <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>
@@ -5414,6 +5410,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Guardar y notificar grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Guardar y actualizar perfil del grupo</target>
@@ -6101,11 +6101,19 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Algunos errores no críticos ocurrieron durante la importación - para más detalles puedes ver la consola de Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Alguien</target>
@@ -6240,6 +6248,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Autenticación del sistema</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Timeout de la conexión TCP</target>
@@ -6779,11 +6791,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Actualizar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>¿Actualizar la configuración de los hosts .onion?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Actualizar contraseña de la base de datos</target>
@@ -6794,9 +6801,8 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>¿Actualizar la configuración de red?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>¿Actualizar el modo de aislamiento de transporte?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Al actualizar la configuración el cliente se reconectará a todos los servidores.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Al actualizar esta configuración el cliente se reconectará a todos los servidores.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Actualizar y abrir Chat</target>
@@ -6919,11 +6920,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Selección de usuarios</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Usar hosts .onion requiere un proveedor VPN compatible.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Usar servidores SimpleX Chat.</target>
@@ -7184,11 +7180,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Servidor XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>Servidores XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Tú</target>
@@ -7403,6 +7394,14 @@ Repeat connection request?</source>
         <target>Te has unido a este grupo. Conectando con el emisor de la invitacíon.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Debes usar la versión más reciente de tu base de datos ÚNICAMENTE en un dispositivo, de lo contrario podrías dejar de recibir mensajes de algunos contactos.</target>
@@ -8383,8 +8382,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>con servidores desconocidos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff
index 5b6a1fab80..37d3b4aa03 100644
--- a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
+++ b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
@@ -1185,6 +1185,10 @@
         <target>Chat-tietokanta poistettu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Chat-tietokanta tuotu</target>
@@ -3746,6 +3750,10 @@ This is your link for group %@!</source>
         <target>Enintään 30 sekuntia, vastaanotetaan välittömästi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3828,12 +3836,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4192,14 +4196,18 @@ This is your link for group %@!</source>
         <target>Kertakutsulinkki</target>
         <note>No comment provided by engineer.</note>
       </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>Yhteyden muodostamiseen tarvitaan Onion-isäntiä. Edellyttää VPN:n sallimista.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Yhteyden muodostamiseen tarvitaan Onion-isäntiä.
+Edellyttää VPN:n sallimista.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion-isäntiä käytetään, kun niitä on saatavilla. Edellyttää VPN:n sallimista.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion-isäntiä käytetään, kun niitä on saatavilla.
+Edellyttää VPN:n sallimista.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5025,11 +5033,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Paljasta</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Palauta</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Peruuta</target>
@@ -5059,11 +5062,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5092,6 +5090,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Tallenna ja ilmoita ryhmän jäsenille</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Tallenna ja päivitä ryhmäprofiili</target>
@@ -5736,11 +5738,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Tuonnin aikana tapahtui joitakin ei-vakavia virheitä – saatat nähdä Chat-konsolissa lisätietoja.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Joku</target>
@@ -5866,6 +5876,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Järjestelmän todennus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP-yhteyden aikakatkaisu</target>
@@ -6374,11 +6388,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Päivitä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Päivitä .onion-isäntien asetus?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Päivitä tietokannan tunnuslause</target>
@@ -6389,9 +6398,8 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Päivitä verkkoasetukset?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Päivitä kuljetuksen eristystila?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6399,11 +6407,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Asetusten päivittäminen yhdistää asiakkaan uudelleen kaikkiin palvelimiin.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Tämän asetuksen päivittäminen yhdistää asiakkaan uudelleen kaikkiin palvelimiin.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Päivitä ja avaa keskustelu</target>
@@ -6503,11 +6506,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>.onion-isäntien käyttäminen vaatii yhteensopivan VPN-palveluntarjoajan.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Käyttää SimpleX Chat -palvelimia.</target>
@@ -6744,11 +6742,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP-palvelimet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Sinä</target>
@@ -6947,6 +6940,14 @@ Repeat connection request?</source>
         <target>Liityit tähän ryhmään. Muodostetaan yhteyttä ryhmän jäsenten kutsumiseksi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Sinun tulee käyttää keskustelujen-tietokannan uusinta versiota AINOSTAAN yhdessä laitteessa, muuten saatat lakata vastaanottamasta viestejä joiltakin kontakteilta.</target>
@@ -7891,8 +7892,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff
index e3c45aeebf..3f02545700 100644
--- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
+++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
@@ -1252,6 +1252,10 @@
         <target>Base de données du chat supprimée</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Base de données du chat importée</target>
@@ -3966,6 +3970,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Max 30 secondes, réception immédiate.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Réception de message</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Lien d'invitation unique</target>
         <note>No comment provided by engineer.</note>
       </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>Les hôtes .onion seront nécessaires pour la connexion. Nécessite l'activation d'un VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Les hôtes .onion seront **nécessaires** pour la connexion.
+Nécessite l'activation d'un VPN.</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>Les hôtes .onion seront utilisés dès que possible. Nécessite l'activation d'un VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Les hôtes .onion seront utilisés dès que possible.
+Nécessite l'activation d'un VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Révéler</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Revenir en arrière</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Révoquer</target>
@@ -5379,11 +5380,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Serveur SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <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>
@@ -5414,6 +5410,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Enregistrer et en informer les membres du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Enregistrer et mettre à jour le profil du groupe</target>
@@ -6100,11 +6100,19 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Quelqu'un</target>
@@ -6239,6 +6247,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Authentification du système</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Délai de connexion TCP</target>
@@ -6778,11 +6790,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Mise à jour</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Mettre à jour le paramètre des hôtes .onion ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Mise à jour de la phrase secrète de la base de données</target>
@@ -6793,9 +6800,8 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Mettre à jour les paramètres réseau ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Mettre à jour le mode d'isolement du transport ?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6803,11 +6809,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>La mise à jour des ces paramètres reconnectera le client à tous les serveurs.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>La mise à jour de ce paramètre reconnectera le client à tous les serveurs.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Mettre à niveau et ouvrir le chat</target>
@@ -6918,11 +6919,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Sélection de l'utilisateur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>L'utilisation des hôtes .onion nécessite un fournisseur VPN compatible.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Vous utilisez les serveurs SimpleX.</target>
@@ -7183,11 +7179,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Serveur XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>Serveurs XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Vous</target>
@@ -7402,6 +7393,14 @@ Répéter la demande de connexion ?</target>
         <target>Vous avez rejoint ce groupe. Connexion à l'invitation d'un membre du groupe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Vous devez utiliser la version la plus récente de votre base de données de chat sur un seul appareil UNIQUEMENT, sinon vous risquez de ne plus recevoir les messages de certains contacts.</target>
@@ -8382,8 +8381,8 @@ dernier message reçu : %2$@</target>
         <target>inconnu</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>relais inconnus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff
index d6ac48d974..2ab1126178 100644
--- a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
+++ b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
@@ -1252,6 +1252,10 @@
         <target>Csevegési adatbázis törölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Csevegési adatbázis importálva</target>
@@ -3966,6 +3970,10 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Max. 30 másodperc, azonnal érkezett.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Üzenetjelentés</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Egyszer használatos meghívó hivatkozás</target>
         <note>No comment provided by engineer.</note>
       </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>A kapcsolódáshoz Onion kiszolgálókra lesz szükség. VPN engedélyezése szükséges.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>A kapcsolódáshoz Onion kiszolgálókra lesz szükség.
+VPN engedélyezése szükséges.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion kiszolgálók használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion kiszolgálók használata, ha azok rendelkezésre állnak.
+VPN engedélyezése szükséges.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
         <target>Felfedés</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Visszaállítás</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Visszavonás</target>
@@ -5379,11 +5380,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
         <target>SMP-kiszolgáló</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <target>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>
@@ -5414,6 +5410,10 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
         <target>Mentés és a csoporttagok értesítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Mentés és csoportprofil frissítése</target>
@@ -6101,11 +6101,19 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Valaki</target>
@@ -6240,6 +6248,10 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.<
         <target>Rendszerhitelesítés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP kapcsolat időtúllépés</target>
@@ -6779,11 +6791,6 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>Frissítés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Tor .onion kiszolgálók beállításainak frissítése?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Adatbázis jelmondat megváltoztatása</target>
@@ -6794,9 +6801,8 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>Hálózati beállítások megváltoztatása?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Kapcsolat izolációs mód frissítése?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>A beállítások frissítése a kiszolgálókhoz való ú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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>A beállítás frissítésével a kliens újrakapcsolódik az összes kiszolgálóhoz.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>A csevegés frissítése és megnyitása</target>
@@ -6919,11 +6920,6 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>Felhasználó kiválasztása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>A .onion kiszolgálók használatához kompatibilis VPN szolgáltatóra van szükség.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>SimpleX Chat kiszolgálók használatban.</target>
@@ -7184,11 +7180,6 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
         <target>XFTP-kiszolgáló</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP kiszolgálók</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Ön</target>
@@ -7403,6 +7394,14 @@ Kapcsolódási kérés megismétlése?</target>
         <target>Csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi ismerőstől.</target>
@@ -8383,8 +8382,8 @@ utoljára fogadott üzenet: %2$@</target>
         <target>ismeretlen</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>ismeretlen átjátszók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff
index e196830ac4..7fa997f06d 100644
--- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
+++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
@@ -1252,6 +1252,10 @@
         <target>Database della chat eliminato</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Database della chat importato</target>
@@ -3966,6 +3970,10 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Max 30 secondi, ricevuto istantaneamente.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Ricezione messaggi</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Link di invito una tantum</target>
         <note>No comment provided by engineer.</note>
       </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>Gli host Onion saranno necessari per la connessione. Richiede l'attivazione della VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Gli host Onion saranno **necessari** per la connessione.
+Richiede l'attivazione della VPN.</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>Gli host Onion verranno usati quando disponibili. Richiede l'attivazione della VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Gli host Onion verranno usati quando disponibili.
+Richiede l'attivazione della VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Rivela</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Ripristina</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Revoca</target>
@@ -5379,11 +5380,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Server SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <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>
@@ -5414,6 +5410,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Salva e avvisa i membri del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Salva e aggiorna il profilo del gruppo</target>
@@ -6101,11 +6101,19 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Si sono verificati alcuni errori non gravi durante l'importazione: vedi la console della chat per i dettagli.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Qualcuno</target>
@@ -6240,6 +6248,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Autenticazione di sistema</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Scadenza connessione TCP</target>
@@ -6779,11 +6791,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Aggiorna</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Aggiornare l'impostazione degli host .onion?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Aggiorna la password del database</target>
@@ -6794,9 +6801,8 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Aggiornare le impostazioni di rete?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Aggiornare la modalità di isolamento del trasporto?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>L'aggiornamento delle impostazioni riconnetterà il client a tutti i server.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>L'aggiornamento di questa impostazione riconnetterà il client a tutti i server.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Aggiorna e apri chat</target>
@@ -6919,11 +6920,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Selezione utente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>L'uso di host .onion richiede un fornitore di VPN compatibile.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Utilizzo dei server SimpleX Chat.</target>
@@ -7184,11 +7180,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Server XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>Server XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Tu</target>
@@ -7403,6 +7394,14 @@ Ripetere la richiesta di connessione?</target>
         <target>Sei entrato/a in questo gruppo. Connessione al membro del gruppo invitante.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Devi usare la versione più recente del tuo database della chat SOLO su un dispositivo, altrimenti potresti non ricevere più i messaggi da alcuni contatti.</target>
@@ -8383,8 +8382,8 @@ ultimo msg ricevuto: %2$@</target>
         <target>sconosciuto</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>relay sconosciuti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff
index 46ef837f9f..584c186c4d 100644
--- a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
+++ b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
@@ -1209,6 +1209,10 @@
         <target>チャットのデータベースが削除されました</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>チャットのデータベースが読み込まれました</target>
@@ -3771,6 +3775,10 @@ This is your link for group %@!</source>
         <target>最大 30 秒で即時受信します。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3852,12 +3860,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4217,14 +4221,18 @@ This is your link for group %@!</source>
         <target>使い捨ての招待リンク</target>
         <note>No comment provided by engineer.</note>
       </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>接続にオニオンのホストが必要となります。VPN を有効にする必要があります。</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>接続にオニオンのホストが必要となります。
+VPN を有効にする必要があります。</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>オニオンのホストが利用可能時に使われます。VPN を有効にする必要があります。</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>オニオンのホストが利用可能時に使われます。
+VPN を有効にする必要があります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5050,11 +5058,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>開示する</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>元に戻す</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>取り消す</target>
@@ -5084,11 +5087,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5117,6 +5115,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>保存して、グループのメンバーにに知らせる</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>グループプロファイルの保存と更新</target>
@@ -5755,11 +5757,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>インポート中に致命的でないエラーが発生しました - 詳細はチャットコンソールを参照してください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>誰か</target>
@@ -5885,6 +5895,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>システム認証</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP接続タイムアウト</target>
@@ -6392,11 +6406,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>.onionのホスト設定を更新しますか？</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>データベースのパスフレーズを更新</target>
@@ -6407,9 +6416,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>トランスポート隔離モードを更新しますか？</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6417,11 +6425,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>設定を更新すると、全サーバにクライントの再接続が行われます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>アップグレードしてチャットを開く</target>
@@ -6521,11 +6524,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>.onionホストを使用するには、互換性のあるVPNプロバイダーが必要です。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>SimpleX チャット サーバーを使用する。</target>
@@ -6762,11 +6760,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTPサーバ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>あなた</target>
@@ -6965,6 +6958,14 @@ Repeat connection request?</source>
         <target>グループに参加しました。招待をくれたメンバーに接続してます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>あなたの最新データベースを1つの端末にしか使わなければ、一部の連絡先からメッセージが届きかねます。</target>
@@ -7909,8 +7910,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff
index 6a5eb34a47..d94be279f9 100644
--- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
+++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
@@ -1252,6 +1252,10 @@
         <target>Chat database verwijderd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Chat database geïmporteerd</target>
@@ -3966,6 +3970,10 @@ Dit is jouw link voor groep %@!</target>
         <target>Max 30 seconden, direct ontvangen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ Dit is jouw link voor groep %@!</target>
         <target>Bericht ontvangst</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ Dit is jouw link voor groep %@!</target>
         <target>Eenmalige uitnodiging link</target>
         <note>No comment provided by engineer.</note>
       </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>Onion hosts zullen nodig zijn voor verbinding. Vereist het inschakelen van VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Onion hosts zullen nodig zijn voor verbinding.
+Vereist het inschakelen van VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion hosts worden gebruikt indien beschikbaar. Vereist het inschakelen van VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion hosts worden gebruikt indien beschikbaar.
+Vereist het inschakelen van VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Onthullen</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Terugdraaien</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Intrekken</target>
@@ -5379,11 +5380,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>SMP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <target>SMP servers</target>
-        <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>
@@ -5414,6 +5410,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Opslaan en groep leden melden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Groep profiel opslaan en bijwerken</target>
@@ -6101,11 +6101,19 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Er zijn enkele niet-fatale fouten opgetreden tijdens het importeren - u kunt de Chat console raadplegen voor meer details.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Iemand</target>
@@ -6240,6 +6248,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Systeem authenticatie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Timeout van TCP-verbinding</target>
@@ -6779,11 +6791,6 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Update</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>.onion hosts-instelling updaten?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Database wachtwoord bijwerken</target>
@@ -6794,9 +6801,8 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Netwerk instellingen bijwerken?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Transportisolatiemodus updaten?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Door de instellingen bij te werken, wordt de client opnieuw verbonden met alle servers.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Als u deze instelling bijwerkt, wordt de client opnieuw verbonden met alle servers.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Upgrade en open chat</target>
@@ -6919,11 +6920,6 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Gebruikersselectie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Het gebruik van .onion-hosts vereist een compatibele VPN-provider.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>SimpleX Chat servers gebruiken.</target>
@@ -7184,11 +7180,6 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>XFTP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP servers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Jij</target>
@@ -7403,6 +7394,14 @@ Verbindingsverzoek herhalen?</target>
         <target>Je bent lid geworden van deze groep. Verbinding maken met uitnodigend groepslid.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>U mag ALLEEN de meest recente versie van uw chat database op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</target>
@@ -8383,8 +8382,8 @@ laatst ontvangen bericht: %2$@</target>
         <target>onbekend</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>onbekende relays</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff
index a9d342d549..5b6e769692 100644
--- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
+++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
@@ -1252,6 +1252,10 @@
         <target>Baza danych czatu usunięta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Zaimportowano bazę danych czatu</target>
@@ -3966,6 +3970,10 @@ To jest twój link do grupy %@!</target>
         <target>Maksymalnie 30 sekund, odbierane natychmiast.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -4055,14 +4063,8 @@ To jest twój link do grupy %@!</target>
         <target>Odebranie wiadomości</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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4448,14 +4450,18 @@ To jest twój link do grupy %@!</target>
         <target>Jednorazowy link zaproszenia</target>
         <note>No comment provided by engineer.</note>
       </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>Hosty onion będą wymagane do połączenia. Wymaga włączenia VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Hosty onion będą wymagane do połączenia.
+Wymaga włączenia VPN.</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>Hosty onion będą używane, gdy będą dostępne. Wymaga włączenia VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Hosty onion będą używane, gdy będą dostępne.
+Wymaga włączenia VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5344,11 +5350,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Ujawnij</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Przywrócić</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Odwołaj</target>
@@ -5379,11 +5380,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Serwer SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</source>
-        <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>
@@ -5414,6 +5410,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zapisz i powiadom członków grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Zapisz i zaktualizuj profil grupowy</target>
@@ -6101,11 +6101,19 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Ktoś</target>
@@ -6240,6 +6248,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Uwierzytelnianie systemu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Limit czasu połączenia TCP</target>
@@ -6779,11 +6791,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Aktualizuj</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Zaktualizować ustawienie hostów .onion?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Aktualizuj hasło do bazy danych</target>
@@ -6794,9 +6801,8 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Zaktualizować ustawienia sieci?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Zaktualizować tryb izolacji transportu?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6804,11 +6810,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Aktualizacja ustawień spowoduje ponowne połączenie klienta ze wszystkimi serwerami.</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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Aktualizacja tych ustawień spowoduje ponowne połączenie klienta ze wszystkimi serwerami.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Zaktualizuj i otwórz czat</target>
@@ -6919,11 +6920,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Wybór użytkownika</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Używanie hostów .onion wymaga kompatybilnego dostawcy VPN.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Używanie serwerów SimpleX Chat.</target>
@@ -7184,11 +7180,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Serwer XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>Serwery XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Ty</target>
@@ -7403,6 +7394,14 @@ Powtórzyć prośbę połączenia?</target>
         <target>Dołączyłeś do tej grupy. Łączenie z zapraszającym członkiem grupy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Musisz używać najnowszej wersji bazy danych czatu TYLKO na jednym urządzeniu, w przeciwnym razie możesz przestać otrzymywać wiadomości od niektórych kontaktów.</target>
@@ -8383,8 +8382,8 @@ ostatnia otrzymana wiadomość: %2$@</target>
         <target>nieznany</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>nieznane przekaźniki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
index 7789f9ddcf..cd0798a027 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
@@ -1237,6 +1237,10 @@
         <target>Данные чата удалены</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Архив чата импортирован</target>
@@ -3911,6 +3915,10 @@ This is your link for group %@!</source>
         <target>Макс. 30 секунд, доставляются мгновенно.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3994,14 +4002,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4381,14 +4383,18 @@ This is your link for group %@!</source>
         <target>Одноразовая ссылка</target>
         <note>No comment provided by engineer.</note>
       </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>Подключаться только к onion хостам. Требуется включенный VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Подключаться только к **onion** хостам.
+Требуется совместимый VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion хосты используются, если возможно. Требуется включенный VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion хосты используются, если возможно.
+Требуется совместимый VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5253,11 +5259,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Показать</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Отменить изменения</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Отозвать</target>
@@ -5287,11 +5288,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5322,6 +5318,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Сохранить и уведомить членов группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Сохранить сообщение и обновить группу</target>
@@ -5988,11 +5988,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Во время импорта произошли некоторые ошибки - для получения более подробной информации вы можете обратиться к консоли.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Контакт</target>
@@ -6122,6 +6130,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Системная аутентификация</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Таймаут TCP соединения</target>
@@ -6655,11 +6667,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Обновить настройки .onion хостов?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Поменять пароль</target>
@@ -6670,9 +6677,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Обновить режим отдельных сессий?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6680,11 +6686,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Обновление этих настроек приведет к сбросу и установке нового соединения со всеми серверами.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Обновить и открыть чат</target>
@@ -6791,11 +6792,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Для использования .onion хостов требуется совместимый VPN провайдер.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Используются серверы, предоставленные SimpleX Chat.</target>
@@ -7052,11 +7048,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP серверы</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Вы</target>
@@ -7270,6 +7261,14 @@ Repeat connection request?</source>
         <target>Вы вступили в эту группу. Устанавливается соединение с пригласившим членом группы.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Вы должны всегда использовать самую новую версию данных чата, ТОЛЬКО на одном устройстве, иначе Вы можете перестать получать сообщения от каких то контактов.</target>
@@ -8240,8 +8239,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>неизвестные серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff
index 0735f1b288..4c40040191 100644
--- a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
+++ b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
@@ -1177,6 +1177,10 @@
         <target>ลบฐานข้อมูลแชทแล้ว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>นำฐานข้อมูลแชทเข้าแล้ว</target>
@@ -3729,6 +3733,10 @@ This is your link for group %@!</source>
         <target>สูงสุด 30 วินาที รับทันที</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3811,12 +3819,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4173,13 +4177,15 @@ This is your link for group %@!</source>
         <target>ลิงก์คำเชิญแบบใช้ครั้งเดียว</target>
         <note>No comment provided by engineer.</note>
       </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>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
         <target>จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ</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>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
         <target>จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5004,11 +5010,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>เปิดเผย</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>เปลี่ยนกลับ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>ถอน</target>
@@ -5038,11 +5039,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5071,6 +5067,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>บันทึกและแจ้งให้สมาชิกในกลุ่มทราบ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>บันทึกและอัปเดตโปรไฟล์กลุ่ม</target>
@@ -5711,11 +5711,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>ข้อผิดพลาดที่ไม่ร้ายแรงบางอย่างเกิดขึ้นระหว่างการนำเข้า - คุณอาจดูรายละเอียดเพิ่มเติมได้ที่คอนโซล Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>ใครบางคน</target>
@@ -5841,6 +5849,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>การรับรองความถูกต้องของระบบ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>หมดเวลาการเชื่อมต่อ TCP</target>
@@ -6348,11 +6360,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>อัปเดตการตั้งค่าโฮสต์ .onion ไหม?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>อัปเดตรหัสผ่านของฐานข้อมูล</target>
@@ -6363,9 +6370,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>อัปเดตโหมดการแยกการขนส่งไหม?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6373,11 +6379,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>การอัปเดตการตั้งค่านี้จะเชื่อมต่อไคลเอนต์กับเซิร์ฟเวอร์ทั้งหมดอีกครั้ง</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>อัปเกรดและเปิดการแชท</target>
@@ -6475,11 +6476,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>การใช้โฮสต์ .onion ต้องการผู้ให้บริการ VPN ที่เข้ากันได้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>กำลังใช้เซิร์ฟเวอร์ SimpleX Chat อยู่</target>
@@ -6716,11 +6712,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>เซิร์ฟเวอร์ XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>คุณ</target>
@@ -6918,6 +6909,14 @@ Repeat connection request?</source>
         <target>คุณเข้าร่วมกลุ่มนี้แล้ว กำลังเชื่อมต่อเพื่อเชิญสมาชิกกลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>คุณต้องใช้ฐานข้อมูลแชทเวอร์ชันล่าสุดบนอุปกรณ์เครื่องเดียวเท่านั้น มิฉะนั้น คุณอาจหยุดได้รับข้อความจากผู้ติดต่อบางคน</target>
@@ -7859,8 +7858,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff
index 2781891aa6..f409d7c2c4 100644
--- a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
+++ b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
@@ -1237,6 +1237,10 @@
         <target>Sohbet veritabanı silindi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Sohbet veritabanı içe aktarıldı</target>
@@ -3912,6 +3916,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Maksimum 30 saniye, anında alındı.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3996,14 +4004,8 @@ Bu senin grup için bağlantın %@!</target>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4383,14 +4385,18 @@ Bu senin grup için bağlantın %@!</target>
         <target>Tek zamanlı bağlantı daveti</target>
         <note>No comment provided by engineer.</note>
       </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>Bağlantı için Onion ana bilgisayarları gerekecektir. VPN'nin etkinleştirilmesi gerekir.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Bağlantı için Onion ana bilgisayarları gerekecektir.
+VPN'nin etkinleştirilmesi gerekir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion ana bilgisayarları mevcutsa kullanılacaktır. VPN'nin etkinleştirilmesi gerekir.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion ana bilgisayarları mevcutsa kullanılacaktır.
+VPN'nin etkinleştirilmesi gerekir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5255,11 +5261,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Göster</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Geri al</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>İptal et</target>
@@ -5289,11 +5290,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5324,6 +5320,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Kaydet ve grup üyelerine bildir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Kaydet ve grup profilini güncelle</target>
@@ -5990,11 +5990,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>İçe aktarma sırasında bazı ölümcül olmayan hatalar oluştu - daha fazla ayrıntı için Sohbet konsoluna bakabilirsiniz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Biri</target>
@@ -6124,6 +6132,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Sistem yetkilendirilmesi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP bağlantı zaman aşımı</target>
@@ -6657,11 +6669,6 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Güncelle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>.onion ana bilgisayarların ayarı güncellensin mi?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Veritabanı parolasını güncelle</target>
@@ -6672,9 +6679,8 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Bağlantı ayarları güncellensin mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Taşıma izolasyon modu güncellensin mi?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6682,11 +6688,6 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Ayarların güncellenmesi, istemciyi tüm sunuculara yeniden bağlayacaktı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">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Bu ayarın güncellenmesi, istemciyi tüm sunuculara yeniden bağlayacaktır.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Yükselt ve sohbeti aç</target>
@@ -6793,11 +6794,6 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>.onion ana bilgisayarlarını kullanmak için uyumlu VPN sağlayıcısı gerekir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>SimpleX Chat sunucuları kullanılıyor.</target>
@@ -7054,11 +7050,6 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP sunucuları</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Sen</target>
@@ -7272,6 +7263,14 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>Bu gruba katıldınız. Davet eden grup üyesine bağlanılıyor.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Sohbet veritabanınızın en son sürümünü SADECE bir cihazda kullanmalısınız, aksi takdirde bazı kişilerden daha fazla mesaj alamayabilirsiniz.</target>
@@ -8245,8 +8244,8 @@ son alınan msj: %2$@</target>
         <target>bilinmeyen</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="unknown relays" xml:space="preserve">
-        <source>unknown relays</source>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>bilinmeyen yönlendiriciler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff
index 3d95496a67..82fef1f1bf 100644
--- a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
+++ b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
@@ -1237,6 +1237,10 @@
         <target>Видалено базу даних чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>Імпорт бази даних чату</target>
@@ -3912,6 +3916,10 @@ This is your link for group %@!</source>
         <target>Максимум 30 секунд, отримується миттєво.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3996,14 +4004,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4383,14 +4385,18 @@ This is your link for group %@!</source>
         <target>Посилання на одноразове запрошення</target>
         <note>No comment provided by engineer.</note>
       </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>Для підключення будуть потрібні хости onion. Потрібно увімкнути VPN.</target>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
+        <target>Для підключення будуть потрібні хости onion.
+Потрібно увімкнути VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
-        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion хости будуть використовуватися, коли вони будуть доступні. Потрібно увімкнути VPN.</target>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
+        <target>Onion хости будуть використовуватися, коли вони будуть доступні.
+Потрібно увімкнути VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
@@ -5255,11 +5261,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Показувати</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>Повернутися</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>Відкликати</target>
@@ -5289,11 +5290,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5324,6 +5320,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Зберегти та повідомити учасників групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>Збереження та оновлення профілю групи</target>
@@ -5990,11 +5990,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Під час імпорту виникли деякі нефатальні помилки – ви можете переглянути консоль чату, щоб дізнатися більше.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>Хтось</target>
@@ -6124,6 +6132,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Автентифікація системи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>Тайм-аут TCP-з'єднання</target>
@@ -6657,11 +6669,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>Оновити налаштування хостів .onion?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>Оновити парольну фразу бази даних</target>
@@ -6672,9 +6679,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>Оновити режим транспортної ізоляції?</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6682,11 +6688,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>Оновлення цього параметра призведе до перепідключення клієнта до всіх серверів.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>Оновлення та відкритий чат</target>
@@ -6793,11 +6794,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>Для використання хостів .onion потрібен сумісний VPN-провайдер.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Використання серверів SimpleX Chat.</target>
@@ -7054,11 +7050,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>Сервери XFTP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>Ти</target>
@@ -7272,6 +7263,14 @@ Repeat connection request?</source>
         <target>Ви приєдналися до цієї групи. Підключення до запрошеного учасника групи.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>Ви повинні використовувати найновішу версію бази даних чату ТІЛЬКИ на одному пристрої, інакше ви можете перестати отримувати повідомлення від деяких контактів.</target>
@@ -8245,8 +8244,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <target>невідомі реле</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff
index 097de15cb3..8ebcf02977 100644
--- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
+++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
@@ -1221,6 +1221,10 @@
         <target>聊天数据库已删除</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve">
+        <source>Chat database exported</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
         <target>聊天数据库已导入</target>
@@ -3861,6 +3865,10 @@ This is your link for group %@!</source>
         <target>最长30秒，立即接收。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Media &amp; file servers" xml:space="preserve">
+        <source>Media &amp; file servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
         <note>blur media</note>
@@ -3943,12 +3951,8 @@ This is your link for group %@!</source>
         <source>Message reception</source>
         <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>
+      <trans-unit id="Message servers" xml:space="preserve">
+        <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4324,13 +4328,15 @@ This is your link for group %@!</source>
         <target>一次性邀请链接</target>
         <note>No comment provided by engineer.</note>
       </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>
+      <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be **required** for connection.
+Requires compatible VPN.</source>
         <target>Onion 主机将用于连接。需要启用 VPN。</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>
+      <trans-unit id="Onion hosts will be used when available.&#10;Requires compatible VPN." xml:space="preserve">
+        <source>Onion hosts will be used when available.
+Requires compatible VPN.</source>
         <target>当可用时，将使用 Onion 主机。需要启用 VPN。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5181,11 +5187,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>揭示</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Revert" xml:space="preserve">
-        <source>Revert</source>
-        <target>恢复</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
         <target>撤销</target>
@@ -5215,11 +5216,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SMP servers" xml:space="preserve">
-        <source>SMP servers</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>
@@ -5249,6 +5245,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>保存并通知群组成员</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save and reconnect" xml:space="preserve">
+        <source>Save and reconnect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
         <source>Save and update group profile</source>
         <target>保存和更新组配置文件</target>
@@ -5909,11 +5909,19 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Soft</source>
         <note>blur media</note>
       </trans-unit>
+      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
+        <source>Some file(s) were not exported:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>导入过程中发生了一些非致命错误——您可以查看聊天控制台了解更多详细信息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
+        <source>Some non-fatal errors occurred during import:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
         <source>Somebody</source>
         <target>某人</target>
@@ -6043,6 +6051,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>系统验证</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP connection" xml:space="preserve">
+        <source>TCP connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
         <target>TCP 连接超时</target>
@@ -6572,11 +6584,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="Update .onion hosts setting?" xml:space="preserve">
-        <source>Update .onion hosts setting?</source>
-        <target>更新 .onion 主机设置？</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
         <target>更新数据库密码</target>
@@ -6587,9 +6594,8 @@ 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="Update transport isolation mode?" xml:space="preserve">
-        <source>Update transport isolation mode?</source>
-        <target>更新传输隔离模式？</target>
+      <trans-unit id="Update settings?" xml:space="preserve">
+        <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6597,11 +6603,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="Updating this setting will re-connect the client to all servers." xml:space="preserve">
-        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>更新此设置将重新连接客户端到所有服务器。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
         <source>Upgrade and open chat</source>
         <target>升级并打开聊天</target>
@@ -6705,11 +6706,6 @@ To connect, please ask your contact to create another connection link and check
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
-        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>使用 .onion 主机需要兼容的 VPN 提供商。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>使用 SimpleX Chat 服务器。</target>
@@ -6962,11 +6958,6 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="XFTP servers" xml:space="preserve">
-        <source>XFTP servers</source>
-        <target>XFTP 服务器</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You" xml:space="preserve">
         <source>You</source>
         <target>您</target>
@@ -7171,6 +7162,14 @@ Repeat connection request?</source>
         <target>你加入了这个群组。连接到邀请组成员。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You may migrate the exported database." xml:space="preserve">
+        <source>You may migrate the exported database.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You may save the exported archive." xml:space="preserve">
+        <source>You may save the exported archive.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
         <target>您只能在一台设备上使用最新版本的聊天数据库，否则您可能会停止接收来自某些联系人的消息。</target>
@@ -8134,8 +8133,8 @@ 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>
+      <trans-unit id="unknown servers" xml:space="preserve">
+        <source>unknown servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
diff --git a/apps/ios/SimpleXChat/APITypes.swift b/apps/ios/SimpleXChat/APITypes.swift
index 17b4c2d6ad..b839804b79 100644
--- a/apps/ios/SimpleXChat/APITypes.swift
+++ b/apps/ios/SimpleXChat/APITypes.swift
@@ -1325,13 +1325,31 @@ public struct NetCfg: Codable, Equatable, Hashable {
         smpPingInterval: 1200_000_000
     )
 
-    public static let proxyDefaults: NetCfg = NetCfg(
+    static let proxyDefaults: NetCfg = NetCfg(
         tcpConnectTimeout: 35_000_000,
         tcpTimeout: 20_000_000,
         tcpTimeoutPerKb: 15_000,
         rcvConcurrency: 8,
         smpPingInterval: 1200_000_000
     )
+    
+    public var withProxyTimeouts: NetCfg {
+        var cfg = self
+        cfg.tcpConnectTimeout = NetCfg.proxyDefaults.tcpConnectTimeout
+        cfg.tcpTimeout = NetCfg.proxyDefaults.tcpTimeout
+        cfg.tcpTimeoutPerKb = NetCfg.proxyDefaults.tcpTimeoutPerKb
+        cfg.rcvConcurrency = NetCfg.proxyDefaults.rcvConcurrency
+        cfg.smpPingInterval = NetCfg.proxyDefaults.smpPingInterval
+        return cfg
+    }
+    
+    public var hasProxyTimeouts: Bool {
+        tcpConnectTimeout == NetCfg.proxyDefaults.tcpConnectTimeout &&
+        tcpTimeout == NetCfg.proxyDefaults.tcpTimeout &&
+        tcpTimeoutPerKb == NetCfg.proxyDefaults.tcpTimeoutPerKb &&
+        rcvConcurrency == NetCfg.proxyDefaults.rcvConcurrency &&
+        smpPingInterval == NetCfg.proxyDefaults.smpPingInterval
+    }
 
     public var enableKeepAlive: Bool { tcpKeepAlive != nil }
 }
@@ -1347,16 +1365,16 @@ public enum SocksMode: String, Codable, Hashable {
     case onion = "onion"
 }
 
-public enum SMPProxyMode: String, Codable, Hashable {
+public enum SMPProxyMode: String, Codable, Hashable, SelectableItem {
     case always = "always"
     case unknown = "unknown"
     case unprotected = "unprotected"
     case never = "never"
 
-    public var text: LocalizedStringKey {
+    public var label: LocalizedStringKey {
         switch self {
         case .always: return "always"
-        case .unknown: return "unknown relays"
+        case .unknown: return "unknown servers"
         case .unprotected: return "unprotected"
         case .never: return "never"
         }
@@ -1367,12 +1385,12 @@ public enum SMPProxyMode: String, Codable, Hashable {
     public static let values: [SMPProxyMode] = [.always, .unknown, .unprotected, .never]
 }
 
-public enum SMPProxyFallback: String, Codable, Hashable {
+public enum SMPProxyFallback: String, Codable, Hashable, SelectableItem {
     case allow = "allow"
     case allowProtected = "allowProtected"
     case prohibit = "prohibit"
 
-    public var text: LocalizedStringKey {
+    public var label: LocalizedStringKey {
         switch self {
         case .allow: return "yes"
         case .allowProtected: return "when IP hidden"
diff --git a/apps/ios/SimpleXChat/AppGroup.swift b/apps/ios/SimpleXChat/AppGroup.swift
index 1690c7bc73..933842e0cb 100644
--- a/apps/ios/SimpleXChat/AppGroup.swift
+++ b/apps/ios/SimpleXChat/AppGroup.swift
@@ -66,8 +66,8 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_NTF_ENABLE_PERIODIC: false,
         GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS: OnionHosts.no.rawValue,
         GROUP_DEFAULT_NETWORK_SESSION_MODE: TransportSessionMode.user.rawValue,
-        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.never.rawValue,
-        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allow.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.unknown.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allowProtected.rawValue,
         GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT: NetCfg.defaults.tcpConnectTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT: NetCfg.defaults.tcpTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB: NetCfg.defaults.tcpTimeoutPerKb,
@@ -235,13 +235,13 @@ public let networkSessionModeGroupDefault = EnumDefault<TransportSessionMode>(
 public let networkSMPProxyModeGroupDefault = EnumDefault<SMPProxyMode>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE,
-    withDefault: .never
+    withDefault: .unknown
 )
 
 public let networkSMPProxyFallbackGroupDefault = EnumDefault<SMPProxyFallback>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK,
-    withDefault: .allow
+    withDefault: .allowProtected
 )
 
 public let storeDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_STORE_DB_PASSPHRASE)
diff --git a/apps/ios/bg.lproj/Localizable.strings b/apps/ios/bg.lproj/Localizable.strings
index 1e7b7a6314..7ef2237a06 100644
--- a/apps/ios/bg.lproj/Localizable.strings
+++ b/apps/ios/bg.lproj/Localizable.strings
@@ -641,7 +641,7 @@
 /* rcv group event chat item */
 "blocked %@" = "блокиран %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "блокиран от админ";
 
 /* No comment provided by engineer. */
@@ -2719,10 +2719,10 @@
 "One-time invitation link" = "Линк за еднократна покана";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "За свързване ще са необходими Onion хостове. Изисква се активиране на VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "За свързване ще са **необходими** Onion хостове.\nИзисква се активиране на VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Ще се използват Onion хостове, когато са налични. Изисква се активиране на VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Ще се използват Onion хостове, когато са налични.\nИзисква се активиране на VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Няма се използват Onion хостове.";
@@ -3204,9 +3204,6 @@
 /* chat item action */
 "Reveal" = "Покажи";
 
-/* No comment provided by engineer. */
-"Revert" = "Отмени промените";
-
 /* No comment provided by engineer. */
 "Revoke" = "Отзови";
 
@@ -3336,7 +3333,7 @@
 /* chat item text */
 "security code changed" = "кодът за сигурност е променен";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Избери";
 
 /* No comment provided by engineer. */
@@ -3588,9 +3585,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Малки групи (максимум 20)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP сървъри";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Някои не-фатални грешки са възникнали по време на импортиране - може да видите конзолата за повече подробности.";
 
@@ -3966,18 +3960,12 @@
 /* No comment provided by engineer. */
 "Update" = "Актуализация";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Актуализиране на настройката за .onion хостове?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Актуализирай паролата на базата данни";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Актуализиране на мрежовите настройки?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Актуализиране на режима на изолация на транспорта?";
-
 /* rcv group event chat item */
 "updated group profile" = "актуализиран профил на групата";
 
@@ -3987,9 +3975,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Актуализирането на настройките ще свърже отново клиента към всички сървъри.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Актуализирането на тази настройка ще свърже повторно клиента към всички сървъри.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Актуализирай и отвори чата";
 
@@ -4038,9 +4023,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Потребителски профил";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Използването на .onion хостове изисква съвместим VPN доставчик.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Използват се сървърите на SimpleX Chat.";
 
@@ -4209,9 +4191,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Грешна парола!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP сървъри";
-
 /* pref value */
 "yes" = "да";
 
diff --git a/apps/ios/cs.lproj/Localizable.strings b/apps/ios/cs.lproj/Localizable.strings
index c7f916408f..62d1b541b9 100644
--- a/apps/ios/cs.lproj/Localizable.strings
+++ b/apps/ios/cs.lproj/Localizable.strings
@@ -2215,10 +2215,10 @@
 "One-time invitation link" = "Jednorázový zvací odkaz";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Pro připojení budou vyžadováni Onion hostitelé. Vyžaduje povolení sítě VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Pro připojení budou vyžadováni Onion hostitelé.\nVyžaduje povolení sítě VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion hostitelé budou použiti, pokud jsou k dispozici. Vyžaduje povolení sítě VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion hostitelé budou použiti, pokud jsou k dispozici.\nVyžaduje povolení sítě VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion hostitelé nebudou použiti.";
@@ -2595,9 +2595,6 @@
 /* chat item action */
 "Reveal" = "Odhalit";
 
-/* No comment provided by engineer. */
-"Revert" = "Vrátit";
-
 /* No comment provided by engineer. */
 "Revoke" = "Odvolat";
 
@@ -2700,7 +2697,7 @@
 /* chat item text */
 "security code changed" = "bezpečnostní kód změněn";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Vybrat";
 
 /* No comment provided by engineer. */
@@ -2922,9 +2919,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Malé skupiny (max. 20)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP servery";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.";
 
@@ -3216,27 +3210,18 @@
 /* No comment provided by engineer. */
 "Update" = "Aktualizovat";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Aktualizovat nastavení hostitelů .onion?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Aktualizovat přístupovou frázi databáze";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Aktualizovat nastavení sítě?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Aktualizovat režim dopravní izolace?";
-
 /* rcv group event chat item */
 "updated group profile" = "aktualizoval profil skupiny";
 
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Aktualizací nastavení se klient znovu připojí ke všem serverům.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Aktualizace tohoto nastavení znovu připojí klienta ke všem serverům.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Zvýšit a otevřít chat";
 
@@ -3270,9 +3255,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Profil uživatele";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Použití hostitelů .onion vyžaduje kompatibilního poskytovatele VPN.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Používat servery SimpleX Chat.";
 
@@ -3387,9 +3369,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Špatná přístupová fráze!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP servery";
-
 /* pref value */
 "yes" = "ano";
 
diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings
index b410f63f4c..40dec857b0 100644
--- a/apps/ios/de.lproj/Localizable.strings
+++ b/apps/ios/de.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ wurde blockiert";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "wurde vom Administrator blockiert";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Nachrichtenempfang";
 
-/* 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.";
 
@@ -2977,10 +2971,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.\nRequires compatible VPN." = "Für diese Verbindung werden Onion-Hosts benötigt.\nDies 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.\nRequires compatible VPN." = "Wenn Onion-Hosts verfügbar sind, werden sie verwendet.\nDies erfordert die Aktivierung eines VPNs.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion-Hosts werden nicht verwendet.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Aufdecken";
 
-/* No comment provided by engineer. */
-"Revert" = "Zurückkehren";
-
 /* No comment provided by engineer. */
 "Revoke" = "Widerrufen";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "Sicherheitscode wurde geändert";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Auswählen";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "SMP-Server";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP-Server";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Während des Imports sind einige nicht schwerwiegende Fehler aufgetreten - in der Chat-Konsole finden Sie weitere Einzelheiten.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Unbekannter Fehler";
 
 /* No comment provided by engineer. */
-"unknown relays" = "Unbekannte Relais";
+"unknown servers" = "Unbekannte Relais";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Unbekannte Server!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Aktualisieren";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Einstellung für .onion-Hosts aktualisieren?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Datenbank-Passwort aktualisieren";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Netzwerkeinstellungen aktualisieren?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Transport-Isolations-Modus aktualisieren?";
-
 /* rcv group event chat item */
 "updated group profile" = "Aktualisiertes Gruppenprofil";
 
@@ -4473,9 +4455,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Die Aktualisierung der Einstellungen wird den Client wieder mit allen Servern verbinden.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Die Aktualisierung dieser Einstellung wird den Client wieder mit allen Servern verbinden.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Aktualisieren und den Chat öffnen";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Benutzer-Auswahl";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Für die Nutzung von .onion-Hosts sind kompatible VPN-Anbieter erforderlich.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Verwendung von SimpleX-Chat-Servern.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "XFTP-Server";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP-Server";
-
 /* pref value */
 "yes" = "Ja";
 
diff --git a/apps/ios/es.lproj/Localizable.strings b/apps/ios/es.lproj/Localizable.strings
index a84f8c0433..9b48f56617 100644
--- a/apps/ios/es.lproj/Localizable.strings
+++ b/apps/ios/es.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "ha bloqueado a %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "bloqueado por administrador";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Recepción de mensaje";
 
-/* 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.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Enlace de invitación de un solo uso";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Se requieren hosts .onion para la conexión. Requiere activación de la VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Se **requieren** hosts .onion para la conexión.\nRequiere activación de la VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Se usarán hosts .onion si están disponibles. Requiere activación de la VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Se usarán hosts .onion si están disponibles.\nRequiere activación de la VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "No se usarán hosts .onion.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Revelar";
 
-/* No comment provided by engineer. */
-"Revert" = "Revertir";
-
 /* No comment provided by engineer. */
 "Revoke" = "Revocar";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "código de seguridad cambiado";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Seleccionar";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "Servidor SMP";
 
-/* No comment provided by engineer. */
-"SMP servers" = "Servidores SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Algunos errores no críticos ocurrieron durante la importación - para más detalles puedes ver la consola de Chat.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Error desconocido";
 
 /* No comment provided by engineer. */
-"unknown relays" = "con servidores desconocidos";
+"unknown servers" = "con servidores desconocidos";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "¡Servidores desconocidos!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Actualizar";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "¿Actualizar la configuración de los hosts .onion?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Actualizar contraseña de la base de datos";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "¿Actualizar la configuración de red?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "¿Actualizar el modo de aislamiento de transporte?";
-
 /* rcv group event chat item */
 "updated group profile" = "ha actualizado el perfil del grupo";
 
@@ -4473,9 +4455,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Al actualizar la configuración el cliente se reconectará a todos los servidores.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Al actualizar esta configuración el cliente se reconectará a todos los servidores.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Actualizar y abrir Chat";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Selección de usuarios";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Usar hosts .onion requiere un proveedor VPN compatible.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Usar servidores SimpleX Chat.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "Servidor XFTP";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "Servidores XFTP";
-
 /* pref value */
 "yes" = "sí";
 
diff --git a/apps/ios/fi.lproj/Localizable.strings b/apps/ios/fi.lproj/Localizable.strings
index b9ea0024c5..905a9a1f8f 100644
--- a/apps/ios/fi.lproj/Localizable.strings
+++ b/apps/ios/fi.lproj/Localizable.strings
@@ -2188,10 +2188,10 @@
 "One-time invitation link" = "Kertakutsulinkki";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Yhteyden muodostamiseen tarvitaan Onion-isäntiä. Edellyttää VPN:n sallimista.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Yhteyden muodostamiseen tarvitaan Onion-isäntiä.\nEdellyttää VPN:n sallimista.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion-isäntiä käytetään, kun niitä on saatavilla. Edellyttää VPN:n sallimista.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion-isäntiä käytetään, kun niitä on saatavilla.\nEdellyttää VPN:n sallimista.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion-isäntiä ei käytetä.";
@@ -2565,9 +2565,6 @@
 /* chat item action */
 "Reveal" = "Paljasta";
 
-/* No comment provided by engineer. */
-"Revert" = "Palauta";
-
 /* No comment provided by engineer. */
 "Revoke" = "Peruuta";
 
@@ -2670,7 +2667,7 @@
 /* chat item text */
 "security code changed" = "turvakoodi on muuttunut";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Valitse";
 
 /* No comment provided by engineer. */
@@ -2883,9 +2880,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Pienryhmät (max 20)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP-palvelimet";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Tuonnin aikana tapahtui joitakin ei-vakavia virheitä – saatat nähdä Chat-konsolissa lisätietoja.";
 
@@ -3174,27 +3168,18 @@
 /* No comment provided by engineer. */
 "Update" = "Päivitä";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Päivitä .onion-isäntien asetus?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Päivitä tietokannan tunnuslause";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Päivitä verkkoasetukset?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Päivitä kuljetuksen eristystila?";
-
 /* rcv group event chat item */
 "updated group profile" = "päivitetty ryhmäprofiili";
 
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Asetusten päivittäminen yhdistää asiakkaan uudelleen kaikkiin palvelimiin.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Tämän asetuksen päivittäminen yhdistää asiakkaan uudelleen kaikkiin palvelimiin.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Päivitä ja avaa keskustelu";
 
@@ -3228,9 +3213,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Käyttäjäprofiili";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = ".onion-isäntien käyttäminen vaatii yhteensopivan VPN-palveluntarjoajan.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Käyttää SimpleX Chat -palvelimia.";
 
@@ -3345,9 +3327,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Väärä tunnuslause!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP-palvelimet";
-
 /* pref value */
 "yes" = "kyllä";
 
diff --git a/apps/ios/fr.lproj/Localizable.strings b/apps/ios/fr.lproj/Localizable.strings
index 272c3bb410..7743e491bb 100644
--- a/apps/ios/fr.lproj/Localizable.strings
+++ b/apps/ios/fr.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ bloqué";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "bloqué par l'administrateur";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Réception de message";
 
-/* 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.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Lien d'invitation unique";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Les hôtes .onion seront nécessaires pour la connexion. Nécessite l'activation d'un VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Les hôtes .onion seront **nécessaires** pour la connexion.\nNécessite l'activation d'un VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Les hôtes .onion seront utilisés dès que possible. Nécessite l'activation d'un VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Les hôtes .onion seront utilisés dès que possible.\nNécessite l'activation d'un VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Les hôtes .onion ne seront pas utilisés.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Révéler";
 
-/* No comment provided by engineer. */
-"Revert" = "Revenir en arrière";
-
 /* No comment provided by engineer. */
 "Revoke" = "Révoquer";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "code de sécurité modifié";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Choisir";
 
 /* No comment provided by engineer. */
@@ -4023,9 +4014,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "Serveur SMP";
 
-/* No comment provided by engineer. */
-"SMP servers" = "Serveurs SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.";
 
@@ -4408,7 +4396,7 @@
 "Unknown error" = "Erreur inconnue";
 
 /* No comment provided by engineer. */
-"unknown relays" = "relais inconnus";
+"unknown servers" = "relais inconnus";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Serveurs inconnus !";
@@ -4449,18 +4437,12 @@
 /* No comment provided by engineer. */
 "Update" = "Mise à jour";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Mettre à jour le paramètre des hôtes .onion ?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Mise à jour de la phrase secrète de la base de données";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Mettre à jour les paramètres réseau ?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Mettre à jour le mode d'isolement du transport ?";
-
 /* rcv group event chat item */
 "updated group profile" = "mise à jour du profil de groupe";
 
@@ -4470,9 +4452,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "La mise à jour des ces paramètres reconnectera le client à tous les serveurs.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "La mise à jour de ce paramètre reconnectera le client à tous les serveurs.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Mettre à niveau et ouvrir le chat";
 
@@ -4539,9 +4518,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Sélection de l'utilisateur";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "L'utilisation des hôtes .onion nécessite un fournisseur VPN compatible.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Vous utilisez les serveurs SimpleX.";
 
@@ -4734,9 +4710,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "Serveur XFTP";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "Serveurs XFTP";
-
 /* pref value */
 "yes" = "oui";
 
diff --git a/apps/ios/hu.lproj/Localizable.strings b/apps/ios/hu.lproj/Localizable.strings
index 3027e1df3f..138da70f61 100644
--- a/apps/ios/hu.lproj/Localizable.strings
+++ b/apps/ios/hu.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "letiltotta őt: %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "letiltva az admin által";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Üzenetjelentés";
 
-/* 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.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Egyszer használatos meghívó hivatkozás";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "A kapcsolódáshoz Onion kiszolgálókra lesz szükség. VPN engedélyezése szükséges.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "A kapcsolódáshoz Onion kiszolgálókra lesz szükség.\nVPN engedélyezése szükséges.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion kiszolgálók használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion kiszolgálók használata, ha azok rendelkezésre állnak.\nVPN engedélyezése szükséges.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion kiszolgálók nem lesznek használva.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Felfedés";
 
-/* No comment provided by engineer. */
-"Revert" = "Visszaállítás";
-
 /* No comment provided by engineer. */
 "Revoke" = "Visszavonás";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "a biztonsági kód megváltozott";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Választás";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "SMP-kiszolgáló";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP kiszolgálók";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Ismeretlen hiba";
 
 /* No comment provided by engineer. */
-"unknown relays" = "ismeretlen átjátszók";
+"unknown servers" = "ismeretlen átjátszók";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Ismeretlen kiszolgálók!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Frissítés";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Tor .onion kiszolgálók beállításainak frissítése?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Adatbázis jelmondat megváltoztatása";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Hálózati beállítások megváltoztatása?";
 
-/* No comment provided by engineer. */
-"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";
 
@@ -4473,9 +4455,6 @@
 /* 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.";
 
-/* 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.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "A csevegés frissítése és megnyitása";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Felhasználó kiválasztása";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "A .onion kiszolgálók használatához kompatibilis VPN szolgáltatóra van szükség.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "SimpleX Chat kiszolgálók használatban.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "XFTP-kiszolgáló";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP kiszolgálók";
-
 /* pref value */
 "yes" = "igen";
 
diff --git a/apps/ios/it.lproj/Localizable.strings b/apps/ios/it.lproj/Localizable.strings
index 5854d28162..f2e8f4fc21 100644
--- a/apps/ios/it.lproj/Localizable.strings
+++ b/apps/ios/it.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "ha bloccato %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "bloccato dall'amministratore";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Ricezione messaggi";
 
-/* 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.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Link di invito una tantum";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Gli host Onion saranno necessari per la connessione. Richiede l'attivazione della VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Gli host Onion saranno **necessari** per la connessione.\nRichiede l'attivazione della VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Gli host Onion verranno usati quando disponibili. Richiede l'attivazione della VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Gli host Onion verranno usati quando disponibili.\nRichiede l'attivazione della VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Gli host Onion non verranno usati.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Rivela";
 
-/* No comment provided by engineer. */
-"Revert" = "Ripristina";
-
 /* No comment provided by engineer. */
 "Revoke" = "Revoca";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "codice di sicurezza modificato";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Seleziona";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "Server SMP";
 
-/* No comment provided by engineer. */
-"SMP servers" = "Server SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Si sono verificati alcuni errori non gravi durante l'importazione: vedi la console della chat per i dettagli.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Errore sconosciuto";
 
 /* No comment provided by engineer. */
-"unknown relays" = "relay sconosciuti";
+"unknown servers" = "relay sconosciuti";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Server sconosciuti!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Aggiorna";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Aggiornare l'impostazione degli host .onion?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Aggiorna la password del database";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Aggiornare le impostazioni di rete?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Aggiornare la modalità di isolamento del trasporto?";
-
 /* rcv group event chat item */
 "updated group profile" = "ha aggiornato il profilo del gruppo";
 
@@ -4473,9 +4455,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "L'aggiornamento delle impostazioni riconnetterà il client a tutti i server.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "L'aggiornamento di questa impostazione riconnetterà il client a tutti i server.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Aggiorna e apri chat";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Selezione utente";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "L'uso di host .onion richiede un fornitore di VPN compatibile.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Utilizzo dei server SimpleX Chat.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "Server XFTP";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "Server XFTP";
-
 /* pref value */
 "yes" = "sì";
 
diff --git a/apps/ios/ja.lproj/Localizable.strings b/apps/ios/ja.lproj/Localizable.strings
index 7c8897e6cb..7a9483cea5 100644
--- a/apps/ios/ja.lproj/Localizable.strings
+++ b/apps/ios/ja.lproj/Localizable.strings
@@ -2263,10 +2263,10 @@
 "One-time invitation link" = "使い捨ての招待リンク";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "接続にオニオンのホストが必要となります。VPN を有効にする必要があります。";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "接続にオニオンのホストが必要となります。\nVPN を有効にする必要があります。";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "オニオンのホストが利用可能時に使われます。VPN を有効にする必要があります。";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "オニオンのホストが利用可能時に使われます。\nVPN を有効にする必要があります。";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "オニオンのホストが使われません。";
@@ -2640,9 +2640,6 @@
 /* chat item action */
 "Reveal" = "開示する";
 
-/* No comment provided by engineer. */
-"Revert" = "元に戻す";
-
 /* No comment provided by engineer. */
 "Revoke" = "取り消す";
 
@@ -2745,7 +2742,7 @@
 /* chat item text */
 "security code changed" = "セキュリティコードが変更されました";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "選択";
 
 /* No comment provided by engineer. */
@@ -2940,9 +2937,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "小グループ（最大20名）";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMPサーバ";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "インポート中に致命的でないエラーが発生しました - 詳細はチャットコンソールを参照してください。";
 
@@ -3228,27 +3222,18 @@
 /* No comment provided by engineer. */
 "Update" = "更新";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = ".onionのホスト設定を更新しますか？";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "データベースのパスフレーズを更新";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "ネットワーク設定を更新しますか？";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "トランスポート隔離モードを更新しますか？";
-
 /* rcv group event chat item */
 "updated group profile" = "グループプロフィールを更新しました";
 
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "設定を更新すると、全サーバにクライントの再接続が行われます。";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "設定を更新すると、全サーバにクライントの再接続が行われます。";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "アップグレードしてチャットを開く";
 
@@ -3282,9 +3267,6 @@
 /* No comment provided by engineer. */
 "User profile" = "ユーザープロフィール";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = ".onionホストを使用するには、互換性のあるVPNプロバイダーが必要です。";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "SimpleX チャット サーバーを使用する。";
 
@@ -3399,9 +3381,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "パスフレーズが違います！";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTPサーバ";
-
 /* pref value */
 "yes" = "はい";
 
diff --git a/apps/ios/nl.lproj/Localizable.strings b/apps/ios/nl.lproj/Localizable.strings
index 23eccdcf3b..688bc8cab9 100644
--- a/apps/ios/nl.lproj/Localizable.strings
+++ b/apps/ios/nl.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "geblokkeerd %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "geblokkeerd door beheerder";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Bericht ontvangst";
 
-/* 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é.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Eenmalige uitnodiging link";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Onion hosts zullen nodig zijn voor verbinding. Vereist het inschakelen van VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Onion hosts zullen nodig zijn voor verbinding.\nVereist het inschakelen van VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion hosts worden gebruikt indien beschikbaar. Vereist het inschakelen van VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion hosts worden gebruikt indien beschikbaar.\nVereist het inschakelen van VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion hosts worden niet gebruikt.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Onthullen";
 
-/* No comment provided by engineer. */
-"Revert" = "Terugdraaien";
-
 /* No comment provided by engineer. */
 "Revoke" = "Intrekken";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "beveiligingscode gewijzigd";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Selecteer";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "SMP server";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP servers";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Er zijn enkele niet-fatale fouten opgetreden tijdens het importeren - u kunt de Chat console raadplegen voor meer details.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Onbekende fout";
 
 /* No comment provided by engineer. */
-"unknown relays" = "onbekende relays";
+"unknown servers" = "onbekende relays";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Onbekende servers!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Update";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = ".onion hosts-instelling updaten?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Database wachtwoord bijwerken";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Netwerk instellingen bijwerken?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Transportisolatiemodus updaten?";
-
 /* rcv group event chat item */
 "updated group profile" = "bijgewerkt groep profiel";
 
@@ -4473,9 +4455,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Door de instellingen bij te werken, wordt de client opnieuw verbonden met alle servers.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Als u deze instelling bijwerkt, wordt de client opnieuw verbonden met alle servers.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Upgrade en open chat";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Gebruikersselectie";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Het gebruik van .onion-hosts vereist een compatibele VPN-provider.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "SimpleX Chat servers gebruiken.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "XFTP server";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP servers";
-
 /* pref value */
 "yes" = "Ja";
 
diff --git a/apps/ios/pl.lproj/Localizable.strings b/apps/ios/pl.lproj/Localizable.strings
index fd284d9537..5953c00684 100644
--- a/apps/ios/pl.lproj/Localizable.strings
+++ b/apps/ios/pl.lproj/Localizable.strings
@@ -689,7 +689,7 @@
 /* rcv group event chat item */
 "blocked %@" = "zablokowany %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "zablokowany przez admina";
 
 /* No comment provided by engineer. */
@@ -2698,12 +2698,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Odebranie wiadomości";
 
-/* 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.";
 
@@ -2977,10 +2971,10 @@
 "One-time invitation link" = "Jednorazowy link zaproszenia";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Hosty onion będą wymagane do połączenia. Wymaga włączenia VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Hosty onion będą wymagane do połączenia.\nWymaga włączenia VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Hosty onion będą używane, gdy będą dostępne. Wymaga włączenia VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Hosty onion będą używane, gdy będą dostępne.\nWymaga włączenia VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Hosty onion nie będą używane.";
@@ -3552,9 +3546,6 @@
 /* chat item action */
 "Reveal" = "Ujawnij";
 
-/* No comment provided by engineer. */
-"Revert" = "Przywrócić";
-
 /* No comment provided by engineer. */
 "Revoke" = "Odwołaj";
 
@@ -3699,7 +3690,7 @@
 /* chat item text */
 "security code changed" = "kod bezpieczeństwa zmieniony";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Wybierz";
 
 /* No comment provided by engineer. */
@@ -4026,9 +4017,6 @@
 /* No comment provided by engineer. */
 "SMP server" = "Serwer SMP";
 
-/* No comment provided by engineer. */
-"SMP servers" = "Serwery SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.";
 
@@ -4411,7 +4399,7 @@
 "Unknown error" = "Nieznany błąd";
 
 /* No comment provided by engineer. */
-"unknown relays" = "nieznane przekaźniki";
+"unknown servers" = "nieznane przekaźniki";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Nieznane serwery!";
@@ -4452,18 +4440,12 @@
 /* No comment provided by engineer. */
 "Update" = "Aktualizuj";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Zaktualizować ustawienie hostów .onion?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Aktualizuj hasło do bazy danych";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Zaktualizować ustawienia sieci?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Zaktualizować tryb izolacji transportu?";
-
 /* rcv group event chat item */
 "updated group profile" = "zaktualizowano profil grupy";
 
@@ -4473,9 +4455,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Aktualizacja ustawień spowoduje ponowne połączenie klienta ze wszystkimi serwerami.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Aktualizacja tych ustawień spowoduje ponowne połączenie klienta ze wszystkimi serwerami.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Zaktualizuj i otwórz czat";
 
@@ -4542,9 +4521,6 @@
 /* No comment provided by engineer. */
 "User selection" = "Wybór użytkownika";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Używanie hostów .onion wymaga kompatybilnego dostawcy VPN.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Używanie serwerów SimpleX Chat.";
 
@@ -4737,9 +4713,6 @@
 /* No comment provided by engineer. */
 "XFTP server" = "Serwer XFTP";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "Serwery XFTP";
-
 /* pref value */
 "yes" = "tak";
 
diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings
index d842364f91..a1b95a63a0 100644
--- a/apps/ios/ru.lproj/Localizable.strings
+++ b/apps/ios/ru.lproj/Localizable.strings
@@ -2500,12 +2500,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." = "Источник сообщения остаётся конфиденциальным.";
 
@@ -2761,10 +2755,10 @@
 "One-time invitation link" = "Одноразовая ссылка";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Подключаться только к onion хостам. Требуется включенный VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Подключаться только к **onion** хостам.\nТребуется совместимый VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion хосты используются, если возможно. Требуется включенный VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion хосты используются, если возможно.\nТребуется совместимый VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion хосты не используются.";
@@ -3261,9 +3255,6 @@
 /* chat item action */
 "Reveal" = "Показать";
 
-/* No comment provided by engineer. */
-"Revert" = "Отменить изменения";
-
 /* No comment provided by engineer. */
 "Revoke" = "Отозвать";
 
@@ -3396,7 +3387,7 @@
 /* chat item text */
 "security code changed" = "код безопасности изменился";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Выбрать";
 
 /* No comment provided by engineer. */
@@ -3666,9 +3657,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Маленькие группы (до 20)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP серверы";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Во время импорта произошли некоторые ошибки - для получения более подробной информации вы можете обратиться к консоли.";
 
@@ -4018,7 +4006,7 @@
 "Unknown error" = "Неизвестная ошибка";
 
 /* No comment provided by engineer. */
-"unknown relays" = "неизвестные серверы";
+"unknown servers" = "неизвестные серверы";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Неизвестные серверы!";
@@ -4059,18 +4047,12 @@
 /* No comment provided by engineer. */
 "Update" = "Обновить";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Обновить настройки .onion хостов?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Поменять пароль";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Обновить настройки сети?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Обновить режим отдельных сессий?";
-
 /* rcv group event chat item */
 "updated group profile" = "обновил(а) профиль группы";
 
@@ -4080,9 +4062,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Обновление настроек приведет к сбросу и установке нового соединения со всеми серверами.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Обновление этих настроек приведет к сбросу и установке нового соединения со всеми серверами.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Обновить и открыть чат";
 
@@ -4137,9 +4116,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Профиль чата";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Для использования .onion хостов требуется совместимый VPN провайдер.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Используются серверы, предоставленные SimpleX Chat.";
 
@@ -4320,9 +4296,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Неправильный пароль!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP серверы";
-
 /* pref value */
 "yes" = "да";
 
diff --git a/apps/ios/th.lproj/Localizable.strings b/apps/ios/th.lproj/Localizable.strings
index b1d328ce6e..90b052a4dc 100644
--- a/apps/ios/th.lproj/Localizable.strings
+++ b/apps/ios/th.lproj/Localizable.strings
@@ -2125,10 +2125,10 @@
 "One-time invitation link" = "ลิงก์คำเชิญแบบใช้ครั้งเดียว";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "จำเป็นต้องมีโฮสต์หัวหอมสำหรับการเชื่อมต่อ ต้องเปิดใช้งาน VPN สำหรับการเชื่อมต่อ";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "โฮสต์หัวหอมจะไม่ถูกใช้";
@@ -2496,9 +2496,6 @@
 /* chat item action */
 "Reveal" = "เปิดเผย";
 
-/* No comment provided by engineer. */
-"Revert" = "เปลี่ยนกลับ";
-
 /* No comment provided by engineer. */
 "Revoke" = "ถอน";
 
@@ -2601,7 +2598,7 @@
 /* chat item text */
 "security code changed" = "เปลี่ยนรหัสความปลอดภัยแล้ว";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "เลือก";
 
 /* No comment provided by engineer. */
@@ -2802,9 +2799,6 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "ข้อความที่ข้ามไป";
 
-/* No comment provided by engineer. */
-"SMP servers" = "เซิร์ฟเวอร์ SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "ข้อผิดพลาดที่ไม่ร้ายแรงบางอย่างเกิดขึ้นระหว่างการนำเข้า - คุณอาจดูรายละเอียดเพิ่มเติมได้ที่คอนโซล Chat";
 
@@ -3087,27 +3081,18 @@
 /* No comment provided by engineer. */
 "Update" = "อัปเดต";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "อัปเดตการตั้งค่าโฮสต์ .onion ไหม?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "อัปเดตรหัสผ่านของฐานข้อมูล";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "อัปเดตการตั้งค่าเครือข่ายไหม?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "อัปเดตโหมดการแยกการขนส่งไหม?";
-
 /* rcv group event chat item */
 "updated group profile" = "อัปเดตโปรไฟล์กลุ่มแล้ว";
 
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "การอัปเดตการตั้งค่าจะเชื่อมต่อไคลเอนต์กับเซิร์ฟเวอร์ทั้งหมดอีกครั้ง";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "การอัปเดตการตั้งค่านี้จะเชื่อมต่อไคลเอนต์กับเซิร์ฟเวอร์ทั้งหมดอีกครั้ง";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "อัปเกรดและเปิดการแชท";
 
@@ -3135,9 +3120,6 @@
 /* No comment provided by engineer. */
 "User profile" = "โปรไฟล์ผู้ใช้";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "การใช้โฮสต์ .onion ต้องการผู้ให้บริการ VPN ที่เข้ากันได้";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "กำลังใช้เซิร์ฟเวอร์ SimpleX Chat อยู่";
 
@@ -3252,9 +3234,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "รหัสผ่านผิด!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "เซิร์ฟเวอร์ XFTP";
-
 /* pref value */
 "yes" = "ใช่";
 
diff --git a/apps/ios/tr.lproj/Localizable.strings b/apps/ios/tr.lproj/Localizable.strings
index 98645f8b42..4b45b7cabe 100644
--- a/apps/ios/tr.lproj/Localizable.strings
+++ b/apps/ios/tr.lproj/Localizable.strings
@@ -647,7 +647,7 @@
 /* rcv group event chat item */
 "blocked %@" = "engellendi %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "yönetici tarafından engellendi";
 
 /* No comment provided by engineer. */
@@ -2506,12 +2506,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.";
 
@@ -2767,10 +2761,10 @@
 "One-time invitation link" = "Tek zamanlı bağlantı daveti";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Bağlantı için Onion ana bilgisayarları gerekecektir. VPN'nin etkinleştirilmesi gerekir.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Bağlantı için Onion ana bilgisayarları gerekecektir.\nVPN'nin etkinleştirilmesi gerekir.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion ana bilgisayarları mevcutsa kullanılacaktır. VPN'nin etkinleştirilmesi gerekir.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion ana bilgisayarları mevcutsa kullanılacaktır.\nVPN'nin etkinleştirilmesi gerekir.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion ana bilgisayarları kullanılmayacaktır.";
@@ -3267,9 +3261,6 @@
 /* chat item action */
 "Reveal" = "Göster";
 
-/* No comment provided by engineer. */
-"Revert" = "Geri al";
-
 /* No comment provided by engineer. */
 "Revoke" = "İptal et";
 
@@ -3402,7 +3393,7 @@
 /* chat item text */
 "security code changed" = "güvenlik kodu değiştirildi";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Seç";
 
 /* No comment provided by engineer. */
@@ -3675,9 +3666,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Küçük gruplar (en fazla 20 kişi)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP sunucuları";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "İçe aktarma sırasında bazı ölümcül olmayan hatalar oluştu - daha fazla ayrıntı için Sohbet konsoluna bakabilirsiniz.";
 
@@ -4027,7 +4015,7 @@
 "Unknown error" = "Bilinmeyen hata";
 
 /* No comment provided by engineer. */
-"unknown relays" = "bilinmeyen yönlendiriciler";
+"unknown servers" = "bilinmeyen yönlendiriciler";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Bilinmeyen sunucular!";
@@ -4068,18 +4056,12 @@
 /* No comment provided by engineer. */
 "Update" = "Güncelle";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = ".onion ana bilgisayarların ayarı güncellensin mi?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Veritabanı parolasını güncelle";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Bağlantı ayarları güncellensin mi?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Taşıma izolasyon modu güncellensin mi?";
-
 /* rcv group event chat item */
 "updated group profile" = "grup profili güncellendi";
 
@@ -4089,9 +4071,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Ayarların güncellenmesi, istemciyi tüm sunuculara yeniden bağlayacaktır.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Bu ayarın güncellenmesi, istemciyi tüm sunuculara yeniden bağlayacaktır.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Yükselt ve sohbeti aç";
 
@@ -4146,9 +4125,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Kullanıcı profili";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = ".onion ana bilgisayarlarını kullanmak için uyumlu VPN sağlayıcısı gerekir.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "SimpleX Chat sunucuları kullanılıyor.";
 
@@ -4329,9 +4305,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Yanlış parola!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP sunucuları";
-
 /* pref value */
 "yes" = "evet";
 
diff --git a/apps/ios/uk.lproj/Localizable.strings b/apps/ios/uk.lproj/Localizable.strings
index 1d2630dd1f..a8138d29a9 100644
--- a/apps/ios/uk.lproj/Localizable.strings
+++ b/apps/ios/uk.lproj/Localizable.strings
@@ -647,7 +647,7 @@
 /* rcv group event chat item */
 "blocked %@" = "заблоковано %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "заблоковано адміністратором";
 
 /* No comment provided by engineer. */
@@ -2506,12 +2506,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." = "Джерело повідомлення залишається приватним.";
 
@@ -2767,10 +2761,10 @@
 "One-time invitation link" = "Посилання на одноразове запрошення";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Для підключення будуть потрібні хости onion. Потрібно увімкнути VPN.";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Для підключення будуть потрібні хости onion.\nПотрібно увімкнути VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion хости будуть використовуватися, коли вони будуть доступні. Потрібно увімкнути VPN.";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion хости будуть використовуватися, коли вони будуть доступні.\nПотрібно увімкнути VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion хости не будуть використовуватися.";
@@ -3267,9 +3261,6 @@
 /* chat item action */
 "Reveal" = "Показувати";
 
-/* No comment provided by engineer. */
-"Revert" = "Повернутися";
-
 /* No comment provided by engineer. */
 "Revoke" = "Відкликати";
 
@@ -3402,7 +3393,7 @@
 /* chat item text */
 "security code changed" = "змінено код безпеки";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "Виберіть";
 
 /* No comment provided by engineer. */
@@ -3675,9 +3666,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Невеликі групи (максимум 20 осіб)";
 
-/* No comment provided by engineer. */
-"SMP servers" = "Сервери SMP";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Під час імпорту виникли деякі нефатальні помилки – ви можете переглянути консоль чату, щоб дізнатися більше.";
 
@@ -4027,7 +4015,7 @@
 "Unknown error" = "Невідома помилка";
 
 /* No comment provided by engineer. */
-"unknown relays" = "невідомі реле";
+"unknown servers" = "невідомі реле";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Невідомі сервери!";
@@ -4068,18 +4056,12 @@
 /* No comment provided by engineer. */
 "Update" = "Оновлення";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Оновити налаштування хостів .onion?";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "Оновити парольну фразу бази даних";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Оновити налаштування мережі?";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "Оновити режим транспортної ізоляції?";
-
 /* rcv group event chat item */
 "updated group profile" = "оновлений профіль групи";
 
@@ -4089,9 +4071,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Оновлення налаштувань призведе до перепідключення клієнта до всіх серверів.";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "Оновлення цього параметра призведе до перепідключення клієнта до всіх серверів.";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Оновлення та відкритий чат";
 
@@ -4146,9 +4125,6 @@
 /* No comment provided by engineer. */
 "User profile" = "Профіль користувача";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "Для використання хостів .onion потрібен сумісний VPN-провайдер.";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Використання серверів SimpleX Chat.";
 
@@ -4329,9 +4305,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Неправильний пароль!";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "Сервери XFTP";
-
 /* pref value */
 "yes" = "так";
 
diff --git a/apps/ios/zh-Hans.lproj/Localizable.strings b/apps/ios/zh-Hans.lproj/Localizable.strings
index 07eecee246..f28cbcfcec 100644
--- a/apps/ios/zh-Hans.lproj/Localizable.strings
+++ b/apps/ios/zh-Hans.lproj/Localizable.strings
@@ -599,7 +599,7 @@
 /* rcv group event chat item */
 "blocked %@" = "已封禁 %@";
 
-/* blocked chat item */
+/* marked deleted chat item preview text */
 "blocked by admin" = "由管理员封禁";
 
 /* No comment provided by engineer. */
@@ -2599,10 +2599,10 @@
 "One-time invitation link" = "一次性邀请链接";
 
 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "Onion 主机将用于连接。需要启用 VPN。";
+"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Onion 主机将用于连接。需要启用 VPN。";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "当可用时，将使用 Onion 主机。需要启用 VPN。";
+"Onion hosts will be used when available.\nRequires compatible VPN." = "当可用时，将使用 Onion 主机。需要启用 VPN。";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "将不会使用 Onion 主机。";
@@ -3060,9 +3060,6 @@
 /* chat item action */
 "Reveal" = "揭示";
 
-/* No comment provided by engineer. */
-"Revert" = "恢复";
-
 /* No comment provided by engineer. */
 "Revoke" = "撤销";
 
@@ -3189,7 +3186,7 @@
 /* chat item text */
 "security code changed" = "安全密码已更改";
 
-/* No comment provided by engineer. */
+/* chat item action */
 "Select" = "选择";
 
 /* No comment provided by engineer. */
@@ -3441,9 +3438,6 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "小群组（最多 20 人）";
 
-/* No comment provided by engineer. */
-"SMP servers" = "SMP 服务器";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "导入过程中发生了一些非致命错误——您可以查看聊天控制台了解更多详细信息。";
 
@@ -3813,18 +3807,12 @@
 /* No comment provided by engineer. */
 "Update" = "更新";
 
-/* No comment provided by engineer. */
-"Update .onion hosts setting?" = "更新 .onion 主机设置？";
-
 /* No comment provided by engineer. */
 "Update database passphrase" = "更新数据库密码";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "更新网络设置？";
 
-/* No comment provided by engineer. */
-"Update transport isolation mode?" = "更新传输隔离模式？";
-
 /* rcv group event chat item */
 "updated group profile" = "已更新的群组资料";
 
@@ -3834,9 +3822,6 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "更新设置会将客户端重新连接到所有服务器。";
 
-/* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "更新此设置将重新连接客户端到所有服务器。";
-
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "升级并打开聊天";
 
@@ -3882,9 +3867,6 @@
 /* No comment provided by engineer. */
 "User profile" = "用户资料";
 
-/* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "使用 .onion 主机需要兼容的 VPN 提供商。";
-
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "使用 SimpleX Chat 服务器。";
 
@@ -4047,9 +4029,6 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "密码错误！";
 
-/* No comment provided by engineer. */
-"XFTP servers" = "XFTP 服务器";
-
 /* pref value */
 "yes" = "是";