Merge branch 'stable' into stable-android

.github/workflows/build.yml

@@ -79,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: "9.6.3"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -188,7 +188,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -259,40 +259,15 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
-
-      - name: 'Setup MSYS2'
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ucrt64
-          update: true
-          install: >-
-            git
-            perl
-            make
-          pacboy: >-
-            toolchain:p
-            cmake:p
 
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: msys2 {0}
+        shell: cmd
         run: |
-          export PATH=$PATH:/c/ghcup/bin
-          scripts/desktop/prepare-openssl-windows.sh
-          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
-          rm cabal.project.local 2>/dev/null || true
-          echo "ignore-project: False" >> cabal.project.local
-          echo "package direct-sqlcipher" >> cabal.project.local
-          echo "    flags: +openssl" >> cabal.project.local
-          echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
-          echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
-
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)
@@ -318,36 +293,4 @@ jobs:
           body: |
             ${{ steps.windows_build.outputs.bin_hash }}
 
-      - name: Windows build desktop
-        id: windows_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        shell: msys2 {0}
-        run: |
-          export PATH=$PATH:/c/ghcup/bin
-          scripts/desktop/build-lib-windows.sh
-          cd apps/multiplatform
-          ./gradlew packageMsi
-          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-      
-      - name: Windows upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Windows update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_desktop_build.outputs.package_hash }}
-
       # Windows /

.github/workflows/web.yml

@@ -9,7 +9,6 @@ on:
       - website/**
       - images/**
       - blog/**
-      - docs/**
       - .github/workflows/web.yml
 
 jobs:

Dockerfile

@@ -8,12 +8,12 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
     chmod +x /usr/bin/ghcup
 
 # Install ghc
-RUN ghcup install ghc 9.6.3
+RUN ghcup install ghc 8.10.7
 # Install cabal
-RUN ghcup install cabal 3.10.1.0
+RUN ghcup install cabal
 # Set both as default
-RUN ghcup set ghc 9.6.3 && \
-    ghcup set cabal 3.10.1.0
+RUN ghcup set ghc 8.10.7 && \
+    ghcup set cabal
 
 COPY . /project
 WORKDIR /project

apps/ios/Shared/AppDelegate.swift

@@ -55,6 +55,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                      didReceiveRemoteNotification userInfo: [AnyHashable : Any],
                      fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         logger.debug("AppDelegate: didReceiveRemoteNotification")
+        print("*** userInfo", userInfo)
         let m = ChatModel.shared
         if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
            m.notificationMode != .off {
@@ -120,10 +121,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
         BGManager.shared.receiveMessages(complete)
     }
-
-    static func keepScreenOn(_ on: Bool) {
-        UIApplication.shared.isIdleTimerDisabled = on
-    }
 }
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {

apps/ios/Shared/ContentView.swift

@@ -31,11 +31,11 @@ struct ContentView: View {
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
     private enum ChatListActionSheet: Identifiable {
-        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
+        case connectViaUrl(action: ConnReqType, link: String)
 
         var id: String {
             switch self {
-            case let .planAndConnectSheet(sheet): return sheet.id
+            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
             }
         }
     }
@@ -93,7 +93,7 @@ struct ContentView: View {
                 mainView()
                 .actionSheet(item: $chatListActionSheet) { sheet in
                     switch sheet {
-                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
                     }
                 }
             } else {
@@ -290,16 +290,12 @@ struct ContentView: View {
             if let url = m.appOpenUrl {
                 m.appOpenUrl = nil
                 var path = url.path
+                logger.debug("ContentView.connectViaUrl path: \(path)")
                 if (path == "/contact" || path == "/invitation") {
                     path.removeFirst()
+                    let action: ConnReqType = path == "contact" ? .contact : .invitation
                     let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                    planAndConnect(
-                        link,
-                        showAlert: showPlanAndConnectAlert,
-                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
-                        dismiss: false,
-                        incognito: nil
-                    )
+                    chatListActionSheet = .connectViaUrl(action: action, link: link)
                 } else {
                     AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
                 }
@@ -307,8 +303,20 @@ struct ContentView: View {
         }
     }
 
-    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
-        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
+        let title: LocalizedStringKey
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
+        )
     }
 }
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -46,7 +46,6 @@ class AudioRecorder {
             audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
 
             await MainActor.run {
-                AppDelegate.keepScreenOn(true)
                 recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
                     guard let time = self.audioRecorder?.currentTime else { return }
                     self.onTimer?(time)
@@ -58,10 +57,6 @@ class AudioRecorder {
             }
             return nil
         } catch let error {
-            await MainActor.run {
-                AppDelegate.keepScreenOn(false)
-            }
-            try? av.setCategory(AVAudioSession.Category.soloAmbient)
             logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
             return .error(error.localizedDescription)
         }
@@ -76,8 +71,6 @@ class AudioRecorder {
             timer.invalidate()
         }
         recordingTimer = nil
-        AppDelegate.keepScreenOn(false)
-        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
     }
 
     private func checkPermission() async -> Bool {
@@ -128,19 +121,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
 
         playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
             if self.audioPlayer?.isPlaying ?? false {
-                AppDelegate.keepScreenOn(true)
                 guard let time = self.audioPlayer?.currentTime else { return }
                 self.onTimer?(time)
-                AudioPlayer.changeAudioSession(true)
-            } else {
-                AudioPlayer.changeAudioSession(false)
             }
         }
     }
 
     func pause() {
         audioPlayer?.pause()
-        AppDelegate.keepScreenOn(false)
     }
 
     func play() {
@@ -161,8 +149,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     func stop() {
         if let player = audioPlayer {
             player.stop()
-            AppDelegate.keepScreenOn(false)
-            AudioPlayer.changeAudioSession(false)
         }
         audioPlayer = nil
         if let timer = playbackTimer {
@@ -171,24 +157,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         playbackTimer = nil
     }
 
-    static func changeAudioSession(_ playback: Bool) {
-        // When there is a audio recording, setting any other category will disable sound
-        if AVAudioSession.sharedInstance().category == .playAndRecord {
-            return
-        }
-        if playback {
-            if AVAudioSession.sharedInstance().category != .playback {
-                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
-            }
-        } else {
-            if AVAudioSession.sharedInstance().category != .soloAmbient {
-                logger.log("AudioSession: soloAmbient")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
-            }
-        }
-    }
-
     func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         stop()
         self.onFinishPlayback?()

apps/ios/Shared/Model/ChatModel.swift

@@ -62,9 +62,8 @@ final class ChatModel: ObservableObject {
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
-    @Published var groupMembers: [GMember] = []
+    @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
     @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
@@ -85,8 +84,6 @@ final class ChatModel: ObservableObject {
     @Published var activeCall: Call?
     @Published var callCommand: WCallCommand?
     @Published var showCallView = false
-    // remote desktop
-    @Published var remoteCtrlSession: RemoteCtrlSession?
     // currently showing QR code
     @Published var connReqInv: String?
     // audio recording and playback
@@ -112,10 +109,6 @@ final class ChatModel: ObservableObject {
         notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
     }
 
-    var activeRemoteCtrl: Bool {
-        remoteCtrlSession?.active ?? false
-    }
-
     func getUser(_ userId: Int64) -> User? {
         currentUser?.userId == userId
         ? currentUser
@@ -159,20 +152,6 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func getGroupChat(_ groupId: Int64) -> Chat? {
-        chats.first { chat in
-            if case let .group(groupInfo) = chat.chatInfo {
-                return groupInfo.groupId == groupId
-            } else {
-                return false
-            }
-        }
-    }
-
-    func getGroupMember(_ groupMemberId: Int64) -> GMember? {
-        groupMembers.first { $0.groupMemberId == groupMemberId }
-    }
-
     private func getChatIndex(_ id: String) -> Int? {
         chats.firstIndex(where: { $0.id == id })
     }
@@ -186,7 +165,6 @@ final class ChatModel: ObservableObject {
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatInfo = cInfo
-            chats[i].created = Date.now
         }
     }
 
@@ -200,7 +178,7 @@ final class ChatModel: ObservableObject {
 
     func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
         var updatedConn = contact.activeConn
-        updatedConn?.connectionStats = connectionStats
+        updatedConn.connectionStats = connectionStats
         var updatedContact = contact
         updatedContact.activeConn = updatedConn
         updateContact(updatedContact)
@@ -318,11 +296,7 @@ final class ChatModel: ObservableObject {
             return false
         } else {
             withAnimation(itemAnimation()) {
-                var ci = cItem
-                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                    ci.meta.itemStatus = status
-                }
-                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -335,22 +309,26 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
             withAnimation {
                 _updateChatItem(at: i, with: cItem)
             }
-        } else if let status = status {
-            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
+        let ci = reversedChatItems[i]
         reversedChatItems[i] = cItem
         reversedChatItems[i].viewTimestamp = .now
+        // on some occasions the confirmation of message being accepted by the server (tick)
+        // arrives earlier than the response from API, and item remains without tick
+        if case .sndNew = cItem.meta.itemStatus {
+            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
+        }
     }
 
-    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
         reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
@@ -486,7 +464,6 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             reversedChatItems = []
         }
     }
@@ -539,62 +516,27 @@ final class ChatModel: ObservableObject {
             users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
     }
 
-    // this function analyses "connected" events and assumes that each member will be there only once
-    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
-        var count = 0
+    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
+        guard var i = getChatItemIndex(ci) else { return [] }
         var ns: [String] = []
-        if let ciCategory = chatItem.mergeCategory,
-           var i = getChatItemIndex(chatItem) {
-            while i < reversedChatItems.count {
-                let ci = reversedChatItems[i]
-                if ci.mergeCategory != ciCategory { break }
-                if let m = ci.memberConnected {
-                    ns.append(m.displayName)
-                }
-                count += 1
-                i += 1
-            }
+        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
+            ns.append(m.displayName)
+            i += 1
         }
-        return (count, ns)
+        return ns
     }
 
-    // returns the index of the passed item and the next item (it has smaller index)
-    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
-        if let i = getChatItemIndex(ci) {
-            (i, i > 0 ? reversedChatItems[i - 1] : nil)
+    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
+        if let i = getChatItemIndex(ci)  {
+            return (
+                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
+                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
+            )
         } else {
-            (nil, nil)
+            return (nil, nil)
         }
     }
 
-    // returns the index of the first item in the same merged group (the first hidden item)
-    // and the previous visible item with another merge category
-    func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
-        guard var i = ciIndex else { return (nil, nil) }
-        let fst = reversedChatItems.count - 1
-        while i < fst {
-            i = i + 1
-            let ci = reversedChatItems[i]
-            if ciCategory == nil || ciCategory != ci.mergeCategory {
-                return (i - 1, ci)
-            }
-        }
-        return (i, nil)
-    }
-
-    // returns the previous member in the same merge group and the count of members in this group
-    func getPrevHiddenMember(_ member: GroupMember, _ range: ClosedRange<Int>) -> (GroupMember?, Int) {
-        var prevMember: GroupMember? = nil
-        var memberIds: Set<Int64> = []
-        for i in range {
-            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
-                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
-                memberIds.insert(m.groupMemberId)
-            }
-        }
-        return (prevMember, memberIds.count)
-    }
-
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
             popChat_(i)
@@ -629,14 +571,13 @@ final class ChatModel: ObservableObject {
         }
         // update current chat
         if chatId == groupInfo.id {
-            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+            if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
                 withAnimation(.default) {
-                    self.groupMembers[i].wrapped = member
-                    self.groupMembers[i].created = Date.now
+                    self.groupMembers[i] = member
                 }
                 return false
             } else {
-                withAnimation { groupMembers.append(GMember(member)) }
+                withAnimation { groupMembers.append(member) }
                 return true
             }
         } else {
@@ -645,10 +586,11 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
-        if var conn = member.activeConn {
-            conn.connectionStats = connectionStats
+        if let conn = member.activeConn {
+            var updatedConn = conn
+            updatedConn.connectionStats = connectionStats
             var updatedMember = member
-            updatedMember.activeConn = conn
+            updatedMember.activeConn = updatedConn
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
@@ -677,17 +619,11 @@ final class ChatModel: ObservableObject {
     }
 
     func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
+        networkStatuses[contact.activeConn.agentConnId] = status
     }
 
     func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
+        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
     }
 }
 
@@ -753,47 +689,40 @@ final class Chat: ObservableObject, Identifiable {
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 
-final class GMember: ObservableObject, Identifiable {
-    @Published var wrapped: GroupMember
-    var created = Date.now
+enum NetworkStatus: Decodable, Equatable {
+    case unknown
+    case connected
+    case disconnected
+    case error(String)
 
-    init(_ member: GroupMember) {
-        self.wrapped = member
+    var statusString: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "connected"
+            case .error: return "error"
+            default: return "connecting"
+            }
+        }
     }
 
-    var id: String { wrapped.id }
-    var groupId: Int64 { wrapped.groupId }
-    var groupMemberId: Int64 { wrapped.groupMemberId }
-    var displayName: String { wrapped.displayName }
-    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
-    static let sampleData = GMember(GroupMember.sampleData)
-}
-
-struct RemoteCtrlSession {
-    var ctrlAppInfo: CtrlAppInfo
-    var appVersion: String
-    var sessionState: UIRemoteCtrlSessionState
-
-    func updateState(_ state: UIRemoteCtrlSessionState) -> RemoteCtrlSession {
-        RemoteCtrlSession(ctrlAppInfo: ctrlAppInfo, appVersion: appVersion, sessionState: state)
+    var statusExplanation: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "You are connected to the server used to receive messages from this contact."
+            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+            default: return "Trying to connect to the server used to receive messages from this contact."
+            }
+        }
     }
 
-    var active: Bool {
-        if case .connected = sessionState { true } else { false }
-    }
-
-    var sessionCode: String? {
-        switch sessionState {
-        case let .pendingConfirmation(_, sessionCode): sessionCode
-        case let .connected(_, sessionCode): sessionCode
-        default: nil
+    var imageName: String {
+        get {
+            switch self {
+            case .unknown: return "circle.dotted"
+            case .connected: return "circle.fill"
+            case .disconnected: return "ellipsis.circle.fill"
+            case .error: return "exclamationmark.circle.fill"
+            }
         }
     }
 }
-
-enum UIRemoteCtrlSessionState {
-    case starting
-    case connecting(remoteCtrl_: RemoteCtrlInfo?)
-    case pendingConfirmation(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case connected(remoteCtrl: RemoteCtrlInfo, sessionCode: String)
-}

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -257,12 +257,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
-func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = chatSendCmdSync(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
     try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -312,7 +306,6 @@ func loadChat(chat: Chat, search: String = "") {
     do {
         let cInfo = chat.chatInfo
         let m = ChatModel.shared
-        m.chatItemStatuses = [:]
         m.reversedChatItems = []
         let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
         m.updateChatInfo(chat.chatInfo)
@@ -502,10 +495,6 @@ func apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings) a
     try await sendCommandOkResp(.apiSetChatSettings(type: type, id: id, chatSettings: chatSettings))
 }
 
-func apiSetMemberSettings(_ groupId: Int64, _ groupMemberId: Int64, _ memberSettings: GroupMemberSettings) async throws {
-    try await sendCommandOkResp(.apiSetMemberSettings(groupId: groupId, groupMemberId: groupMemberId, memberSettings: memberSettings))
-}
-
 func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profile?) {
     let r = await chatSendCmd(.apiContactInfo(contactId: contactId))
     if case let .contactInfo(_, _, connStats, customUserProfile) = r { return (connStats, customUserProfile) }
@@ -597,14 +586,6 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
     throw r
 }
 
-func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
-    let userId = try currentUserId("apiConnectPlan")
-    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
-    if case let .connectionPlan(_, connectionPlan) = r { return connectionPlan }
-    logger.error("apiConnectPlan error: \(responseError(r))")
-    throw r
-}
-
 func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
     let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
@@ -629,7 +610,10 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
-        let alert = contactAlreadyExistsAlert(contact)
+        let alert = mkAlert(
+            title: "Contact already exists",
+            message: "You are already connected to \(contact.displayName)."
+        )
         return (nil, alert)
     case .chatCmdError(_, .error(.invalidConnReq)):
         let alert = mkAlert(
@@ -657,13 +641,6 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
     return (nil, alert)
 }
 
-func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connected to \(contact.displayName)."
-    )
-}
-
 private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     if let networkErrorAlert = networkErrorAlert(r) {
         return networkErrorAlert
@@ -675,30 +652,18 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     }
 }
 
-func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Contact?, Alert?) {
-    guard let userId = ChatModel.shared.currentUser?.userId else {
-        logger.error("apiConnectContactViaAddress: no current user")
-        return (nil, nil)
-    }
-    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
-    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
-    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
-    let alert = connectionErrorAlert(r)
-    return (nil, alert)
-}
-
-func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
+func apiDeleteChat(type: ChatType, id: Int64) async throws {
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
     throw r
 }
 
-func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
+func deleteChat(_ chat: Chat) async {
     do {
         let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId)
         DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
     } catch let error {
         logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -736,9 +701,8 @@ func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
     let userId = try currentUserId("apiUpdateProfile")
     let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
-    case .userProfileNoChange: return (profile, [])
+    case .userProfileNoChange: return nil
     case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
-    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
     default: throw r
     }
 }
@@ -905,44 +869,6 @@ func apiCancelFile(fileId: Int64) async -> AChatItem? {
     }
 }
 
-func setLocalDeviceName(_ displayName: String) throws {
-    try sendCommandOkRespSync(.setLocalDeviceName(displayName: displayName))
-}
-
-func connectRemoteCtrl(desktopAddress: String) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
-    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
-}
-
-func findKnownRemoteCtrl() async throws {
-    try await sendCommandOkResp(.findKnownRemoteCtrl)
-}
-
-func confirmRemoteCtrl(_ rcId: Int64) async throws {
-    try await sendCommandOkResp(.confirmRemoteCtrl(remoteCtrlId: rcId))
-}
-
-func verifyRemoteCtrlSession(_ sessCode: String) async throws -> RemoteCtrlInfo {
-    let r = await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
-    if case let .remoteCtrlConnected(rc) = r { return rc }
-    throw r
-}
-
-func listRemoteCtrls() throws -> [RemoteCtrlInfo] {
-    let r = chatSendCmdSync(.listRemoteCtrls)
-    if case let .remoteCtrlList(rcInfo) = r { return rcInfo }
-    throw r
-}
-
-func stopRemoteCtrl() async throws {
-    try await sendCommandOkResp(.stopRemoteCtrl)
-}
-
-func deleteRemoteCtrl(_ rcId: Int64) async throws {
-    try await sendCommandOkResp(.deleteRemoteCtrl(remoteCtrlId: rcId))
-}
-
 func networkErrorAlert(_ r: ChatResponse) -> Alert? {
     switch r {
     case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
@@ -1018,12 +944,6 @@ func apiCallStatus(_ contact: Contact, _ status: String) async throws {
     }
 }
 
-func apiGetNetworkStatuses() throws -> [ConnNetworkStatus] {
-    let r = chatSendCmdSync(.apiGetNetworkStatuses)
-    if case let .networkStatuses(_, statuses) = r { return statuses }
-    throw r
-}
-
 func markChatRead(_ chat: Chat, aboveItem: ChatItem? = nil) async {
     do {
         if chat.chatStats.unreadCount > 0 {
@@ -1071,15 +991,9 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
     throw r
 }
 
-private func sendCommandOkRespSync(_ cmd: ChatCommand) throws {
-    let r = chatSendCmdSync(cmd)
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
+func apiNewGroup(_ p: GroupProfile) throws -> GroupInfo {
     let userId = try currentUserId("apiNewGroup")
-    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
+    let r = chatSendCmdSync(.apiNewGroup(userId: userId, groupProfile: p))
     if case let .groupCreated(_, groupInfo) = r { return groupInfo }
     throw r
 }
@@ -1139,8 +1053,8 @@ func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
     return []
 }
 
-func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
-    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
+func filterMembersToAdd(_ ms: [GroupMember]) -> [Contact] {
+    let memberContactIds = ms.compactMap{ m in m.memberCurrent ? m.memberContactId : nil }
     return ChatModel.shared.chats
         .compactMap{ $0.chatInfo.contact }
         .filter{ !memberContactIds.contains($0.apiId) }
@@ -1219,7 +1133,6 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
     try setXFTPConfig(getXFTPCfg())
-    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
@@ -1372,20 +1285,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(connection.id)
             }
         }
-    case let .contactDeletedByContact(user, contact):
-        if active(user) && contact.directOrUsed {
-            await MainActor.run {
-                m.updateContact(contact)
-            }
-        }
     case let .contactConnected(user, contact, _):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                if let conn = contact.activeConn {
-                    m.dismissConnReqView(conn.id)
-                    m.removeChat(conn.id)
-                }
+                m.dismissConnReqView(contact.activeConn.id)
+                m.removeChat(contact.activeConn.id)
             }
         }
         if contact.directOrUsed {
@@ -1398,10 +1303,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                if let conn = contact.activeConn {
-                    m.dismissConnReqView(conn.id)
-                    m.removeChat(conn.id)
-                }
+                m.dismissConnReqView(contact.activeConn.id)
+                m.removeChat(contact.activeConn.id)
             }
         }
     case let .receivedContactRequest(user, contactRequest):
@@ -1426,12 +1329,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateChatInfo(cInfo)
             }
         }
-    case let .groupMemberUpdated(user, groupInfo, _, toMember):
-        if active(user) {
-            await MainActor.run {
-                _ = m.upsertGroupMember(groupInfo, toMember)
-            }
-        }
     case let .contactsMerged(user, intoContact, mergedContact):
         if active(user) && m.hasChat(mergedContact.id) {
             await MainActor.run {
@@ -1445,6 +1342,13 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await updateContactsStatus(contactRefs, status: .connected)
     case let .contactsDisconnected(_, contactRefs):
         await updateContactsStatus(contactRefs, status: .disconnected)
+    case let .contactSubError(user, contact, chatError):
+        await MainActor.run {
+            if active(user) {
+                m.updateContact(contact)
+            }
+            processContactSubError(contact, chatError)
+        }
     case let .contactSubSummary(_, contactSubscriptions):
         await MainActor.run {
             for sub in contactSubscriptions {
@@ -1459,18 +1363,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 }
             }
         }
-    case let .networkStatus(status, connections):
-        await MainActor.run {
-            for cId in connections {
-                m.networkStatuses[cId] = status
-            }
-        }
-    case let .networkStatuses(_, statuses): ()
-        await MainActor.run {
-            for s in statuses {
-                m.networkStatuses[s.agentConnId] = s.networkStatus
-            }
-        }
     case let .newChatItem(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
@@ -1492,8 +1384,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .chatItemStatusUpdated(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent && active(user) {
-            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
+        if !cItem.isDeletedContent {
+            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
+            if added && cItem.showNotification {
+                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+            }
         }
         if let endTask = m.messageDelivery[cItem.id] {
             switch cItem.meta.itemStatus {
@@ -1540,19 +1435,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
 
         await MainActor.run {
             m.updateGroup(groupInfo)
-            if let conn = hostContact?.activeConn {
-                m.dismissConnReqView(conn.id)
-                m.removeChat(conn.id)
-            }
-        }
-    case let .groupLinkConnecting(user, groupInfo, hostMember):
-        if !active(user) { return }
-        
-        await MainActor.run {
-            m.updateGroup(groupInfo)
-            if let hostConn = hostMember.activeConn {
-                m.dismissConnReqView(hostConn.id)
-                m.removeChat(hostConn.id)
+            if let hostContact = hostContact {
+                m.dismissConnReqView(hostContact.activeConn.id)
+                m.removeChat(hostContact.activeConn.id)
             }
         }
     case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
@@ -1614,11 +1499,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateGroup(toGroup)
             }
         }
-    case let .memberRole(user, groupInfo, byMember: _, member: member, fromRole: _, toRole: _):
+    case let .memberRole(user, groupInfo, _, _, _, _):
         if active(user) {
             await MainActor.run {
                 m.updateGroup(groupInfo)
-                _ = m.upsertGroupMember(groupInfo, member)
             }
         }
     case let .newMemberContactReceivedInv(user, contact, _, _):
@@ -1714,26 +1598,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await MainActor.run {
             m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
         }
-    case let .remoteCtrlFound(remoteCtrl):
-        // TODO multicast
-        logger.debug("\(String(describing: remoteCtrl))")
-    case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode):
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.pendingConfirmation(remoteCtrl_: remoteCtrl_, sessionCode: sessionCode)
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case let .remoteCtrlConnected(remoteCtrl):
-        // TODO currently it is returned in response to command, so it is redundant
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case .remoteCtrlStopped:
-        // This delay is needed to cancel the session that fails on network failure,
-        // e.g. when user did not grant permission to access local network yet.
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            switchToLocalSession()
-        }
     default:
         logger.debug("unsupported event: \(res.responseType)")
     }
@@ -1747,19 +1611,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
     }
 }
 
-func switchToLocalSession() {
-    let m = ChatModel.shared
-    m.remoteCtrlSession = nil
-    do {
-        m.users = try listUsers()
-        try getUserChatData()
-        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
-    } catch let error {
-        logger.debug("error updating chat data: \(responseError(error))")
-    }
-}
-
 func active(_ user: any UserLike) -> Bool {
     user.userId == ChatModel.shared.currentUser?.id
 }
@@ -1792,7 +1643,7 @@ func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
     case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
     default: err = String(describing: chatError)
     }
-    m.setContactNetworkStatus(contact, .error(connectionError: err))
+    m.setContactNetworkStatus(contact, .error(err))
 }
 
 func refreshCallInvitations() throws {

apps/ios/Shared/Views/Call/ActiveCallView.swift

@@ -39,7 +39,6 @@ struct ActiveCallView: View {
         }
         .onAppear {
             logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
-            AppDelegate.keepScreenOn(true)
             createWebRTCClient()
             dismissAllSheets()
         }
@@ -49,7 +48,6 @@ struct ActiveCallView: View {
         }
         .onDisappear {
             logger.debug("ActiveCallView: disappear")
-            AppDelegate.keepScreenOn(false)
             client?.endCall()
         }
         .onChange(of: m.callCommand) { _ in sendCommandToClient()}

apps/ios/Shared/Views/Call/CallController.swift

@@ -108,6 +108,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(true)
             logger.debug("audioSession activated")
         } catch {
+            print(error)
             logger.error("failed activating audio session")
         }
     }
@@ -120,6 +121,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(false)
             logger.debug("audioSession deactivated")
         } catch {
+            print(error)
             logger.error("failed deactivating audio session")
         }
         suspendOnEndCall()

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

@@ -99,12 +99,12 @@ struct ChatInfoView: View {
     @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
-    @State private var showDeleteContactActionSheet = false
     @State private var sendReceipts = SendReceipts.userDefault(true)
     @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum ChatInfoViewAlert: Identifiable {
+        case deleteContactAlert
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
@@ -114,6 +114,7 @@ struct ChatInfoView: View {
 
         var id: String {
             switch self {
+            case .deleteContactAlert: return "deleteContactAlert"
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
@@ -163,13 +164,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
-                .disabled(!contact.ready || !contact.active)
+                .disabled(!contact.ready)
 
                 if let contactLink = contact.contactLink {
                     Section {
-                        SimpleXLinkQRCode(uri: contactLink)
+                        QRCode(uri: contactLink)
                         Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
+                            showShareSheet(items: [contactLink])
                         } label: {
                             Label("Share address", systemImage: "square.and.arrow.up")
                         }
@@ -180,7 +181,7 @@ struct ChatInfoView: View {
                     }
                 }
 
-                if contact.ready && contact.active {
+                if contact.ready {
                     Section("Servers") {
                         networkStatusRow()
                             .onTapGesture {
@@ -191,7 +192,8 @@ struct ChatInfoView: View {
                                 alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                !contact.ready
+                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || connStats.ratchetSyncSendProhibited
                             )
                             if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
@@ -232,6 +234,7 @@ struct ChatInfoView: View {
         }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
+            case .deleteContactAlert: return deleteContactAlert()
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
@@ -240,26 +243,6 @@ struct ChatInfoView: View {
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
-                        .destructive(Text("Delete")) { deleteContact(notify: false) },
-                        .cancel()
-                    ]
-                )
-            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { deleteContact() },
-                        .cancel()
-                    ]
-                )
-            }
-        }
     }
 
     private func contactInfoHeader() -> some View {
@@ -338,7 +321,7 @@ struct ChatInfoView: View {
                 verify: { code in
                     if let r = apiVerifyContact(chat.chatInfo.apiId, connectionCode: code) {
                         let (verified, existingCode) = r
-                        contact.activeConn?.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
+                        contact.activeConn.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         DispatchQueue.main.async {
                             chat.chatInfo = .direct(contact: contact)
@@ -432,7 +415,7 @@ struct ChatInfoView: View {
 
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            showDeleteContactActionSheet = true
+            alert = .deleteContactAlert
         } label: {
             Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
@@ -448,23 +431,30 @@ struct ChatInfoView: View {
         }
     }
 
-    private func deleteContact(notify: Bool? = nil) {
-        Task {
-            do {
-                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
-                await MainActor.run {
-                    dismiss()
-                    chatModel.chatId = nil
-                    chatModel.removeChat(chat.chatInfo.id)
+    private func deleteContactAlert() -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task {
+                    do {
+                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
+                        await MainActor.run {
+                            dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
+                        }
+                    } catch let error {
+                        logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                        let a = getErrorAlert(error, "Error deleting contact")
+                        await MainActor.run {
+                            alert = .error(title: a.title, error: a.message)
+                        }
+                    }
                 }
-            } catch let error {
-                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                let a = getErrorAlert(error, "Error deleting contact")
-                await MainActor.run {
-                    alert = .error(title: a.title, error: a.message)
-                }
-            }
-        }
+            },
+            secondaryButton: .cancel()
+        )
     }
 
     private func clearChatAlert() -> Alert {

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

@@ -11,7 +11,7 @@ import SimpleXChat
 
 struct CICallItemView: View {
     @EnvironmentObject var m: ChatModel
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var status: CICallStatus
     var duration: Int
@@ -60,7 +60,7 @@ struct CICallItemView: View {
 
 
     @ViewBuilder private func acceptCallButton() -> some View {
-        if case let .direct(contact) = chat.chatInfo {
+        if case let .direct(contact) = chatInfo {
             Button {
                 if let invitation = m.callInvitations[contact.id] {
                     CallController.shared.answerCall(invitation: invitation)

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

@@ -10,92 +10,20 @@ import SwiftUI
 import SimpleXChat
 
 struct CIChatFeatureView: View {
-    @EnvironmentObject var m: ChatModel
     var chatItem: ChatItem
-    @Binding var revealed: Bool
     var feature: Feature
     var icon: String? = nil
     var iconColor: Color
 
     var body: some View {
-        if !revealed, let fs = mergedFeautures() {
-            HStack {
-                ForEach(fs, content: featureIconView)
-            }
-            .padding(.horizontal, 6)
-            .padding(.vertical, 6)
-        } else {
-            fullFeatureView
-        }
-    }
-
-    private struct FeatureInfo: Identifiable {
-        var icon: String
-        var scale: CGFloat
-        var color: Color
-        var param: String?
-
-        init(_ f: Feature, _ color: Color, _ param: Int?) {
-            self.icon = f.iconFilled
-            self.scale = f.iconScale
-            self.color = color
-            self.param = f.hasParam && param != nil ? timeText(param) : nil
-        }
-
-        var id: String {
-            "\(icon) \(color) \(param ?? "")"
-        }
-    }
-
-    private func mergedFeautures() -> [FeatureInfo]? {
-        var fs: [FeatureInfo] = []
-        var icons: Set<String> = []
-        if var i = m.getChatItemIndex(chatItem) {
-            while i < m.reversedChatItems.count,
-                  let f = featureInfo(m.reversedChatItems[i]) {
-                if !icons.contains(f.icon) {
-                    fs.insert(f, at: 0)
-                    icons.insert(f.icon)
-                }
-                i += 1
-            }
-        }
-        return fs.count > 1 ? fs : nil
-    }
-
-    private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
-        switch ci.content {
-        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
-        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
-        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
-        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
-        default: nil
-        }
-    }
-
-    @ViewBuilder private func featureIconView(_ f: FeatureInfo) -> some View {
-        let i = Image(systemName: f.icon)
-            .foregroundColor(f.color)
-            .scaleEffect(f.scale)
-        if let param = f.param {
-            HStack {
-                i
-                chatEventText(Text(param)).lineLimit(1)
-            }
-        } else {
-            i
-        }
-    }
-
-    private var fullFeatureView: some View {
         HStack(alignment: .bottom, spacing: 4) {
             Image(systemName: icon ?? feature.iconFilled)
                 .foregroundColor(iconColor)
                 .scaleEffect(feature.iconScale)
             chatEventText(chatItem)
         }
-        .padding(.horizontal, 6)
-        .padding(.vertical, 4)
+        .padding(.leading, 6)
+        .padding(.bottom, 6)
         .textSelection(.disabled)
     }
 }
@@ -103,6 +31,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
     static var previews: some View {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
     }
 }

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

@@ -13,9 +13,11 @@ struct CIEventView: View {
     var eventText: Text
 
     var body: some View {
-        eventText
-        .padding(.horizontal, 6)
-        .padding(.vertical, 4)
+        HStack(alignment: .bottom, spacing: 0) {
+            eventText
+        }
+        .padding(.leading, 6)
+        .padding(.bottom, 6)
         .textSelection(.disabled)
     }
 }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFeaturePreferenceView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var feature: ChatFeature
     var allowed: FeatureAllowed
@@ -80,6 +80,7 @@ struct CIFeaturePreferenceView_Previews: PreviewProvider {
             quotedItem: nil,
             file: nil
         )
-        CIFeaturePreferenceView(chat: Chat.sampleData, chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
+        CIFeaturePreferenceView(chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
+            .environmentObject(Chat.sampleData)
     }
 }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFileView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let file: CIFile?
     let edited: Bool
@@ -84,7 +83,7 @@ struct CIFileView: View {
                 if fileSizeValid() {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
-                        if let user = m.currentUser {
+                        if let user = ChatModel.shared.currentUser {
                             let encrypted = privacyEncryptLocalFilesGroupDefault.get()
                             await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                         }
@@ -235,17 +234,18 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -17,45 +17,34 @@ struct CIGroupInvitationView: View {
     var memberRole: GroupMemberRole
     var chatIncognito: Bool = false
     @State private var frameWidth: CGFloat = 0
-    @State private var inProgress = false
-    @State private var progressByTimeout = false
 
     var body: some View {
         let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
         let v = ZStack(alignment: .bottomTrailing) {
-            ZStack {
-                VStack(alignment: .leading) {
-                    groupInfoView(action)
-                        .padding(.horizontal, 2)
-                        .padding(.top, 8)
-                        .padding(.bottom, 6)
+            VStack(alignment: .leading) {
+                groupInfoView(action)
+                .padding(.horizontal, 2)
+                .padding(.top, 8)
+                .padding(.bottom, 6)
+                .overlay(DetermineWidth())
+
+                Divider().frame(width: frameWidth)
+
+                if action {
+                    groupInvitationText()
+                        .overlay(DetermineWidth())
+                    Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                        .foregroundColor(chatIncognito ? .indigo : .accentColor)
+                        .font(.callout)
+                        .padding(.trailing, 60)
+                        .overlay(DetermineWidth())
+                } else {
+                    groupInvitationText()
+                        .padding(.trailing, 60)
                         .overlay(DetermineWidth())
-
-                    Divider().frame(width: frameWidth)
-
-                    if action {
-                        VStack(alignment: .leading, spacing: 2) {
-                            groupInvitationText()
-                                .overlay(DetermineWidth())
-                            Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                                .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
-                                .font(.callout)
-                                .padding(.trailing, 60)
-                                .overlay(DetermineWidth())
-                        }
-                    } else {
-                        groupInvitationText()
-                            .padding(.trailing, 60)
-                            .overlay(DetermineWidth())
-                    }
-                }
-                .padding(.bottom, 2)
-
-                if progressByTimeout {
-                    ProgressView().scaleEffect(2)
                 }
             }
-
+            .padding(.bottom, 2)
             chatItem.timestampText
                 .font(.caption)
                 .foregroundColor(.secondary)
@@ -66,24 +55,11 @@ struct CIGroupInvitationView: View {
         .cornerRadius(18)
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
-        .onChange(of: inProgress) { inProgress in
-            if inProgress {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    progressByTimeout = inProgress
-                }
-            } else {
-                progressByTimeout = false
-            }
-        }
 
         if action {
             v.onTapGesture {
-                inProgress = true
-                joinGroup(groupInvitation.groupId) {
-                    await MainActor.run { inProgress = false }
-                }
+                joinGroup(groupInvitation.groupId)
             }
-            .disabled(inProgress)
         } else {
             v
         }
@@ -91,7 +67,7 @@ struct CIGroupInvitationView: View {
 
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
-        if action && !inProgress {
+        if action {
             color = chatIncognito ? .indigo : .accentColor
         } else {
             color = Color(uiColor: .tertiaryLabel)

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIImageView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let chatItem: ChatItem
     let image: String
@@ -37,7 +36,7 @@ struct CIImageView: View {
                             switch file.fileStatus {
                             case .rcvInvitation:
                                 Task {
-                                    if let user = m.currentUser {
+                                    if let user = ChatModel.shared.currentUser {
                                         await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                     }
                                 }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMemberCreatedContactView: View {
-    @EnvironmentObject var m: ChatModel
     var chatItem: ChatItem
     
     var body: some View {
@@ -22,7 +21,7 @@ struct CIMemberCreatedContactView: View {
                         .onTapGesture {
                             dismissAllSheets(animated: true)
                             DispatchQueue.main.async {
-                                m.chatId = "@\(contactId)"
+                                ChatModel.shared.chatId = "@\(contactId)"
                             }
                         }
                 } else {

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMetaView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
     var paleMetaColor = Color(UIColor.tertiaryLabel)
@@ -95,14 +95,15 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -12,8 +12,7 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
 
 struct CIRcvDecryptionError: View {
-    @EnvironmentObject var m: ChatModel
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
@@ -46,7 +45,7 @@ struct CIRcvDecryptionError: View {
                     do {
                         let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                         if let s = stats {
-                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
+                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
                         }
                     } catch let error {
                         logger.error("apiGroupMemberInfo error: \(responseError(error))")
@@ -66,7 +65,7 @@ struct CIRcvDecryptionError: View {
 
     @ViewBuilder private func viewBody() -> some View {
         if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn?.connectionStats {
+           let contactStats = contact.activeConn.connectionStats {
             if contactStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncContactConnection(contact) }
@@ -80,8 +79,8 @@ struct CIRcvDecryptionError: View {
             }
         } else if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let mem = m.getGroupMember(groupMember.groupMemberId),
-                  let memberStats = mem.wrapped.activeConn?.connectionStats {
+                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
+                  let memberStats = modelMember.activeConn?.connectionStats {
             if memberStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
@@ -123,7 +122,7 @@ struct CIRcvDecryptionError: View {
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -143,7 +142,7 @@ struct CIRcvDecryptionError: View {
                 + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -165,8 +164,6 @@ struct CIRcvDecryptionError: View {
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
         case .other:
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
-        case .ratchetSync:
-            message = Text("Encryption re-negotiation failed.")
         }
         return message
     }
@@ -176,7 +173,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
                 await MainActor.run {
-                    m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
                 }
             } catch let error {
                 logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
@@ -193,7 +190,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let stats = try apiSyncContactRatchet(contact.apiId, false)
                 await MainActor.run {
-                    m.updateContactConnectionStats(contact, stats)
+                    ChatModel.shared.updateContactConnectionStats(contact, stats)
                 }
             } catch let error {
                 logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")

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

@@ -9,10 +9,8 @@
 import SwiftUI
 import AVKit
 import SimpleXChat
-import Combine
 
 struct CIVideoView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     private let chatItem: ChatItem
     private let image: String
@@ -29,7 +27,6 @@ struct CIVideoView: View {
     @State private var showFullScreenPlayer = false
     @State private var timeObserver: Any? = nil
     @State private var fullScreenTimeObserver: Any? = nil
-    @State private var publisher: AnyCancellable? = nil
 
     init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
         self.chatItem = chatItem
@@ -104,7 +101,7 @@ struct CIVideoView: View {
                 let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                 VideoPlayerView(player: player, url: url, showControls: false)
                 .frame(width: w, height: w * preview.size.height / preview.size.width)
-                .onChange(of: m.stopPreviousRecPlay) { playingUrl in
+                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
                     if playingUrl != url {
                         player.pause()
                         videoPlaying = false
@@ -127,7 +124,7 @@ struct CIVideoView: View {
                 }
                 if !videoPlaying {
                     Button {
-                        m.stopPreviousRecPlay = url
+                        ChatModel.shared.stopPreviousRecPlay = url
                         player.play()
                     } label: {
                         playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
@@ -259,7 +256,7 @@ struct CIVideoView: View {
     // TODO encrypt: where file size is checked?
     private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
         Task {
-            if let user = m.currentUser {
+            if let user = ChatModel.shared.currentUser {
                 await receiveFile(user, file.fileId, encrypted, false)
             }
         }
@@ -293,17 +290,9 @@ struct CIVideoView: View {
             )
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    m.stopPreviousRecPlay = url
+                    ChatModel.shared.stopPreviousRecPlay = url
                     if let player = fullPlayer {
                         player.play()
-                        var played = false
-                        publisher = player.publisher(for: \.timeControlStatus).sink { status in
-                            if played || status == .playing {
-                                AppDelegate.keepScreenOn(status == .playing)
-                                AudioPlayer.changeAudioSession(status == .playing)
-                            }
-                            played = status == .playing
-                        }
                         fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
                             player.seek(to: CMTime.zero)
                             player.play()
@@ -318,7 +307,6 @@ struct CIVideoView: View {
                 fullScreenTimeObserver = nil
                 fullPlayer?.pause()
                 fullPlayer?.seek(to: CMTime.zero)
-                publisher?.cancel()
             }
         }
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIVoiceView: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
@@ -92,7 +91,7 @@ struct CIVoiceView: View {
     }
 
     private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem)
+        CIMetaView(chatItem: chatItem)
     }
 }
 
@@ -220,7 +219,7 @@ struct VoiceMessagePlayer: View {
     private func downloadButton(_ recordingFile: CIFile) -> some View {
         Button {
             Task {
-                if let user = chatModel.currentUser {
+                if let user = ChatModel.shared.currentUser {
                     await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                 }
             }
@@ -285,7 +284,6 @@ struct CIVoiceView_Previews: PreviewProvider {
         )
         Group {
             CIVoiceView(
-                chat: Chat.sampleData,
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
@@ -294,11 +292,12 @@ struct CIVoiceView_Previews: PreviewProvider {
                 playbackTime: .constant(TimeInterval(20)),
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct DeletedItemView: View {
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -19,7 +18,7 @@ struct DeletedItemView: View {
             Text(chatItem.content.text)
                 .foregroundColor(.secondary)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -33,8 +32,8 @@ struct DeletedItemView: View {
 struct DeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct EmojiItemView: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -18,7 +17,7 @@ struct EmojiItemView: View {
             emojiText(chatItem.content.text)
                 .padding(.top, 8)
                 .padding(.horizontal, 6)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }
@@ -33,8 +32,8 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
-            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
+            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
         }
         .previewLayout(.fixed(width: 360, height: 70))
     }

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

@@ -88,12 +88,13 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -150,7 +150,7 @@ struct FullScreenMediaView: View {
 
     private func startPlayerAndNotify() {
         if let player = player {
-            m.stopPreviousRecPlay = url
+            ChatModel.shared.stopPreviousRecPlay = url
             player.play()
         }
     }

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

@@ -10,12 +10,11 @@ import SwiftUI
 import SimpleXChat
 
 struct IntegrityErrorItemView: View {
-    @ObservedObject var chat: Chat
     var msgError: MsgErrorType
     var chatItem: ChatItem
 
     var body: some View {
-        CIMsgError(chat: chat, chatItem: chatItem) {
+        CIMsgError(chatItem: chatItem) {
             switch msgError {
             case .msgSkipped:
                 AlertManager.shared.showAlertMsg(
@@ -53,7 +52,6 @@ struct IntegrityErrorItemView: View {
 }
 
 struct CIMsgError: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var onTap: () -> Void
 
@@ -62,7 +60,7 @@ struct CIMsgError: View {
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -76,6 +74,6 @@ struct CIMsgError: View {
 
 struct IntegrityErrorItemView_Previews: PreviewProvider {
     static var previews: some View {
-        IntegrityErrorItemView(chat: Chat.sampleData, msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
+        IntegrityErrorItemView(msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
     }
 }

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

@@ -10,70 +10,39 @@ import SwiftUI
 import SimpleXChat
 
 struct MarkedDeletedItemView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
-    @Binding var revealed: Bool
 
     var body: some View {
-        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .padding(.horizontal, 12)
+        HStack(alignment: .bottom, spacing: 0) {
+            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
+                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
+            } else {
+                markedDeletedText("marked deleted")
+            }
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .padding(.leading, 12)
         .padding(.vertical, 6)
         .background(chatItemFrameColor(chatItem, colorScheme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }
 
-    var mergedMarkedDeletedText: LocalizedStringKey {
-        if !revealed,
-           let ciCategory = chatItem.mergeCategory,
-           var i = m.getChatItemIndex(chatItem) {
-            var moderated = 0
-            var blocked = 0
-            var deleted = 0
-            var moderatedBy: Set<String> = []
-            while i < m.reversedChatItems.count,
-                  let ci = .some(m.reversedChatItems[i]),
-                  ci.mergeCategory == ciCategory,
-                  let itemDeleted = ci.meta.itemDeleted {
-                switch itemDeleted {
-                case let .moderated(_, byGroupMember):
-                    moderated += 1
-                    moderatedBy.insert(byGroupMember.displayName)
-                case .blocked: blocked += 1
-                case .deleted: deleted += 1
-                }
-                i += 1
-            }
-            let total = moderated + blocked + deleted
-            return total <= 1
-            ? markedDeletedText
-            : total == moderated
-            ? "\(total) messages moderated by \(moderatedBy.joined(separator: ", "))"
-            : total == blocked
-            ? "\(total) messages blocked"
-            : "\(total) messages marked deleted"
-        } else {
-            return markedDeletedText
-        }
-    }
-
-    var markedDeletedText: LocalizedStringKey {
-        switch chatItem.meta.itemDeleted {
-        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
-        case .blocked: "blocked"
-        default: "marked deleted"
-        }
+    func markedDeletedText(_ s: LocalizedStringKey) -> some View {
+        Text(s)
+            .font(.caption)
+            .foregroundColor(.secondary)
+            .italic()
+            .lineLimit(1)
     }
 }
 
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -25,7 +25,7 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 }
 
 struct MsgContentView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
@@ -121,11 +121,13 @@ private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
         case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
         case let .colored(color): return Text(t).foregroundColor(color.uiColor)
         case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, trustedUri, smpHosts):
             switch privacySimplexLinkModeDefault.get() {
             case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
             case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return linkText(t, simplexUri, preview, prefix: "")
+            case .browser: return trustedUri
+                                    ? linkText(t, t, preview, prefix: "")
+                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
             }
         case .email: return linkText(t, t, preview, prefix: "mailto:")
         case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
@@ -152,7 +154,6 @@ struct MsgContentView_Previews: PreviewProvider {
     static var previews: some View {
         let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
         return MsgContentView(
-            chat: Chat.sampleData,
             text: chatItem.text,
             formattedText: chatItem.formattedText,
             sender: chatItem.memberDisplayName,

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemInfoView: View {
-    @EnvironmentObject var chatModel: ChatModel
     @Environment(\.colorScheme) var colorScheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
@@ -291,8 +290,8 @@ struct ChatItemInfoView: View {
 
     private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
         memberDeliveryStatuses.compactMap({ mds in
-            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
-                return (mem.wrapped, mds.memberDeliveryStatus)
+            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
+                return (mem, mds.memberDeliveryStatus)
             } else {
                 return nil
             }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemView: View {
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
@@ -19,19 +19,8 @@ struct ChatItemView: View {
     @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-    init(
-        chat: Chat,
-        chatItem: ChatItem,
-        showMember: Bool = false,
-        maxWidth: CGFloat = .infinity,
-        scrollProxy: ScrollViewProxy? = nil,
-        revealed: Binding<Bool>,
-        allowMenu: Binding<Bool> = .constant(false),
-        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
-        playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback),
-        playbackTime: Binding<TimeInterval?> = .constant(nil)
-    ) {
-        self.chat = chat
+    init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
+        self.chatInfo = chatInfo
         self.chatItem = chatItem
         self.maxWidth = maxWidth
         _scrollProxy = .init(initialValue: scrollProxy)
@@ -44,15 +33,15 @@ struct ChatItemView: View {
 
     var body: some View {
         let ci = chatItem
-        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
+        if chatItem.meta.itemDeleted != nil && !revealed {
+            MarkedDeletedItemView(chatItem: chatItem)
         } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
-                EmojiItemView(chat: chat, chatItem: ci)
+                EmojiItemView(chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
+                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -62,15 +51,14 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
-    @Binding var revealed: Bool
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
@@ -84,14 +72,14 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvCall(status, duration): callItemView(status, duration)
         case let .rcvIntegrityError(msgError):
             if developerTools {
-                IntegrityErrorItemView(chat: chat, msgError: msgError, chatItem: chatItem)
+                IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
             } else {
                 ZStack {}
             }
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(chat: chat, msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvDirectEvent: eventItemView()
+        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()
         case .sndGroupEvent: eventItemView()
@@ -100,9 +88,9 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .rcvChatPreference(feature, allowed, param):
-            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
+            CIFeaturePreferenceView(chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
+            CIChatFeatureView(chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: .secondary)
         case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -114,15 +102,15 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func deletedItemView() -> some View {
-        DeletedItemView(chat: chat, chatItem: chatItem)
+        DeletedItemView(chatItem: chatItem)
     }
 
     private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
-        CICallItemView(chat: chat, chatItem: chatItem, status: status, duration: duration)
+        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
     }
 
     private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
     }
 
     private func eventItemView() -> some View {
@@ -130,9 +118,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func eventItemViewText() -> Text {
-        if !revealed, let t = mergedGroupEventText {
-            return chatEventText(t + Text(" ") + chatItem.timestampText)
-        } else if let member = chatItem.memberDisplayName {
+        if let member = chatItem.memberDisplayName {
             return Text(member + " ")
                     .font(.caption)
                     .foregroundColor(.secondary)
@@ -144,42 +130,34 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
 
-    private var mergedGroupEventText: Text? {
-        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
-        let members: LocalizedStringKey =
-            switch ns.count {
-            case 1: "\(ns[0]) connected"
-            case 2: "\(ns[0]) and \(ns[1]) connected"
-            case 3: "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
-            default:
-                ns.count > 3
-                ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
-                : ""
-            }
-        return if count <= 1 {
-            nil
-        } else if ns.count == 0 {
-            Text("\(count) group events")
-        } else if count > ns.count {
-            Text(members) + Text(" ") + Text("and \(count - ns.count) other events")
+    private var membersConnectedItemText: Text {
+        if let t = membersConnectedText {
+            return chatEventText(t, chatItem.timestampText)
         } else {
-            Text(members)
+            return eventItemViewText()
         }
     }
-}
 
-func chatEventText(_ text: Text) -> Text {
-    text
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .fontWeight(.light)
+    private var membersConnectedText: LocalizedStringKey? {
+        let ns = chatModel.getConnectedMemberNames(chatItem)
+        return ns.count > 3
+            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
+            : ns.count == 3
+            ? "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
+            : ns.count == 2
+            ? "\(ns[0]) and \(ns[1]) connected"
+            : nil
+    }
 }
 
 func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
-    chatEventText(Text(eventText) + Text(" ") + ts)
+    (Text(eventText) + Text(" ") + ts)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
 }
 
 func chatEventText(_ ci: ChatItem) -> Text {
@@ -189,15 +167,15 @@ func chatEventText(_ ci: ChatItem) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
@@ -209,7 +187,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -220,7 +198,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
@@ -231,7 +209,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -242,7 +220,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -253,7 +231,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),

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

@@ -21,7 +21,9 @@ struct ChatView: View {
     @State private var showChatInfoSheet: Bool = false
     @State private var showAddMembersSheet: Bool = false
     @State private var composeState = ComposeState()
+    @State private var deletingItem: ChatItem? = nil
     @State private var keyboardVisible = false
+    @State private var showDeleteMessage = false
     @State private var connectionStats: ConnectionStats?
     @State private var customUserProfile: Profile?
     @State private var connectionCode: String?
@@ -34,12 +36,7 @@ struct ChatView: View {
     @State private var searchText: String = ""
     @FocusState private var searchFocussed
     // opening GroupMemberInfoView on member icon
-    @State private var membersLoaded = false
-    @State private var selectedMember: GMember? = nil
-    // opening GroupLinkView on link button (incognito)
-    @State private var showGroupLinkSheet: Bool = false
-    @State private var groupLink: String?
-    @State private var groupLinkMemberRole: GroupMemberRole = .member
+    @State private var selectedMember: GroupMember? = nil
 
     var body: some View {
         if #available(iOS 16.0, *) {
@@ -94,10 +91,7 @@ struct ChatView: View {
                 chatModel.chatId = nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
-                        chatModel.chatItemStatuses = [:]
                         chatModel.reversedChatItems = []
-                        chatModel.groupMembers = []
-                        membersLoaded = false
                     }
                 }
             }
@@ -114,7 +108,7 @@ struct ChatView: View {
                                     connectionStats = stats
                                     customUserProfile = profile
                                     connectionCode = code
-                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                                    if contact.activeConn.connectionCode != ct.activeConn.connectionCode {
                                         chat.chatInfo = .direct(contact: ct)
                                     }
                                 }
@@ -135,21 +129,18 @@ struct ChatView: View {
                     }
                 } else if case let .group(groupInfo) = cInfo {
                     Button {
-                        Task { await loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
+                        Task {
+                            let groupMembers = await apiListMembers(groupInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                                showChatInfoSheet = true
+                            }
+                        }
                     } label: {
                         ChatInfoToolbar(chat: chat)
                     }
                     .appSheet(isPresented: $showChatInfoSheet) {
-                        GroupChatInfoView(
-                            chat: chat,
-                            groupInfo: Binding(
-                                get: { groupInfo },
-                                set: { gInfo in
-                                    chat.chatInfo = .group(groupInfo: gInfo)
-                                    chat.created = Date.now
-                                }
-                            )
-                        )
+                        GroupChatInfoView(chat: chat, groupInfo: groupInfo)
                     }
                 }
             }
@@ -159,7 +150,7 @@ struct ChatView: View {
                     HStack {
                         if contact.allowsFeature(.calls) {
                             callButton(contact, .audio, imageName: "phone")
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         }
                         Menu {
                             if contact.allowsFeature(.calls) {
@@ -168,11 +159,11 @@ struct ChatView: View {
                                 } label: {
                                     Label("Video call", systemImage: "video")
                                 }
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                             }
                             searchButton()
                             toggleNtfsButton(chat)
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         } label: {
                             Image(systemName: "ellipsis")
                         }
@@ -181,16 +172,9 @@ struct ChatView: View {
                     HStack {
                         if groupInfo.canAddMembers {
                             if (chat.chatInfo.incognito) {
-                                groupLinkButton()
-                                    .appSheet(isPresented: $showGroupLinkSheet) {
-                                        GroupLinkView(
-                                            groupId: groupInfo.groupId,
-                                            groupLink: $groupLink,
-                                            groupLinkMemberRole: $groupLinkMemberRole,
-                                            showTitle: true,
-                                            creatingGroup: false
-                                        )
-                                    }
+                                Image(systemName: "person.crop.circle.badge.plus")
+                                    .foregroundColor(Color(uiColor: .tertiaryLabel))
+                                    .onTapGesture { AlertManager.shared.showAlert(cantInviteIncognitoAlert()) }
                             } else {
                                 addMembersButton()
                                     .appSheet(isPresented: $showAddMembersSheet) {
@@ -212,17 +196,6 @@ struct ChatView: View {
         }
     }
 
-    private func loadGroupMembers(_ groupInfo: GroupInfo, updateView: @escaping () -> Void = {}) async {
-        let groupMembers = await apiListMembers(groupInfo.groupId)
-        await MainActor.run {
-            if chatModel.chatId == groupInfo.id {
-                chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                membersLoaded = true
-                updateView()
-            }
-        }
-    }
-
     private func initChatView() {
         let cInfo = chat.chatInfo
         if case let .direct(contact) = cInfo {
@@ -348,7 +321,6 @@ struct ChatView: View {
     @ViewBuilder private func connectingText() -> some View {
         if case let .direct(contact) = chat.chatInfo,
            !contact.ready,
-           contact.active,
            !contact.nextSendGrpInv {
             Text("connecting…")
                 .font(.caption)
@@ -431,32 +403,19 @@ struct ChatView: View {
     private func addMembersButton() -> some View {
         Button {
             if case let .group(gInfo) = chat.chatInfo {
-                Task { await loadGroupMembers(gInfo) { showAddMembersSheet = true } }
+                Task {
+                    let groupMembers = await apiListMembers(gInfo.groupId)
+                    await MainActor.run {
+                        ChatModel.shared.groupMembers = groupMembers
+                        showAddMembersSheet = true
+                    }
+                }
             }
         } label: {
             Image(systemName: "person.crop.circle.badge.plus")
         }
     }
-
-    private func groupLinkButton() -> some View {
-        Button {
-            if case let .group(gInfo) = chat.chatInfo {
-                Task {
-                    do {
-                        if let link = try apiGetGroupLink(gInfo.groupId) {
-                            (groupLink, groupLinkMemberRole) = link
-                        }
-                    } catch let error {
-                        logger.error("ChatView apiGetGroupLink: \(responseError(error))")
-                    }
-                    showGroupLinkSheet = true
-                }
-            }
-        } label: {
-            Image(systemName: "link.badge.plus")
-        }
-    }
-
+    
     private func loadChatItems(_ cInfo: ChatInfo, _ ci: ChatItem, _ proxy: ScrollViewProxy) {
         if let firstItem = chatModel.reversedChatItems.last, firstItem.id == ci.id {
             if loadingItems || firstPage { return }
@@ -486,30 +445,73 @@ struct ChatView: View {
     }
     
     @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
+        if case let .groupRcv(member) = ci.chatDir,
+           case let .group(groupInfo) = chat.chatInfo {
+            let (prevItem, nextItem) = chatModel.getChatItemNeighbors(ci)
+            if ci.memberConnected != nil && nextItem?.memberConnected != nil {
+                // memberConnected events are aggregated at the last chat item in a row of such events, see ChatItemView
+                ZStack {} // scroll doesn't work if it's EmptyView()
+            } else {
+                if prevItem == nil || showMemberImage(member, prevItem) {
+                    VStack(alignment: .leading, spacing: 4) {
+                        if ci.content.showMemberName {
+                            Text(member.displayName)
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                                .padding(.leading, memberImageSize + 14)
+                                .padding(.top, 7)
+                        }
+                        HStack(alignment: .top, spacing: 8) {
+                            ProfileImage(imageStr: member.memberProfile.image)
+                                .frame(width: memberImageSize, height: memberImageSize)
+                                .onTapGesture { selectedMember = member }
+                                .appSheet(item: $selectedMember) { member in
+                                    GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
+                                }
+                            chatItemWithMenu(ci, maxWidth)
+                        }
+                    }
+                    .padding(.top, 5)
+                    .padding(.trailing)
+                    .padding(.leading, 12)
+                } else {
+                    chatItemWithMenu(ci, maxWidth)
+                        .padding(.top, 5)
+                        .padding(.trailing)
+                        .padding(.leading, memberImageSize + 8 + 12)
+                }
+            }
+        } else {
+            chatItemWithMenu(ci, maxWidth)
+                .padding(.horizontal)
+                .padding(.top, 5)
+        }
+    }
+
+    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
         ChatItemWithMenu(
-            chat: chat,
-            chatItem: ci,
+            ci: ci,
             maxWidth: maxWidth,
+            scrollProxy: scrollProxy,
+            deleteMessage: deleteMessage,
+            deletingItem: $deletingItem,
             composeState: $composeState,
-            selectedMember: $selectedMember,
-            chatView: self
+            showDeleteMessage: $showDeleteMessage
         )
+        .environmentObject(chat)
     }
 
     private struct ChatItemWithMenu: View {
-        @EnvironmentObject var m: ChatModel
+        @EnvironmentObject var chat: Chat
         @Environment(\.colorScheme) var colorScheme
-        @ObservedObject var chat: Chat
-        var chatItem: ChatItem
+        var ci: ChatItem
         var maxWidth: CGFloat
+        var scrollProxy: ScrollViewProxy?
+        var deleteMessage: (CIDeleteMode) -> Void
+        @Binding var deletingItem: ChatItem?
         @Binding var composeState: ComposeState
-        @Binding var selectedMember: GMember?
-        var chatView: ChatView
+        @Binding var showDeleteMessage: Bool
 
-        @State private var deletingItem: ChatItem? = nil
-        @State private var showDeleteMessage = false
-        @State private var deletingItems: [Int64] = []
-        @State private var showDeleteMessages = false
         @State private var revealed = false
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
@@ -521,114 +523,18 @@ struct ChatView: View {
         @State private var playbackTime: TimeInterval?
 
         var body: some View {
-            let (currIndex, nextItem) = m.getNextChatItem(chatItem)
-            let ciCategory = chatItem.mergeCategory
-            if (ciCategory != nil && ciCategory == nextItem?.mergeCategory) {
-                // memberConnected events and deleted items are aggregated at the last chat item in a row, see ChatItemView
-                ZStack {} // scroll doesn't work if it's EmptyView()
-            } else {
-                let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
-                let range = itemsRange(currIndex, prevHidden)
-                if revealed, let range = range {
-                    let items = Array(zip(Array(range), m.reversedChatItems[range]))
-                    ForEach(items, id: \.1.viewId) { (i, ci) in
-                        let prev = i == prevHidden ? prevItem : m.reversedChatItems[i + 1]
-                        chatItemView(ci, nil, prev)
-                    }
-                } else {
-                    chatItemView(chatItem, range, prevItem)
-                }
-            }
-        }
-
-        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?) -> some View {
-            if case let .groupRcv(member) = ci.chatDir,
-               case let .group(groupInfo) = chat.chatInfo {
-                let (prevMember, memCount): (GroupMember?, Int) =
-                    if let range = range {
-                        m.getPrevHiddenMember(member, range)
-                    } else {
-                        (nil, 1)
-                    }
-                if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
-                    VStack(alignment: .leading, spacing: 4) {
-                        if ci.content.showMemberName {
-                            Text(memberNames(member, prevMember, memCount))
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                                .padding(.leading, memberImageSize + 14)
-                                .padding(.top, 7)
-                        }
-                        HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image)
-                                .frame(width: memberImageSize, height: memberImageSize)
-                                .onTapGesture {
-                                    if chatView.membersLoaded {
-                                        selectedMember = m.getGroupMember(member.groupMemberId)
-                                    } else {
-                                        Task {
-                                            await chatView.loadGroupMembers(groupInfo) {
-                                                selectedMember = m.getGroupMember(member.groupMemberId)
-                                            }
-                                        }
-                                    }
-                                }
-                                .appSheet(item: $selectedMember) { member in
-                                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
-                                }
-                            chatItemWithMenu(ci, range, maxWidth)
-                        }
-                    }
-                    .padding(.top, 5)
-                    .padding(.trailing)
-                    .padding(.leading, 12)
-                } else {
-                    chatItemWithMenu(ci, range, maxWidth)
-                        .padding(.top, 5)
-                        .padding(.trailing)
-                        .padding(.leading, memberImageSize + 8 + 12)
-                }
-            } else {
-                chatItemWithMenu(ci, range, maxWidth)
-                    .padding(.horizontal)
-                    .padding(.top, 5)
-            }
-        }
-
-        private func memberNames(_ member: GroupMember, _ prevMember: GroupMember?, _ memCount: Int) -> LocalizedStringKey {
-            let name = member.displayName
-            return if let prevName = prevMember?.displayName {
-                memCount > 2
-                ? "\(name), \(prevName) and \(memCount - 2) members"
-                : "\(name) and \(prevName)"
-            } else {
-                "\(name)"
-            }
-        }
-
-        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat) -> some View {
             let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
             let uiMenu: Binding<UIMenu> = Binding(
-                get: { UIMenu(title: "", children: menu(ci, range, live: composeState.liveMessage != nil)) },
+                get: { UIMenu(title: "", children: menu(live: composeState.liveMessage != nil)) },
                 set: { _ in }
             )
             
             VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(
-                    chat: chat,
-                    chatItem: ci,
-                    maxWidth: maxWidth,
-                    scrollProxy: chatView.scrollProxy,
-                    revealed: $revealed,
-                    allowMenu: $allowMenu,
-                    audioPlayer: $audioPlayer,
-                    playbackState: $playbackState,
-                    playbackTime: $playbackTime
-                )
-                .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
-                .accessibilityLabel("")
+                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+                    .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
+                    .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
-                    chatItemReactions(ci)
+                    chatItemReactions()
                         .padding(.bottom, 4)
                 }
             }
@@ -642,11 +548,6 @@ struct ChatView: View {
                         }
                     }
                 }
-                .confirmationDialog(deleteMessagesTitle, isPresented: $showDeleteMessages, titleVisibility: .visible) {
-                    Button("Delete for me", role: .destructive) {
-                        deleteMessages()
-                    }
-                }
                 .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
                 .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
                 .onDisappear {
@@ -664,15 +565,7 @@ struct ChatView: View {
                 }
         }
 
-        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
-            switch (prevItem?.chatDir) {
-            case .groupSnd: return true
-            case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
-            default: return false
-            }
-        }
-
-        private func chatItemReactions(_ ci: ChatItem) -> some View {
+        private func chatItemReactions() -> some View {
             HStack(spacing: 4) {
                 ForEach(ci.reactions, id: \.reaction) { r in
                     let v = HStack(spacing: 4) {
@@ -692,7 +585,7 @@ struct ChatView: View {
 
                     if chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted) {
                         v.onTapGesture {
-                            setReaction(ci, add: !r.userReacted, reaction: r.reaction)
+                            setReaction(add: !r.userReacted, reaction: r.reaction)
                         }
                     } else {
                         v
@@ -701,10 +594,10 @@ struct ChatView: View {
             }
         }
 
-        private func menu(_ ci: ChatItem, _ range: ClosedRange<Int>?, live: Bool) -> [UIMenuElement] {
+        private func menu(live: Bool) -> [UIMenuElement] {
             var menu: [UIMenuElement] = []
             if let mc = ci.content.msgContent, ci.meta.itemDeleted == nil || revealed {
-                let rs = allReactions(ci)
+                let rs = allReactions()
                 if chat.chatInfo.featureEnabled(.reactions) && ci.allowAddReaction,
                    rs.count > 0 {
                     var rm: UIMenu
@@ -721,10 +614,10 @@ struct ChatView: View {
                     menu.append(rm)
                 }
                 if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
-                    menu.append(replyUIAction(ci))
+                    menu.append(replyUIAction())
                 }
-                menu.append(shareUIAction(ci))
-                menu.append(copyUIAction(ci))
+                menu.append(shareUIAction())
+                menu.append(copyUIAction())
                 if let fileSource = getLoadedFileSource(ci.file) {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
@@ -737,9 +630,9 @@ struct ChatView: View {
                     }
                 }
                 if ci.meta.editable && !mc.isVoice && !live {
-                    menu.append(editAction(ci))
+                    menu.append(editAction())
                 }
-                menu.append(viewInfoUIAction(ci))
+                menu.append(viewInfoUIAction())
                 if revealed {
                     menu.append(hideUIAction())
                 }
@@ -749,31 +642,25 @@ struct ChatView: View {
                     menu.append(cancelFileUIAction(file.fileId, cancelAction))
                 }
                 if !live || !ci.meta.isLive {
-                    menu.append(deleteUIAction(ci))
+                    menu.append(deleteUIAction())
                 }
                 if let (groupInfo, _) = ci.memberToModerate(chat.chatInfo) {
-                    menu.append(moderateUIAction(ci, groupInfo))
+                    menu.append(moderateUIAction(groupInfo))
                 }
             } else if ci.meta.itemDeleted != nil {
-                if revealed {
-                    menu.append(hideUIAction())
-                } else if !ci.isDeletedContent {
+                if !ci.isDeletedContent {
                     menu.append(revealUIAction())
-                } else if range != nil {
-                    menu.append(expandUIAction())
                 }
-                menu.append(viewInfoUIAction(ci))
-                menu.append(deleteUIAction(ci))
+                menu.append(viewInfoUIAction())
+                menu.append(deleteUIAction())
             } else if ci.isDeletedContent {
-                menu.append(viewInfoUIAction(ci))
-                menu.append(deleteUIAction(ci))
-            } else if ci.mergeCategory != nil && ((range?.count ?? 0) > 1 || revealed) {
-                menu.append(revealed ? shrinkUIAction() : expandUIAction())
+                menu.append(viewInfoUIAction())
+                menu.append(deleteUIAction())
             }
             return menu
         }
         
-        private func replyUIAction(_ ci: ChatItem) -> UIAction {
+        private func replyUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Reply", comment: "chat item action"),
                 image: UIImage(systemName: "arrowshape.turn.up.left")
@@ -808,11 +695,11 @@ struct ChatView: View {
             )
         }
 
-        private func allReactions(_ ci: ChatItem) -> [UIAction] {
+        private func allReactions() -> [UIAction] {
             MsgReaction.values.compactMap { r in
                 ci.reactions.contains(where: { $0.userReacted && $0.reaction == r })
                 ? nil
-                : UIAction(title: r.text) { _ in setReaction(ci, add: true, reaction: r) }
+                : UIAction(title: r.text) { _ in setReaction(add: true, reaction: r) }
             }
         }
 
@@ -820,7 +707,7 @@ struct ChatView: View {
             rs.count > 4 ? 3 : 4
         }
 
-        private func setReaction(_ ci: ChatItem, add: Bool, reaction: MsgReaction) {
+        private func setReaction(add: Bool, reaction: MsgReaction) {
             Task {
                 do {
                     let cInfo = chat.chatInfo
@@ -832,7 +719,7 @@ struct ChatView: View {
                         reaction: reaction
                     )
                     await MainActor.run {
-                        m.updateChatItem(chat.chatInfo, chatItem)
+                        ChatModel.shared.updateChatItem(chat.chatInfo, chatItem)
                     }
                 } catch let error {
                     logger.error("apiChatItemReaction error: \(responseError(error))")
@@ -840,7 +727,7 @@ struct ChatView: View {
             }
         }
 
-        private func shareUIAction(_ ci: ChatItem) -> UIAction {
+        private func shareUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Share", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.arrow.up")
@@ -853,7 +740,7 @@ struct ChatView: View {
             }
         }
         
-        private func copyUIAction(_ ci: ChatItem) -> UIAction {
+        private func copyUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Copy", comment: "chat item action"),
                 image: UIImage(systemName: "doc.on.doc")
@@ -886,7 +773,7 @@ struct ChatView: View {
             }
         }
         
-        private func editAction(_ ci: ChatItem) -> UIAction {
+        private func editAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Edit", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.pencil")
@@ -897,7 +784,7 @@ struct ChatView: View {
             }
         }
 
-        private func viewInfoUIAction(_ ci: ChatItem) -> UIAction {
+        private func viewInfoUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Info", comment: "chat item action"),
                 image: UIImage(systemName: "info.circle")
@@ -910,7 +797,10 @@ struct ChatView: View {
                             chatItemInfo = ciInfo
                         }
                         if case let .group(gInfo) = chat.chatInfo {
-                            await chatView.loadGroupMembers(gInfo)
+                            let groupMembers = await apiListMembers(gInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                            }
                         }
                     } catch let error {
                         logger.error("apiGetChatItemInfo error: \(responseError(error))")
@@ -931,7 +821,7 @@ struct ChatView: View {
                     message: Text(cancelAction.alert.message),
                     primaryButton: .destructive(Text(cancelAction.alert.confirm)) {
                         Task {
-                            if let user = m.currentUser {
+                            if let user = ChatModel.shared.currentUser {
                                 await cancelFile(user: user, fileId: fileId)
                             }
                         }
@@ -952,45 +842,18 @@ struct ChatView: View {
             }
         }
         
-        private func deleteUIAction(_ ci: ChatItem) -> UIAction {
+        private func deleteUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Delete", comment: "chat item action"),
                 image: UIImage(systemName: "trash"),
                 attributes: [.destructive]
             ) { _ in
-                if !revealed && ci.meta.itemDeleted != nil,
-                   let currIndex = m.getChatItemIndex(ci),
-                   let ciCategory = ci.mergeCategory {
-                    let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
-                    if let range = itemsRange(currIndex, prevHidden) {
-                        var itemIds: [Int64] = []
-                        for i in range {
-                            itemIds.append(m.reversedChatItems[i].id)
-                        }
-                        showDeleteMessages = true
-                        deletingItems = itemIds
-                    } else {
-                        showDeleteMessage = true
-                        deletingItem = ci
-                    }
-                } else {
-                    showDeleteMessage = true
-                    deletingItem = ci
-                }
+                showDeleteMessage = true
+                deletingItem = ci
             }
         }
 
-        private func itemsRange(_ currIndex: Int?, _ prevHidden: Int?) -> ClosedRange<Int>? {
-            if let currIndex = currIndex,
-               let prevHidden = prevHidden,
-               prevHidden > currIndex {
-                currIndex...prevHidden
-            } else {
-                nil
-            }
-        }
-
-        private func moderateUIAction(_ ci: ChatItem, _ groupInfo: GroupInfo) -> UIAction {
+        private func moderateUIAction(_ groupInfo: GroupInfo) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Moderate", comment: "chat item action"),
                 image: UIImage(systemName: "flag"),
@@ -1022,105 +885,20 @@ struct ChatView: View {
                 }
             }
         }
-
-        private func expandUIAction() -> UIAction {
-            UIAction(
-                title: NSLocalizedString("Expand", comment: "chat item action"),
-                image: UIImage(systemName: "arrow.up.and.line.horizontal.and.arrow.down")
-            ) { _ in
-                withAnimation {
-                    revealed = true
-                }
-            }
-        }
-
-        private func shrinkUIAction() -> UIAction {
-            UIAction(
-                title: NSLocalizedString("Hide", comment: "chat item action"),
-                image: UIImage(systemName: "arrow.down.and.line.horizontal.and.arrow.up")
-            ) { _ in
-                withAnimation {
-                    revealed = false
-                }
-            }
-        }
-
+        
         private var broadcastDeleteButtonText: LocalizedStringKey {
             chat.chatInfo.featureEnabled(.fullDelete) ? "Delete for everyone" : "Mark deleted for everyone"
         }
-
-        var deleteMessagesTitle: LocalizedStringKey {
-            let n = deletingItems.count
-            return n == 1 ? "Delete message?" : "Delete \(n) messages?"
-        }
-
-        private func deleteMessages() {
-            let itemIds = deletingItems
-            if itemIds.count > 0 {
-                let chatInfo = chat.chatInfo
-                Task {
-                    var deletedItems: [ChatItem] = []
-                    for itemId in itemIds {
-                        do {
-                            let (di, _) = try await apiDeleteChatItem(
-                                type: chatInfo.chatType,
-                                id: chatInfo.apiId,
-                                itemId: itemId,
-                                mode: .cidmInternal
-                            )
-                            deletedItems.append(di)
-                        } catch {
-                            logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
-                        }
-                    }
-                    await MainActor.run {
-                        for di in deletedItems {
-                            m.removeChatItem(chatInfo, di)
-                        }
-                    }
-                }
-            }
-        }
-
-        private func deleteMessage(_ mode: CIDeleteMode) {
-            logger.debug("ChatView deleteMessage")
-            Task {
-                logger.debug("ChatView deleteMessage: in Task")
-                do {
-                    if let di = deletingItem {
-                        var deletedItem: ChatItem
-                        var toItem: ChatItem?
-                        if case .cidmBroadcast = mode,
-                           let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
-                            (deletedItem, toItem) = try await apiDeleteMemberChatItem(
-                                groupId: groupInfo.apiId,
-                                groupMemberId: groupMember.groupMemberId,
-                                itemId: di.id
-                            )
-                        } else {
-                            (deletedItem, toItem) = try await apiDeleteChatItem(
-                                type: chat.chatInfo.chatType,
-                                id: chat.chatInfo.apiId,
-                                itemId: di.id,
-                                mode: mode
-                            )
-                        }
-                        DispatchQueue.main.async {
-                            deletingItem = nil
-                            if let toItem = toItem {
-                                _ = m.upsertChatItem(chat.chatInfo, toItem)
-                            } else {
-                                m.removeChatItem(chat.chatInfo, deletedItem)
-                            }
-                        }
-                    }
-                } catch {
-                    logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
-                }
-            }
-        }
     }
 
+    private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
+        switch (prevItem?.chatDir) {
+        case .groupSnd: return true
+        case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
+        default: return false
+        }
+    }
+    
     private func scrollToBottom(_ proxy: ScrollViewProxy) {
         if let ci = chatModel.reversedChatItems.first {
             withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
@@ -1132,6 +910,44 @@ struct ChatView: View {
             withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
         }
     }
+    
+    private func deleteMessage(_ mode: CIDeleteMode) {
+        logger.debug("ChatView deleteMessage")
+        Task {
+            logger.debug("ChatView deleteMessage: in Task")
+            do {
+                if let di = deletingItem {
+                    var deletedItem: ChatItem
+                    var toItem: ChatItem?
+                    if case .cidmBroadcast = mode,
+                       let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
+                        (deletedItem, toItem) = try await apiDeleteMemberChatItem(
+                            groupId: groupInfo.apiId,
+                            groupMemberId: groupMember.groupMemberId,
+                            itemId: di.id
+                        )
+                    } else {
+                        (deletedItem, toItem) = try await apiDeleteChatItem(
+                            type: chat.chatInfo.chatType,
+                            id: chat.chatInfo.apiId,
+                            itemId: di.id,
+                            mode: mode
+                        )
+                    }
+                    DispatchQueue.main.async {
+                        deletingItem = nil
+                        if let toItem = toItem {
+                            _ = chatModel.upsertChatItem(chat.chatInfo, toItem)
+                        } else {
+                            chatModel.removeChatItem(chat.chatInfo, deletedItem)
+                        }
+                    }
+                }
+            } catch {
+                logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
+            }
+        }
+    }
 }
 
 @ViewBuilder func toggleNtfsButton(_ chat: Chat) -> some View {
@@ -1148,7 +964,7 @@ struct ChatView: View {
 
 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
     var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs ? .all : .none
+    chatSettings.enableNtfs = enableNtfs
     updateChatSettings(chat, chatSettings: chatSettings)
 }
 

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

@@ -592,14 +592,12 @@ struct ComposeView: View {
             EmptyView()
         case let .quotedItem(chatItem: quotedItem):
             ContextItemView(
-                chat: chat,
                 contextItem: quotedItem,
                 contextIcon: "arrowshape.turn.up.left",
                 cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
             )
         case let .editingItem(chatItem: editingItem):
             ContextItemView(
-                chat: chat,
                 contextItem: editingItem,
                 contextIcon: "pencil",
                 cancelContextItem: { clearState() }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct ContextItemView: View {
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     let contextItem: ChatItem
     let contextIcon: String
     let cancelContextItem: () -> Void
@@ -49,7 +48,6 @@ struct ContextItemView: View {
 
     private func msgContentView(lines: Int) -> some View {
         MsgContentView(
-            chat: chat,
             text: contextItem.text,
             formattedText: contextItem.formattedText
         )
@@ -61,6 +59,6 @@ struct ContextItemView: View {
 struct ContextItemView_Previews: PreviewProvider {
     static var previews: some View {
         let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
     }
 }

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

@@ -14,28 +14,20 @@ import PhotosUI
 struct NativeTextEditor: UIViewRepresentable {
     @Binding var text: String
     @Binding var disableEditing: Bool
-    @Binding var height: CGFloat
+    let height: CGFloat
+    let font: UIFont
     @Binding var focused: Bool
     let alignment: TextAlignment
     let onImagesAdded: ([UploadContent]) -> Void
     
-    private let minHeight: CGFloat = 37
-
-    private let defaultHeight: CGFloat = {
-        let field = CustomUITextField(height: Binding.constant(0))
-        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
-        return min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, 37), 360).rounded(.down)
-    }()
-    
     func makeUIView(context: Context) -> UITextView {
-        let field = CustomUITextField(height: _height)
+        let field = CustomUITextField()
         field.text = text
+        field.font = font
         field.textAlignment = alignment == .leading ? .left : .right
         field.autocapitalizationType = .sentences
         field.setOnTextChangedListener { newText, images in
             if !disableEditing {
-                // Speed up the process of updating layout, reduce jumping content on screen
-                if !isShortEmoji(newText) { updateHeight(field) }
                 text = newText
             } else {
                 field.text = text
@@ -47,72 +39,24 @@ struct NativeTextEditor: UIViewRepresentable {
         field.setOnFocusChangedListener { focused = $0 }
         field.delegate = field
         field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
-        updateFont(field)
-        updateHeight(field)
         return field
     }
     
     func updateUIView(_ field: UITextView, context: Context) {
         field.text = text
+        field.font = font
         field.textAlignment = alignment == .leading ? .left : .right
-        updateFont(field)
-        updateHeight(field)
-    }
-
-    private func updateHeight(_ field: UITextView) {
-        let maxHeight = min(360, field.font!.lineHeight * 12)
-        // When having emoji in text view and then removing it, sizeThatFits shows previous size (too big for empty text view), so using work around with default size
-        let newHeight = field.text == ""
-        ? defaultHeight
-        : min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, minHeight), maxHeight).rounded(.down)
-
-        if field.frame.size.height != newHeight {
-            field.frame.size = CGSizeMake(field.frame.size.width, newHeight)
-            (field as! CustomUITextField).invalidateIntrinsicContentHeight(newHeight)
-        }
-    }
-
-    private func updateFont(_ field: UITextView) {
-        field.font = isShortEmoji(field.text)
-        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
-        : UIFont.preferredFont(forTextStyle: .body)
     }
 }
 
 private class CustomUITextField: UITextView, UITextViewDelegate {
-    var height: Binding<CGFloat>
-    var newHeight: CGFloat = 0
     var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
     var onFocusChanged: (Bool) -> Void = { focused in }
     
-    init(height: Binding<CGFloat>) {
-        self.height = height
-        super.init(frame: .zero, textContainer: nil)
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("Not implemented")
-    }
-
-    // This func here needed because using frame.size.height in intrinsicContentSize while loading a screen with text (for example. when you have a draft),
-    // produces incorrect height because at that point intrinsicContentSize has old value of frame.size.height even if it was set to new value right before the call
-    // (who knows why...)
-    func invalidateIntrinsicContentHeight(_ newHeight: CGFloat) {
-        self.newHeight = newHeight
-        invalidateIntrinsicContentSize()
-    }
-
-    override var intrinsicContentSize: CGSize {
-        if height.wrappedValue != newHeight {
-            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
-        }
-        return CGSizeMake(0, newHeight)
-    }
-
     func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
         self.onTextChanged = onTextChanged
     }
-
+    
     func setOnFocusChangedListener(onFocusChanged: @escaping (Bool) -> Void) {
         self.onFocusChanged = onFocusChanged
     }
@@ -200,14 +144,14 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
 struct NativeTextEditor_Previews: PreviewProvider{
     static var previews: some View {
-        NativeTextEditor(
+        return NativeTextEditor(
             text: Binding.constant("Hello, world!"),
             disableEditing: Binding.constant(false),
-            height: Binding.constant(100),
+            height: 100,
+            font: UIFont.preferredFont(forTextStyle: .body),
             focused: Binding.constant(false),
             alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )
-        .fixedSize(horizontal: false, vertical: true)
     }
 }

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

@@ -32,12 +32,15 @@ struct SendMessageView: View {
     var sendButtonColor = Color.accentColor
     @State private var teHeight: CGFloat = 42
     @State private var teFont: Font = .body
+    @State private var teUiFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
     @State private var sendButtonSize: CGFloat = 29
     @State private var sendButtonOpacity: CGFloat = 1
     @State private var showCustomDisappearingMessageDialogue = false
     @State private var showCustomTimePicker = false
     @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
     @State private var progressByTimeout = false
+    var maxHeight: CGFloat = 360
+    var minHeight: CGFloat = 37
     @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
 
     var body: some View {
@@ -54,16 +57,30 @@ struct SendMessageView: View {
                             .frame(maxWidth: .infinity)
                     } else {
                         let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
+                        Text(composeState.message)
+                            .lineLimit(10)
+                            .font(teFont)
+                            .multilineTextAlignment(alignment)
+// put text on top (after NativeTextEditor) and set color to precisely align it on changes
+//                            .foregroundColor(.red)
+                            .foregroundColor(.clear)
+                            .padding(.horizontal, 10)
+                            .padding(.top, 8)
+                            .padding(.bottom, 6)
+                            .matchedGeometryEffect(id: "te", in: namespace)
+                            .background(GeometryReader(content: updateHeight))
+
                         NativeTextEditor(
                             text: $composeState.message,
                             disableEditing: $composeState.inProgress,
-                            height: $teHeight,
+                            height: teHeight,
+                            font: teUiFont,
                             focused: $keyboardVisible,
                             alignment: alignment,
                             onImagesAdded: onMediaAdded
                         )
                         .allowsTightening(false)
-                        .fixedSize(horizontal: false, vertical: true)
+                        .frame(height: teHeight)
                     }
                 }
 
@@ -83,13 +100,11 @@ struct SendMessageView: View {
                     .frame(height: teHeight, alignment: .bottom)
                 }
             }
-            .padding(.vertical, 1)
-            .overlay(
+
             RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
                 .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-            )
+                .frame(height: teHeight)
         }
-        .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
             if inProgress {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
@@ -400,12 +415,16 @@ struct SendMessageView: View {
         .padding([.bottom, .trailing], 4)
     }
 
-    private func updateFont(_ text: String) {
+    private func updateHeight(_ g: GeometryProxy) -> Color {
         DispatchQueue.main.async {
-            teFont = isShortEmoji(text)
-            ? (text.count < 4 ? largeEmojiFont : mediumEmojiFont)
-            : .body
+            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
+            (teFont, teUiFont) = isShortEmoji(composeState.message)
+                                    ? composeState.message.count < 4
+                                        ? (largeEmojiFont, largeEmojiUIFont)
+                                        : (mediumEmojiFont, mediumEmojiUIFont)
+                                    : (.body, UIFont.preferredFont(forTextStyle: .body))
         }
+        return Color.clear
     }
 }
 

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

@@ -144,7 +144,7 @@ struct AddGroupMembersViewCommon: View {
             do {
                 for contactId in selectedContacts {
                     let member = try await apiAddMember(groupInfo.groupId, contactId, selectedRole)
-                    await MainActor.run { _ = chatModel.upsertGroupMember(groupInfo, member) }
+                    await MainActor.run { _ = ChatModel.shared.upsertGroupMember(groupInfo, member) }
                 }
                 addedMembersCb(selectedContacts)
             } catch {

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

@@ -15,7 +15,7 @@ struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
-    @Binding var groupInfo: GroupInfo
+    @State var groupInfo: GroupInfo
     @ObservedObject private var alertManager = AlertManager.shared
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
@@ -35,30 +35,14 @@ struct GroupChatInfoView: View {
         case leaveGroupAlert
         case cantInviteIncognitoAlert
         case largeGroupReceiptsDisabled
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
-        case removeMemberAlert(mem: GroupMember)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
-        var id: String {
-            switch self {
-            case .deleteGroupAlert: return "deleteGroupAlert"
-            case .clearChatAlert: return "clearChatAlert"
-            case .leaveGroupAlert: return "leaveGroupAlert"
-            case .cantInviteIncognitoAlert: return "cantInviteIncognitoAlert"
-            case .largeGroupReceiptsDisabled: return "largeGroupReceiptsDisabled"
-            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
-            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
-            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
-            case let .error(title, _): return "error \(title)"
-            }
-        }
+        var id: GroupChatInfoViewAlert { get { self } }
     }
 
     var body: some View {
         NavigationView {
             let members = chatModel.groupMembers
-                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
+                .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved }
                 .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
 
             List {
@@ -73,7 +57,7 @@ struct GroupChatInfoView: View {
                         addOrEditWelcomeMessage()
                     }
                     groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                         sendReceiptsOption()
                     } else {
                         sendReceiptsOptionDisabled()
@@ -100,17 +84,17 @@ struct GroupChatInfoView: View {
                             .padding(.leading, 8)
                     }
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
-                    MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
+                    let filteredMembers = s == "" ? members : members.filter { $0.chatViewName.localizedLowercase.contains(s) }
+                    memberView(groupInfo.membership, user: true)
                     ForEach(filteredMembers) { member in
                         ZStack {
                             NavigationLink {
-                                memberInfoView(member)
+                                memberInfoView(member.groupMemberId)
                             } label: {
                                 EmptyView()
                             }
                             .opacity(0)
-                            MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
+                            memberView(member)
                         }
                     }
                 }
@@ -142,10 +126,6 @@ struct GroupChatInfoView: View {
             case .leaveGroupAlert: return leaveGroupAlert()
             case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
             case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
-            case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
-            case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
-            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
             }
         }
         .onAppear {
@@ -194,7 +174,7 @@ struct GroupChatInfoView: View {
                     Task {
                         let groupMembers = await apiListMembers(groupInfo.groupId)
                         await MainActor.run {
-                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                            ChatModel.shared.groupMembers = groupMembers
                         }
                     }
                 }
@@ -203,92 +183,51 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private struct MemberRowView: View {
-        var groupInfo: GroupInfo
-        @ObservedObject var groupMember: GMember
-        var user: Bool = false
-        @Binding var alert: GroupChatInfoViewAlert?
-
-        var body: some View {
-            let member = groupMember.wrapped
-            let v = HStack{
-                ProfileImage(imageStr: member.image)
-                    .frame(width: 38, height: 38)
-                    .padding(.trailing, 2)
-                // TODO server connection status
-                VStack(alignment: .leading) {
-                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
-                    (member.verified ? memberVerifiedShield + t : t)
-                        .lineLimit(1)
-                    let s = Text(member.memberStatus.shortText)
-                    (user ? Text ("you: ") + s : s)
-                        .lineLimit(1)
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                }
-                Spacer()
-                let role = member.memberRole
-                if role == .owner || role == .admin {
-                    Text(member.memberRole.text)
-                        .foregroundColor(.secondary)
-                }
+    private func memberView(_ member: GroupMember, user: Bool = false) -> some View {
+        HStack{
+            ProfileImage(imageStr: member.image)
+                .frame(width: 38, height: 38)
+                .padding(.trailing, 2)
+            // TODO server connection status
+            VStack(alignment: .leading) {
+                let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
+                (member.verified ? memberVerifiedShield + t : t)
+                    .lineLimit(1)
+                let s = Text(member.memberStatus.shortText)
+                (user ? Text ("you: ") + s : s)
+                    .lineLimit(1)
+                    .font(.caption)
+                    .foregroundColor(.secondary)
             }
-
-            if user {
-                v
-            } else if member.canBeRemoved(groupInfo: groupInfo) {
-                removeSwipe(member, blockSwipe(member, v))
-            } else {
-                blockSwipe(member, v)
-            }
-        }
-
-        private func blockSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
-            v.swipeActions(edge: .leading) {
-                if member.memberSettings.showMessages {
-                    Button {
-                        alert = .blockMemberAlert(mem: member)
-                    } label: {
-                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
-                    }
-                } else {
-                    Button {
-                        alert = .unblockMemberAlert(mem: member)
-                    } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
-                    }
-                }
-            }
-        }
-
-        private func removeSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
-            v.swipeActions(edge: .trailing) {
-                Button(role: .destructive) {
-                    alert = .removeMemberAlert(mem: member)
-                } label: {
-                    Label("Remove member", systemImage: "trash")
-                        .foregroundColor(Color.red)
-                }
+            Spacer()
+            let role = member.memberRole
+            if role == .owner || role == .admin {
+                Text(member.memberRole.text)
+                    .foregroundColor(.secondary)
             }
         }
     }
 
-    private func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
-            .navigationBarHidden(false)
+    private var memberVerifiedShield: Text {
+        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+            .font(.caption)
+            .baselineOffset(2)
+            .kerning(-2)
+            .foregroundColor(.secondary)
+    }
+
+    @ViewBuilder private func memberInfoView(_ groupMemberId: Int64?) -> some View {
+        if let mId = groupMemberId, let member = chatModel.groupMembers.first(where: { $0.groupMemberId == mId }) {
+            GroupMemberInfoView(groupInfo: groupInfo, member: member)
+                .navigationBarHidden(false)
+        }
     }
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            GroupLinkView(
-                groupId: groupInfo.groupId,
-                groupLink: $groupLink,
-                groupLinkMemberRole: $groupLinkMemberRole,
-                showTitle: false,
-                creatingGroup: false
-            )
-            .navigationBarTitle("Group link")
-            .navigationBarTitleDisplayMode(.large)
+            GroupLinkView(groupId: groupInfo.groupId, groupLink: $groupLink, groupLinkMemberRole: $groupLinkMemberRole)
+                .navigationBarTitle("Group link")
+                .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
                 Label("Create group link", systemImage: "link.badge.plus")
@@ -436,28 +375,6 @@ struct GroupChatInfoView: View {
             alert = .largeGroupReceiptsDisabled
         }
     }
-
-    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
-        Alert(
-            title: Text("Remove member?"),
-            message: Text("Member will be removed from group - this cannot be undone!"),
-            primaryButton: .destructive(Text("Remove")) {
-                Task {
-                    do {
-                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
-                        await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
-                        }
-                    } catch let error {
-                        logger.error("apiRemoveMember error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error removing member")
-                        alert = .error(title: a.title, error: a.message)
-                    }
-                }
-            },
-            secondaryButton: .cancel()
-        )
-    }
 }
 
 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -479,14 +396,6 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
     }
 }
 
-private var memberVerifiedShield: Text {
-    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-        .font(.caption)
-        .baselineOffset(2)
-        .kerning(-2)
-        .foregroundColor(.secondary)
-}
-
 func cantInviteIncognitoAlert() -> Alert {
     Alert(
         title: Text("Can't invite contacts!"),
@@ -503,9 +412,6 @@ func largeGroupReceiptsDisabledAlert() -> Alert {
 
 struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupChatInfoView(
-            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData)
-        )
+        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
     }
 }

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

@@ -13,9 +13,6 @@ struct GroupLinkView: View {
     var groupId: Int64
     @Binding var groupLink: String?
     @Binding var groupLinkMemberRole: GroupMemberRole
-    var showTitle: Bool = false
-    var creatingGroup: Bool = false
-    var linkCreatedCb: (() -> Void)? = nil
     @State private var creatingLink = false
     @State private var alert: GroupLinkAlert?
 
@@ -32,35 +29,10 @@ struct GroupLinkView: View {
     }
 
     var body: some View {
-        if creatingGroup {
-            NavigationView {
-                groupLinkView()
-                    .toolbar {
-                        ToolbarItem(placement: .navigationBarTrailing) {
-                            Button ("Continue") { linkCreatedCb?() }
-                        }
-                    }
-            }
-        } else {
-            groupLinkView()
-        }
-    }
-
-    private func groupLinkView() -> some View {
         List {
-            Group {
-                if showTitle {
-                    Text("Group link")
-                        .font(.largeTitle)
-                        .bold()
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-                Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
-            }
-            .listRowBackground(Color.clear)
-            .listRowSeparator(.hidden)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
+            Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
+                .listRowBackground(Color.clear)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
             Section {
                 if let groupLink = groupLink {
                     Picker("Initial role", selection: $groupLinkMemberRole) {
@@ -69,17 +41,15 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
+                    QRCode(uri: groupLink)
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
-                    if !creatingGroup {
-                        Button(role: .destructive) { alert = .deleteLink } label: {
-                            Label("Delete link", systemImage: "trash")
-                        }
+                    Button(role: .destructive) { alert = .deleteLink } label: {
+                        Label("Delete link", systemImage: "trash")
                     }
                 } else {
                     Button(action: createGroupLink) {

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

@@ -12,40 +12,38 @@ import SimpleXChat
 struct GroupMemberInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @State var groupInfo: GroupInfo
-    @ObservedObject var groupMember: GMember
+    var groupInfo: GroupInfo
+    @State var member: GroupMember
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
+    @State private var connectToMemberDialog: Bool = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
     @State private var progressIndicator = false
 
     enum GroupMemberInfoViewAlert: Identifiable {
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
         case removeMemberAlert(mem: GroupMember)
         case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole)
         case switchAddressAlert
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
-        case planAndConnectAlert(alert: PlanAndConnectAlert)
+        case connRequestSentAlert(type: ConnReqType)
         case error(title: LocalizedStringKey, error: LocalizedStringKey)
+        case other(alert: Alert)
 
         var id: String {
             switch self {
-            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
-            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
-            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
-            case let .changeMemberRoleAlert(mem, role): return "changeMemberRoleAlert \(mem.groupMemberId) \(role.rawValue)"
+            case .removeMemberAlert: return "removeMemberAlert"
+            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
             case .switchAddressAlert: return "switchAddressAlert"
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
+            case .connRequestSentAlert: return "connRequestSentAlert"
             case let .error(title, _): return "error \(title)"
+            case let .other(alert): return "other \(alert)"
             }
         }
     }
@@ -70,7 +68,6 @@ struct GroupMemberInfoView: View {
     private func groupMemberInfoView() -> some View {
         ZStack {
             VStack {
-                let member = groupMember.wrapped
                 List {
                     groupMemberInfoHeader(member)
                         .listRowBackground(Color.clear)
@@ -99,9 +96,9 @@ struct GroupMemberInfoView: View {
 
                     if let contactLink = member.contactLink {
                         Section {
-                            SimpleXLinkQRCode(uri: contactLink)
+                            QRCode(uri: contactLink)
                             Button {
-                                showShareSheet(items: [simplexChatLink(contactLink)])
+                                showShareSheet(items: [contactLink])
                             } label: {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
@@ -164,14 +161,9 @@ struct GroupMemberInfoView: View {
                         }
                     }
 
-                    Section {
-                        if member.memberSettings.showMessages {
-                            blockMemberButton(member)
-                        } else {
-                            unblockMemberButton(member)
-                        }
-                        if member.canBeRemoved(groupInfo: groupInfo) {
-                                removeMemberButton(member)
+                    if member.canBeRemoved(groupInfo: groupInfo) {
+                        Section {
+                            removeMemberButton(member)
                         }
                     }
 
@@ -192,7 +184,7 @@ struct GroupMemberInfoView: View {
                     do {
                         let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
                         let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                        _ = chatModel.upsertGroupMember(groupInfo, mem)
+                        member = mem
                         connectionStats = stats
                         connectionCode = code
                     } catch let error {
@@ -200,30 +192,25 @@ struct GroupMemberInfoView: View {
                     }
                     justOpened = false
                 }
-                .onChange(of: newRole) { newRole in
+                .onChange(of: newRole) { _ in
                     if newRole != member.memberRole {
                         alert = .changeMemberRoleAlert(mem: member, role: newRole)
                     }
                 }
-                .onChange(of: member.memberRole) { role in
-                    newRole = role
-                }
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             .alert(item: $alert) { alertItem in
                 switch(alertItem) {
-                case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
-                case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
                 case let .removeMemberAlert(mem): return removeMemberAlert(mem)
                 case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem)
                 case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
                 case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                 case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
-                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
+                case let .connRequestSentAlert(type): return connReqSentAlert(type)
                 case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                case let .other(alert): return alert
                 }
             }
-            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
 
             if progressIndicator {
                 ProgressView().scaleEffect(2)
@@ -233,16 +220,25 @@ struct GroupMemberInfoView: View {
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            planAndConnect(
-                contactLink,
-                showAlert: { alert = .planAndConnectAlert(alert: $0) },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: nil
-            )
+            connectToMemberDialog = true
         } label: {
             Label("Connect", systemImage: "link")
         }
+        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
+            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
+            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
+        }
+    }
+
+    func connectViaAddress(incognito: Bool, contactLink: String) {
+        Task {
+            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
+            if let connReqType = connReqType {
+                alert = .connRequestSentAlert(type: connReqType)
+            } else if let connectAlert = connectAlert {
+                alert = .other(alert: connectAlert)
+            }
+        }
     }
 
     func knownDirectChatButton(_ chat: Chat) -> some View {
@@ -278,7 +274,7 @@ struct GroupMemberInfoView: View {
             progressIndicator = true
             Task {
                 do {
-                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, member.groupMemberId)
                     await MainActor.run {
                         progressIndicator = false
                         chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
@@ -336,20 +332,20 @@ struct GroupMemberInfoView: View {
     }
 
     private func verifyCodeButton(_ code: String) -> some View {
-        let member = groupMember.wrapped
-        return NavigationLink {
+        NavigationLink {
             VerifyCodeView(
                 displayName: member.displayName,
                 connectionCode: code,
                 connectionVerified: member.verified,
                 verify: { code in
-                    var member = groupMember.wrapped
                     if let r = apiVerifyGroupMember(member.groupId, member.groupMemberId, connectionCode: code) {
                         let (verified, existingCode) = r
                         let connCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         member.activeConn?.connectionCode = connCode
-                        _ = chatModel.upsertGroupMember(groupInfo, member)
+                        if let i = chatModel.groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+                            chatModel.groupMembers[i].activeConn?.connectionCode = connCode
+                        }
                         return r
                     }
                     return nil
@@ -383,29 +379,12 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    private func blockMemberButton(_ mem: GroupMember) -> some View {
-        Button(role: .destructive) {
-            alert = .blockMemberAlert(mem: mem)
-        } label: {
-            Label("Block member", systemImage: "hand.raised")
-                .foregroundColor(.red)
-        }
-    }
-
-    private func unblockMemberButton(_ mem: GroupMember) -> some View {
-        Button {
-            alert = .unblockMemberAlert(mem: mem)
-        } label: {
-            Label("Unblock member", systemImage: "hand.raised.slash")
-        }
-    }
-
     private func removeMemberButton(_ mem: GroupMember) -> some View {
         Button(role: .destructive) {
             alert = .removeMemberAlert(mem: mem)
         } label: {
             Label("Remove member", systemImage: "trash")
-                .foregroundColor(.red)
+                .foregroundColor(Color.red)
         }
     }
 
@@ -441,6 +420,7 @@ struct GroupMemberInfoView: View {
                     do {
                         let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
                         await MainActor.run {
+                            member = updatedMember
                             _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                         }
                         
@@ -461,10 +441,10 @@ struct GroupMemberInfoView: View {
     private func switchMemberAddress() {
         Task {
             do {
-                let stats = try apiSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                     dismiss()
                 }
             } catch let error {
@@ -480,10 +460,10 @@ struct GroupMemberInfoView: View {
     private func abortSwitchMemberAddress() {
         Task {
             do {
-                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                 }
             } catch let error {
                 logger.error("abortSwitchMemberAddress apiAbortSwitchGroupMember error: \(responseError(error))")
@@ -498,7 +478,7 @@ struct GroupMemberInfoView: View {
     private func syncMemberConnection(force: Bool) {
         Task {
             do {
-                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, groupMember.groupMemberId, force)
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, force)
                 connectionStats = stats
                 await MainActor.run {
                     chatModel.updateGroupMemberConnectionStats(groupInfo, mem, stats)
@@ -515,54 +495,11 @@ struct GroupMemberInfoView: View {
     }
 }
 
-func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Block member?"),
-        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
-        primaryButton: .destructive(Text("Block")) {
-            toggleShowMemberMessages(gInfo, mem, false)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func unblockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Unblock member?"),
-        message: Text("Messages from \(mem.chatViewName) will be shown!"),
-        primaryButton: .default(Text("Unblock")) {
-            toggleShowMemberMessages(gInfo, mem, true)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func toggleShowMemberMessages(_ gInfo: GroupInfo, _ member: GroupMember, _ showMessages: Bool) {
-    var memberSettings = member.memberSettings
-    memberSettings.showMessages = showMessages
-    updateMemberSettings(gInfo, member, memberSettings)
-}
-
-func updateMemberSettings(_ gInfo: GroupInfo, _ member: GroupMember, _ memberSettings: GroupMemberSettings) {
-    Task {
-        do {
-            try await apiSetMemberSettings(gInfo.groupId, member.groupMemberId, memberSettings)
-            await MainActor.run {
-                var mem = member
-                mem.memberSettings = memberSettings
-                _ = ChatModel.shared.upsertGroupMember(gInfo, mem)
-            }
-        } catch let error {
-            logger.error("apiSetMemberSettings error \(responseError(error))")
-        }
-    }
-}
-
 struct GroupMemberInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
-            groupMember: GMember.sampleData
+            member: GroupMember.sampleData
         )
     }
 }

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

@@ -27,7 +27,8 @@ struct GroupPreferencesView: View {
                 featureSection(.directMessages, $preferences.directMessages.enable)
                 featureSection(.reactions, $preferences.reactions.enable)
                 featureSection(.voice, $preferences.voice.enable)
-                featureSection(.files, $preferences.files.enable)
+//                TODO uncomment in 5.3
+//                featureSection(.files, $preferences.files.enable)
 
                 if groupInfo.canEdit {
                     Section {

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

@@ -9,18 +9,6 @@
 import SwiftUI
 import SimpleXChat
 
-enum GroupProfileAlert: Identifiable {
-    case saveError(err: String)
-    case invalidName(validName: String)
-
-    var id: String {
-        switch self {
-        case let .saveError(err): return "saveError \(err)"
-        case let .invalidName(validName): return "invalidName \(validName)"
-        }
-    }
-}
-
 struct GroupProfileView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -30,7 +18,8 @@ struct GroupProfileView: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: GroupProfileAlert?
+    @State private var showSaveErrorAlert = false
+    @State private var saveGroupError: String? = nil
     @FocusState private var focusDisplayName
 
     var body: some View {
@@ -58,29 +47,20 @@ struct GroupProfileView: View {
             .frame(maxWidth: .infinity, alignment: .center)
 
             VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
-                    if !validNewProfileName() {
-                        Button {
-                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
-                        } label: {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                ZStack(alignment: .leading) {
+                    if !validDisplayName(groupProfile.displayName) {
+                        Image(systemName: "exclamationmark.circle")
+                            .foregroundColor(.red)
+                            .padding(.bottom, 10)
                     }
                     profileNameTextEdit("Group display name", $groupProfile.displayName)
                         .focused($focusDisplayName)
                 }
-                .padding(.bottom)
-                let fullName = groupInfo.groupProfile.fullName
-                if fullName != "" && fullName != groupProfile.displayName {
-                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
-                        .padding(.bottom)
-                }
+                profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
                 HStack(spacing: 20) {
                     Button("Cancel") { dismiss() }
                     Button("Save group profile") { saveProfile() }
-                        .disabled(!canUpdateProfile())
+                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
                 }
             }
             .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -119,39 +99,27 @@ struct GroupProfileView: View {
                 focusDisplayName = true
             }
         }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .saveError(err):
-                return Alert(
-                    title: Text("Error saving group profile"),
-                    message: Text(err)
-                )
-            case let .invalidName(name):
-                return createInvalidNameAlert(name, $groupProfile.displayName)
-            }
+        .alert(isPresented: $showSaveErrorAlert) {
+            Alert(
+                title: Text("Error saving group profile"),
+                message: Text("\(saveGroupError ?? "Unexpected error")")
+            )
         }
         .contentShape(Rectangle())
         .onTapGesture { hideKeyboard() }
     }
 
-    private func canUpdateProfile() -> Bool {
-        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
-    }
-
-    private func validNewProfileName() -> Bool {
-        groupProfile.displayName == groupInfo.groupProfile.displayName
-            || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
-    }
-
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func saveProfile() {
         Task {
             do {
-                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
                     groupInfo = gInfo
@@ -160,7 +128,8 @@ struct GroupProfileView: View {
                 }
             } catch let error {
                 let err = responseError(error)
-                alert = .saveError(err: err)
+                saveGroupError = err
+                showSaveErrorAlert = true
                 logger.error("GroupProfile apiUpdateGroup error: \(err)")
             }
         }

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

@@ -32,110 +32,55 @@ struct ChatListNavLink: View {
     @State private var showJoinGroupDialog = false
     @State private var showContactConnectionInfo = false
     @State private var showInvalidJSON = false
-    @State private var showDeleteContactActionSheet = false
-    @State private var showConnectContactViaAddressDialog = false
-    @State private var inProgress = false
-    @State private var progressByTimeout = false
 
     var body: some View {
-        Group {
-            switch chat.chatInfo {
-            case let .direct(contact):
-                contactNavLink(contact)
-            case let .group(groupInfo):
-                groupNavLink(groupInfo)
-            case let .contactRequest(cReq):
-                contactRequestNavLink(cReq)
-            case let .contactConnection(cConn):
-                contactConnectionNavLink(cConn)
-            case let .invalidJSON(json):
-                invalidJSONPreview(json)
-            }
-        }
-        .onChange(of: inProgress) { inProgress in
-            if inProgress {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    progressByTimeout = inProgress
-                }
-            } else {
-                progressByTimeout = false
-            }
+        switch chat.chatInfo {
+        case let .direct(contact):
+            contactNavLink(contact)
+        case let .group(groupInfo):
+            groupNavLink(groupInfo)
+        case let .contactRequest(cReq):
+            contactRequestNavLink(cReq)
+        case let .contactConnection(cConn):
+            contactConnectionNavLink(cConn)
+        case let .invalidJSON(json):
+            invalidJSONPreview(json)
         }
     }
 
     @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil {
-                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: rowHeights[dynamicTypeSize])
-                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                        Button {
-                            showDeleteContactActionSheet = true
-                        } label: {
-                            Label("Delete", systemImage: "trash")
-                        }
-                        .tint(.red)
-                    }
-                    .onTapGesture { showConnectContactViaAddressDialog = true }
-                    .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-                        Button("Use current profile") { connectContactViaAddress_(contact, false) }
-                        Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-                    }
-            } else {
-                NavLinkPlain(
-                    tag: chat.chatInfo.id,
-                    selection: $chatModel.chatId,
-                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
-                )
-                .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                    markReadButton()
-                    toggleFavoriteButton()
-                    toggleNtfsButton(chat)
-                }
-                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                    if !chat.chatItems.isEmpty {
-                        clearChatButton()
-                    }
-                    Button {
-                        if contact.ready || !contact.active {
-                            showDeleteContactActionSheet = true
-                        } else {
-                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
-                        }
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
-                    .tint(.red)
-                }
-                .frame(height: rowHeights[dynamicTypeSize])
-            }
+        NavLinkPlain(
+            tag: chat.chatInfo.id,
+            selection: $chatModel.chatId,
+            label: { ChatPreviewView(chat: chat) }
+        )
+        .swipeActions(edge: .leading, allowsFullSwipe: true) {
+            markReadButton()
+            toggleFavoriteButton()
+            toggleNtfsButton(chat)
         }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
-                        .cancel()
-                    ]
-                )
-            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
-                        .cancel()
-                    ]
-                )
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            if !chat.chatItems.isEmpty {
+                clearChatButton()
             }
+            Button {
+                AlertManager.shared.showAlert(
+                    contact.ready
+                    ? deleteContactAlert(chat.chatInfo)
+                    : deletePendingContactAlert(chat, contact)
+                )
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
         }
+        .frame(height: rowHeights[dynamicTypeSize])
     }
 
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
-            ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
@@ -146,16 +91,12 @@ struct ChatListNavLink: View {
                 .onTapGesture { showJoinGroupDialog = true }
                 .confirmationDialog("Group invitation", isPresented: $showJoinGroupDialog, titleVisibility: .visible) {
                     Button(chat.chatInfo.incognito ? "Join incognito" : "Join group") {
-                        inProgress = true
-                        joinGroup(groupInfo.groupId) {
-                            await MainActor.run { inProgress = false }
-                        }
+                        joinGroup(groupInfo.groupId)
                     }
                     Button("Delete invitation", role: .destructive) { Task { await deleteChat(chat) } }
                 }
-                .disabled(inProgress)
         case .memAccepted:
-            ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
@@ -172,7 +113,7 @@ struct ChatListNavLink: View {
             NavLinkPlain(
                 tag: chat.chatInfo.id,
                 selection: $chatModel.chatId,
-                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
+                label: { ChatPreviewView(chat: chat) },
                 disabled: !groupInfo.ready
             )
             .frame(height: rowHeights[dynamicTypeSize])
@@ -197,10 +138,7 @@ struct ChatListNavLink: View {
 
     private func joinGroupButton() -> some View {
         Button {
-            inProgress = true
-            joinGroup(chat.chatInfo.apiId) {
-                await MainActor.run { inProgress = false }
-            }
+            joinGroup(chat.chatInfo.apiId)
         } label: {
             Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
@@ -331,6 +269,17 @@ struct ChatListNavLink: View {
         }
     }
 
+    private func deleteContactAlert(_ chatInfo: ChatInfo) -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task { await deleteChat(chat) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group?"),
@@ -432,17 +381,6 @@ struct ChatListNavLink: View {
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
             }
     }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
-            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
-            }
-        }
-    }
 }
 
 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
@@ -471,22 +409,7 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
     )
 }
 
-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
-    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
-    if let alert = alert {
-        AlertManager.shared.showAlert(alert)
-        return false
-    } else if let contact = contact {
-        await MainActor.run {
-            ChatModel.shared.updateContact(contact)
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
-        }
-        return true
-    }
-    return false
-}
-
-func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
+func joinGroup(_ groupId: Int64) {
     Task {
         logger.debug("joinGroup")
         do {
@@ -501,9 +424,7 @@ func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
                 AlertManager.shared.showAlertMsg(title: "No group!", message: "This group no longer exists.")
                 await deleteGroup()
             }
-            await onComplete()
         } catch let error {
-            await onComplete()
             let a = getErrorAlert(error, "Error joining group")
             AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
         }

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

@@ -15,7 +15,6 @@ struct ChatListView: View {
     @State private var searchText = ""
     @State private var showAddChat = false
     @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
 
     var body: some View {
@@ -30,7 +29,7 @@ struct ChatListView: View {
         ZStack(alignment: .topLeading) {
             NavStackCompat(
                 isActive: Binding(
-                    get: { chatModel.chatId != nil },
+                    get: { ChatModel.shared.chatId != nil },
                     set: { _ in }
                 ),
                 destination: chatView
@@ -49,14 +48,7 @@ struct ChatListView: View {
                     }
                 }
             }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
+            UserPicker(showSettings: $showSettings, userPickerVisible: $userPickerVisible)
         }
     }
 
@@ -185,6 +177,13 @@ struct ChatListView: View {
                 showAddChat = true
             }
 
+            connectButton("or chat with the developers") {
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(simplexTeamURL)
+                }
+            }
+            .padding(.top, 10)
+
             Spacer()
             Text("You have no chats")
                 .foregroundColor(.secondary)

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

@@ -12,7 +12,6 @@ import SimpleXChat
 struct ChatPreviewView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var chat: Chat
-    @Binding var progressByTimeout: Bool
     @Environment(\.colorScheme) var colorScheme
     var darkGreen = Color(red: 0, green: 0.5, blue: 0)
 
@@ -58,26 +57,19 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            if !contact.active {
-                inactiveIcon()
-            } else {
-                EmptyView()
-            }
-        case let .group(groupInfo):
+        if case let .group(groupInfo) = chat.chatInfo {
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: inactiveIcon()
-            case .memRemoved: inactiveIcon()
-            case .memGroupDeleted: inactiveIcon()
+            case .memLeft: groupInactiveIcon()
+            case .memRemoved: groupInactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
             default: EmptyView()
             }
-        default:
+        } else {
             EmptyView()
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    @ViewBuilder private func groupInactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -88,6 +80,7 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             previewTitle(contact.verified == true ? verifiedIcon + t : t)
+                .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
         case let .group(groupInfo):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
@@ -112,17 +105,14 @@ struct ChatPreviewView: View {
 
     private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
         ZStack(alignment: .topTrailing) {
-            let t = text
+            text
                 .lineLimit(2)
                 .multilineTextAlignment(.leading)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-            if !showChatPreviews && !draft {
-                t.privacySensitive(true).redacted(reason: .privacy)
-            } else {
-                t
-            }
+                .privacySensitive(!showChatPreviews && !draft)
+                .redacted(reason: .privacy)
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -190,13 +180,10 @@ struct ChatPreviewView: View {
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil {
-                    chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
-                } else if !contact.ready && contact.activeConn != nil {
+                if !contact.ready {
                     if contact.nextSendGrpInv {
                         chatPreviewInfoText("send direct message")
-                    } else if contact.active {
+                    } else {
                         chatPreviewInfoText("connecting…")
                     }
                 }
@@ -241,26 +228,16 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatStatusImage() -> some View {
         switch chat.chatInfo {
         case let .direct(contact):
-            if contact.active && contact.activeConn != nil {
-                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito)
-                case .error:
-                    Image(systemName: "exclamationmark.circle")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 17, height: 17)
-                        .foregroundColor(.secondary)
-                default:
-                    ProgressView()
-                }
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
-            }
-        case .group:
-            if progressByTimeout {
+            switch (chatModel.contactNetworkStatus(contact)) {
+            case .connected: incognitoIcon(chat.chatInfo.incognito)
+            case .error:
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 17, height: 17)
+                    .foregroundColor(.secondary)
+            default:
                 ProgressView()
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
             }
         default:
             incognitoIcon(chat.chatInfo.incognito)
@@ -290,30 +267,30 @@ struct ChatPreviewView_Previews: PreviewProvider {
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: []
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.group,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, d. consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
         }
         .previewLayout(.fixed(width: 360, height: 78))
     }

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

@@ -61,7 +61,7 @@ struct ContactConnectionInfo: View {
 
                     if contactConnection.initiated,
                        let connReqInv = contactConnection.connReqInv {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                        QRCode(uri: connReqInv)
                         incognitoEnabled()
                         shareLinkButton(connReqInv)
                         oneTimeLinkLearnMoreButton()
@@ -119,7 +119,7 @@ struct ContactConnectionInfo: View {
                 if let conn = try await apiSetConnectionAlias(connId: contactConnection.pccConnId, localAlias: localAlias) {
                     await MainActor.run {
                         contactConnection = conn
-                        m.updateContactConnection(conn)
+                        ChatModel.shared.updateContactConnection(conn)
                         dismiss()
                     }
                 }

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

@@ -13,7 +13,6 @@ struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     @Binding var showSettings: Bool
-    @Binding var showConnectDesktop: Bool
     @Binding var userPickerVisible: Bool
     @State var scrollViewContentSize: CGSize = .zero
     @State var disableScrolling: Bool = true
@@ -63,13 +62,6 @@ struct UserPicker: View {
                 .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
                 .frame(maxHeight: scrollViewContentSize.height)
 
-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-                Divider()
                 menuButton("Settings", icon: "gearshape") {
                     showSettings = true
                     withAnimation {
@@ -93,7 +85,7 @@ struct UserPicker: View {
             do {
                 m.users = try listUsers()
             } catch let error {
-                logger.error("Error loading users \(responseError(error))")
+                logger.error("Error updating users \(responseError(error))")
             }
         }
     }
@@ -152,8 +144,7 @@ struct UserPicker: View {
                     .overlay(DetermineWidth())
                 Spacer()
                 Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(.secondary)
+//                    .frame(width: 24, alignment: .center)
             }
             .padding(.horizontal)
             .padding(.vertical, 22)
@@ -179,7 +170,6 @@ struct UserPicker_Previews: PreviewProvider {
         m.users = [UserInfo.sampleData, UserInfo.sampleData]
         return UserPicker(
             showSettings: Binding.constant(false),
-            showConnectDesktop: Binding.constant(false),
             userPickerVisible: Binding.constant(true)
         )
         .environmentObject(m)

apps/ios/Shared/Views/Helpers/VideoPlayerView.swift

@@ -6,7 +6,6 @@
 import Foundation
 import SwiftUI
 import AVKit
-import Combine
 
 struct VideoPlayerView: UIViewRepresentable {
 
@@ -38,14 +37,6 @@ struct VideoPlayerView: UIViewRepresentable {
             player.seek(to: CMTime.zero)
             player.play()
         }
-        var played = false
-        context.coordinator.publisher = player.publisher(for: \.timeControlStatus).sink { status in
-            if played || status == .playing {
-                AppDelegate.keepScreenOn(status == .playing)
-                AudioPlayer.changeAudioSession(status == .playing)
-            }
-            played = status == .playing
-        }
         return controller.view
     }
 
@@ -59,13 +50,12 @@ struct VideoPlayerView: UIViewRepresentable {
     class Coordinator: NSObject {
         var controller: AVPlayerViewController?
         var timeObserver: Any? = nil
-        var publisher: AnyCancellable? = nil
 
         deinit {
+            print("deinit coordinator of VideoPlayer")
             if let timeObserver = timeObserver {
                 NotificationCenter.default.removeObserver(timeObserver)
             }
-            publisher?.cancel()
         }
     }
 }

apps/ios/Shared/Views/NewChat/AddContactView.swift

@@ -21,7 +21,7 @@ struct AddContactView: View {
             List {
                 Section {
                     if connReqInvitation != "" {
-                        SimpleXLinkQRCode(uri: connReqInvitation)
+                        QRCode(uri: connReqInvitation)
                     } else {
                         ProgressView()
                             .progressViewStyle(.circular)
@@ -48,7 +48,7 @@ struct AddContactView: View {
                        let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
                         await MainActor.run {
                             contactConnection = conn
-                            chatModel.updateContactConnection(conn)
+                            ChatModel.shared.updateContactConnection(conn)
                         }
                     }
                 } catch {
@@ -99,7 +99,7 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {
 
 func shareLinkButton(_ connReqInvitation: String) -> some View {
     Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
+        showShareSheet(items: [connReqInvitation])
     } label: {
         settingsRow("square.and.arrow.up") {
             Text("Share 1-time link")

apps/ios/Shared/Views/NewChat/AddGroupView.swift

@@ -12,45 +12,27 @@ import SimpleXChat
 struct AddGroupView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @State private var chat: Chat?
     @State private var groupInfo: GroupInfo?
     @State private var profile = GroupProfile(displayName: "", fullName: "")
     @FocusState private var focusDisplayName
+    @FocusState private var focusFullName
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var showInvalidNameAlert = false
-    @State private var groupLink: String?
-    @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
         if let chat = chat, let groupInfo = groupInfo {
-            if !groupInfo.membership.memberIncognito {
-                AddGroupMembersViewCommon(
-                    chat: chat,
-                    groupInfo: groupInfo,
-                    creatingGroup: true,
-                    showFooterCounter: false
-                ) { _ in
-                    dismiss()
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
-                    }
-                }
-            } else {
-                GroupLinkView(
-                    groupId: groupInfo.groupId,
-                    groupLink: $groupLink,
-                    groupLinkMemberRole: $groupLinkMemberRole,
-                    showTitle: true,
-                    creatingGroup: true
-                ) {
-                    dismiss()
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
-                    }
+            AddGroupMembersViewCommon(
+                chat: chat,
+                groupInfo: groupInfo,
+                creatingGroup: true,
+                showFooterCounter: false
+            ) { _ in
+                dismiss()
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    m.chatId = groupInfo.id
                 }
             }
         } else {
@@ -59,62 +41,79 @@ struct AddGroupView: View {
     }
 
     func createGroupView() -> some View {
-        List {
-            Group {
-                Text("Create secret group")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.bottom, 24)
-                    .onTapGesture(perform: hideKeyboard)
+        VStack(alignment: .leading) {
+            Text("Create secret group")
+                .font(.largeTitle)
+                .padding(.vertical, 4)
+            Text("The group is fully decentralized – it is visible only to the members.")
+                .padding(.bottom, 4)
 
-                ZStack(alignment: .center) {
-                    ZStack(alignment: .topTrailing) {
-                        ProfileImage(imageStr: profile.image, color: Color(uiColor: .secondarySystemGroupedBackground))
-                            .aspectRatio(1, contentMode: .fit)
-                            .frame(maxWidth: 128, maxHeight: 128)
-                        if profile.image != nil {
-                            Button {
-                                profile.image = nil
-                            } label: {
-                                Image(systemName: "multiply")
-                                    .resizable()
-                                    .aspectRatio(contentMode: .fit)
-                                    .frame(width: 12)
-                            }
+            HStack {
+                Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                Spacer().frame(width: 8)
+                Text("Your chat profile will be sent to group members").font(.footnote)
+            }
+            .padding(.bottom)
+
+            ZStack(alignment: .center) {
+                ZStack(alignment: .topTrailing) {
+                    profileImageView(profile.image)
+                    if profile.image != nil {
+                        Button {
+                            profile.image = nil
+                        } label: {
+                            Image(systemName: "multiply")
+                                .resizable()
+                                .aspectRatio(contentMode: .fit)
+                                .frame(width: 12)
                         }
                     }
+                }
 
-                    editImageButton { showChooseSource = true }
-                        .buttonStyle(BorderlessButtonStyle()) // otherwise whole "list row" is clickable
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
+                editImageButton { showChooseSource = true }
             }
-            .listRowBackground(Color.clear)
-            .listRowSeparator(.hidden)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            .frame(maxWidth: .infinity, alignment: .center)
+            .padding(.bottom, 4)
 
-            Section {
-                groupNameTextField()
-                Button(action: createGroup) {
-                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
+            ZStack(alignment: .topLeading) {
+                if !validDisplayName(profile.displayName) {
+                    Image(systemName: "exclamationmark.circle")
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
                 }
-                .disabled(!canCreateProfile())
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedGroupProfileInfo(incognitoDefault)
-                    Text("Fully decentralized – visible only to members.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .onTapGesture(perform: hideKeyboard)
+                textField("Group display name", text: $profile.displayName)
+                    .focused($focusDisplayName)
+                    .submitLabel(.next)
+                    .onSubmit {
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
+                    }
             }
+            textField("Group full name (optional)", text: $profile.fullName)
+                .focused($focusFullName)
+                .submitLabel(.go)
+                .onSubmit {
+                    if canCreateProfile() { createGroup() }
+                    else { focusFullName = true }
+                }
+
+            Spacer()
+
+            Button {
+                createGroup()
+            } label: {
+                Text("Create")
+                Image(systemName: "greaterthan")
+            }
+            .disabled(!canCreateProfile())
+            .frame(maxWidth: .infinity, alignment: .trailing)
         }
         .onAppear() {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 focusDisplayName = true
             }
         }
+        .padding()
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -134,9 +133,6 @@ struct AddGroupView: View {
                 didSelectItem in showImagePicker = false
             }
         }
-        .alert(isPresented: $showInvalidNameAlert) {
-            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
-        }
         .onChange(of: chosenImage) { image in
             if let image = image {
                 profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
@@ -144,52 +140,26 @@ struct AddGroupView: View {
                 profile.image = nil
             }
         }
-    }
-
-    func groupNameTextField() -> some View {
-        ZStack(alignment: .leading) {
-            let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-            if name != mkValidName(name) {
-                Button {
-                    showInvalidNameAlert = true
-                } label: {
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                }
-            } else {
-                Image(systemName: "pencil").foregroundColor(.secondary)
-            }
-            textField("Enter group name…", text: $profile.displayName)
-                .focused($focusDisplayName)
-                .submitLabel(.continue)
-                .onSubmit {
-                    if canCreateProfile() { createGroup() }
-                }
-        }
+        .contentShape(Rectangle())
+        .onTapGesture { hideKeyboard() }
     }
 
     func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
         TextField(placeholder, text: text)
-            .padding(.leading, 36)
-    }
-
-    func sharedGroupProfileInfo(_ incognito: Bool) -> Text {
-        let name = ChatModel.shared.currentUser?.displayName ?? ""
-        return Text(
-            incognito
-            ? "A new random profile will be shared."
-            : "Your profile **\(name)** will be shared."
-        )
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
     }
 
     func createGroup() {
         hideKeyboard()
         do {
-            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
-            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
+            let gInfo = try apiNewGroup(profile)
             Task {
                 let groupMembers = await apiListMembers(gInfo.groupId)
                 await MainActor.run {
-                    m.groupMembers = groupMembers.map { GMember.init($0) }
+                    ChatModel.shared.groupMembers = groupMembers
                 }
             }
             let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
@@ -210,8 +180,7 @@ struct AddGroupView: View {
     }
 
     func canCreateProfile() -> Bool {
-        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-        return name != "" && validDisplayName(name)
+        profile.displayName != "" && validDisplayName(profile.displayName)
     }
 }
 

apps/ios/Shared/Views/NewChat/NewChatButton.swift

@@ -58,398 +58,65 @@ struct NewChatButton: View {
     }
 }
 
-enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
-
-    var id: String {
-        switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
-        }
-    }
+enum ConnReqType: Equatable {
+    case contact
+    case invitation
 }
 
-func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
-    switch alert {
-    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own one-time link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case .invitationLinkConnecting:
-        return Alert(
-            title: Text("Already connecting!"),
-            message: Text("You are already connecting via this one-time link!")
-        )
-    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own SimpleX address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat connection request?"),
-            message: Text("You have already requested connection via this address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Join group?"),
-            message: Text("You will connect to all group members."),
-            primaryButton: .default(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat join request?"),
-            message: Text("You are already joining the group via this link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnecting(_, groupInfo):
-        if let groupInfo = groupInfo {
-            return Alert(
-                title: Text("Group already exists!"),
-                message: Text("You are already joining the group \(groupInfo.displayName).")
-            )
-        } else {
-            return Alert(
-                title: Text("Already joining the group!"),
-                message: Text("You are already joining the group via this link.")
-            )
-        }
-    }
-}
-
-enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
-
-    var id: String {
-        switch self {
-        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool) -> ActionSheet {
-    switch sheet {
-    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
-        return ActionSheet(
-            title: Text("Connect with \(contact.chatViewName)"),
-            buttons: [
-                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
-        if let incognito = incognito {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) },
-                    .cancel()
-                ]
-            )
-        } else {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                    .cancel()
-                ]
-            )
-        }
-    }
-}
-
-func planAndConnect(
-    _ connectionLink: String,
-    showAlert: @escaping (PlanAndConnectAlert) -> Void,
-    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
-    dismiss: Bool,
-    incognito: Bool?
-) {
-    Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
-            switch connectionPlan {
-            case let .invitationLink(ilp):
-                switch ilp {
-                case .ok:
-                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
-                    }
-                case let .connecting(contact_):
-                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                }
-            case let .contactAddress(cap):
-                switch cap {
-                case .ok:
-                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
-                    }
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
-                    }
-                case let .connectingProhibit(contact):
-                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                case let .contactViaAddress(contact):
-                    logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
-                    }
-                }
-            case let .groupLink(glp):
-                switch glp {
-                case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
-                    }
-                case let .ownLink(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
-                    }
-                case let .connectingProhibit(groupInfo_):
-                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
-                case let .known(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
-                }
-            }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
-            }
-        }
-    }
-}
-
-private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool) {
-    Task {
-        if dismiss {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true)
-            }
-        }
-        _ = await connectContactViaAddress(contact.contactId, incognito)
-    }
-}
-
-private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
+func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
     Task {
         if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
-            } else {
-                crt = connReqType
-            }
             DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(crt))
-                    }
-                } else {
-                    AlertManager.shared.showAlert(connReqSentAlert(crt))
-                }
+                dismiss?()
+                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
             }
         } else {
-            if dismiss {
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true)
-                }
-            }
-        }
-    }
-}
-
-func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
             DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = c.id
-                    showAlreadyExistsAlert?()
-                }
+                dismiss?()
             }
         }
     }
 }
 
-func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = g.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
+struct CReqClientData: Decodable {
+    var type: String
+    var groupLinkId: String?
+}
+
+func parseLinkQueryData(_ connectionLink: String) -> CReqClientData? {
+    if let hashIndex = connectionLink.firstIndex(of: "#"),
+       let urlQuery = URL(string: String(connectionLink[connectionLink.index(after: hashIndex)...])),
+       let components = URLComponents(url: urlQuery, resolvingAgainstBaseURL: false),
+       let data = components.queryItems?.first(where: { $0.name == "data" })?.value,
+       let d = data.data(using: .utf8),
+       let crData = try? getJSONDecoder().decode(CReqClientData.self, from: d) {
+        return crData
+    } else {
+        return nil
     }
 }
 
-func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connecting to \(contact.displayName)."
+func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
+    return crData.type == "group" && crData.groupLinkId != nil
+}
+
+func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
+    return Alert(
+        title: Text("Connect via group link?"),
+        message: Text("You will join a group this link refers to and connect to its group members."),
+        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
+            connectViaLink(connectionLink, incognito: incognito)
+        },
+        secondaryButton: .cancel()
     )
 }
 
-func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    mkAlert(
-        title: "Group already exists",
-        message: "You are already in group \(groupInfo.displayName)."
-    )
-}
-
-enum ConnReqType: Equatable {
-    case invitation
-    case contact
-    case groupLink
-
-    var connReqSentText: LocalizedStringKey {
-        switch self {
-        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
-        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
-        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
-        }
-    }
-}
-
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
-    switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
-    }
-}
-
 func connReqSentAlert(_ type: ConnReqType) -> Alert {
     return mkAlert(
         title: "Connection request sent!",
-        message: type.connReqSentText
+        message: type == .contact
+            ? "You will be connected when your connection request is accepted, please wait or check later!"
+            : "You will be connected when your contact's device is online, please wait or check later!"
     )
 }
 

apps/ios/Shared/Views/NewChat/PasteToConnectView.swift

@@ -14,8 +14,6 @@ struct PasteToConnectView: View {
     @State private var connectionLink: String = ""
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @FocusState private var linkEditorFocused: Bool
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         List {
@@ -54,15 +52,11 @@ struct PasteToConnectView: View {
                 
                 IncognitoToggle(incognitoEnabled: $incognitoDefault)
             } footer: {
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedProfileInfo(incognitoDefault)
-                    Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
+                sharedProfileInfo(incognitoDefault)
+                + Text(String("\n\n"))
+                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
             }
         }
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     private func linkEditor() -> some View {
@@ -89,13 +83,13 @@ struct PasteToConnectView: View {
 
     private func connect() {
         let link = connectionLink.trimmingCharacters(in: .whitespaces)
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: incognitoDefault
-        )
+        if let crData = parseLinkQueryData(link),
+           checkCRDataGroup(crData) {
+            dismiss()
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
+        } else {
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
+        }
     }
 }
 

apps/ios/Shared/Views/NewChat/QRCode.swift

@@ -28,22 +28,6 @@ struct MutableQRCode: View {
     }
 }
 
-struct SimpleXLinkQRCode: View {
-    let uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-
-    var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor)
-    }
-}
-
-func simplexChatLink(_ uri: String) -> String {
-    uri.starts(with: "simplex:/")
-    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
-    : uri
-}
-
 struct QRCode: View {
     let uri: String
     var withLogo: Bool = true

apps/ios/Shared/Views/NewChat/ScanToConnectView.swift

@@ -13,8 +13,6 @@ import CodeScanner
 struct ScanToConnectView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         ScrollView {
@@ -38,11 +36,11 @@ struct ScanToConnectView: View {
                     )
                     .padding(.top)
 
-                VStack(alignment: .leading, spacing: 4) {
+                Group {
                     sharedProfileInfo(incognitoDefault)
-                    Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
+                    + Text(String("\n\n"))
+                    + Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
                 }
-                .frame(maxWidth: .infinity, alignment: .leading)
                 .font(.footnote)
                 .foregroundColor(.secondary)
                 .padding(.horizontal)
@@ -51,20 +49,18 @@ struct ScanToConnectView: View {
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
         .background(Color(.systemGroupedBackground))
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     func processQRCode(_ resp: Result<ScanResult, ScanError>) {
         switch resp {
         case let .success(r):
-            planAndConnect(
-                r.string,
-                showAlert: { alert = $0 },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: incognitoDefault
-            )
+            if let crData = parseLinkQueryData(r.string),
+               checkCRDataGroup(crData) {
+                dismiss()
+                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
+            } else {
+                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
+            }
         case let .failure(e):
             logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
             dismiss()

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

@@ -9,244 +9,175 @@
 import SwiftUI
 import SimpleXChat
 
-enum UserProfileAlert: Identifiable {
-    case duplicateUserError
-    case createUserError(error: LocalizedStringKey)
-    case invalidNameError(validName: String)
-
-    var id: String {
-        switch self {
-        case .duplicateUserError: return "duplicateUserError"
-        case .createUserError: return "createUserError"
-        case let .invalidNameError(validName): return "invalidNameError \(validName)"
-        }
-    }
-}
-
 struct CreateProfile: View {
-    @Environment(\.dismiss) var dismiss
-    @State private var displayName: String = ""
-    @FocusState private var focusDisplayName
-    @State private var alert: UserProfileAlert?
-
-    var body: some View {
-        List {
-            Section {
-                TextField("Enter your name…", text: $displayName)
-                    .focused($focusDisplayName)
-                Button {
-                    createProfile(displayName, showAlert: { alert = $0 }, dismiss: dismiss)
-                } label: {
-                    Label("Create profile", systemImage: "checkmark")
-                }
-                .disabled(!canCreateProfile(displayName))
-            } header: {
-                HStack {
-                    Text("Your profile")
-                    let name = displayName.trimmingCharacters(in: .whitespaces)
-                    let validName = mkValidName(name)
-                    if name != validName {
-                        Spacer()
-                        Image(systemName: "exclamationmark.circle")
-                            .foregroundColor(.red)
-                            .onTapGesture {
-                                alert = .invalidNameError(validName: validName)
-                            }
-                    }
-                }
-                .frame(height: 20)
-            } footer: {
-                VStack(alignment: .leading, spacing: 8) {
-                    Text("Your profile, contacts and delivered messages are stored on your device.")
-                    Text("The profile is only shared with your contacts.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-            }
-        }
-        .navigationTitle("Create your profile")
-        .alert(item: $alert) { a in userProfileAlert(a, $displayName) }
-        .onAppear() {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                focusDisplayName = true
-            }
-        }
-        .keyboardPadding()
-    }
-}
-
-struct CreateFirstProfile: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss
     @State private var displayName: String = ""
+    @State private var fullName: String = ""
     @FocusState private var focusDisplayName
+    @FocusState private var focusFullName
+    @State private var alert: CreateProfileAlert?
+
+    private enum CreateProfileAlert: Identifiable {
+        case duplicateUserError
+        case createUserError(error: LocalizedStringKey)
+
+        var id: String {
+            switch self {
+            case .duplicateUserError: return "duplicateUserError"
+            case .createUserError: return "createUserError"
+            }
+        }
+    }
 
     var body: some View {
         VStack(alignment: .leading) {
-            Group {
-                Text("Create your profile")
-                    .font(.largeTitle)
-                    .bold()
-                Text("Your profile, contacts and delivered messages are stored on your device.")
-                    .foregroundColor(.secondary)
-                Text("The profile is only shared with your contacts.")
-                    .foregroundColor(.secondary)
-                    .padding(.bottom)
-            }
-            .padding(.bottom)
-
+            Text("Create your profile")
+                .font(.largeTitle)
+                .bold()
+                .padding(.bottom, 4)
+                .frame(maxWidth: .infinity)
+            Text("Your profile, contacts and delivered messages are stored on your device.")
+                .padding(.bottom, 4)
+            Text("The profile is only shared with your contacts.")
+                .padding(.bottom)
             ZStack(alignment: .topLeading) {
-                let name = displayName.trimmingCharacters(in: .whitespaces)
-                let validName = mkValidName(name)
-                if name != validName {
-                    Button {
-                        showAlert(.invalidNameError(validName: validName))
-                    } label: {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                    }
-                } else {
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                if !validDisplayName(displayName) {
+                    Image(systemName: "exclamationmark.circle")
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
                 }
-                TextField("Enter your name…", text: $displayName)
+                textField("Display name", text: $displayName)
                     .focused($focusDisplayName)
-                    .padding(.leading, 32)
+                    .submitLabel(.next)
+                    .onSubmit {
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
+                    }
             }
-            .padding(.bottom)
+            textField("Full name (optional)", text: $fullName)
+                .focused($focusFullName)
+                .submitLabel(.go)
+                .onSubmit {
+                    if canCreateProfile() { createProfile() }
+                    else { focusFullName = true }
+                }
+
             Spacer()
-            onboardingButtons()
+
+            HStack {
+                if m.users.isEmpty {
+                    Button {
+                        hideKeyboard()
+                        withAnimation {
+                            m.onboardingStage = .step1_SimpleXInfo
+                        }
+                    } label: {
+                        HStack {
+                            Image(systemName: "lessthan")
+                            Text("About SimpleX")
+                        }
+                    }
+                }
+
+                Spacer()
+
+                HStack {
+                    Button {
+                        createProfile()
+                    } label: {
+                        Text("Create")
+                        Image(systemName: "greaterthan")
+                    }
+                    .disabled(!canCreateProfile())
+                }
+            }
         }
         .onAppear() {
             focusDisplayName = true
             setLastVersionDefault()
         }
+        .alert(item: $alert) { a in
+            switch a {
+            case .duplicateUserError: return duplicateUserAlert
+            case let .createUserError(err): return creatUserErrorAlert(err)
+            }
+        }
         .padding()
-        .frame(maxWidth: .infinity, alignment: .leading)
         .keyboardPadding()
     }
 
-    func onboardingButtons() -> some View {
-        HStack {
-            Button {
-                hideKeyboard()
+    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
+        TextField(placeholder, text: text)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
+    }
+
+    func createProfile() {
+        hideKeyboard()
+        let profile = Profile(
+            displayName: displayName,
+            fullName: fullName
+        )
+        do {
+            m.currentUser = try apiCreateActiveUser(profile)
+            if m.users.isEmpty {
+                try startChat()
                 withAnimation {
-                    m.onboardingStage = .step1_SimpleXInfo
+                    onboardingStageDefault.set(.step3_CreateSimpleXAddress)
+                    m.onboardingStage = .step3_CreateSimpleXAddress
                 }
-            } label: {
-                HStack {
-                    Image(systemName: "lessthan")
-                    Text("About SimpleX")
-                }
-            }
-
-            Spacer()
-
-            Button {
-                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
-            } label: {
-                HStack {
-                    Text("Create")
-                    Image(systemName: "greaterthan")
-                }
-            }
-            .disabled(!canCreateProfile(displayName))
-        }
-    }
-
-    private func showAlert(_ alert: UserProfileAlert) {
-        AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
-    }
-}
-
-private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
-    hideKeyboard()
-    let profile = Profile(
-        displayName: displayName.trimmingCharacters(in: .whitespaces),
-        fullName: ""
-    )
-    let m = ChatModel.shared
-    do {
-        m.currentUser = try apiCreateActiveUser(profile)
-        if m.users.isEmpty {
-            try startChat()
-            withAnimation {
-                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
-                m.onboardingStage = .step3_CreateSimpleXAddress
-            }
-        } else {
-            onboardingStageDefault.set(.onboardingComplete)
-            m.onboardingStage = .onboardingComplete
-            dismiss()
-            m.users = try listUsers()
-            try getUserChatData()
-        }
-    } catch let error {
-        switch error as? ChatResponse {
-        case .chatCmdError(_, .errorStore(.duplicateName)),
-             .chatCmdError(_, .error(.userExists)):
-            if m.currentUser == nil {
-                AlertManager.shared.showAlert(duplicateUserAlert)
             } else {
-                showAlert(.duplicateUserError)
+                onboardingStageDefault.set(.onboardingComplete)
+                m.onboardingStage = .onboardingComplete
+                dismiss()
+                m.users = try listUsers()
+                try getUserChatData()
             }
-        default:
-            let err: LocalizedStringKey = "Error: \(responseError(error))"
-            if m.currentUser == nil {
-                AlertManager.shared.showAlert(creatUserErrorAlert(err))
-            } else {
-                showAlert(.createUserError(error: err))
+        } catch let error {
+            switch error as? ChatResponse {
+            case .chatCmdError(_, .errorStore(.duplicateName)),
+                 .chatCmdError(_, .error(.userExists)):
+                if m.currentUser == nil {
+                    AlertManager.shared.showAlert(duplicateUserAlert)
+                } else {
+                    alert = .duplicateUserError
+                }
+            default:
+                let err: LocalizedStringKey = "Error: \(responseError(error))"
+                if m.currentUser == nil {
+                    AlertManager.shared.showAlert(creatUserErrorAlert(err))
+                } else {
+                    alert = .createUserError(error: err)
+                }
             }
+            logger.error("Failed to create user or start chat: \(responseError(error))")
         }
-        logger.error("Failed to create user or start chat: \(responseError(error))")
     }
-}
 
-private func canCreateProfile(_ displayName: String) -> Bool {
-    let name = displayName.trimmingCharacters(in: .whitespaces)
-    return name != "" && mkValidName(name) == name
-}
-
-func userProfileAlert(_ alert: UserProfileAlert, _ displayName: Binding<String>) -> Alert {
-    switch alert {
-    case .duplicateUserError: return duplicateUserAlert
-    case let .createUserError(err): return creatUserErrorAlert(err)
-    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
+    func canCreateProfile() -> Bool {
+        displayName != "" && validDisplayName(displayName)
     }
-}
 
-private var duplicateUserAlert: Alert {
-    Alert(
-        title: Text("Duplicate display name!"),
-        message: Text("You already have a chat profile with the same display name. Please choose another name.")
-    )
-}
+    private var duplicateUserAlert: Alert {
+        Alert(
+            title: Text("Duplicate display name!"),
+            message: Text("You already have a chat profile with the same display name. Please choose another name.")
+        )
+    }
 
-private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
-    Alert(
-        title: Text("Error creating profile!"),
-        message: Text(err)
-    )
-}
-
-func createInvalidNameAlert(_ name: String, _ displayName: Binding<String>) -> Alert {
-    name == ""
-    ? Alert(title: Text("Invalid name!"))
-    : Alert(
-        title: Text("Invalid name!"),
-        message: Text("Correct name to \(name)?"),
-        primaryButton: .default(
-            Text("Ok"),
-            action: { displayName.wrappedValue = name }
-        ),
-        secondaryButton: .cancel()
-    )
+    private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
+        Alert(
+            title: Text("Error creating profile!"),
+            message: Text(err)
+        )
+    }
 }
 
 func validDisplayName(_ name: String) -> Bool {
-    mkValidName(name.trimmingCharacters(in: .whitespaces)) == name
-}
-
-func mkValidName(_ s: String) -> String {
-    var c = s.cString(using: .utf8)!
-    return fromCString(chat_valid_name(&c)!)
+    name.firstIndex(of: " ") == nil && name.first != "@" && name.first != "#"
 }
 
 struct CreateProfile_Previews: PreviewProvider {

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

@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                         Spacer()
 
                         if let userAddress = m.userAddress {
-                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                            QRCode(uri: userAddress.connReqContact)
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -126,7 +126,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [userAddress.connReqContact])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -194,7 +194,7 @@ struct SendAddressMailView: View {
         let messageBody = String(format: NSLocalizedString("""
             <p>Hi!</p>
             <p><a href="%@">Connect to me via SimpleX Chat</a></p>
-            """, comment: "email text"), simplexChatLink(userAddress.connReqContact))
+            """, comment: "email text"), userAddress.connReqContact)
         MailView(
             isShowing: self.$showMailView,
             result: $mailViewResult,

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

@@ -14,7 +14,7 @@ struct OnboardingView: View {
     var body: some View {
         switch onboarding {
         case .step1_SimpleXInfo: SimpleXInfo(onboarding: true)
-        case .step2_CreateProfile: CreateFirstProfile()
+        case .step2_CreateProfile: CreateProfile()
         case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
         case .step4_SetNotificationsMode: SetNotificationsMode()
         case .onboardingComplete: EmptyView()

apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift

@@ -1,434 +0,0 @@
-//
-//  ConnectDesktopView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 13/10/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-import CodeScanner
-
-struct ConnectDesktopView: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    var viaSettings = false
-    @AppStorage(DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS) private var deviceName = UIDevice.current.name
-    @AppStorage(DEFAULT_CONFIRM_REMOTE_SESSIONS) private var confirmRemoteSessions = false
-    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) private var connectRemoteViaMulticast = false
-    @AppStorage(DEFAULT_OFFER_REMOTE_MULTICAST) private var offerRemoteMulticast = true
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @State private var sessionAddress: String = ""
-    @State private var remoteCtrls: [RemoteCtrlInfo] = []
-    @State private var alert: ConnectDesktopAlert?
-
-    private enum ConnectDesktopAlert: Identifiable {
-        case unlinkDesktop(rc: RemoteCtrlInfo)
-        case disconnectDesktop(action: UserDisconnectAction)
-        case badInvitationError
-        case badVersionError(version: String?)
-        case desktopDisconnectedError
-        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
-
-        var id: String {
-            switch self {
-            case let .unlinkDesktop(rc): "unlinkDesktop \(rc.remoteCtrlId)"
-            case let .disconnectDesktop(action): "disconnectDecktop \(action)"
-            case .badInvitationError: "badInvitationError"
-            case let .badVersionError(v): "badVersionError \(v ?? "")"
-            case .desktopDisconnectedError: "desktopDisconnectedError"
-            case let .error(title, _): "error \(title)"
-            }
-        }
-    }
-
-    private enum UserDisconnectAction: String {
-        case back
-        case dismiss // TODO dismiss settings after confirmation
-    }
-
-    var body: some View {
-        if viaSettings {
-            viewBody
-                .modifier(BackButton(label: "Back") {
-                    if m.activeRemoteCtrl {
-                        alert = .disconnectDesktop(action: .back)
-                    } else {
-                        dismiss()
-                    }
-                })
-        } else {
-            NavigationView {
-                viewBody
-            }
-        }
-    }
-
-    var viewBody: some View {
-        Group {
-            if let session = m.remoteCtrlSession {
-                switch session.sessionState {
-                case .starting: connectingDesktopView(session, nil)
-                case let .connecting(rc_): connectingDesktopView(session, rc_)
-                case let .pendingConfirmation(rc_, sessCode):
-                    if confirmRemoteSessions || rc_ == nil {
-                        verifySessionView(session, rc_, sessCode)
-                    } else {
-                        connectingDesktopView(session, rc_).onAppear {
-                            verifyDesktopSessionCode(sessCode)
-                        }
-                    }
-                case let .connected(rc, _): activeSessionView(session, rc)
-                }
-            } else {
-                connectDesktopView()
-            }
-        }
-        .onAppear {
-            setDeviceName(deviceName)
-            updateRemoteCtrls()
-        }
-        .onDisappear {
-            if m.remoteCtrlSession != nil {
-                disconnectDesktop()
-            }
-        }
-        .onChange(of: deviceName) {
-            setDeviceName($0)
-        }
-        .onChange(of: m.activeRemoteCtrl) {
-            UIApplication.shared.isIdleTimerDisabled = $0
-        }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .unlinkDesktop(rc):
-                Alert(
-                    title: Text("Unlink desktop?"),
-                    primaryButton: .destructive(Text("Unlink")) {
-                        unlinkDesktop(rc)
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .disconnectDesktop(action):
-                Alert(
-                    title: Text("Disconnect desktop?"),
-                    primaryButton: .destructive(Text("Disconnect")) {
-                        disconnectDesktop(action)
-                    },
-                    secondaryButton: .cancel()
-                )
-            case .badInvitationError:
-                Alert(title: Text("Bad desktop address"))
-            case let .badVersionError(v):
-                Alert(
-                    title: Text("Incompatible version"),
-                    message: Text("Desktop app version \(v ?? "") is not compatible with this app.")
-                )
-            case .desktopDisconnectedError:
-                Alert(title: Text("Connection terminated"))
-            case let .error(title, error):
-                Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(m.activeRemoteCtrl)
-    }
-
-    private func connectDesktopView() -> some View {
-        List {
-            Section("This device name") {
-                devicesView()
-            }
-            scanDesctopAddressView()
-            if developerTools {
-                desktopAddressView()
-            }
-        }
-        .navigationTitle("Connect to desktop")
-    }
-
-    private func connectingDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> some View {
-        List {
-            Section("Connecting to desktop") {
-                ctrlDeviceNameText(session, rc)
-                ctrlDeviceVersionText(session)
-            }
-
-            if let sessCode = session.sessionCode {
-                Section("Session code") {
-                    sessionCodeText(sessCode)
-                }
-            }
-
-            Section {
-                disconnectButton()
-            }
-        }
-        .navigationTitle("Connecting to desktop")
-    }
-
-    private func verifySessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?, _ sessCode: String) -> some View {
-        List {
-            Section("Connected to desktop") {
-                ctrlDeviceNameText(session, rc)
-                ctrlDeviceVersionText(session)
-            }
-
-            Section("Verify code with desktop") {
-                sessionCodeText(sessCode)
-                Button {
-                    verifyDesktopSessionCode(sessCode)
-                } label: {
-                    Label("Confirm", systemImage: "checkmark")
-                }
-            }
-
-            Section {
-                disconnectButton()
-            }
-        }
-        .navigationTitle("Verify connection")
-    }
-
-    private func ctrlDeviceNameText(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> Text {
-        var t = Text(rc?.deviceViewName ?? session.ctrlAppInfo.deviceName)
-        if (rc == nil) {
-            t = t + Text(" ") + Text("(new)").italic()
-        }
-        return t
-    }
-
-    private func ctrlDeviceVersionText(_ session: RemoteCtrlSession) -> Text {
-        let v = session.ctrlAppInfo.appVersionRange.maxVersion
-        var t = Text("v\(v)")
-        if v != session.appVersion {
-            t = t + Text(" ") + Text("(this device v\(session.appVersion))").italic()
-        }
-        return t
-    }
-
-    private func activeSessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo) -> some View {
-        List {
-            Section("Connected desktop") {
-                Text(rc.deviceViewName)
-                ctrlDeviceVersionText(session)
-            }
-
-            if let sessCode = session.sessionCode {
-                Section("Session code") {
-                    sessionCodeText(sessCode)
-                }
-            }
-
-            Section {
-                disconnectButton()
-            } footer: {
-                // This is specific to iOS
-                Text("Keep the app open to use it from desktop")
-            }
-        }
-        .navigationTitle("Connected to desktop")
-    }
-
-    private func sessionCodeText(_ code: String) -> some View {
-        Text(code.prefix(23))
-    }
-
-    private func devicesView() -> some View {
-        Group {
-            TextField("Enter this device name…", text: $deviceName)
-            if !remoteCtrls.isEmpty {
-                NavigationLink {
-                    linkedDesktopsView()
-                } label: {
-                    Text("Linked desktops")
-                }
-            }
-        }
-    }
-
-    private func scanDesctopAddressView() -> some View {
-        Section("Scan QR code from desktop") {
-            CodeScannerView(codeTypes: [.qr], completion: processDesktopQRCode)
-                .aspectRatio(1, contentMode: .fit)
-                .cornerRadius(12)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .padding(.horizontal)
-        }
-    }
-
-    private func desktopAddressView() -> some View {
-        Section("Desktop address") {
-            if sessionAddress.isEmpty {
-                Button {
-                    sessionAddress = UIPasteboard.general.string ?? ""
-                } label: {
-                    Label("Paste desktop address", systemImage: "doc.plaintext")
-                }
-                .disabled(!UIPasteboard.general.hasStrings)
-            } else {
-                HStack {
-                    Text(sessionAddress).lineLimit(1)
-                    Spacer()
-                    Image(systemName: "multiply.circle.fill")
-                        .foregroundColor(.secondary)
-                        .onTapGesture { sessionAddress = "" }
-                }
-            }
-            Button {
-                connectDesktopAddress(sessionAddress)
-            } label: {
-                Label("Connect to desktop", systemImage: "rectangle.connected.to.line.below")
-            }
-            .disabled(sessionAddress.isEmpty)
-        }
-    }
-
-    private func linkedDesktopsView() -> some View {
-        List {
-            Section("Desktop devices") {
-                ForEach(remoteCtrls, id: \.remoteCtrlId) { rc in
-                    remoteCtrlView(rc)
-                }
-                .onDelete { indexSet in
-                    if let i = indexSet.first, i < remoteCtrls.count {
-                        alert = .unlinkDesktop(rc: remoteCtrls[i])
-                    }
-                }
-            }
-
-            Section("Linked desktop options") {
-                Toggle("Verify connections", isOn: $confirmRemoteSessions)
-                Toggle("Discover on network", isOn: $connectRemoteViaMulticast).disabled(true)
-            }
-        }
-        .navigationTitle("Linked desktops")
-    }
-
-    private func remoteCtrlView(_ rc: RemoteCtrlInfo) -> some View {
-        Text(rc.deviceViewName)
-    }
-
-
-    private func setDeviceName(_ name: String) {
-        do {
-            try setLocalDeviceName(deviceName)
-        } catch let e {
-            errorAlert(e)
-        }
-    }
-
-    private func updateRemoteCtrls() {
-        do {
-            remoteCtrls = try listRemoteCtrls()
-        } catch let e {
-            errorAlert(e)
-        }
-    }
-
-    private func processDesktopQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r): connectDesktopAddress(r.string)
-        case let .failure(e): errorAlert(e)
-        }
-    }
-
-    private func connectDesktopAddress(_ addr: String) {
-        Task {
-            do {
-                let (rc_, ctrlAppInfo, v) = try await connectRemoteCtrl(desktopAddress: addr)
-                await MainActor.run {
-                    sessionAddress = ""
-                    m.remoteCtrlSession = RemoteCtrlSession(
-                        ctrlAppInfo: ctrlAppInfo,
-                        appVersion: v,
-                        sessionState: .connecting(remoteCtrl_: rc_)
-                    )
-                }
-            } catch let e {
-                await MainActor.run {
-                    switch e as? ChatResponse {
-                    case .chatCmdError(_, .errorRemoteCtrl(.badInvitation)): alert = .badInvitationError
-                    case .chatCmdError(_, .error(.commandError)): alert = .badInvitationError
-                    case let .chatCmdError(_, .errorRemoteCtrl(.badVersion(v))): alert = .badVersionError(version: v)
-                    case .chatCmdError(_, .errorAgent(.RCP(.version))): alert = .badVersionError(version: nil)
-                    case .chatCmdError(_, .errorAgent(.RCP(.ctrlAuth))): alert = .desktopDisconnectedError
-                    default: errorAlert(e)
-                    }
-                }
-            }
-        }
-    }
-
-    private func verifyDesktopSessionCode(_ sessCode: String) {
-        Task {
-            do {
-                let rc = try await verifyRemoteCtrlSession(sessCode)
-                await MainActor.run {
-                    m.remoteCtrlSession = m.remoteCtrlSession?.updateState(.connected(remoteCtrl: rc, sessionCode: sessCode))
-                }
-                await MainActor.run {
-                    updateRemoteCtrls()
-                }
-            } catch let error {
-                await MainActor.run {
-                    errorAlert(error)
-                }
-            }
-        }
-    }
-
-    private func disconnectButton() -> some View {
-        Button {
-            disconnectDesktop()
-        } label: {
-            Label("Disconnect", systemImage: "multiply")
-        }
-    }
-
-    private func disconnectDesktop(_ action: UserDisconnectAction? = nil) {
-        Task {
-            do {
-                try await stopRemoteCtrl()
-                await MainActor.run {
-                    switchToLocalSession()
-                    switch action {
-                    case .back: dismiss()
-                    case .dismiss: dismiss()
-                    case .none: ()
-                    }
-                }
-            } catch let e {
-                await MainActor.run {
-                    errorAlert(e)
-                }
-            }
-        }
-    }
-
-    private func unlinkDesktop(_ rc: RemoteCtrlInfo) {
-        Task {
-            do {
-                try await deleteRemoteCtrl(rc.remoteCtrlId)
-                await MainActor.run {
-                    remoteCtrls.removeAll(where: { $0.remoteCtrlId == rc.remoteCtrlId })
-                }
-            } catch let e {
-                await MainActor.run {
-                    errorAlert(e)
-                }
-            }
-        }
-    }
-
-    private func errorAlert(_ error: Error) {
-        let a = getErrorAlert(error, "Error")
-        alert = .error(title: a.title, error: a.message)
-    }
-}
-
-#Preview {
-    ConnectDesktopView()
-}

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

@@ -66,9 +66,6 @@ struct PrivacySettings: View {
                 Section {
                     settingsRow("lock.doc") {
                         Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                            .onChange(of: encryptLocalFiles) {
-                                setEncryptLocalFiles($0)
-                            }
                     }
                     settingsRow("photo") {
                         Toggle("Auto-accept images", isOn: $autoAcceptImages)
@@ -93,9 +90,7 @@ struct PrivacySettings: View {
                     }
                     settingsRow("link") {
                         Picker("SimpleX links", selection: $simplexLinkMode) {
-                            ForEach(
-                                SimpleXLinkMode.values + (SimpleXLinkMode.values.contains(simplexLinkMode) ? [] : [simplexLinkMode])
-                            ) { mode in
+                            ForEach(SimpleXLinkMode.values) { mode in
                                 Text(mode.text)
                             }
                         }
@@ -106,6 +101,10 @@ struct PrivacySettings: View {
                     }
                 } header: {
                     Text("Chats")
+                } footer: {
+                    if case .browser = simplexLinkMode {
+                        Text("Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.")
+                    }
                 }
 
                 Section {
@@ -119,7 +118,7 @@ struct PrivacySettings: View {
                     Text("Send delivery receipts to")
                 } footer: {
                     VStack(alignment: .leading) {
-                        Text("These settings are for your current profile **\(m.currentUser?.displayName ?? "")**.")
+                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
                         Text("They can be overridden in contact and group settings.")
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
@@ -184,16 +183,6 @@ struct PrivacySettings: View {
         }
     }
 
-    private func setEncryptLocalFiles(_ enable: Bool) {
-        do {
-            try apiSetEncryptLocalFiles(enable)
-        } catch let error {
-            let err = responseError(error)
-            logger.error("apiSetEncryptLocalFiles \(err)")
-            alert = .error(title: "Error", error: "\(err)")
-        }
-    }
-
     private func setOrAskSendReceiptsContacts(_ enable: Bool) {
         contactReceiptsOverrides = m.chats.reduce(0) { count, chat in
             let sendRcpts = chat.chatInfo.contact?.chatSettings.sendRcpts
@@ -356,7 +345,7 @@ struct SimplexLockView: View {
         var id: Self { self }
     }
 
-    let laDelays: [Int] = [10, 30, 60, 180, 600, 0]
+    let laDelays: [Int] = [10, 30, 60, 180, 0]
 
     func laDelayText(_ t: Int) -> LocalizedStringKey {
         let m = t / 60
@@ -378,7 +367,6 @@ struct SimplexLockView: View {
                             Text(mode.text)
                         }
                     }
-                    .frame(height: 36)
                     if performLA {
                         Picker("Lock after", selection: $laLockDelay) {
                             let delays = laDelays.contains(laLockDelay) ? laDelays : [laLockDelay] + laDelays
@@ -386,7 +374,6 @@ struct SimplexLockView: View {
                                 Text(laDelayText(t))
                             }
                         }
-                        .frame(height: 36)
                         if showChangePassword && laMode == .passcode {
                             Button("Change passcode") {
                                 changeLAPassword()

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

@@ -53,10 +53,6 @@ let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
 let DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME = "customDisappearingMessageTime"
 let DEFAULT_SHOW_UNREAD_AND_FAVORITES = "showUnreadAndFavorites"
-let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
-let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
-let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
-let DEFAULT_OFFER_REMOTE_MULTICAST = "offerRemoteMulticast"
 
 let appDefaults: [String: Any] = [
     DEFAULT_SHOW_LA_NOTICE: false,
@@ -89,10 +85,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_SHOW_MUTE_PROFILE_ALERT: true,
     DEFAULT_ONBOARDING_STAGE: OnboardingStage.onboardingComplete.rawValue,
     DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
-    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
-    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: false,
-    DEFAULT_OFFER_REMOTE_MULTICAST: true
+    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false
 ]
 
 enum SimpleXLinkMode: String, Identifiable {
@@ -100,7 +93,7 @@ enum SimpleXLinkMode: String, Identifiable {
     case full
     case browser
 
-    static var values: [SimpleXLinkMode] = [.description, .full]
+    static var values: [SimpleXLinkMode] = [.description, .full, .browser]
 
     public var id: Self { self }
 
@@ -185,12 +178,6 @@ struct SettingsView: View {
                     } label: {
                         settingsRow("switch.2") { Text("Chat preferences") }
                     }
-
-                    NavigationLink {
-                        ConnectDesktopView(viaSettings: true)
-                    } label: {
-                        settingsRow("desktopcomputer") { Text("Use from desktop") }
-                    }
                 }
                 .disabled(chatModel.chatRunning != true)
                 
@@ -375,9 +362,7 @@ struct SettingsView: View {
 
 func settingsRow<Content : View>(_ icon: String, color: Color = .secondary, content: @escaping () -> Content) -> some View {
     ZStack(alignment: .leading) {
-        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-            .symbolRenderingMode(.monochrome)
-            .foregroundColor(color)
+        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(color)
         content().padding(.leading, indent)
     }
 }
@@ -396,9 +381,7 @@ struct ProfilePreview: View {
                 Text(profileOf.displayName)
                     .fontWeight(.bold)
                     .font(.title2)
-                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
-                    Text(profileOf.fullName)
-                }
+                Text(profileOf.fullName)
             }
         }
     }

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

@@ -190,7 +190,7 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
+            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
             shareQRCodeButton(userAddress)
             if MFMailComposeViewController.canSendMail() {
                 shareViaEmailButton(userAddress)
@@ -248,7 +248,7 @@ struct UserAddressView: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [userAddress.connReqContact])
         } label: {
             settingsRow("square.and.arrow.up") {
                 Text("Share address")

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

@@ -17,8 +17,6 @@ struct UserProfile: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: UserProfileAlert?
-    @FocusState private var focusDisplayName
 
     var body: some View {
         let user: User = chatModel.currentUser!
@@ -49,27 +47,18 @@ struct UserProfile: View {
 
                 VStack(alignment: .leading) {
                     ZStack(alignment: .leading) {
-                        if !validNewProfileName(user) {
-                            Button {
-                                alert = .invalidNameError(validName: mkValidName(profile.displayName))
-                            } label: {
-                                Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                            }
-                        } else {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                        if !validDisplayName(profile.displayName) {
+                            Image(systemName: "exclamationmark.circle")
+                                .foregroundColor(.red)
+                                .padding(.bottom, 10)
                         }
-                        profileNameTextEdit("Profile name", $profile.displayName)
-                            .focused($focusDisplayName)
-                    }
-                    .padding(.bottom)
-                    if showFullName(user) {
-                        profileNameTextEdit("Full name (optional)", $profile.fullName)
-                            .padding(.bottom)
+                        profileNameTextEdit("Display name", $profile.displayName)
                     }
+                    profileNameTextEdit("Full name (optional)", $profile.fullName)
                     HStack(spacing: 20) {
                         Button("Cancel") { editProfile = false }
                         Button("Save (and notify contacts)") { saveProfile() }
-                            .disabled(!canSaveProfile(user))
+                            .disabled(profile.displayName == "" || !validDisplayName(profile.displayName))
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -85,14 +74,11 @@ struct UserProfile: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
                 VStack(alignment: .leading) {
-                    profileNameView("Profile name:", user.profile.displayName)
-                    if showFullName(user) {
-                        profileNameView("Full name:", user.profile.fullName)
-                    }
+                    profileNameView("Display name:", user.profile.displayName)
+                    profileNameView("Full name:", user.profile.fullName)
                     Button("Edit") {
                         profile = fromLocalProfile(user.profile)
                         editProfile = true
-                        focusDisplayName = true
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -131,12 +117,14 @@ struct UserProfile: View {
                 profile.image = nil
             }
         }
-        .alert(item: $alert) { a in userProfileAlert(a, $profile.displayName) }
     }
 
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func profileNameView(_ label: LocalizedStringKey, _ name: String) -> some View {
@@ -153,34 +141,19 @@ struct UserProfile: View {
         showChooseSource = true
     }
 
-    private func validNewProfileName(_ user: User) -> Bool {
-        profile.displayName == user.profile.displayName || validDisplayName(profile.displayName.trimmingCharacters(in: .whitespaces))
-    }
-
-    private func showFullName(_ user: User) -> Bool {
-        user.profile.fullName != "" && user.profile.fullName != user.profile.displayName
-    }
-
-    private func canSaveProfile(_ user: User) -> Bool {
-        profile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName(user)
-    }
-
     func saveProfile() {
         Task {
             do {
-                profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
                 if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                     DispatchQueue.main.async {
                         chatModel.updateCurrentUser(newProfile)
                         profile = newProfile
                     }
-                    editProfile = false
-                } else {
-                    alert = .duplicateUserError
                 }
             } catch {
                 logger.error("UserProfile apiUpdateProfile error: \(responseError(error))")
             }
+            editProfile = false
         }
     }
 }

apps/ios/SimpleX (iOS).entitlements

@@ -18,9 +18,5 @@
 	<array>
 		<string>$(AppIdentifierPrefix)chat.simplex.app</string>
 	</array>
-	<key>com.apple.developer.networking.multicast</key>
-	<true/>
-	<key>com.apple.developer.device-information.user-assigned-device-name</key>
-	<true/>
 </dict>
 </plist>

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ и %@ са свързани</target>
@@ -101,10 +97,6 @@
         <target>%1$@ в %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ е свързан!</target>
@@ -130,10 +122,6 @@
         <target>%@ иска да се свърже!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ и %lld други членове са свързани</target>
@@ -199,27 +187,11 @@
         <target>%lld файл(а) с общ размер от %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld членове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld минути</target>
@@ -290,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -400,10 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -629,10 +589,6 @@
         <target>Всички съобщения ще бъдат изтрити - това не може да бъде отменено! Съобщенията ще бъдат изтрити САМО за вас.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Всички ваши контакти ще останат свързани.</target>
@@ -738,14 +694,6 @@
         <target>Вече сте свързани?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Винаги използвай реле</target>
@@ -866,10 +814,6 @@
         <target>Назад</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Лошо ID на съобщението</target>
@@ -885,18 +829,6 @@
         <target>По-добри съобщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>И вие, и вашият контакт можете да добавяте реакции към съобщението.</target>
@@ -1158,31 +1090,24 @@
         <target>Свързване</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Свързване директно</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Свързване инкогнито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Свързване чрез линк на контакта</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Свързване чрез групов линк?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1200,18 +1125,6 @@ This is your own one-time link!</source>
         <target>Свързване чрез еднократен линк за връзка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Свързване със сървъра…</target>
@@ -1222,10 +1135,6 @@ This is your own one-time link!</source>
         <target>Свързване със сървър…(грешка: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Връзка</target>
@@ -1246,10 +1155,6 @@ This is your own one-time link!</source>
         <target>Заявката за връзка е изпратена!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Времето на изчакване за установяване на връзката изтече</target>
@@ -1265,6 +1170,11 @@ This is your own one-time link!</source>
         <target>Контактът вече съществува</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Контактът и всички съобщения ще бъдат изтрити - това не може да бъде отменено!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Контактът е скрит:</target>
@@ -1315,10 +1225,6 @@ This is your own one-time link!</source>
         <target>Версия на ядрото: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Създай</target>
@@ -1339,10 +1245,6 @@ This is your own one-time link!</source>
         <target>Създай файл</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Създай групов линк</target>
@@ -1363,10 +1265,6 @@ This is your own one-time link!</source>
         <target>Създай линк за еднократна покана</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Създай опашка</target>
@@ -1525,10 +1423,6 @@ This is your own one-time link!</source>
         <target>Изтрий</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Изтрий контакт</target>
@@ -1554,10 +1448,6 @@ This is your own one-time link!</source>
         <target>Изтрий всички файлове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Изтрий архив</target>
@@ -1588,9 +1478,9 @@ This is your own one-time link!</source>
         <target>Изтрий контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Изтрий контакт?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1733,18 +1623,6 @@ This cannot be undone!</source>
         <target>Описание</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Разработване</target>
@@ -1835,17 +1713,19 @@ This cannot be undone!</source>
         <target>Прекъсни връзката</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Открийте и се присъединете към групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Показвано Име</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Показвано име:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2018,14 +1898,6 @@ This cannot be undone!</source>
         <target>Криптирано съобщение: неочаквана грешка</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Въведете kодa за достъп</target>
@@ -2036,10 +1908,6 @@ This cannot be undone!</source>
         <target>Въведи правилна парола.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Въведи парола…</target>
@@ -2055,10 +1923,6 @@ This cannot be undone!</source>
         <target>Въведи сървъра ръчно</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Въведи съобщение при посрещане…</target>
@@ -2069,10 +1933,6 @@ This cannot be undone!</source>
         <target>Въведи съобщение при посрещане…(незадължително)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Грешка при свързване със сървъра</target>
@@ -2130,7 +1990,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Грешка при създаване на контакт с член</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2265,7 +2124,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Грешка при изпращане на съобщение за покана за контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2348,10 +2206,6 @@ This cannot be undone!</source>
         <target>Изход без запазване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Експортирай база данни</target>
@@ -2497,10 +2351,6 @@ This cannot be undone!</source>
         <target>Пълно име:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Напълно преработено - работи във фонов режим!</target>
@@ -2521,14 +2371,6 @@ This cannot be undone!</source>
         <target>Група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Показвано име на групата</target>
@@ -2829,10 +2671,6 @@ This cannot be undone!</source>
         <target>Несъвместима версия на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Неправилен kод за достъп</target>
@@ -2880,10 +2718,6 @@ This cannot be undone!</source>
         <target>Невалиден линк за връзка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Невалиден адрес на сървъра!</target>
@@ -2975,33 +2809,16 @@ This cannot be undone!</source>
         <target>Влез в групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Влез инкогнито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Присъединяване към групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Запазете връзките си</target>
@@ -3062,14 +2879,6 @@ This is your link for group %@!</source>
         <target>Ограничения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Съобщение на живо!</target>
@@ -3220,10 +3029,6 @@ This is your link for group %@!</source>
         <target>Съобщения и файлове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Архивът на базата данни се мигрира…</target>
@@ -3555,7 +3360,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>Отвори</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3573,10 +3377,6 @@ This is your link for group %@!</source>
         <target>Отвори конзолата</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Отвори потребителските профили</target>
@@ -3592,6 +3392,11 @@ This is your link for group %@!</source>
         <target>Отваряне на база данни…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Отварянето на линка в браузъра може да намали поверителността и сигурността на връзката. Несигурните SimpleX линкове ще бъдат червени.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING бройка</target>
@@ -3637,10 +3442,6 @@ This is your link for group %@!</source>
         <target>Постави</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Постави изображение</target>
@@ -3786,14 +3587,6 @@ This is your link for group %@!</source>
         <target>Профилно изображение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Профилна парола</target>
@@ -4039,14 +3832,6 @@ This is your link for group %@!</source>
         <target>Предоговори криптирането?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Отговори</target>
@@ -4232,10 +4017,6 @@ This is your link for group %@!</source>
         <target>Сканирай QR код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Сканирай код</target>
@@ -4318,7 +4099,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Изпрати лично съобщение за свързване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4456,10 +4236,6 @@ This is your link for group %@!</source>
         <target>Сървъри</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Задай 1 ден</target>
@@ -4770,10 +4546,6 @@ This is your link for group %@!</source>
         <target>Докосни бутона </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Докосни за активиране на профил.</target>
@@ -4871,6 +4643,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Криптирането работи и новото споразумение за криптиране не е необходимо. Това може да доведе до грешки при свързване!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Групата е напълно децентрализирана – видима е само за членовете.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Хешът на предишното съобщение е различен.</target>
@@ -4956,10 +4733,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Това действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Тази група има над %lld членове, потвърждения за доставка не се изпращат.</target>
@@ -4970,14 +4743,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Тази група вече не съществува.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Тази настройка се прилага за съобщения в текущия ви профил **%@**.</target>
@@ -5075,18 +4840,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Не може да се запише гласово съобщение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Неочаквана грешка: %@</target>
@@ -5149,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 За да се свържете, моля, помолете вашия контакт да създаде друг линк за връзка и проверете дали имате стабилна мрежова връзка.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Отключи</target>
@@ -5247,10 +4992,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Използвай за нови връзки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Използвай интерфейса за повикване на iOS</target>
@@ -5281,23 +5022,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Използват се сървърите на SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Потвръди сигурността на връзката</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Потвръди кода за сигурност</target>
@@ -5458,35 +5187,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Вие сте свързани към сървъра, използван за получаване на съобщения от този контакт.</target>
@@ -5582,15 +5282,6 @@ Repeat join request?</source>
         <target>Не можахте да бъдете потвърдени; Моля, опитайте отново.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>Нямате чатове</target>
@@ -5641,10 +5332,6 @@ Repeat connection request?</source>
         <target>Ще бъдете свързани с групата, когато устройството на домакина на групата е онлайн, моля, изчакайте или проверете по-късно!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Ще бъдете свързани, когато заявката ви за връзка бъде приета, моля, изчакайте или проверете по-късно!</target>
@@ -5660,8 +5347,9 @@ Repeat connection request?</source>
         <target>Ще трябва да се идентифицирате, когато стартирате или възобновите приложението след 30 секунди във фонов режим.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Ще се присъедините към групата, към която този линк препраща, и ще се свържете с нейните членове.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5729,6 +5417,11 @@ Repeat connection request?</source>
         <target>Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Вашият чат профил ще бъде изпратен на членовете на групата</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Вашите чат профили</target>
@@ -5783,10 +5476,6 @@ You can change it in Settings.</source>
         <target>Вашата поверителност</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Вашият профил **%@** ще бъде споделен.</target>
@@ -5879,10 +5568,6 @@ SimpleX сървърите не могат да видят вашия профи
         <target>винаги</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>аудио разговор (не е e2e криптиран)</target>
@@ -5898,10 +5583,6 @@ SimpleX сървърите не могат да видят вашия профи
         <target>лош хеш на съобщението</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>удебелен</target>
@@ -5974,7 +5655,6 @@ SimpleX сървърите не могат да видят вашия профи
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>свързан директно</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6072,10 +5752,6 @@ SimpleX сървърите не могат да видят вашия профи
         <target>изтрит</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>групата изтрита</target>
@@ -6360,8 +6036,7 @@ SimpleX сървърите не могат да видят вашия профи
         <source>off</source>
         <target>изключено</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6378,6 +6053,11 @@ SimpleX сървърите не могат да видят вашия профи
         <target>включено</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>или пишете на разработчиците</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>собственик</target>
@@ -6440,7 +6120,6 @@ SimpleX сървърите не могат да видят вашия профи
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>изпрати лично съобщение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6468,10 +6147,6 @@ SimpleX сървърите не могат да видят вашия профи
         <target>актуализиран профил на групата</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6609,10 +6284,6 @@ SimpleX сървърите не могат да видят вашия профи
         <target>SimpleX използва Face ID за локалнa идентификация</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX се нуждае от достъп до микрофона за аудио и видео разговори и за запис на гласови съобщения.</target>

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,11 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <target>%@ and %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ and %@ connected</target>
@@ -102,11 +97,6 @@
         <target>%1$@ at %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <target>%@ connected</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ is connected!</target>
@@ -132,11 +122,6 @@
         <target>%@ wants to connect!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <target>%@, %@ and %lld members</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ and %lld other members connected</target>
@@ -202,31 +187,11 @@
         <target>%lld file(s) with total size of %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <target>%lld group events</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld members</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <target>%lld messages blocked</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <target>%lld messages marked deleted</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <target>%lld messages moderated by %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minutes</target>
@@ -297,16 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <target>(new)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <target>(this device v%@)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -409,11 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <target>0 sec</target>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -639,11 +589,6 @@
         <target>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <target>All new messages from %@ will be hidden!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>All your contacts will remain connected.</target>
@@ -749,16 +694,6 @@
         <target>Already connected?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <target>Already connecting!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <target>Already joining the group!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Always use relay</target>
@@ -879,11 +814,6 @@
         <target>Back</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <target>Bad desktop address</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Bad message ID</target>
@@ -899,21 +829,6 @@
         <target>Better messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <target>Block</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <target>Block member</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <target>Block member?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Both you and your contact can add message reactions.</target>
@@ -1175,38 +1090,24 @@
         <target>Connect</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Connect directly</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Connect incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
-        <target>Connect to desktop</target>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Connect via contact link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <target>Connect to yourself?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <target>Connect to yourself?
-This is your own SimpleX address!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <target>Connect to yourself?
-This is your own one-time link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
-        <target>Connect via contact address</target>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Connect via group link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1224,21 +1125,6 @@ This is your own one-time link!</target>
         <target>Connect via one-time link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <target>Connect with %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <target>Connected desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <target>Connected to desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Connecting to server…</target>
@@ -1249,11 +1135,6 @@ This is your own one-time link!</target>
         <target>Connecting to server… (error: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <target>Connecting to desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Connection</target>
@@ -1274,11 +1155,6 @@ This is your own one-time link!</target>
         <target>Connection request sent!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <target>Connection terminated</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Connection timeout</target>
@@ -1294,6 +1170,11 @@ This is your own one-time link!</target>
         <target>Contact already exists</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Contact and all messages will be deleted - this cannot be undone!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Contact hidden:</target>
@@ -1344,11 +1225,6 @@ This is your own one-time link!</target>
         <target>Core version: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <target>Correct name to %@?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Create</target>
@@ -1369,11 +1245,6 @@ This is your own one-time link!</target>
         <target>Create file</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <target>Create group</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Create group link</target>
@@ -1394,11 +1265,6 @@ This is your own one-time link!</target>
         <target>Create one-time invitation link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <target>Create profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Create queue</target>
@@ -1557,11 +1423,6 @@ This is your own one-time link!</target>
         <target>Delete</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <target>Delete %lld messages?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Delete Contact</target>
@@ -1587,11 +1448,6 @@ This is your own one-time link!</target>
         <target>Delete all files</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <target>Delete and notify contact</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Delete archive</target>
@@ -1622,11 +1478,9 @@ This is your own one-time link!</target>
         <target>Delete contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
-        <target>Delete contact?
-This cannot be undone!</target>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Delete contact?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1769,21 +1623,6 @@ This cannot be undone!</target>
         <target>Description</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <target>Desktop address</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <target>Desktop app version %@ is not compatible with this app.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <target>Desktop devices</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Develop</target>
@@ -1874,19 +1713,19 @@ This cannot be undone!</target>
         <target>Disconnect</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <target>Disconnect desktop?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Discover and join groups</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
-        <target>Discover on network</target>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Display name</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Display name:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2059,16 +1898,6 @@ This cannot be undone!</target>
         <target>Encrypted message: unexpected error</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <target>Encryption re-negotiation error</target>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <target>Encryption re-negotiation failed.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Enter Passcode</target>
@@ -2079,11 +1908,6 @@ This cannot be undone!</target>
         <target>Enter correct passphrase.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <target>Enter group name…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Enter passphrase…</target>
@@ -2099,11 +1923,6 @@ This cannot be undone!</target>
         <target>Enter server manually</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <target>Enter this device name…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Enter welcome message…</target>
@@ -2114,11 +1933,6 @@ This cannot be undone!</target>
         <target>Enter welcome message… (optional)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <target>Enter your name…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Error</target>
@@ -2394,11 +2208,6 @@ This cannot be undone!</target>
         <target>Exit without saving</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <target>Expand</target>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Export database</target>
@@ -2544,11 +2353,6 @@ This cannot be undone!</target>
         <target>Full name:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <target>Fully decentralized – visible only to members.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Fully re-implemented - work in background!</target>
@@ -2569,16 +2373,6 @@ This cannot be undone!</target>
         <target>Group</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <target>Group already exists</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <target>Group already exists!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Group display name</target>
@@ -2879,11 +2673,6 @@ This cannot be undone!</target>
         <target>Incompatible database version</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <target>Incompatible version</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Incorrect passcode</target>
@@ -2931,11 +2720,6 @@ This cannot be undone!</target>
         <target>Invalid connection link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <target>Invalid name!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Invalid server address!</target>
@@ -3027,38 +2811,16 @@ This cannot be undone!</target>
         <target>Join group</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <target>Join group?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Join incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <target>Join with current profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <target>Join your group?
-This is your link for group %@!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Joining group</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <target>Keep the app open to use it from desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Keep your connections</target>
@@ -3119,16 +2881,6 @@ This is your link for group %@!</target>
         <target>Limitations</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <target>Linked desktop options</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <target>Linked desktops</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live message!</target>
@@ -3279,11 +3031,6 @@ This is your link for group %@!</target>
         <target>Messages &amp; files</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <target>Messages from %@ will be shown!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Migrating database archive…</target>
@@ -3633,11 +3380,6 @@ This is your link for group %@!</target>
         <target>Open chat console</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <target>Open group</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Open user profiles</target>
@@ -3653,6 +3395,11 @@ This is your link for group %@!</target>
         <target>Opening database…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING count</target>
@@ -3698,11 +3445,6 @@ This is your link for group %@!</target>
         <target>Paste</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <target>Paste desktop address</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Paste image</target>
@@ -3848,16 +3590,6 @@ This is your link for group %@!</target>
         <target>Profile image</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profile name</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profile name:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Profile password</target>
@@ -4103,16 +3835,6 @@ This is your link for group %@!</target>
         <target>Renegotiate encryption?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <target>Repeat connection request?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <target>Repeat join request?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Reply</target>
@@ -4298,11 +4020,6 @@ This is your link for group %@!</target>
         <target>Scan QR code</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <target>Scan QR code from desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Scan code</target>
@@ -4523,11 +4240,6 @@ This is your link for group %@!</target>
         <target>Servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <target>Session code</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Set 1 day</target>
@@ -4838,11 +4550,6 @@ This is your link for group %@!</target>
         <target>Tap button </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <target>Tap to Connect</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Tap to activate profile.</target>
@@ -4940,6 +4647,11 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>The group is fully decentralized – it is visible only to the members.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>The hash of the previous message is different.</target>
@@ -5025,11 +4737,6 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <target>This device name</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>This group has over %lld members, delivery receipts are not sent.</target>
@@ -5040,16 +4747,6 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>This group no longer exists.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <target>This is your own SimpleX address!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <target>This is your own one-time link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>This setting applies to messages in your current chat profile **%@**.</target>
@@ -5147,21 +4844,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Unable to record voice message</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <target>Unblock</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <target>Unblock member</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <target>Unblock member?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Unexpected error: %@</target>
@@ -5224,16 +4906,6 @@ To connect, please ask your contact to create another connection link and check
 To connect, please ask your contact to create another connection link and check that you have a stable network connection.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <target>Unlink</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <target>Unlink desktop?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Unlock</target>
@@ -5324,11 +4996,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Use for new connections</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <target>Use from desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Use iOS call interface</target>
@@ -5359,26 +5026,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Using SimpleX Chat servers.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <target>Verify code with desktop</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <target>Verify connection</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Verify connection security</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <target>Verify connections</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Verify security code</target>
@@ -5539,43 +5191,6 @@ To connect, please ask your contact to create another connection link and check
         <target>You are already connected to %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <target>You are already connecting to %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <target>You are already connecting via this one-time link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <target>You are already in group %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <target>You are already joining the group %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <target>You are already joining the group via this link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <target>You are already joining the group via this link.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <target>You are already joining the group!
-Repeat join request?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>You are connected to the server used to receive messages from this contact.</target>
@@ -5671,18 +5286,6 @@ Repeat join request?</target>
         <target>You could not be verified; please try again.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <target>You have already requested connection via this address!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <target>You have already requested connection!
-Repeat connection request?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>You have no chats</target>
@@ -5733,11 +5336,6 @@ Repeat connection request?</target>
         <target>You will be connected to group when the group host's device is online, please wait or check later!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>You will be connected when group link host's device is online, please wait or check later!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>You will be connected when your connection request is accepted, please wait or check later!</target>
@@ -5753,9 +5351,9 @@ Repeat connection request?</target>
         <target>You will be required to authenticate when you start or resume the app after 30 seconds in background.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
-        <target>You will connect to all group members.</target>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>You will join a group this link refers to and connect to its group members.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5823,6 +5421,11 @@ Repeat connection request?</target>
         <target>Your chat database is not encrypted - set passphrase to encrypt it.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Your chat profile will be sent to group members</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Your chat profiles</target>
@@ -5877,11 +5480,6 @@ You can change it in Settings.</target>
         <target>Your privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <target>Your profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Your profile **%@** will be shared.</target>
@@ -5974,11 +5572,6 @@ SimpleX servers cannot see your profile.</target>
         <target>always</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <target>and %lld other events</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>audio call (not e2e encrypted)</target>
@@ -5994,11 +5587,6 @@ SimpleX servers cannot see your profile.</target>
         <target>bad message hash</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <target>blocked</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>bold</target>
@@ -6169,11 +5757,6 @@ SimpleX servers cannot see your profile.</target>
         <target>deleted</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <target>deleted contact</target>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>deleted group</target>
@@ -6458,8 +6041,7 @@ SimpleX servers cannot see your profile.</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6476,6 +6058,11 @@ SimpleX servers cannot see your profile.</target>
         <target>on</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>or chat with the developers</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>owner</target>
@@ -6566,11 +6153,6 @@ SimpleX servers cannot see your profile.</target>
         <target>updated group profile</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <target>v%@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6708,11 +6290,6 @@ SimpleX servers cannot see your profile.</target>
         <target>SimpleX uses Face ID for local authentication</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <target>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</target>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX needs microphone access for audio and video calls, and to record voice messages.</target>

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

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ y %@ conectados</target>
@@ -101,10 +97,6 @@
         <target>%1$@ a las %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ ¡está conectado!</target>
@@ -130,10 +122,6 @@
         <target>¡ %@ quiere contactar!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ y %lld miembros más conectados</target>
@@ -199,27 +187,11 @@
         <target>%lld archivo(s) con un tamaño total de %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld miembros</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minutos</target>
@@ -227,7 +199,6 @@
       </trans-unit>
       <trans-unit id="%lld new interface languages" xml:space="preserve">
         <source>%lld new interface languages</source>
-        <target>%lld idiomas de interfaz nuevos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -277,12 +248,12 @@
       </trans-unit>
       <trans-unit id="%u messages failed to decrypt." xml:space="preserve">
         <source>%u messages failed to decrypt.</source>
-        <target>%u mensaje(s) no ha(n) podido ser descifrado(s).</target>
+        <target>%u mensajes no pudieron ser descifrados.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%u messages skipped." xml:space="preserve">
         <source>%u messages skipped.</source>
-        <target>%u mensaje(s) omitido(s).</target>
+        <target>%u mensajes omitidos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="(" xml:space="preserve">
@@ -290,14 +261,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -372,9 +335,6 @@
         <source>- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
 - delivery receipts (up to 20 members).
 - faster and more stable.</source>
-        <target>- conexión al [servicio de directorio](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
-- confirmaciones de entrega (hasta 20 miembros).
-- mayor rapidez y estabilidad.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve">
@@ -400,10 +360,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -629,10 +585,6 @@
         <target>Se eliminarán todos los mensajes SOLO para tí. ¡No podrá deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Todos tus contactos permanecerán conectados.</target>
@@ -738,14 +690,6 @@
         <target>¿Ya está conectado?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Usar siempre retransmisor</target>
@@ -768,7 +712,6 @@
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
         <source>App encrypts new local files (except videos).</source>
-        <target>Cifrado de los nuevos archivos locales (excepto vídeos).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
@@ -866,10 +809,6 @@
         <target>Volver</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>ID de mensaje incorrecto</target>
@@ -885,18 +824,6 @@
         <target>Mensajes mejorados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Tanto tú como tu contacto podéis añadir reacciones a los mensajes.</target>
@@ -924,7 +851,6 @@
       </trans-unit>
       <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve">
         <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target>Búlgaro, Finlandés, Tailandés y Ucraniano - gracias a los usuarios y [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1158,31 +1084,24 @@
         <target>Conectar</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Conectar directamente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Conectar incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Conectar mediante enlace de contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>¿Conectar mediante enlace de grupo?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1200,18 +1119,6 @@ This is your own one-time link!</source>
         <target>Conectar mediante enlace de un sólo uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Conectando con el servidor…</target>
@@ -1222,10 +1129,6 @@ This is your own one-time link!</source>
         <target>Conectando con el servidor... (error: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Conexión</target>
@@ -1246,10 +1149,6 @@ This is your own one-time link!</source>
         <target>¡Solicitud de conexión enviada!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Tiempo de conexión expirado</target>
@@ -1265,6 +1164,11 @@ This is your own one-time link!</source>
         <target>El contácto ya existe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>El contacto y todos los mensajes serán eliminados. ¡No podrá deshacerse!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Contacto oculto:</target>
@@ -1315,10 +1219,6 @@ This is your own one-time link!</source>
         <target>Versión Core: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Crear</target>
@@ -1339,10 +1239,6 @@ This is your own one-time link!</source>
         <target>Crear archivo</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Crear enlace de grupo</target>
@@ -1355,7 +1251,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>Crea perfil nuevo en la [aplicación para PC](https://simplex.Descargas/de chat/). 💻</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1363,10 +1258,6 @@ This is your own one-time link!</source>
         <target>Crea enlace de invitación de un uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Crear cola</target>
@@ -1525,10 +1416,6 @@ This is your own one-time link!</source>
         <target>Eliminar</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Eliminar contacto</target>
@@ -1554,10 +1441,6 @@ This is your own one-time link!</source>
         <target>Eliminar todos los archivos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Eliminar archivo</target>
@@ -1588,9 +1471,9 @@ This is your own one-time link!</source>
         <target>Eliminar contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Eliminar contacto?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1733,18 +1616,6 @@ This cannot be undone!</source>
         <target>Descripción</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Desarrollo</target>
@@ -1835,17 +1706,18 @@ This cannot be undone!</source>
         <target>Desconectar</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
-        <target>Descubre y únete a grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Nombre mostrado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Nombre mostrado:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1975,12 +1847,10 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encrypt local files" xml:space="preserve">
         <source>Encrypt local files</source>
-        <target>Cifra archivos locales</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
         <source>Encrypt stored files &amp; media</source>
-        <target>Cifra archivos almacenados y multimedia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
@@ -2018,14 +1888,6 @@ This cannot be undone!</source>
         <target>Mensaje cifrado: error inesperado</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Introduce Código</target>
@@ -2036,10 +1898,6 @@ This cannot be undone!</source>
         <target>Introduce la contraseña correcta.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Introduce la contraseña…</target>
@@ -2055,10 +1913,6 @@ This cannot be undone!</source>
         <target>Introduce el servidor manualmente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Introduce mensaje de bienvenida…</target>
@@ -2069,10 +1923,6 @@ This cannot be undone!</source>
         <target>Introduce mensaje de bienvenida… (opcional)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Error</target>
@@ -2130,7 +1980,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Error al establecer contacto con el miembro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2140,7 +1989,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
-        <target>Error al descifrar el archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
@@ -2265,7 +2113,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Error al enviar mensaje de invitación al contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2348,10 +2195,6 @@ This cannot be undone!</source>
         <target>Salir sin guardar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Exportar base de datos</target>
@@ -2497,10 +2340,6 @@ This cannot be undone!</source>
         <target>Nombre completo:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Completamente reimplementado: ¡funciona en segundo plano!</target>
@@ -2521,14 +2360,6 @@ This cannot be undone!</source>
         <target>Grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Nombre mostrado del grupo</target>
@@ -2631,12 +2462,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Group will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for all members - this cannot be undone!</source>
-        <target>El grupo será eliminado para todos los miembros. ¡No podrá deshacerse!</target>
+        <target>El grupo se eliminará para todos los miembros. ¡No podrá deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for you - this cannot be undone!</source>
-        <target>El grupo será eliminado para tí. ¡No podrá deshacerse!</target>
+        <target>El grupo se eliminará para tí. ¡No podrá deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
@@ -2829,10 +2660,6 @@ This cannot be undone!</source>
         <target>Versión de base de datos incompatible</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Código de acceso incorrecto</target>
@@ -2880,10 +2707,6 @@ This cannot be undone!</source>
         <target>Enlace de conexión no válido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>¡Dirección de servidor no válida!</target>
@@ -2975,33 +2798,16 @@ This cannot be undone!</source>
         <target>Únete al grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Únete en modo incógnito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Entrando al grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Conserva tus conexiones</target>
@@ -3062,14 +2868,6 @@ This is your link for group %@!</source>
         <target>Limitaciones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>¡Mensaje en vivo!</target>
@@ -3220,10 +3018,6 @@ This is your link for group %@!</source>
         <target>Mensajes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Migrando base de datos…</target>
@@ -3336,7 +3130,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New desktop app!" xml:space="preserve">
         <source>New desktop app!</source>
-        <target>Nueva aplicación para PC!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
@@ -3555,7 +3348,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>Abrir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3573,10 +3365,6 @@ This is your link for group %@!</source>
         <target>Abrir consola de Chat</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Abrir perfil de usuario</target>
@@ -3592,6 +3380,11 @@ This is your link for group %@!</source>
         <target>Abriendo base de datos…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Abrir el enlace en el navegador puede reducir la privacidad y seguridad de la conexión. Los enlaces SimpleX que no son de confianza aparecerán en rojo.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Contador PING</target>
@@ -3637,10 +3430,6 @@ This is your link for group %@!</source>
         <target>Pegar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Pegar imagen</target>
@@ -3786,14 +3575,6 @@ This is your link for group %@!</source>
         <target>Imagen del perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Contraseña del perfil</target>
@@ -4039,14 +3820,6 @@ This is your link for group %@!</source>
         <target>¿Renegociar cifrado?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Responder</target>
@@ -4232,10 +4005,6 @@ This is your link for group %@!</source>
         <target>Escanear código QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Escanear código</target>
@@ -4318,7 +4087,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Enviar mensaje directo para conectar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4456,10 +4224,6 @@ This is your link for group %@!</source>
         <target>Servidores</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Establecer 1 día</target>
@@ -4627,7 +4391,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
-        <target>Modo incógnito simplificado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -4770,10 +4533,6 @@ This is your link for group %@!</source>
         <target>Pulsa el botón </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Pulsa sobre un perfil para activarlo.</target>
@@ -4871,6 +4630,11 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>El cifrado funciona y un cifrado nuevo no es necesario. ¡Podría dar lugar a errores de conexión!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>El grupo está totalmente descentralizado y sólo es visible para los miembros.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>El hash del mensaje anterior es diferente.</target>
@@ -4956,10 +4720,6 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>Esta acción no se puede deshacer. Tu perfil, contactos, mensajes y archivos se perderán irreversiblemente.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Este grupo tiene más de %lld miembros, no se enviarán confirmaciones de entrega.</target>
@@ -4970,14 +4730,6 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>Este grupo ya no existe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Esta configuración se aplica a los mensajes del perfil actual **%@**.</target>
@@ -5037,7 +4789,6 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
         <source>Toggle incognito when connecting.</source>
-        <target>Activa incógnito al conectar.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
@@ -5075,18 +4826,6 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>No se puede grabar mensaje de voz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Error inesperado: %@</target>
@@ -5150,14 +4889,6 @@ que este enlace ya se haya usado, podría ser un error. Por favor, notifícalo.
 Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueba que tienes buena conexión de red.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Desbloquear</target>
@@ -5248,10 +4979,6 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
         <target>Usar para conexiones nuevas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Usar interfaz de llamada de iOS</target>
@@ -5282,23 +5009,11 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
         <target>Usar servidores SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Comprobar la seguridad de la conexión</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Comprobar código de seguridad</target>
@@ -5459,35 +5174,6 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
         <target>Ya estás conectado a %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Estás conectado al servidor usado para recibir mensajes de este contacto.</target>
@@ -5583,15 +5269,6 @@ Repeat join request?</source>
         <target>No has podido ser autenticado. Inténtalo de nuevo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>No tienes chats</target>
@@ -5642,10 +5319,6 @@ Repeat connection request?</source>
         <target>Te conectarás al grupo cuando el dispositivo del anfitrión esté en línea, por favor espera o compruébalo más tarde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Te conectarás cuando tu solicitud se acepte, por favor espera o compruébalo más tarde.</target>
@@ -5661,8 +5334,9 @@ Repeat connection request?</source>
         <target>Se te pedirá identificarte cuándo inicies o continues usando la aplicación tras 30 segundos en segundo plano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Te unirás al grupo al que hace referencia este enlace y te conectarás con sus miembros.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5730,6 +5404,11 @@ Repeat connection request?</source>
         <target>La base de datos no está cifrada - establece una contraseña para cifrarla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Tu perfil será enviado a los miembros del grupo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Mis perfiles</target>
@@ -5784,10 +5463,6 @@ Puedes cambiarlo en Configuración.</target>
         <target>Privacidad</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Tu perfil **%@** será compartido.</target>
@@ -5880,10 +5555,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>siempre</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>llamada (sin cifrar)</target>
@@ -5899,10 +5570,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>hash de mensaje erróneo</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>negrita</target>
@@ -5975,7 +5642,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>conectado directamente</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6073,10 +5739,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>eliminado</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>grupo eliminado</target>
@@ -6361,8 +6023,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <source>off</source>
         <target>desactivado</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6379,6 +6040,11 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>Activado</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>o contacta mediante Chat con los desarrolladores</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>propietario</target>
@@ -6441,7 +6107,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>Enviar mensaje directo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6469,10 +6134,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>ha actualizado el perfil del grupo</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6610,10 +6271,6 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>SimpleX usa reconocimiento facial para la autenticación local</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX necesita acceso al micrófono para las llamadas de audio, vídeo y para grabar mensajes de voz.</target>

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / % @</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ ja %@ yhdistetty</target>
@@ -101,10 +97,6 @@
         <target>%1$@ klo %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ on yhdistetty!</target>
@@ -130,10 +122,6 @@
         <target>%@ haluaa muodostaa yhteyden!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ ja %lld muut jäsenet yhdistetty</target>
@@ -199,27 +187,11 @@
         <target>%lld tiedosto(a), joiden kokonaiskoko on %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld jäsenet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minuuttia</target>
@@ -227,7 +199,6 @@
       </trans-unit>
       <trans-unit id="%lld new interface languages" xml:space="preserve">
         <source>%lld new interface languages</source>
-        <target>%lld uutta käyttöliittymän kieltä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -290,14 +261,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -397,10 +360,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -626,10 +585,6 @@
         <target>Kaikki viestit poistetaan - tätä ei voi kumota! Viestit poistuvat VAIN sinulta.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Kaikki kontaktisi pysyvät yhteydessä.</target>
@@ -735,14 +690,6 @@
         <target>Oletko jo muodostanut yhteyden?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Käytä aina relettä</target>
@@ -862,10 +809,6 @@
         <target>Takaisin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Virheellinen viestin tunniste</target>
@@ -881,18 +824,6 @@
         <target>Parempia viestejä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sekä sinä että kontaktisi voivat käyttää viestireaktioita.</target>
@@ -1153,31 +1084,24 @@
         <target>Yhdistä</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Yhdistä suoraan</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Yhdistä Incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Yhdistä kontaktilinkillä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Yhdistetäänkö ryhmälinkin kautta?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1195,18 +1119,6 @@ This is your own one-time link!</source>
         <target>Yhdistä kertalinkillä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Yhteyden muodostaminen palvelimeen…</target>
@@ -1217,10 +1129,6 @@ This is your own one-time link!</source>
         <target>Yhteyden muodostaminen palvelimeen... (virhe: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Yhteys</target>
@@ -1241,10 +1149,6 @@ This is your own one-time link!</source>
         <target>Yhteyspyyntö lähetetty!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Yhteyden aikakatkaisu</target>
@@ -1260,6 +1164,11 @@ This is your own one-time link!</source>
         <target>Kontakti on jo olemassa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Kontakti ja kaikki viestit poistetaan - tätä ei voi perua!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Kontakti piilotettu:</target>
@@ -1310,10 +1219,6 @@ This is your own one-time link!</source>
         <target>Ydinversio: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Luo</target>
@@ -1334,10 +1239,6 @@ This is your own one-time link!</source>
         <target>Luo tiedosto</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Luo ryhmälinkki</target>
@@ -1350,7 +1251,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>Luo uusi profiili [työpöytäsovelluksessa](https://simplex.chat/downloads/). 💻</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1358,10 +1258,6 @@ This is your own one-time link!</source>
         <target>Luo kertakutsulinkki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Luo jono</target>
@@ -1520,10 +1416,6 @@ This is your own one-time link!</source>
         <target>Poista</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Poista kontakti</target>
@@ -1549,10 +1441,6 @@ This is your own one-time link!</source>
         <target>Poista kaikki tiedostot</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Poista arkisto</target>
@@ -1583,9 +1471,9 @@ This is your own one-time link!</source>
         <target>Poista kontakti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Poista kontakti?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1728,18 +1616,6 @@ This cannot be undone!</source>
         <target>Kuvaus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Kehitä</target>
@@ -1830,17 +1706,18 @@ This cannot be undone!</source>
         <target>Katkaise</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
-        <target>Löydä ryhmiä ja liity niihin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Näyttönimi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Näyttönimi:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2012,14 +1889,6 @@ This cannot be undone!</source>
         <target>Salattu viesti: odottamaton virhe</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Syötä pääsykoodi</target>
@@ -2030,10 +1899,6 @@ This cannot be undone!</source>
         <target>Anna oikea tunnuslause.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Syötä tunnuslause…</target>
@@ -2049,10 +1914,6 @@ This cannot be undone!</source>
         <target>Syötä palvelin manuaalisesti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Kirjoita tervetuloviesti…</target>
@@ -2063,10 +1924,6 @@ This cannot be undone!</source>
         <target>Kirjoita tervetuloviesti... (valinnainen)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Virhe</target>
@@ -2340,10 +2197,6 @@ This cannot be undone!</source>
         <target>Poistu tallentamatta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Vie tietokanta</target>
@@ -2489,10 +2342,6 @@ This cannot be undone!</source>
         <target>Koko nimi:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Täysin uudistettu - toimii taustalla!</target>
@@ -2513,14 +2362,6 @@ This cannot be undone!</source>
         <target>Ryhmä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Ryhmän näyttönimi</target>
@@ -2821,10 +2662,6 @@ This cannot be undone!</source>
         <target>Yhteensopimaton tietokantaversio</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Väärä pääsykoodi</target>
@@ -2872,10 +2709,6 @@ This cannot be undone!</source>
         <target>Virheellinen yhteyslinkki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Virheellinen palvelinosoite!</target>
@@ -2967,33 +2800,16 @@ This cannot be undone!</source>
         <target>Liity ryhmään</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Liity incognito-tilassa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Liittyy ryhmään</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Pidä kontaktisi</target>
@@ -3054,14 +2870,6 @@ This is your link for group %@!</source>
         <target>Rajoitukset</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live-viesti!</target>
@@ -3212,10 +3020,6 @@ This is your link for group %@!</source>
         <target>Viestit ja tiedostot</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Siirretään tietokannan arkistoa…</target>
@@ -3563,10 +3367,6 @@ This is your link for group %@!</source>
         <target>Avaa keskustelukonsoli</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Avaa käyttäjäprofiilit</target>
@@ -3582,6 +3382,11 @@ This is your link for group %@!</source>
         <target>Avataan tietokantaa…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Linkin avaaminen selaimessa voi heikentää yhteyden yksityisyyttä ja turvallisuutta. Epäluotetut SimpleX-linkit näkyvät punaisina.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING-määrä</target>
@@ -3627,10 +3432,6 @@ This is your link for group %@!</source>
         <target>Liitä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Liitä kuva</target>
@@ -3776,14 +3577,6 @@ This is your link for group %@!</source>
         <target>Profiilikuva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Profiilin salasana</target>
@@ -4029,14 +3822,6 @@ This is your link for group %@!</source>
         <target>Uudelleenneuvottele salaus?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Vastaa</target>
@@ -4222,10 +4007,6 @@ This is your link for group %@!</source>
         <target>Skannaa QR-koodi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Skannaa koodi</target>
@@ -4445,10 +4226,6 @@ This is your link for group %@!</source>
         <target>Palvelimet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Aseta 1 päivä</target>
@@ -4758,10 +4535,6 @@ This is your link for group %@!</source>
         <target>Napauta painiketta </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Aktivoi profiili napauttamalla.</target>
@@ -4859,6 +4632,11 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Salaus toimii ja uutta salaussopimusta ei tarvita. Tämä voi johtaa yhteysvirheisiin!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Ryhmä on täysin hajautettu - se näkyy vain jäsenille.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Edellisen viestin tarkiste on erilainen.</target>
@@ -4944,10 +4722,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Tätä toimintoa ei voi kumota - profiilisi, kontaktisi, viestisi ja tiedostosi poistuvat peruuttamattomasti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Tässä ryhmässä on yli %lld jäsentä, lähetyskuittauksia ei lähetetä.</target>
@@ -4958,14 +4732,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Tätä ryhmää ei enää ole olemassa.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Tämä asetus koskee nykyisen keskusteluprofiilisi viestejä *%@**.</target>
@@ -5062,18 +4828,6 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
         <target>Ääniviestiä ei voi tallentaa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Odottamaton virhe: %@</target>
@@ -5136,14 +4890,6 @@ To connect, please ask your contact to create another connection link and check
 Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja tarkista, että verkkoyhteytesi on vakaa.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Avaa</target>
@@ -5234,10 +4980,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Käytä uusiin yhteyksiin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Käytä iOS:n puhelujen käyttöliittymää</target>
@@ -5268,23 +5010,11 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Käyttää SimpleX Chat -palvelimia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Tarkista yhteyden suojaus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Tarkista turvakoodi</target>
@@ -5445,35 +5175,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Olet jo muodostanut yhteyden %@:n kanssa.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Olet yhteydessä palvelimeen, jota käytetään vastaanottamaan viestejä tältä kontaktilta.</target>
@@ -5569,15 +5270,6 @@ Repeat join request?</source>
         <target>Sinua ei voitu todentaa; yritä uudelleen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>Sinulla ei ole keskusteluja</target>
@@ -5628,10 +5320,6 @@ Repeat connection request?</source>
         <target>Sinut yhdistetään ryhmään, kun ryhmän isännän laite on online-tilassa, odota tai tarkista myöhemmin!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Sinut yhdistetään, kun yhteyspyyntösi on hyväksytty, odota tai tarkista myöhemmin!</target>
@@ -5647,8 +5335,9 @@ Repeat connection request?</source>
         <target>Sinun on tunnistauduttava, kun käynnistät sovelluksen tai jatkat sen käyttöä 30 sekunnin tauon jälkeen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Liityt ryhmään, johon tämä linkki viittaa, ja muodostat yhteyden sen ryhmän jäseniin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5716,6 +5405,11 @@ Repeat connection request?</source>
         <target>Keskustelut-tietokantasi ei ole salattu - aseta tunnuslause sen salaamiseksi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Keskusteluprofiilisi lähetetään ryhmän jäsenille</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Keskusteluprofiilisi</target>
@@ -5770,10 +5464,6 @@ Voit muuttaa sitä Asetuksista.</target>
         <target>Yksityisyytesi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Profiilisi **%@** jaetaan.</target>
@@ -5866,10 +5556,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>aina</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>äänipuhelu (ei e2e-salattu)</target>
@@ -5885,10 +5571,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>virheellinen viestin tarkiste</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>lihavoitu</target>
@@ -6058,10 +5740,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>poistettu</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>poistettu ryhmä</target>
@@ -6346,8 +6024,7 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <source>off</source>
         <target>pois</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6364,6 +6041,11 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>päällä</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>tai keskustele kehittäjien kanssa</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>omistaja</target>
@@ -6453,10 +6135,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>päivitetty ryhmäprofiili</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6594,10 +6272,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
         <target>SimpleX käyttää Face ID:tä paikalliseen todennukseen</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX tarvitsee mikrofonia ääni- ja videopuheluita ja ääniviestien tallentamista varten.</target>

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,11 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <target>%@ et %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ et %@ sont connecté.es</target>
@@ -102,11 +97,6 @@
         <target>%1$@ à %2$@ :</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <target>%@ connecté(e)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ est connecté·e !</target>
@@ -132,11 +122,6 @@
         <target>%@ veut se connecter !</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <target>%@, %@ et %lld membres</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ et %lld autres membres sont connectés</target>
@@ -202,31 +187,11 @@
         <target>%lld fichier·s pour une taille totale de %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <target>%lld événements de groupe</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld membres</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <target>%lld messages bloqués</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <target>%lld messages marqués comme supprimés</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <target>%lld messages modérés par %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minutes</target>
@@ -297,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -407,11 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <target>0 sec</target>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -637,11 +589,6 @@
         <target>Tous les messages seront supprimés - impossible de revenir en arrière ! Les messages seront supprimés UNIQUEMENT pour vous.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <target>Tous les nouveaux messages de %@ seront cachés !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Tous vos contacts resteront connectés.</target>
@@ -747,16 +694,6 @@
         <target>Déjà connecté ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <target>Déjà en connexion !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <target>Groupe déjà rejoint !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Se connecter via relais</target>
@@ -877,10 +814,6 @@
         <target>Retour</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Mauvais ID de message</target>
@@ -896,21 +829,6 @@
         <target>Meilleurs messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <target>Bloquer</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <target>Bloquer ce membre</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <target>Bloquer ce membre ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Vous et votre contact pouvez ajouter des réactions aux messages.</target>
@@ -1172,37 +1090,24 @@
         <target>Se connecter</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Se connecter directement</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Se connecter incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Se connecter via un lien de contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <target>Se connecter à soi-même ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <target>Se connecter à soi-même ?
-C'est votre propre adresse SimpleX !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <target>Se connecter à soi-même ?
-Il s'agit de votre propre lien unique !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
-        <target>Se connecter via l'adresse de contact</target>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Se connecter via le lien du groupe ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1220,19 +1125,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Se connecter via un lien unique</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <target>Se connecter avec %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Connexion au serveur…</target>
@@ -1243,10 +1135,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Connexion au serveur… (erreur : %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Connexion</target>
@@ -1267,10 +1155,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Demande de connexion envoyée !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Délai de connexion</target>
@@ -1286,6 +1170,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Contact déjà existant</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Le contact et tous les messages seront supprimés - impossible de revenir en arrière !</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Contact masqué :</target>
@@ -1336,11 +1225,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Version du cœur : v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <target>Corriger le nom pour %@ ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Créer</target>
@@ -1361,11 +1245,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Créer un fichier</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <target>Créer un groupe</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Créer un lien de groupe</target>
@@ -1386,11 +1265,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Créer un lien d'invitation unique</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <target>Créer le profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Créer une file d'attente</target>
@@ -1549,11 +1423,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <target>Supprimer %lld messages ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Supprimer le contact</target>
@@ -1579,11 +1448,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Effacer tous les fichiers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <target>Supprimer et en informer le contact</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Supprimer l'archive</target>
@@ -1614,11 +1478,9 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer le contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
-        <target>Supprimer le contact ?
-Cette opération ne peut être annulée !</target>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Supprimer le contact ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1761,18 +1623,6 @@ Cette opération ne peut être annulée !</target>
         <target>Description</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Développer</target>
@@ -1863,17 +1713,19 @@ Cette opération ne peut être annulée !</target>
         <target>Se déconnecter</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Découvrir et rejoindre des groupes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Nom affiché</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Nom affiché :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2046,14 +1898,6 @@ Cette opération ne peut être annulée !</target>
         <target>Message chiffrée : erreur inattendue</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Entrer le code d'accès</target>
@@ -2064,11 +1908,6 @@ Cette opération ne peut être annulée !</target>
         <target>Entrez la phrase secrète correcte.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <target>Entrer un nom de groupe…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Entrez la phrase secrète…</target>
@@ -2084,10 +1923,6 @@ Cette opération ne peut être annulée !</target>
         <target>Entrer un serveur manuellement</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Entrez un message de bienvenue…</target>
@@ -2098,11 +1933,6 @@ Cette opération ne peut être annulée !</target>
         <target>Entrez un message de bienvenue… (facultatif)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <target>Entrez votre nom…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Erreur</target>
@@ -2160,7 +1990,6 @@ Cette opération ne peut être annulée !</target>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Erreur lors de la création du contact du membre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2295,7 +2124,6 @@ Cette opération ne peut être annulée !</target>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Erreur lors de l'envoi de l'invitation de contact d'un membre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2378,11 +2206,6 @@ Cette opération ne peut être annulée !</target>
         <target>Quitter sans sauvegarder</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <target>Développer</target>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Exporter la base de données</target>
@@ -2528,11 +2351,6 @@ Cette opération ne peut être annulée !</target>
         <target>Nom complet :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <target>Entièrement décentralisé – visible que par ses membres.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Entièrement réimplémenté - fonctionne en arrière-plan !</target>
@@ -2553,16 +2371,6 @@ Cette opération ne peut être annulée !</target>
         <target>Groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <target>Le groupe existe déjà</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <target>Ce groupe existe déjà !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Nom d'affichage du groupe</target>
@@ -2863,10 +2671,6 @@ Cette opération ne peut être annulée !</target>
         <target>Version de la base de données incompatible</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Code d'accès erroné</target>
@@ -2914,11 +2718,6 @@ Cette opération ne peut être annulée !</target>
         <target>Lien de connection invalide</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <target>Nom invalide !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Adresse de serveur invalide !</target>
@@ -3010,37 +2809,16 @@ Cette opération ne peut être annulée !</target>
         <target>Rejoindre le groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <target>Rejoindre le groupe ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Rejoindre en incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <target>Rejoindre avec le profil actuel</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <target>Rejoindre votre groupe ?
-Voici votre lien pour le groupe %@ !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Entrain de rejoindre le groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Conserver vos connexions</target>
@@ -3101,14 +2879,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Limitations</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Message dynamique !</target>
@@ -3259,11 +3029,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <target>Les messages de %@ seront affichés !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Migration de l'archive de la base de données…</target>
@@ -3595,7 +3360,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>Ouvrir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3613,11 +3377,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Ouvrir la console du chat</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <target>Ouvrir le groupe</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Ouvrir les profils d'utilisateurs</target>
@@ -3633,6 +3392,11 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Ouverture de la base de données…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Ouvrir le lien dans le navigateur peut réduire la confidentialité et la sécurité de la connexion. Les liens SimpleX non fiables seront en rouge.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Nombre de PING</target>
@@ -3678,10 +3442,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Coller</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Coller l'image</target>
@@ -3827,16 +3587,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Image de profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nom du profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nom du profil :</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Mot de passe de profil</target>
@@ -4082,16 +3832,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Renégocier le chiffrement?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <target>Répéter la demande de connexion ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <target>Répéter la requête d'adhésion ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Répondre</target>
@@ -4277,10 +4017,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Scanner un code QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Scanner le code</target>
@@ -4358,12 +4094,11 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Send direct message" xml:space="preserve">
         <source>Send direct message</source>
-        <target>Envoyer un message direct</target>
+        <target>Envoi de message direct</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Envoyer un message direct pour vous connecter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4501,10 +4236,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Serveurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Définir 1 jour</target>
@@ -4815,11 +4546,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Appuyez sur le bouton </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <target>Tapez pour vous connecter</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Appuyez pour activer un profil.</target>
@@ -4917,6 +4643,11 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Le chiffrement fonctionne et le nouvel accord de chiffrement n'est pas nécessaire. Cela peut provoquer des erreurs de connexion !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Le groupe est entièrement décentralisé – il n'est visible que par ses membres.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Le hash du message précédent est différent.</target>
@@ -5002,10 +4733,6 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Cette action ne peut être annulée - votre profil, vos contacts, vos messages et vos fichiers seront irréversiblement perdus.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Ce groupe compte plus de %lld membres, les accusés de réception ne sont pas envoyés.</target>
@@ -5016,16 +4743,6 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Ce groupe n'existe plus.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <target>Voici votre propre adresse SimpleX !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <target>Voici votre propre lien unique !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Ce paramètre s'applique aux messages de votre profil de chat actuel **%@**.</target>
@@ -5123,21 +4840,6 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Impossible d'enregistrer un message vocal</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <target>Débloquer</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <target>Débloquer ce membre</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <target>Débloquer ce membre ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Erreur inattendue : %@</target>
@@ -5200,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 Pour vous connecter, veuillez demander à votre contact de créer un autre lien de connexion et vérifiez que vous disposez d'une connexion réseau stable.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Déverrouiller</target>
@@ -5298,10 +4992,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser pour les nouvelles connexions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Utiliser l'interface d'appel d'iOS</target>
@@ -5332,23 +5022,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utilisation des serveurs SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Vérifier la sécurité de la connexion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Vérifier le code de sécurité</target>
@@ -5509,43 +5187,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Vous êtes déjà connecté·e à %@ via ce lien.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <target>Vous êtes déjà en train de vous connecter à %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <target>Vous êtes déjà connecté(e) via ce lien unique !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <target>Vous êtes déjà dans le groupe %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <target>Vous êtes déjà en train de rejoindre le groupe %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <target>Vous êtes déjà en train de rejoindre le groupe via ce lien !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <target>Vous êtes déjà en train de rejoindre le groupe via ce lien.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <target>Vous êtes déjà membre de ce groupe !
-Répéter la demande d'adhésion ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Vous êtes connecté·e au serveur utilisé pour recevoir les messages de ce contact.</target>
@@ -5641,18 +5282,6 @@ Répéter la demande d'adhésion ?</target>
         <target>Vous n'avez pas pu être vérifié·e ; veuillez réessayer.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <target>Vous avez déjà demandé une connexion via cette adresse !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <target>Vous avez déjà demandé une connexion !
-Répéter la demande de connexion ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>Vous n'avez aucune discussion</target>
@@ -5703,11 +5332,6 @@ Répéter la demande de connexion ?</target>
         <target>Vous serez connecté·e au groupe lorsque l'appareil de l'hôte sera en ligne, veuillez attendre ou vérifier plus tard !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>Vous serez connecté(e) lorsque l'appareil de l'hôte du lien de groupe sera en ligne, veuillez patienter ou vérifier plus tard !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Vous serez connecté·e lorsque votre demande de connexion sera acceptée, veuillez attendre ou vérifier plus tard !</target>
@@ -5723,9 +5347,9 @@ Répéter la demande de connexion ?</target>
         <target>Il vous sera demandé de vous authentifier lorsque vous démarrez ou reprenez l'application après 30 secondes en arrière-plan.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
-        <target>Vous vous connecterez à tous les membres du groupe.</target>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Vous allez rejoindre le groupe correspondant à ce lien et être mis en relation avec les autres membres du groupe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5793,6 +5417,11 @@ Répéter la demande de connexion ?</target>
         <target>Votre base de données de chat n'est pas chiffrée - définisez une phrase secrète.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Votre profil de chat sera envoyé aux membres du groupe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Vos profils de chat</target>
@@ -5847,11 +5476,6 @@ Vous pouvez modifier ce choix dans les Paramètres.</target>
         <target>Votre vie privée</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <target>Votre profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Votre profil **%@** sera partagé.</target>
@@ -5944,11 +5568,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>toujours</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <target>et %lld autres événements</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>appel audio (sans chiffrement)</target>
@@ -5964,11 +5583,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>hash de message incorrect</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <target>blocké</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>gras</target>
@@ -6041,7 +5655,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>s'est connecté.e de manière directe</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6139,11 +5752,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>supprimé</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <target>contact supprimé</target>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>groupe supprimé</target>
@@ -6428,8 +6036,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6446,6 +6053,11 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>on</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>ou ici pour discuter avec les développeurs</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>propriétaire</target>
@@ -6508,7 +6120,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>envoyer un message direct</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6536,10 +6147,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>mise à jour du profil de groupe</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6677,10 +6284,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>SimpleGroup not found!X utilise Face ID pour l'authentification locale</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX a besoin d'un accès au microphone pour les appels audio et vidéo ainsi que pour enregistrer des messages vocaux.</target>

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,11 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <target>%@ e %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ e %@ sono connessi/e</target>
@@ -102,11 +97,6 @@
         <target>%1$@ alle %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <target>%@ si è connesso/a</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ è connesso/a!</target>
@@ -132,11 +122,6 @@
         <target>%@ si vuole connettere!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <target>%@, %@ e %lld membri</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ e altri %lld membri sono connessi</target>
@@ -202,31 +187,11 @@
         <target>%lld file con dimensione totale di %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <target>%lld eventi del gruppo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld membri</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <target>%lld messaggi bloccati</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <target>%lld messaggi contrassegnati eliminati</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <target>%lld messaggi moderati da %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minuti</target>
@@ -297,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -407,11 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <target>0 sec</target>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -637,11 +589,6 @@
         <target>Tutti i messaggi verranno eliminati, non è reversibile! I messaggi verranno eliminati SOLO per te.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <target>Tutti i nuovi messaggi da %@ verrranno nascosti!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Tutti i tuoi contatti resteranno connessi.</target>
@@ -747,16 +694,6 @@
         <target>Già connesso/a?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <target>Già in connessione!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <target>Già in ingresso nel gruppo!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Connetti via relay</target>
@@ -877,10 +814,6 @@
         <target>Indietro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>ID del messaggio errato</target>
@@ -896,21 +829,6 @@
         <target>Messaggi migliorati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <target>Blocca</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <target>Blocca membro</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <target>Bloccare il membro?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sia tu che il tuo contatto potete aggiungere reazioni ai messaggi.</target>
@@ -1172,37 +1090,24 @@
         <target>Connetti</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Connetti direttamente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Connetti in incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Connetti via link del contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <target>Connettersi a te stesso?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <target>Connettersi a te stesso?
-Questo è il tuo indirizzo SimpleX!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <target>Connettersi a te stesso?
-Questo è il tuo link una tantum!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
-        <target>Connettere via indirizzo del contatto</target>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Connettere via link del gruppo?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1220,19 +1125,6 @@ Questo è il tuo link una tantum!</target>
         <target>Connetti via link una tantum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <target>Connettersi con %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Connessione al server…</target>
@@ -1243,10 +1135,6 @@ Questo è il tuo link una tantum!</target>
         <target>Connessione al server… (errore: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Connessione</target>
@@ -1267,10 +1155,6 @@ Questo è il tuo link una tantum!</target>
         <target>Richiesta di connessione inviata!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Connessione scaduta</target>
@@ -1286,6 +1170,11 @@ Questo è il tuo link una tantum!</target>
         <target>Il contatto esiste già</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Il contatto e tutti i messaggi verranno eliminati, non è reversibile!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Contatto nascosto:</target>
@@ -1336,11 +1225,6 @@ Questo è il tuo link una tantum!</target>
         <target>Versione core: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <target>Correggere il nome a %@?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Crea</target>
@@ -1361,11 +1245,6 @@ Questo è il tuo link una tantum!</target>
         <target>Crea file</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <target>Crea gruppo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Crea link del gruppo</target>
@@ -1386,11 +1265,6 @@ Questo è il tuo link una tantum!</target>
         <target>Crea link di invito una tantum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <target>Crea profilo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Crea coda</target>
@@ -1549,11 +1423,6 @@ Questo è il tuo link una tantum!</target>
         <target>Elimina</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <target>Eliminare %lld messaggi?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Elimina contatto</target>
@@ -1579,11 +1448,6 @@ Questo è il tuo link una tantum!</target>
         <target>Elimina tutti i file</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <target>Elimina e avvisa il contatto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Elimina archivio</target>
@@ -1614,11 +1478,9 @@ Questo è il tuo link una tantum!</target>
         <target>Elimina contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
-        <target>Eliminare il contatto?
-Non è reversibile!</target>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Eliminare il contatto?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1761,18 +1623,6 @@ Non è reversibile!</target>
         <target>Descrizione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Sviluppa</target>
@@ -1863,17 +1713,19 @@ Non è reversibile!</target>
         <target>Disconnetti</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Scopri ed unisciti ai gruppi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Nome da mostrare</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Nome da mostrare:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2046,14 +1898,6 @@ Non è reversibile!</target>
         <target>Messaggio crittografato: errore imprevisto</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Inserisci il codice di accesso</target>
@@ -2064,11 +1908,6 @@ Non è reversibile!</target>
         <target>Inserisci la password giusta.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <target>Inserisci il nome del gruppo…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Inserisci la password…</target>
@@ -2084,10 +1923,6 @@ Non è reversibile!</target>
         <target>Inserisci il server a mano</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Inserisci il messaggio di benvenuto…</target>
@@ -2098,11 +1933,6 @@ Non è reversibile!</target>
         <target>Inserisci il messaggio di benvenuto… (facoltativo)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <target>Inserisci il tuo nome…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Errore</target>
@@ -2160,7 +1990,6 @@ Non è reversibile!</target>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Errore di creazione del contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2295,7 +2124,6 @@ Non è reversibile!</target>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Errore di invio dell'invito al contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2378,11 +2206,6 @@ Non è reversibile!</target>
         <target>Esci senza salvare</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <target>Espandi</target>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Esporta database</target>
@@ -2528,11 +2351,6 @@ Non è reversibile!</target>
         <target>Nome completo:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <target>Completamente decentralizzato: visibile solo ai membri.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Completamente reimplementato - funziona in secondo piano!</target>
@@ -2553,16 +2371,6 @@ Non è reversibile!</target>
         <target>Gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <target>Il gruppo esiste già</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <target>Il gruppo esiste già!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Nome mostrato del gruppo</target>
@@ -2863,10 +2671,6 @@ Non è reversibile!</target>
         <target>Versione del database incompatibile</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Codice di accesso errato</target>
@@ -2914,11 +2718,6 @@ Non è reversibile!</target>
         <target>Link di connessione non valido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <target>Nome non valido!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Indirizzo del server non valido!</target>
@@ -3010,37 +2809,16 @@ Non è reversibile!</target>
         <target>Entra nel gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <target>Entrare nel gruppo?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Entra in incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <target>Entra con il profilo attuale</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <target>Entrare nel tuo gruppo?
-Questo è il tuo link per il gruppo %@!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Ingresso nel gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Mantieni le tue connessioni</target>
@@ -3101,14 +2879,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Limitazioni</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Messaggio in diretta!</target>
@@ -3259,11 +3029,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Messaggi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <target>I messaggi da %@ verranno mostrati!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Migrazione archivio del database…</target>
@@ -3595,7 +3360,6 @@ Questo è il tuo link per il gruppo %@!</target>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>Apri</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3613,11 +3377,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Apri la console della chat</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <target>Apri gruppo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Apri i profili utente</target>
@@ -3633,6 +3392,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Apertura del database…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Aprire il link nel browser può ridurre la privacy e la sicurezza della connessione. I link SimpleX non fidati saranno in rosso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Conteggio PING</target>
@@ -3678,10 +3442,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Incolla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Incolla immagine</target>
@@ -3827,16 +3587,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Immagine del profilo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nome del profilo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nome del profilo:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Password del profilo</target>
@@ -4082,16 +3832,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Rinegoziare la crittografia?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <target>Ripetere la richiesta di connessione?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <target>Ripetere la richiesta di ingresso?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Rispondi</target>
@@ -4154,7 +3894,7 @@ Questo è il tuo link per il gruppo %@!</target>
       </trans-unit>
       <trans-unit id="Revert" xml:space="preserve">
         <source>Revert</source>
-        <target>Ripristina</target>
+        <target>Annulla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
@@ -4277,10 +4017,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Scansiona codice QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Scansiona codice</target>
@@ -4363,7 +4099,6 @@ Questo è il tuo link per il gruppo %@!</target>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Invia messaggio diretto per connetterti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4501,10 +4236,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Imposta 1 giorno</target>
@@ -4815,11 +4546,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Tocca il pulsante </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <target>Tocca per connettere</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Tocca per attivare il profilo.</target>
@@ -4917,6 +4643,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>La crittografia funziona e il nuovo accordo sulla crittografia non è richiesto. Potrebbero verificarsi errori di connessione!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Il gruppo è completamente decentralizzato: è visibile solo ai membri.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>L'hash del messaggio precedente è diverso.</target>
@@ -5002,10 +4733,6 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Questa azione non può essere annullata: il tuo profilo, i contatti, i messaggi e i file andranno persi in modo irreversibile.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Questo gruppo ha più di %lld membri, le ricevute di consegna non vengono inviate.</target>
@@ -5016,16 +4743,6 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Questo gruppo non esiste più.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <target>Questo è il tuo indirizzo SimpleX!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <target>Questo è il tuo link una tantum!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Questa impostazione si applica ai messaggi del profilo di chat attuale **%@**.</target>
@@ -5123,21 +4840,6 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Impossibile registrare il messaggio vocale</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <target>Sblocca</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <target>Sblocca membro</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <target>Sbloccare il membro?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Errore imprevisto: % @</target>
@@ -5200,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e controlla di avere una connessione di rete stabile.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Sblocca</target>
@@ -5298,10 +4992,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa per connessioni nuove</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Usa interfaccia di chiamata iOS</target>
@@ -5332,23 +5022,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Utilizzo dei server SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Verifica la sicurezza della connessione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Verifica codice di sicurezza</target>
@@ -5509,43 +5187,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Sei già connesso/a a %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <target>Ti stai già connettendo a %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <target>Ti stai già connettendo tramite questo link una tantum!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <target>Sei già nel gruppo %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <target>Stai già entrando nel gruppo %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <target>Stai già entrando nel gruppo tramite questo link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <target>Stai già entrando nel gruppo tramite questo link.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <target>Stai già entrando nel gruppo!
-Ripetere la richiesta di ingresso?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Sei connesso/a al server usato per ricevere messaggi da questo contatto.</target>
@@ -5641,18 +5282,6 @@ Ripetere la richiesta di ingresso?</target>
         <target>Non è stato possibile verificarti, riprova.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <target>Hai già richiesto la connessione tramite questo indirizzo!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <target>Hai già richiesto la connessione!
-Ripetere la richiesta di connessione?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>Non hai chat</target>
@@ -5703,11 +5332,6 @@ Ripetere la richiesta di connessione?</target>
         <target>Verrai connesso/a al gruppo quando il dispositivo dell'host del gruppo sarà in linea, attendi o controlla più tardi!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>Verrai connesso/a quando il dispositivo dell'host del gruppo sarà in linea, attendi o controlla più tardi!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Verrai connesso/a quando la tua richiesta di connessione verrà accettata, attendi o controlla più tardi!</target>
@@ -5723,9 +5347,9 @@ Ripetere la richiesta di connessione?</target>
         <target>Dovrai autenticarti quando avvii o riapri l'app dopo 30 secondi in secondo piano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
-        <target>Ti connetterai a tutti i membri del gruppo.</target>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Entrerai in un gruppo a cui si riferisce questo link e ti connetterai ai suoi membri.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5793,6 +5417,11 @@ Ripetere la richiesta di connessione?</target>
         <target>Il tuo database della chat non è crittografato: imposta la password per crittografarlo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Il tuo profilo di chat verrà inviato ai membri del gruppo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>I tuoi profili di chat</target>
@@ -5847,11 +5476,6 @@ Puoi modificarlo nelle impostazioni.</target>
         <target>La tua privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <target>Il tuo profilo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Il tuo profilo **%@** verrà condiviso.</target>
@@ -5944,11 +5568,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>sempre</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <target>e altri %lld eventi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>chiamata audio (non crittografata e2e)</target>
@@ -5964,11 +5583,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>hash del messaggio errato</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <target>bloccato</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>grassetto</target>
@@ -6001,7 +5615,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="changed role of %@ to %@" xml:space="preserve">
         <source>changed role of %1$@ to %2$@</source>
-        <target>ha cambiato il ruolo di %1$@ in %2$@</target>
+        <target>cambiato il ruolo di %1$@ in %2$@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="changed your role to %@" xml:space="preserve">
@@ -6041,7 +5655,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>si è connesso/a direttamente</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6139,11 +5752,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>eliminato</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <target>contatto eliminato</target>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>gruppo eliminato</target>
@@ -6361,7 +5969,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
         <source>connected</source>
-        <target>si è connesso/a</target>
+        <target>è connesso/a</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="message received" xml:space="preserve">
@@ -6428,8 +6036,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6446,6 +6053,11 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>on</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>o scrivi agli sviluppatori</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>proprietario</target>
@@ -6473,7 +6085,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="removed" xml:space="preserve">
         <source>removed</source>
-        <target>rimosso</target>
+        <target>ha rimosso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="removed %@" xml:space="preserve">
@@ -6483,7 +6095,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="removed you" xml:space="preserve">
         <source>removed you</source>
-        <target>ti ha rimosso/a</target>
+        <target>sei stato/a rimosso/a</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="sec" xml:space="preserve">
@@ -6508,7 +6120,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>invia messaggio diretto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6536,10 +6147,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>profilo del gruppo aggiornato</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6677,10 +6284,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>SimpleX usa Face ID per l'autenticazione locale</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX ha bisogno dell'accesso al microfono per le chiamate audio e video e per registrare messaggi vocali.</target>

apps/ios/SimpleX Localizations/it.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ と %@ は接続中</target>
@@ -101,10 +97,6 @@
         <target>%1$@ at %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ 接続中!</target>
@@ -130,10 +122,6 @@
         <target>%@ が接続を希望しています!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ および %lld 人のメンバーが接続中</target>
@@ -199,27 +187,11 @@
         <target>%lld 個のファイル（合計サイズ: %@）</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld 人のメンバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld 分</target>
@@ -227,7 +199,6 @@
       </trans-unit>
       <trans-unit id="%lld new interface languages" xml:space="preserve">
         <source>%lld new interface languages</source>
-        <target>%lldつの新しいインターフェース言語</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -290,14 +261,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -397,10 +360,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0秒</target>
@@ -626,10 +585,6 @@
         <target>全てのメッセージが削除されます(※注意：元に戻せません！※)。削除されるのは片方あなたのメッセージのみ。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>あなたの連絡先が繋がったまま継続します。</target>
@@ -735,14 +690,6 @@
         <target>すでに接続済みですか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>常にリレーを経由する</target>
@@ -765,7 +712,6 @@
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
         <source>App encrypts new local files (except videos).</source>
-        <target>アプリは新しいローカルファイル（ビデオを除く）を暗号化します。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
@@ -863,10 +809,6 @@
         <target>戻る</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>メッセージ ID が正しくありません</target>
@@ -882,18 +824,6 @@
         <target>より良いメッセージ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>自分も相手もメッセージへのリアクションを追加できます。</target>
@@ -921,7 +851,6 @@
       </trans-unit>
       <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve">
         <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target>ブルガリア語、フィンランド語、タイ語、ウクライナ語 - ユーザーと [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)に感謝します！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1155,31 +1084,24 @@
         <target>接続</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>直接接続する</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>シークレットモードで接続</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>連絡先リンク経由で接続しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>グループリンク経由で接続しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1197,18 +1119,6 @@ This is your own one-time link!</source>
         <target>使い捨てリンク経由で接続しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>サーバーに接続中…</target>
@@ -1219,10 +1129,6 @@ This is your own one-time link!</source>
         <target>サーバーに接続中… (エラー: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>接続</target>
@@ -1243,10 +1149,6 @@ This is your own one-time link!</source>
         <target>接続リクエストを送信しました！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>接続タイムアウト</target>
@@ -1262,6 +1164,11 @@ This is your own one-time link!</source>
         <target>連絡先に既に存在します</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>連絡先と全メッセージが削除されます (※元に戻せません※)！</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>連絡先が非表示:</target>
@@ -1312,10 +1219,6 @@ This is your own one-time link!</source>
         <target>コアのバージョン: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>作成</target>
@@ -1336,10 +1239,6 @@ This is your own one-time link!</source>
         <target>ファイルを作成</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>グループのリンクを生成する</target>
@@ -1352,7 +1251,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>[デスクトップアプリ](https://simplex.chat/downloads/)で新しいプロファイルを作成します。 💻</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1360,10 +1258,6 @@ This is your own one-time link!</source>
         <target>使い捨ての招待リンクを生成する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>キューの作成</target>
@@ -1522,10 +1416,6 @@ This is your own one-time link!</source>
         <target>削除</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>連絡先を削除</target>
@@ -1551,10 +1441,6 @@ This is your own one-time link!</source>
         <target>ファイルを全て削除</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>アーカイブを削除</target>
@@ -1585,9 +1471,9 @@ This is your own one-time link!</source>
         <target>連絡先を削除</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>連絡先を削除しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1722,7 +1608,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
         <source>Delivery receipts!</source>
-        <target>配信通知！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Description" xml:space="preserve">
@@ -1730,18 +1615,6 @@ This cannot be undone!</source>
         <target>説明</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>開発</target>
@@ -1832,17 +1705,18 @@ This cannot be undone!</source>
         <target>切断</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
-        <target>グループを見つけて参加する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>表示名</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>表示名：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1977,7 +1851,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
         <source>Encrypt stored files &amp; media</source>
-        <target>保存されたファイルとメディアを暗号化する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
@@ -2015,14 +1888,6 @@ This cannot be undone!</source>
         <target>暗号化されたメッセージ : 予期しないエラー</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>パスコードを入力</target>
@@ -2033,10 +1898,6 @@ This cannot be undone!</source>
         <target>正しいパスフレーズを入力してください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>暗証フレーズを入力…</target>
@@ -2052,10 +1913,6 @@ This cannot be undone!</source>
         <target>サーバを手動で入力</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>ウェルカムメッセージを入力してください…</target>
@@ -2066,10 +1923,6 @@ This cannot be undone!</source>
         <target>ウェルカムメッセージを入力…（オプション）</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>エラー</target>
@@ -2127,7 +1980,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>メンバー連絡先の作成中にエラーが発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2261,7 +2113,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>招待メッセージの送信エラー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2343,10 +2194,6 @@ This cannot be undone!</source>
         <target>保存せずに閉じる</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>データベースをエキスポート</target>
@@ -2492,10 +2339,6 @@ This cannot be undone!</source>
         <target>フルネーム：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>完全に再実装されました - バックグラウンドで動作します!</target>
@@ -2516,14 +2359,6 @@ This cannot be undone!</source>
         <target>グループ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>グループ表示の名前</target>
@@ -2824,10 +2659,6 @@ This cannot be undone!</source>
         <target>データベースのバージョンと互換性がない</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>パスコードが正しくありません</target>
@@ -2875,10 +2706,6 @@ This cannot be undone!</source>
         <target>無効な接続リンク</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>無効なサーバアドレス！</target>
@@ -2970,33 +2797,16 @@ This cannot be undone!</source>
         <target>グループに参加</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>シークレットモードで参加</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>グループに参加</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>接続を維持</target>
@@ -3057,14 +2867,6 @@ This is your link for group %@!</source>
         <target>制限事項</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>ライブメッセージ！</target>
@@ -3214,10 +3016,6 @@ This is your link for group %@!</source>
         <target>メッセージ &amp; ファイル</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>データベースのアーカイブを移行しています…</target>
@@ -3330,7 +3128,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New desktop app!" xml:space="preserve">
         <source>New desktop app!</source>
-        <target>新しいデスクトップアプリ！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
@@ -3549,7 +3346,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>開く</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3567,10 +3363,6 @@ This is your link for group %@!</source>
         <target>チャットのコンソールを開く</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>ユーザープロフィールを開く</target>
@@ -3586,6 +3378,11 @@ This is your link for group %@!</source>
         <target>データベースを開いています…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>ブラウザでリンクを開くと接続のプライバシーとセキュリティが下がる可能性があります。信頼されないSimpleXリンクは読み込まれません。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING回数</target>
@@ -3631,10 +3428,6 @@ This is your link for group %@!</source>
         <target>貼り付け</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>画像の貼り付け</target>
@@ -3780,14 +3573,6 @@ This is your link for group %@!</source>
         <target>プロフィール画像</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>プロフィールのパスワード</target>
@@ -4032,14 +3817,6 @@ This is your link for group %@!</source>
         <target>暗号化を再ネゴシエートしますか?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>返信</target>
@@ -4225,10 +4002,6 @@ This is your link for group %@!</source>
         <target>QRコードを読み込む</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>コードを読み込む</target>
@@ -4310,7 +4083,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>ダイレクトメッセージを送信して接続する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4441,10 +4213,6 @@ This is your link for group %@!</source>
         <target>サーバ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>1日に設定</target>
@@ -4612,7 +4380,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
-        <target>シークレットモードの簡素化</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -4755,10 +4522,6 @@ This is your link for group %@!</source>
         <target>ボタンをタップ </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>タップしてプロフィールを有効化する。</target>
@@ -4856,6 +4619,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>暗号化は機能しており、新しい暗号化への同意は必要ありません。接続エラーが発生する可能性があります！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>グループは完全分散型で、メンバーしか内容を見れません。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>以前のメッセージとハッシュ値が異なります。</target>
@@ -4941,10 +4709,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>あなたのプロフィール、連絡先、メッセージ、ファイルが完全削除されます (※元に戻せません※)。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <note>No comment provided by engineer.</note>
@@ -4954,14 +4718,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>このグループはもう存在しません。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>この設定は現在のチャットプロフィール **%@** のメッセージに適用されます。</target>
@@ -5058,18 +4814,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>音声メッセージを録音できません</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>予期しないエラー: %@</target>
@@ -5132,14 +4876,6 @@ To connect, please ask your contact to create another connection link and check
 接続するには、連絡先に別の接続リンクを作成するよう依頼し、ネットワーク接続が安定していることを確認してください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>ロック解除</target>
@@ -5230,10 +4966,6 @@ To connect, please ask your contact to create another connection link and check
         <target>新しい接続に使う</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>iOS通話インターフェースを使用する</target>
@@ -5264,23 +4996,11 @@ To connect, please ask your contact to create another connection link and check
         <target>SimpleX チャット サーバーを使用する。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>接続のセキュリティを確認</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>セキュリティコードを確認</target>
@@ -5441,35 +5161,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>この連絡先から受信するメッセージのサーバに既に接続してます。</target>
@@ -5565,15 +5256,6 @@ Repeat join request?</source>
         <target>確認できませんでした。 もう一度お試しください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>あなたはチャットがありません</target>
@@ -5624,10 +5306,6 @@ Repeat connection request?</source>
         <target>グループのホスト端末がオンラインになったら、接続されます。後でチェックするか、しばらくお待ちください！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>連絡先が繋がりリクエストを承認したら、接続されます。後でチェックするか、しばらくお待ちください！</target>
@@ -5643,8 +5321,9 @@ Repeat connection request?</source>
         <target>起動時、または非アクティブ状態で30秒が経った後に戻ると、認証する必要となります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>このリンクのグループに参加し、そのメンバーに繋がります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5712,6 +5391,11 @@ Repeat connection request?</source>
         <target>チャット データベースは暗号化されていません - 暗号化するにはパスフレーズを設定してください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>あなたのチャットプロフィールが他のグループメンバーに送られます</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>あなたのチャットプロフィール</target>
@@ -5766,10 +5450,6 @@ You can change it in Settings.</source>
         <target>あなたのプライバシー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>あなたのプロファイル **%@** が共有されます。</target>
@@ -5862,10 +5542,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>常に</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>音声通話 (エンドツーエンド暗号化なし）</target>
@@ -5881,10 +5557,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>メッセージのハッシュ値問題</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>太文字</target>
@@ -6054,10 +5726,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>削除完了</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>削除されたグループ</target>
@@ -6342,8 +6010,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <source>off</source>
         <target>オフ</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6360,6 +6027,11 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>オン</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>または開発者とチャットする</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>オーナー</target>
@@ -6449,10 +6121,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>グループプロフィールを更新しました</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6590,10 +6258,6 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
         <target>SimpleX はローカル認証に Face ID を使用します</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX では、音声通話やビデオ通話、および音声メッセージの録音のためにマイクへのアクセスが必要です。</target>

apps/ios/SimpleX Localizations/ja.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

apps/ios/SimpleX Localizations/nl.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,11 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <target>%@ i %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ i %@ połączeni</target>
@@ -102,11 +97,6 @@
         <target>%1$@ o %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <target>%@ połączony</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ jest połączony!</target>
@@ -132,11 +122,6 @@
         <target>%@ chce się połączyć!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <target>%@, %@ i %lld członków</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ i %lld innych członków połączeni</target>
@@ -202,31 +187,11 @@
         <target>%lld plik(i) o całkowitym rozmiarze %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <target>%lld wydarzeń grupy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld członków</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <target>%lld wiadomości zablokowanych</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <target>%lld wiadomości oznaczonych do usunięcia</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <target>%lld wiadomości zmoderowanych przez %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld minut</target>
@@ -297,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -407,11 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <target>0 sek</target>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -637,11 +589,6 @@
         <target>Wszystkie wiadomości zostaną usunięte - nie można tego cofnąć! Wiadomości zostaną usunięte TYLKO dla Ciebie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <target>Wszystkie nowe wiadomości z %@ zostaną ukryte!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Wszystkie Twoje kontakty pozostaną połączone.</target>
@@ -747,16 +694,6 @@
         <target>Już połączony?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <target>Już połączony!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <target>Już dołączono do grupy!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Zawsze używaj przekaźnika</target>
@@ -877,10 +814,6 @@
         <target>Wstecz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Zły identyfikator wiadomości</target>
@@ -896,21 +829,6 @@
         <target>Lepsze wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <target>Zablokuj</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <target>Zablokuj członka</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <target>Zablokować członka?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Zarówno Ty, jak i Twój kontakt możecie dodawać reakcje wiadomości.</target>
@@ -1172,37 +1090,24 @@
         <target>Połącz</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Połącz bezpośrednio</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Połącz incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Połącz przez link kontaktowy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <target>Połączyć się ze sobą?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <target>Połączyć się ze sobą?
-To jest twój własny adres SimpleX!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <target>Połączyć się ze sobą?
-To jest twój jednorazowy link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
-        <target>Połącz przez adres kontaktowy</target>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Połącz się przez link grupowy?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1220,19 +1125,6 @@ To jest twój jednorazowy link!</target>
         <target>Połącz przez jednorazowy link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <target>Połącz z %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Łączenie z serwerem…</target>
@@ -1243,10 +1135,6 @@ To jest twój jednorazowy link!</target>
         <target>Łączenie z serwerem... (błąd: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Połączenie</target>
@@ -1267,10 +1155,6 @@ To jest twój jednorazowy link!</target>
         <target>Prośba o połączenie wysłana!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Czas połączenia minął</target>
@@ -1286,6 +1170,11 @@ To jest twój jednorazowy link!</target>
         <target>Kontakt już istnieje</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Kontakt i wszystkie wiadomości zostaną usunięte - nie można tego cofnąć!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Kontakt ukryty:</target>
@@ -1336,11 +1225,6 @@ To jest twój jednorazowy link!</target>
         <target>Wersja rdzenia: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <target>Poprawić imię na %@?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Utwórz</target>
@@ -1361,11 +1245,6 @@ To jest twój jednorazowy link!</target>
         <target>Utwórz plik</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <target>Utwórz grupę</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Utwórz link do grupy</target>
@@ -1386,11 +1265,6 @@ To jest twój jednorazowy link!</target>
         <target>Utwórz jednorazowy link do zaproszenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <target>Utwórz profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Utwórz kolejkę</target>
@@ -1549,11 +1423,6 @@ To jest twój jednorazowy link!</target>
         <target>Usuń</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <target>Usunąć %lld wiadomości?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Usuń Kontakt</target>
@@ -1579,11 +1448,6 @@ To jest twój jednorazowy link!</target>
         <target>Usuń wszystkie pliki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <target>Usuń i powiadom kontakt</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Usuń archiwum</target>
@@ -1614,11 +1478,9 @@ To jest twój jednorazowy link!</target>
         <target>Usuń kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
-        <target>Usunąć kontakt?
-To nie może być cofnięte!</target>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Usunąć kontakt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1761,18 +1623,6 @@ To nie może być cofnięte!</target>
         <target>Opis</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Deweloperskie</target>
@@ -1863,17 +1713,19 @@ To nie może być cofnięte!</target>
         <target>Rozłącz</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Odkrywaj i dołączaj do grup</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Wyświetlana nazwa</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Wyświetlana nazwa:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2046,14 +1898,6 @@ To nie może być cofnięte!</target>
         <target>Zaszyfrowana wiadomość: nieoczekiwany błąd</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Wprowadź Pin</target>
@@ -2064,11 +1908,6 @@ To nie może być cofnięte!</target>
         <target>Wprowadź poprawne hasło.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <target>Wpisz nazwę grupy…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Wprowadź hasło…</target>
@@ -2084,10 +1923,6 @@ To nie może być cofnięte!</target>
         <target>Wprowadź serwer ręcznie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Wpisz wiadomość powitalną…</target>
@@ -2098,11 +1933,6 @@ To nie może być cofnięte!</target>
         <target>Wpisz wiadomość powitalną… (opcjonalne)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <target>Wpisz swoją nazwę…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Błąd</target>
@@ -2160,7 +1990,6 @@ To nie może być cofnięte!</target>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Błąd tworzenia kontaktu członka</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2295,7 +2124,6 @@ To nie może być cofnięte!</target>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Błąd wysyłania zaproszenia kontaktu członka</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2378,11 +2206,6 @@ To nie może być cofnięte!</target>
         <target>Wyjdź bez zapisywania</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <target>Rozszerz</target>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Eksportuj bazę danych</target>
@@ -2528,11 +2351,6 @@ To nie może być cofnięte!</target>
         <target>Pełna nazwa:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <target>W pełni zdecentralizowana – widoczna tylko dla członków.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>W pełni ponownie zaimplementowany - praca w tle!</target>
@@ -2553,16 +2371,6 @@ To nie może być cofnięte!</target>
         <target>Grupa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <target>Grupa już istnieje</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <target>Grupa już istnieje!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Wyświetlana nazwa grupy</target>
@@ -2863,10 +2671,6 @@ To nie może być cofnięte!</target>
         <target>Niekompatybilna wersja bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Nieprawidłowy pin</target>
@@ -2914,11 +2718,6 @@ To nie może być cofnięte!</target>
         <target>Nieprawidłowy link połączenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <target>Nieprawidłowa nazwa!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Nieprawidłowy adres serwera!</target>
@@ -3010,37 +2809,16 @@ To nie może być cofnięte!</target>
         <target>Dołącz do grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <target>Dołączyć do grupy?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Dołącz incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <target>Dołącz z obecnym profilem</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <target>Dołączyć do twojej grupy?
-To jest twój link do grupy %@!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Dołączanie do grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Zachowaj swoje połączenia</target>
@@ -3101,14 +2879,6 @@ To jest twój link do grupy %@!</target>
         <target>Ograniczenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Wiadomość na żywo!</target>
@@ -3259,11 +3029,6 @@ To jest twój link do grupy %@!</target>
         <target>Wiadomości i pliki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <target>Wiadomości od %@ zostaną pokazane!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Migrowanie archiwum bazy danych…</target>
@@ -3595,7 +3360,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>Otwórz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3613,11 +3377,6 @@ To jest twój link do grupy %@!</target>
         <target>Otwórz konsolę czatu</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <target>Grupa otwarta</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Otwórz profile użytkownika</target>
@@ -3633,6 +3392,11 @@ To jest twój link do grupy %@!</target>
         <target>Otwieranie bazy danych…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Otwarcie łącza w przeglądarce może zmniejszyć prywatność i bezpieczeństwo połączenia. Niezaufane linki SimpleX będą miały kolor czerwony.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Liczba PINGÓW</target>
@@ -3678,10 +3442,6 @@ To jest twój link do grupy %@!</target>
         <target>Wklej</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Wklej obraz</target>
@@ -3827,16 +3587,6 @@ To jest twój link do grupy %@!</target>
         <target>Zdjęcie profilowe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nazwa profilu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nazwa profilu:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Hasło profilu</target>
@@ -4082,16 +3832,6 @@ To jest twój link do grupy %@!</target>
         <target>Renegocjować szyfrowanie?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <target>Powtórzyć prośbę połączenia?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <target>Powtórzyć prośbę dołączenia?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Odpowiedz</target>
@@ -4277,10 +4017,6 @@ To jest twój link do grupy %@!</target>
         <target>Zeskanuj kod QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Zeskanuj kod</target>
@@ -4363,7 +4099,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Wyślij wiadomość bezpośrednią aby połączyć</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4501,10 +4236,6 @@ To jest twój link do grupy %@!</target>
         <target>Serwery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Ustaw 1 dzień</target>
@@ -4815,11 +4546,6 @@ To jest twój link do grupy %@!</target>
         <target>Naciśnij przycisk </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <target>Dotknij aby połączyć</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Dotknij, aby aktywować profil.</target>
@@ -4917,6 +4643,11 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Szyfrowanie działa, a nowe uzgodnienie szyfrowania nie jest wymagane. Może to spowodować błędy w połączeniu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Grupa jest w pełni zdecentralizowana – jest widoczna tylko dla członków.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Hash poprzedniej wiadomości jest inny.</target>
@@ -5002,10 +4733,6 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Tego działania nie można cofnąć - Twój profil, kontakty, wiadomości i pliki zostaną nieodwracalnie utracone.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>Ta grupa ma ponad %lld członków, potwierdzenia dostawy nie są wysyłane.</target>
@@ -5016,16 +4743,6 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Ta grupa już nie istnieje.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <target>To jest twój własny adres SimpleX!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <target>To jest twój jednorazowy link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>To ustawienie dotyczy wiadomości Twojego bieżącego profilu czatu **%@**.</target>
@@ -5123,21 +4840,6 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
         <target>Nie można nagrać wiadomości głosowej</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <target>Odblokuj</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <target>Odblokuj członka</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <target>Odblokować członka?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Nieoczekiwany błąd: %@</target>
@@ -5200,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połączenia i sprawdź, czy masz stabilne połączenie z siecią.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Odblokuj</target>
@@ -5298,10 +4992,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Użyj dla nowych połączeń</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Użyj interfejsu połączeń iOS</target>
@@ -5332,23 +5022,11 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Używanie serwerów SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Weryfikuj bezpieczeństwo połączenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Weryfikuj kod bezpieczeństwa</target>
@@ -5509,43 +5187,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Jesteś już połączony z %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <target>Już się łączysz z %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <target>Już jesteś połączony z tym jednorazowym linkiem!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <target>Już jesteś w grupie %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <target>Już dołączasz do grupy %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <target>Już dołączasz do grupy przez ten link!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <target>Już dołączasz do grupy przez ten link.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <target>Już dołączasz do grupy!
-Powtórzyć prośbę dołączenia?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Jesteś połączony z serwerem używanym do odbierania wiadomości od tego kontaktu.</target>
@@ -5641,18 +5282,6 @@ Powtórzyć prośbę dołączenia?</target>
         <target>Nie można zweryfikować użytkownika; proszę spróbować ponownie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <target>Już prosiłeś o połączenie na ten adres!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <target>Już prosiłeś o połączenie!
-Powtórzyć prośbę połączenia?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>Nie masz czatów</target>
@@ -5703,11 +5332,6 @@ Powtórzyć prośbę połączenia?</target>
         <target>Zostaniesz połączony do grupy, gdy urządzenie gospodarza grupy będzie online, proszę czekać lub sprawdzić później!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>Zostaniesz połączony, gdy urządzenie hosta grupy będzie online, proszę czekać lub sprawdzić później!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Zostaniesz połączony, gdy Twoje żądanie połączenia zostanie zaakceptowane, proszę czekać lub sprawdzić później!</target>
@@ -5723,9 +5347,9 @@ Powtórzyć prośbę połączenia?</target>
         <target>Uwierzytelnienie będzie wymagane przy uruchamianiu lub wznawianiu aplikacji po 30 sekundach w tle.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
-        <target>Zostaniesz połączony ze wszystkimi członkami grupy.</target>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Dołączysz do grupy, do której odnosi się ten link i połączysz się z jej członkami.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5793,6 +5417,11 @@ Powtórzyć prośbę połączenia?</target>
         <target>Baza danych czatu nie jest szyfrowana - ustaw hasło, aby ją zaszyfrować.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Twój profil czatu zostanie wysłany do członków grupy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Twoje profile czatu</target>
@@ -5847,11 +5476,6 @@ Możesz to zmienić w Ustawieniach.</target>
         <target>Twoja prywatność</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <target>Twój profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Twój profil **%@** zostanie udostępniony.</target>
@@ -5944,11 +5568,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>zawsze</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <target>i %lld innych wydarzeń</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>połączenie audio (nie szyfrowane e2e)</target>
@@ -5964,11 +5583,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>zły hash wiadomości</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <target>zablokowany</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>pogrubiona</target>
@@ -6041,7 +5655,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>połącz bezpośrednio</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6139,11 +5752,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>usunięty</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <target>usunięto kontakt</target>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>usunięta grupa</target>
@@ -6428,8 +6036,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <source>off</source>
         <target>wyłączony</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6446,6 +6053,11 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>włączone</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>lub porozmawiać z deweloperami</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>właściciel</target>
@@ -6508,7 +6120,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>wyślij wiadomość bezpośrednią</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6536,10 +6147,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>zaktualizowano profil grupy</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6677,10 +6284,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
         <target>SimpleX używa Face ID do lokalnego uwierzytelniania</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX potrzebuje dostępu do mikrofonu, w celu połączeń audio i wideo oraz nagrywania wiadomości głosowych.</target>

apps/ios/SimpleX Localizations/pl.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ и %@ соединены</target>
@@ -101,10 +97,6 @@
         <target>%1$@ в %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>Установлено соединение с %@!</target>
@@ -130,10 +122,6 @@
         <target>%@ хочет соединиться!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ и %lld других членов соединены</target>
@@ -199,27 +187,11 @@
         <target>%lld файл(ов) общим размером %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>Членов группы: %lld</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld минуты</target>
@@ -290,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -400,10 +364,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0с</target>
@@ -629,10 +589,6 @@
         <target>Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для Вас.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Все контакты, которые соединились через этот адрес, сохранятся.</target>
@@ -738,14 +694,6 @@
         <target>Соединение уже установлено?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Всегда соединяться через relay</target>
@@ -866,10 +814,6 @@
         <target>Назад</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Ошибка ID сообщения</target>
@@ -885,18 +829,6 @@
         <target>Улучшенные сообщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>И Вы, и Ваш контакт можете добавлять реакции на сообщения.</target>
@@ -1158,31 +1090,24 @@
         <target>Соединиться</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Соединиться напрямую</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Соединиться Инкогнито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Соединиться через ссылку-контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Соединиться через ссылку группы?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1200,18 +1125,6 @@ This is your own one-time link!</source>
         <target>Соединиться через одноразовую ссылку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Устанавливается соединение с сервером…</target>
@@ -1222,10 +1135,6 @@ This is your own one-time link!</source>
         <target>Устанавливается соединение с сервером… (ошибка: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Соединение</target>
@@ -1246,10 +1155,6 @@ This is your own one-time link!</source>
         <target>Запрос на соединение отправлен!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Превышено время соединения</target>
@@ -1265,6 +1170,11 @@ This is your own one-time link!</source>
         <target>Существующий контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Контакт и все сообщения будут удалены - это действие нельзя отменить!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Контакт скрыт:</target>
@@ -1315,10 +1225,6 @@ This is your own one-time link!</source>
         <target>Версия ядра: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Создать</target>
@@ -1339,10 +1245,6 @@ This is your own one-time link!</source>
         <target>Создание файла</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Создать ссылку группы</target>
@@ -1363,10 +1265,6 @@ This is your own one-time link!</source>
         <target>Создать ссылку-приглашение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Создание очереди</target>
@@ -1525,10 +1423,6 @@ This is your own one-time link!</source>
         <target>Удалить</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Удалить контакт</target>
@@ -1554,10 +1448,6 @@ This is your own one-time link!</source>
         <target>Удалить все файлы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Удалить архив</target>
@@ -1588,9 +1478,9 @@ This is your own one-time link!</source>
         <target>Удалить контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Удалить контакт?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1733,18 +1623,6 @@ This cannot be undone!</source>
         <target>Описание</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Для разработчиков</target>
@@ -1835,17 +1713,19 @@ This cannot be undone!</source>
         <target>Разрыв соединения</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <target>Найдите и вступите в группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Имя профиля</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Имя профиля:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2018,14 +1898,6 @@ This cannot be undone!</source>
         <target>Зашифрованное сообщение: неожиданная ошибка</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Введите Код</target>
@@ -2036,10 +1908,6 @@ This cannot be undone!</source>
         <target>Введите правильный пароль.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Введите пароль…</target>
@@ -2055,10 +1923,6 @@ This cannot be undone!</source>
         <target>Ввести сервер вручную</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Введите приветственное сообщение…</target>
@@ -2069,10 +1933,6 @@ This cannot be undone!</source>
         <target>Введите приветственное сообщение... (опционально)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Ошибка</target>
@@ -2346,10 +2206,6 @@ This cannot be undone!</source>
         <target>Выйти без сохранения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Экспорт архива чата</target>
@@ -2495,10 +2351,6 @@ This cannot be undone!</source>
         <target>Полное имя:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Полностью обновлены - работают в фоне!</target>
@@ -2519,14 +2371,6 @@ This cannot be undone!</source>
         <target>Группа</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Имя группы</target>
@@ -2827,10 +2671,6 @@ This cannot be undone!</source>
         <target>Несовместимая версия базы данных</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Неправильный код</target>
@@ -2878,10 +2718,6 @@ This cannot be undone!</source>
         <target>Ошибка в ссылке контакта</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Ошибка в адресе сервера!</target>
@@ -2973,33 +2809,16 @@ This cannot be undone!</source>
         <target>Вступить в группу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Вступить инкогнито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Вступление в группу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Сохраните Ваши соединения</target>
@@ -3060,14 +2879,6 @@ This is your link for group %@!</source>
         <target>Ограничения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Живое сообщение!</target>
@@ -3218,10 +3029,6 @@ This is your link for group %@!</source>
         <target>Сообщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Данные чата перемещаются…</target>
@@ -3570,10 +3377,6 @@ This is your link for group %@!</source>
         <target>Открыть консоль</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Открыть профили пользователя</target>
@@ -3589,6 +3392,11 @@ This is your link for group %@!</source>
         <target>Открытие базы данных…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Использование ссылки в браузере может уменьшить конфиденциальность и безопасность соединения. Ссылки на неизвестные сайты будут красными.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Количество PING</target>
@@ -3634,10 +3442,6 @@ This is your link for group %@!</source>
         <target>Вставить</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Вставить изображение</target>
@@ -3783,14 +3587,6 @@ This is your link for group %@!</source>
         <target>Аватар</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Пароль профиля</target>
@@ -4036,14 +3832,6 @@ This is your link for group %@!</source>
         <target>Пересогласовать шифрование?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Ответить</target>
@@ -4229,10 +4017,6 @@ This is your link for group %@!</source>
         <target>Сканировать QR код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Сканировать код</target>
@@ -4452,10 +4236,6 @@ This is your link for group %@!</source>
         <target>Серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Установить 1 день</target>
@@ -4766,10 +4546,6 @@ This is your link for group %@!</source>
         <target>Нажмите кнопку </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Нажмите, чтобы сделать профиль активным.</target>
@@ -4867,6 +4643,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Шифрование работает, и новое соглашение не требуется. Это может привести к ошибкам соединения!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Группа полностью децентрализована — она видна только членам.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Хэш предыдущего сообщения отличается.</target>
@@ -4952,10 +4733,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Это действие нельзя отменить — Ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>В группе более %lld членов, отчёты о доставке выключены.</target>
@@ -4966,14 +4743,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Эта группа больше не существует.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Эта настройка применяется к сообщениям в Вашем текущем профиле чата **%@**.</target>
@@ -5071,18 +4840,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Невозможно записать голосовое сообщение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Неожиданная ошибка: %@</target>
@@ -5145,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 Чтобы установить соединение, попросите Ваш контакт создать еще одну ссылку и проверьте Ваше соединение с сетью.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Разблокировать</target>
@@ -5243,10 +4992,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Использовать для новых соединений</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Использовать интерфейс iOS для звонков</target>
@@ -5277,23 +5022,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Используются серверы, предоставленные SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Проверить безопасность соединения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Подтвердить код безопасности</target>
@@ -5454,35 +5187,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Установлено соединение с сервером, через который Вы получаете сообщения от этого контакта.</target>
@@ -5578,15 +5282,6 @@ Repeat join request?</source>
         <target>Верификация не удалась; пожалуйста, попробуйте ещё раз.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>У Вас нет чатов</target>
@@ -5637,10 +5332,6 @@ Repeat connection request?</source>
         <target>Соединение с группой будет установлено, когда хост группы будет онлайн. Пожалуйста, подождите или проверьте позже!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Соединение будет установлено, когда Ваш запрос будет принят. Пожалуйста, подождите или проверьте позже!</target>
@@ -5656,8 +5347,9 @@ Repeat connection request?</source>
         <target>Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Вы вступите в группу, на которую ссылается эта ссылка, и соединитесь с её членами.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5725,6 +5417,11 @@ Repeat connection request?</source>
         <target>База данных НЕ зашифрована. Установите пароль, чтобы защитить Ваши данные.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Ваш профиль чата будет отправлен членам группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Ваши профили чата</target>
@@ -5779,10 +5476,6 @@ You can change it in Settings.</source>
         <target>Конфиденциальность</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Будет отправлен Ваш профиль **%@**.</target>
@@ -5875,10 +5568,6 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>всегда</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>аудиозвонок (не e2e зашифрованный)</target>
@@ -5894,10 +5583,6 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>ошибка хэш сообщения</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>жирный</target>
@@ -6067,10 +5752,6 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>удалено</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>удалил(а) группу</target>
@@ -6355,8 +6036,7 @@ SimpleX серверы не могут получить доступ к Ваше
         <source>off</source>
         <target>нет</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6373,6 +6053,11 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>да</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>или соединитесь с разработчиками</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>владелец</target>
@@ -6462,10 +6147,6 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>обновил(а) профиль группы</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6603,10 +6284,6 @@ SimpleX серверы не могут получить доступ к Ваше
         <target>SimpleX использует Face ID для аутентификации</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX использует микрофон для аудио и видео звонков, и для записи голосовых сообщений.</target>

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

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -84,10 +84,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <note>No comment provided by engineer.</note>
@@ -97,10 +93,6 @@
         <target>%1$@ ที่ %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ เชื่อมต่อสำเร็จ!</target>
@@ -126,10 +118,6 @@
         <target>%@ อยากเชื่อมต่อ!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <note>No comment provided by engineer.</note>
@@ -194,27 +182,11 @@
         <target>%lld ไฟล์ที่มีขนาดรวม %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld สมาชิก</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld นาที</target>
@@ -284,14 +256,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -391,10 +355,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0s</target>
@@ -618,10 +578,6 @@
         <target>ข้อความทั้งหมดจะถูกลบ - ไม่สามารถยกเลิกได้! ข้อความจะถูกลบสำหรับคุณเท่านั้น.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>ผู้ติดต่อทั้งหมดของคุณจะยังคงเชื่อมต่ออยู่.</target>
@@ -727,14 +683,6 @@
         <target>เชื่อมต่อสำเร็จแล้ว?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>ใช้รีเลย์เสมอ</target>
@@ -854,10 +802,6 @@
         <target>กลับ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>ID ข้อความที่ไม่ดี</target>
@@ -873,18 +817,6 @@
         <target>ข้อความที่ดีขึ้น</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>ทั้งคุณและผู้ติดต่อของคุณสามารถเพิ่มปฏิกิริยาของข้อความได้</target>
@@ -1145,30 +1077,21 @@
         <target>เชื่อมต่อ</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>เชื่อมต่อผ่านลิงค์กลุ่ม?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1185,18 +1108,6 @@ This is your own one-time link!</source>
         <source>Connect via one-time link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>กำลังเชื่อมต่อกับเซิร์ฟเวอร์…</target>
@@ -1207,10 +1118,6 @@ This is your own one-time link!</source>
         <target>กำลังเชื่อมต่อกับเซิร์ฟเวอร์... (ข้อผิดพลาด: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>การเชื่อมต่อ</target>
@@ -1231,10 +1138,6 @@ This is your own one-time link!</source>
         <target>ส่งคําขอเชื่อมต่อแล้ว!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>หมดเวลาการเชื่อมต่อ</target>
@@ -1250,6 +1153,11 @@ This is your own one-time link!</source>
         <target>ผู้ติดต่อรายนี้มีอยู่แล้ว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>ผู้ติดต่อและข้อความทั้งหมดจะถูกลบ - ไม่สามารถยกเลิกได้!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>ผู้ติดต่อถูกซ่อน:</target>
@@ -1300,10 +1208,6 @@ This is your own one-time link!</source>
         <target>รุ่นหลัก: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>สร้าง</target>
@@ -1324,10 +1228,6 @@ This is your own one-time link!</source>
         <target>สร้างไฟล์</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>สร้างลิงค์กลุ่ม</target>
@@ -1347,10 +1247,6 @@ This is your own one-time link!</source>
         <target>สร้างลิงก์เชิญแบบใช้ครั้งเดียว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>สร้างคิว</target>
@@ -1509,10 +1405,6 @@ This is your own one-time link!</source>
         <target>ลบ</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>ลบผู้ติดต่อ</target>
@@ -1538,10 +1430,6 @@ This is your own one-time link!</source>
         <target>ลบไฟล์ทั้งหมด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>ลบที่เก็บถาวร</target>
@@ -1572,9 +1460,9 @@ This is your own one-time link!</source>
         <target>ลบผู้ติดต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>ลบผู้ติดต่อ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1716,18 +1604,6 @@ This cannot be undone!</source>
         <target>คำอธิบาย</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>พัฒนา</target>
@@ -1818,16 +1694,18 @@ This cannot be undone!</source>
         <target>ตัดการเชื่อมต่อ</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>ชื่อที่แสดง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>ชื่อที่แสดง:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1998,14 +1876,6 @@ This cannot be undone!</source>
         <target>ข้อความที่ encrypt: ข้อผิดพลาดที่ไม่คาดคิด</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>ใส่รหัสผ่าน</target>
@@ -2016,10 +1886,6 @@ This cannot be undone!</source>
         <target>ใส่รหัสผ่านที่ถูกต้อง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>ใส่รหัสผ่าน</target>
@@ -2035,10 +1901,6 @@ This cannot be undone!</source>
         <target>ใส่เซิร์ฟเวอร์ด้วยตนเอง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>ใส่ข้อความต้อนรับ…</target>
@@ -2049,10 +1911,6 @@ This cannot be undone!</source>
         <target>ใส่ข้อความต้อนรับ… (ไม่บังคับ)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>ผิดพลาด</target>
@@ -2325,10 +2183,6 @@ This cannot be undone!</source>
         <target>ออกโดยไม่บันทึก</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>ส่งออกฐานข้อมูล</target>
@@ -2474,10 +2328,6 @@ This cannot be undone!</source>
         <target>ชื่อเต็ม:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>ดำเนินการใหม่อย่างสมบูรณ์ - ทำงานในพื้นหลัง!</target>
@@ -2498,14 +2348,6 @@ This cannot be undone!</source>
         <target>กลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>ชื่อกลุ่มที่แสดง</target>
@@ -2805,10 +2647,6 @@ This cannot be undone!</source>
         <target>เวอร์ชันฐานข้อมูลที่เข้ากันไม่ได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>รหัสผ่านไม่ถูกต้อง</target>
@@ -2856,10 +2694,6 @@ This cannot be undone!</source>
         <target>ลิงค์เชื่อมต่อไม่ถูกต้อง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>ที่อยู่เซิร์ฟเวอร์ไม่ถูกต้อง!</target>
@@ -2950,33 +2784,16 @@ This cannot be undone!</source>
         <target>เข้าร่วมกลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>เข้าร่วมแบบไม่ระบุตัวตน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>กำลังจะเข้าร่วมกลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>รักษาการเชื่อมต่อของคุณ</target>
@@ -3037,14 +2854,6 @@ This is your link for group %@!</source>
         <target>ข้อจำกัด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>ข้อความสด!</target>
@@ -3195,10 +3004,6 @@ This is your link for group %@!</source>
         <target>ข้อความและไฟล์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>กำลังย้ายข้อมูลที่เก็บถาวรของฐานข้อมูล…</target>
@@ -3544,10 +3349,6 @@ This is your link for group %@!</source>
         <target>เปิดคอนโซลการแชท</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>เปิดโปรไฟล์ผู้ใช้</target>
@@ -3563,6 +3364,11 @@ This is your link for group %@!</source>
         <target>กำลังเปิดฐานข้อมูล…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>การเปิดลิงก์ในเบราว์เซอร์อาจลดความเป็นส่วนตัวและความปลอดภัยของการเชื่อมต่อ ลิงก์ SimpleX ที่ไม่น่าเชื่อถือจะเป็นสีแดง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>จํานวน PING</target>
@@ -3608,10 +3414,6 @@ This is your link for group %@!</source>
         <target>แปะ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>แปะภาพ</target>
@@ -3756,14 +3558,6 @@ This is your link for group %@!</source>
         <target>รูปโปรไฟล์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>รหัสผ่านโปรไฟล์</target>
@@ -4007,14 +3801,6 @@ This is your link for group %@!</source>
         <target>เจรจา enryption ใหม่หรือไม่?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>ตอบ</target>
@@ -4200,10 +3986,6 @@ This is your link for group %@!</source>
         <target>สแกนคิวอาร์โค้ด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>สแกนรหัส</target>
@@ -4421,10 +4203,6 @@ This is your link for group %@!</source>
         <target>เซิร์ฟเวอร์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>ตั้ง 1 วัน</target>
@@ -4732,10 +4510,6 @@ This is your link for group %@!</source>
         <target>แตะปุ่ม </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>แตะเพื่อเปิดใช้งานโปรไฟล์</target>
@@ -4834,6 +4608,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>encryption กำลังทำงานและไม่จำเป็นต้องใช้ข้อตกลง encryption ใหม่ อาจทำให้การเชื่อมต่อผิดพลาดได้!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>กลุ่มมีการกระจายอำนาจอย่างเต็มที่ – มองเห็นได้เฉพาะสมาชิกเท่านั้น</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>แฮชของข้อความก่อนหน้านี้แตกต่างกัน</target>
@@ -4918,10 +4697,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>การดำเนินการนี้ไม่สามารถยกเลิกได้ - โปรไฟล์ ผู้ติดต่อ ข้อความ และไฟล์ของคุณจะสูญหายไปอย่างถาวร</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <note>No comment provided by engineer.</note>
@@ -4931,14 +4706,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>ไม่มีกลุ่มนี้แล้ว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>การตั้งค่านี้ใช้กับข้อความในโปรไฟล์แชทปัจจุบันของคุณ **%@**</target>
@@ -5035,18 +4802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>ไม่สามารถบันทึกข้อความเสียง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>ข้อผิดพลาดที่ไม่คาดคิด: %@</target>
@@ -5109,14 +4864,6 @@ To connect, please ask your contact to create another connection link and check
 ในการเชื่อมต่อ โปรดขอให้ผู้ติดต่อของคุณสร้างลิงก์การเชื่อมต่ออื่น และตรวจสอบว่าคุณมีการเชื่อมต่อเครือข่ายที่เสถียร</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>ปลดล็อค</target>
@@ -5206,10 +4953,6 @@ To connect, please ask your contact to create another connection link and check
         <target>ใช้สำหรับการเชื่อมต่อใหม่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>ใช้อินเทอร์เฟซการโทร iOS</target>
@@ -5239,23 +4982,11 @@ To connect, please ask your contact to create another connection link and check
         <target>กำลังใช้เซิร์ฟเวอร์ SimpleX Chat อยู่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>ตรวจสอบความปลอดภัยในการเชื่อมต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>ตรวจสอบรหัสความปลอดภัย</target>
@@ -5416,35 +5147,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>คุณเชื่อมต่อกับเซิร์ฟเวอร์ที่ใช้รับข้อความจากผู้ติดต่อนี้</target>
@@ -5540,15 +5242,6 @@ Repeat join request?</source>
         <target>เราไม่สามารถตรวจสอบคุณได้ กรุณาลองอีกครั้ง.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>คุณไม่มีการแชท</target>
@@ -5598,10 +5291,6 @@ Repeat connection request?</source>
         <target>คุณจะเชื่อมต่อกับกลุ่มเมื่ออุปกรณ์โฮสต์ของกลุ่มออนไลน์อยู่ โปรดรอหรือตรวจสอบภายหลัง!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>คุณจะเชื่อมต่อเมื่อคำขอเชื่อมต่อของคุณได้รับการยอมรับ โปรดรอหรือตรวจสอบในภายหลัง!</target>
@@ -5617,8 +5306,9 @@ Repeat connection request?</source>
         <target>คุณจะต้องตรวจสอบสิทธิ์เมื่อคุณเริ่มหรือกลับมาใช้แอปพลิเคชันอีกครั้งหลังจากผ่านไป 30 วินาทีในพื้นหลัง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>คุณจะเข้าร่วมกลุ่มที่ลิงก์นี้อ้างถึงและเชื่อมต่อกับสมาชิกในกลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5686,6 +5376,11 @@ Repeat connection request?</source>
         <target>ฐานข้อมูลการแชทของคุณไม่ได้ถูก encrypt - ตั้งรหัสผ่านเพื่อ encrypt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>โปรไฟล์การแชทของคุณจะถูกส่งไปยังสมาชิกในกลุ่ม</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>โปรไฟล์แชทของคุณ</target>
@@ -5740,10 +5435,6 @@ You can change it in Settings.</source>
         <target>ความเป็นส่วนตัวของคุณ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <note>No comment provided by engineer.</note>
@@ -5835,10 +5526,6 @@ SimpleX servers cannot see your profile.</source>
         <target>เสมอ</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>การโทรด้วยเสียง (ไม่ได้ encrypt จากต้นจนจบ)</target>
@@ -5854,10 +5541,6 @@ SimpleX servers cannot see your profile.</source>
         <target>แฮชข้อความไม่ดี</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>ตัวหนา</target>
@@ -6027,10 +5710,6 @@ SimpleX servers cannot see your profile.</source>
         <target>ลบแล้ว</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>กลุ่มที่ถูกลบ</target>
@@ -6313,8 +5992,7 @@ SimpleX servers cannot see your profile.</source>
         <source>off</source>
         <target>ปิด</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6331,6 +6009,11 @@ SimpleX servers cannot see your profile.</source>
         <target>เปิด</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>หรือแชทกับนักพัฒนาแอป</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>เจ้าของ</target>
@@ -6420,10 +6103,6 @@ SimpleX servers cannot see your profile.</source>
         <target>อัปเดตโปรไฟล์กลุ่มแล้ว</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6561,10 +6240,6 @@ SimpleX servers cannot see your profile.</source>
         <target>SimpleX ใช้ Face ID สำหรับการรับรองความถูกต้องในเครื่อง</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX ต้องการการเข้าถึงไมโครโฟนสำหรับการโทรด้วยเสียงและวิดีโอ และเพื่อบันทึกข้อความเสียง</target>

apps/ios/SimpleX Localizations/th.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ і %@ підключено</target>
@@ -101,10 +97,6 @@
         <target>%1$@ за %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ підключено!</target>
@@ -130,10 +122,6 @@
         <target>%@ хоче підключитися!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ та %lld інші підключені учасники</target>
@@ -199,27 +187,11 @@
         <target>%lld файл(и) загальним розміром %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld учасників</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld хвилин</target>
@@ -289,14 +261,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -396,10 +360,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0с</target>
@@ -625,10 +585,6 @@
         <target>Всі повідомлення будуть видалені - це неможливо скасувати! Повідомлення будуть видалені ТІЛЬКИ для вас.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Всі ваші контакти залишаться на зв'язку.</target>
@@ -734,14 +690,6 @@
         <target>Вже підключено?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>Завжди використовуйте реле</target>
@@ -861,10 +809,6 @@
         <target>Назад</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>Неправильний ідентифікатор повідомлення</target>
@@ -880,18 +824,6 @@
         <target>Кращі повідомлення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Реакції на повідомлення можете додавати як ви, так і ваш контакт.</target>
@@ -1152,31 +1084,24 @@
         <target>Підключіться</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Підключіться безпосередньо</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>Підключайтеся інкогніто</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Підключіться за контактним посиланням</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Підключитися за груповим посиланням?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1194,18 +1119,6 @@ This is your own one-time link!</source>
         <target>Під'єднатися за одноразовим посиланням</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>Підключення до сервера…</target>
@@ -1216,10 +1129,6 @@ This is your own one-time link!</source>
         <target>Підключення до сервера... (помилка: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>Підключення</target>
@@ -1240,10 +1149,6 @@ This is your own one-time link!</source>
         <target>Запит на підключення відправлено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>Тайм-аут з'єднання</target>
@@ -1259,6 +1164,11 @@ This is your own one-time link!</source>
         <target>Контакт вже існує</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Контакт і всі повідомлення будуть видалені - це неможливо скасувати!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>Контакт приховано:</target>
@@ -1309,10 +1219,6 @@ This is your own one-time link!</source>
         <target>Основна версія: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>Створити</target>
@@ -1333,10 +1239,6 @@ This is your own one-time link!</source>
         <target>Створити файл</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>Створити групове посилання</target>
@@ -1356,10 +1258,6 @@ This is your own one-time link!</source>
         <target>Створіть одноразове посилання-запрошення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>Створити чергу</target>
@@ -1518,10 +1416,6 @@ This is your own one-time link!</source>
         <target>Видалити</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>Видалити контакт</target>
@@ -1547,10 +1441,6 @@ This is your own one-time link!</source>
         <target>Видалити всі файли</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>Видалити архів</target>
@@ -1581,9 +1471,9 @@ This is your own one-time link!</source>
         <target>Видалити контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Видалити контакт?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1726,18 +1616,6 @@ This cannot be undone!</source>
         <target>Опис</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>Розробник</target>
@@ -1828,16 +1706,18 @@ This cannot be undone!</source>
         <target>Від'єднати</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Відображуване ім'я</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Відображуване ім'я:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2008,14 +1888,6 @@ This cannot be undone!</source>
         <target>Зашифроване повідомлення: несподівана помилка</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Введіть пароль</target>
@@ -2026,10 +1898,6 @@ This cannot be undone!</source>
         <target>Введіть правильну парольну фразу.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>Введіть пароль…</target>
@@ -2045,10 +1913,6 @@ This cannot be undone!</source>
         <target>Увійдіть на сервер вручну</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>Введіть вітальне повідомлення…</target>
@@ -2059,10 +1923,6 @@ This cannot be undone!</source>
         <target>Введіть вітальне повідомлення... (необов'язково)</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>Помилка</target>
@@ -2335,10 +2195,6 @@ This cannot be undone!</source>
         <target>Вихід без збереження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Експорт бази даних</target>
@@ -2484,10 +2340,6 @@ This cannot be undone!</source>
         <target>Повне ім'я:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>Повністю перероблено - робота у фоновому режимі!</target>
@@ -2508,14 +2360,6 @@ This cannot be undone!</source>
         <target>Група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>Назва групи для відображення</target>
@@ -2816,10 +2660,6 @@ This cannot be undone!</source>
         <target>Несумісна версія бази даних</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>Неправильний пароль</target>
@@ -2867,10 +2707,6 @@ This cannot be undone!</source>
         <target>Неправильне посилання для підключення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>Неправильна адреса сервера!</target>
@@ -2962,33 +2798,16 @@ This cannot be undone!</source>
         <target>Приєднуйтесь до групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>Приєднуйтесь інкогніто</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>Приєднання до групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>Зберігайте свої зв'язки</target>
@@ -3049,14 +2868,6 @@ This is your link for group %@!</source>
         <target>Обмеження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Живе повідомлення!</target>
@@ -3207,10 +3018,6 @@ This is your link for group %@!</source>
         <target>Повідомлення та файли</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>Перенесення архіву бази даних…</target>
@@ -3558,10 +3365,6 @@ This is your link for group %@!</source>
         <target>Відкрийте консоль чату</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>Відкрити профілі користувачів</target>
@@ -3577,6 +3380,11 @@ This is your link for group %@!</source>
         <target>Відкриття бази даних…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Відкриття посилання в браузері може знизити конфіденційність і безпеку з'єднання. Ненадійні посилання SimpleX будуть червоного кольору.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Кількість PING</target>
@@ -3622,10 +3430,6 @@ This is your link for group %@!</source>
         <target>Вставити</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>Вставити зображення</target>
@@ -3771,14 +3575,6 @@ This is your link for group %@!</source>
         <target>Зображення профілю</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>Пароль до профілю</target>
@@ -4024,14 +3820,6 @@ This is your link for group %@!</source>
         <target>Переузгодьте шифрування?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>Відповісти</target>
@@ -4217,10 +4005,6 @@ This is your link for group %@!</source>
         <target>Відскануйте QR-код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>Сканувати код</target>
@@ -4440,10 +4224,6 @@ This is your link for group %@!</source>
         <target>Сервери</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>Встановити 1 день</target>
@@ -4753,10 +4533,6 @@ This is your link for group %@!</source>
         <target>Натисніть кнопку </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>Натисніть, щоб активувати профіль.</target>
@@ -4854,6 +4630,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Шифрування працює і нова угода про шифрування не потрібна. Це може призвести до помилок з'єднання!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Група повністю децентралізована - її бачать лише учасники.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>Хеш попереднього повідомлення відрізняється.</target>
@@ -4939,10 +4720,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Цю дію неможливо скасувати - ваш профіль, контакти, повідомлення та файли будуть безповоротно втрачені.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>У цій групі більше %lld учасників, підтвердження доставки не надсилаються.</target>
@@ -4953,14 +4730,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Цієї групи більше не існує.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Це налаштування застосовується до повідомлень у вашому поточному профілі чату **%@**.</target>
@@ -5057,18 +4826,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Не вдається записати голосове повідомлення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Неочікувана помилка: %@</target>
@@ -5131,14 +4888,6 @@ To connect, please ask your contact to create another connection link and check
 Щоб підключитися, попросіть вашого контакта створити інше посилання і перевірте, чи маєте ви стабільне з'єднання з мережею.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>Розблокувати</target>
@@ -5229,10 +4978,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Використовуйте для нових з'єднань</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>Використовуйте інтерфейс виклику iOS</target>
@@ -5263,23 +5008,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Використання серверів SimpleX Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>Перевірте безпеку з'єднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>Підтвердіть код безпеки</target>
@@ -5440,35 +5173,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>Ви підключені до сервера, який використовується для отримання повідомлень від цього контакту.</target>
@@ -5564,15 +5268,6 @@ Repeat join request?</source>
         <target>Вас не вдалося верифікувати, спробуйте ще раз.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>У вас немає чатів</target>
@@ -5623,10 +5318,6 @@ Repeat connection request?</source>
         <target>Ви будете підключені до групи, коли пристрій господаря групи буде в мережі, будь ласка, зачекайте або перевірте пізніше!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>Ви будете підключені, коли ваш запит на підключення буде прийнято, будь ласка, зачекайте або перевірте пізніше!</target>
@@ -5642,8 +5333,9 @@ Repeat connection request?</source>
         <target>Вам потрібно буде пройти автентифікацію при запуску або відновленні програми після 30 секунд роботи у фоновому режимі.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Ви приєднаєтеся до групи, на яку посилається це посилання, і з'єднаєтеся з її учасниками.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5711,6 +5403,11 @@ Repeat connection request?</source>
         <target>Ваша база даних чату не зашифрована - встановіть ключову фразу, щоб зашифрувати її.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Ваш профіль у чаті буде надіслано учасникам групи</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Ваші профілі чату</target>
@@ -5765,10 +5462,6 @@ You can change it in Settings.</source>
         <target>Ваша конфіденційність</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>Ваш профіль **%@** буде опублікований.</target>
@@ -5861,10 +5554,6 @@ SimpleX servers cannot see your profile.</source>
         <target>завжди</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>аудіовиклик (без шифрування e2e)</target>
@@ -5880,10 +5569,6 @@ SimpleX servers cannot see your profile.</source>
         <target>невірний хеш повідомлення</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>жирний</target>
@@ -6053,10 +5738,6 @@ SimpleX servers cannot see your profile.</source>
         <target>видалено</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>видалено групу</target>
@@ -6341,8 +6022,7 @@ SimpleX servers cannot see your profile.</source>
         <source>off</source>
         <target>вимкнено</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6359,6 +6039,11 @@ SimpleX servers cannot see your profile.</source>
         <target>увімкнено</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>або поспілкуйтеся з розробниками</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>власник</target>
@@ -6448,10 +6133,6 @@ SimpleX servers cannot see your profile.</source>
         <target>оновлений профіль групи</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6589,10 +6270,6 @@ SimpleX servers cannot see your profile.</source>
         <target>SimpleX використовує Face ID для локальної автентифікації</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX потребує доступу до мікрофона для аудіо та відео дзвінків, а також для запису голосових повідомлень.</target>

apps/ios/SimpleX Localizations/uk.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

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

@@ -87,10 +87,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve">
         <source>%@ and %@ connected</source>
         <target>%@ 和%@ 以建立连接</target>
@@ -101,10 +97,6 @@
         <target>@ %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
         <source>%@ is connected!</source>
         <target>%@ 已连接！</target>
@@ -130,10 +122,6 @@
         <target>%@ 要连接！</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
         <target>%@, %@ 和 %lld 个成员</target>
@@ -199,27 +187,11 @@
         <target>%lld 总文件大小 %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
         <target>%lld 成员</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld minutes" xml:space="preserve">
         <source>%lld minutes</source>
         <target>%lld 分钟</target>
@@ -290,14 +262,6 @@
         <target>(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=")" xml:space="preserve">
         <source>)</source>
         <target>)</target>
@@ -372,9 +336,6 @@
         <source>- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
 - delivery receipts (up to 20 members).
 - faster and more stable.</source>
-        <target>- 连接 [目录服务](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
-- 发送回执（最多20成员）。
-- 更快并且更稳固。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve">
@@ -400,10 +361,6 @@
         <target>.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
       <trans-unit id="0s" xml:space="preserve">
         <source>0s</source>
         <target>0秒</target>
@@ -629,10 +586,6 @@
         <target>所有聊天记录和消息将被删除——这一行为无法撤销！只有您的消息会被删除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>所有联系人会保持连接。</target>
@@ -738,14 +691,6 @@
         <target>已连接？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
         <target>一直使用中继</target>
@@ -768,7 +713,6 @@
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
         <source>App encrypts new local files (except videos).</source>
-        <target>应用程序为新的本地文件（视频除外）加密。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
@@ -866,10 +810,6 @@
         <target>返回</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
         <source>Bad message ID</source>
         <target>错误消息 ID</target>
@@ -885,18 +825,6 @@
         <target>更好的消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>您和您的联系人都可以添加消息回应。</target>
@@ -924,7 +852,6 @@
       </trans-unit>
       <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve">
         <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target>保加利亚语、芬兰语、泰语和乌克兰语——感谢用户和[Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1158,31 +1085,24 @@
         <target>连接</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>直接连接</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
         <target>在隐身状态下连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>通过联系人链接进行连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>通过群组链接连接？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link" xml:space="preserve">
@@ -1200,18 +1120,6 @@ This is your own one-time link!</source>
         <target>通过一次性链接连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
         <source>Connecting to server…</source>
         <target>连接服务器中……</target>
@@ -1222,10 +1130,6 @@ This is your own one-time link!</source>
         <target>连接服务器中……（错误：%@）</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
         <source>Connection</source>
         <target>连接</target>
@@ -1246,10 +1150,6 @@ This is your own one-time link!</source>
         <target>已发送连接请求！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
         <source>Connection timeout</source>
         <target>连接超时</target>
@@ -1265,6 +1165,11 @@ This is your own one-time link!</source>
         <target>联系人已存在</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>联系人和所有的消息都将被删除——这是不可逆回的！</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
         <target>联系人已隐藏：</target>
@@ -1315,10 +1220,6 @@ This is your own one-time link!</source>
         <target>核心版本: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
         <target>创建</target>
@@ -1339,10 +1240,6 @@ This is your own one-time link!</source>
         <target>创建文件</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
         <source>Create group link</source>
         <target>创建群组链接</target>
@@ -1355,7 +1252,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>在[桌面应用程序](https://simplex.chat/downloads/)中创建新的个人资料。 💻</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1363,10 +1259,6 @@ This is your own one-time link!</source>
         <target>创建一次性邀请链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
         <target>创建队列</target>
@@ -1525,10 +1417,6 @@ This is your own one-time link!</source>
         <target>删除</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <target>删除联系人</target>
@@ -1554,10 +1442,6 @@ This is your own one-time link!</source>
         <target>删除所有文件</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
         <source>Delete archive</source>
         <target>删除档案</target>
@@ -1588,9 +1472,9 @@ This is your own one-time link!</source>
         <target>删除联系人</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>删除联系人？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1733,18 +1617,6 @@ This cannot be undone!</source>
         <target>描述</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
         <source>Develop</source>
         <target>开发</target>
@@ -1835,17 +1707,18 @@ This cannot be undone!</source>
         <target>断开连接</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
-        <target>发现和加入群组</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>显示名称</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>显示名：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1980,7 +1853,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
         <source>Encrypt stored files &amp; media</source>
-        <target>为存储的文件和媒体加密</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
@@ -2018,14 +1890,6 @@ This cannot be undone!</source>
         <target>加密消息：意外错误</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>输入密码</target>
@@ -2036,10 +1900,6 @@ This cannot be undone!</source>
         <target>输入正确密码。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
         <target>输入密码……</target>
@@ -2055,10 +1915,6 @@ This cannot be undone!</source>
         <target>手动输入服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
         <target>输入欢迎消息……</target>
@@ -2069,10 +1925,6 @@ This cannot be undone!</source>
         <target>输入欢迎消息……（可选）</target>
         <note>placeholder</note>
       </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
         <source>Error</source>
         <target>错误</target>
@@ -2130,7 +1982,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>创建成员联系人时出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2265,7 +2116,6 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>发送成员联系人邀请错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2348,10 +2198,6 @@ This cannot be undone!</source>
         <target>退出而不保存</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>导出数据库</target>
@@ -2497,10 +2343,6 @@ This cannot be undone!</source>
         <target>全名：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
         <target>完全重新实现 - 在后台工作！</target>
@@ -2521,14 +2363,6 @@ This cannot be undone!</source>
         <target>群组</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
         <source>Group display name</source>
         <target>群组显示名称</target>
@@ -2829,10 +2663,6 @@ This cannot be undone!</source>
         <target>数据库版本不兼容</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
         <source>Incorrect passcode</source>
         <target>密码错误</target>
@@ -2880,10 +2710,6 @@ This cannot be undone!</source>
         <target>无效的连接链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
         <source>Invalid server address!</source>
         <target>无效的服务器地址！</target>
@@ -2975,33 +2801,16 @@ This cannot be undone!</source>
         <target>加入群组</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
         <target>加入隐身聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
         <target>加入群组中</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
         <target>保持连接</target>
@@ -3062,14 +2871,6 @@ This is your link for group %@!</source>
         <target>限制</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>实时消息！</target>
@@ -3220,10 +3021,6 @@ This is your link for group %@!</source>
         <target>消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
         <source>Migrating database archive…</source>
         <target>迁移数据库档案中…</target>
@@ -3336,7 +3133,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New desktop app!" xml:space="preserve">
         <source>New desktop app!</source>
-        <target>全新桌面应用！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
@@ -3555,7 +3351,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <target>打开</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3573,10 +3368,6 @@ This is your link for group %@!</source>
         <target>打开聊天控制台</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
         <source>Open user profiles</source>
         <target>打开用户个人资料</target>
@@ -3592,6 +3383,11 @@ This is your link for group %@!</source>
         <target>打开数据库中……</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>在浏览器中打开链接可能会降低连接的隐私和安全性。SimpleX 上不受信任的链接将显示为红色。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING 次数</target>
@@ -3637,10 +3433,6 @@ This is your link for group %@!</source>
         <target>粘贴</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
         <source>Paste image</source>
         <target>粘贴图片</target>
@@ -3786,14 +3578,6 @@ This is your link for group %@!</source>
         <target>资料图片</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
         <source>Profile password</source>
         <target>个人资料密码</target>
@@ -4039,14 +3823,6 @@ This is your link for group %@!</source>
         <target>重新协商加密？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
         <source>Reply</source>
         <target>回复</target>
@@ -4232,10 +4008,6 @@ This is your link for group %@!</source>
         <target>扫描二维码</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
         <source>Scan code</source>
         <target>扫码</target>
@@ -4318,7 +4090,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>发送私信来连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4456,10 +4227,6 @@ This is your link for group %@!</source>
         <target>服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
         <source>Set 1 day</source>
         <target>设定1天</target>
@@ -4627,7 +4394,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
-        <target>简化的隐身模式</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -4770,10 +4536,6 @@ This is your link for group %@!</source>
         <target>点击按钮 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
         <target>点击以激活个人资料。</target>
@@ -4871,6 +4633,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>加密正在运行，不需要新的加密协议。这可能会导致连接错误！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>该小组是完全分散式的——它只对成员可见。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
         <target>上一条消息的散列不同。</target>
@@ -4956,10 +4723,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>此操作无法撤消——您的个人资料、联系人、消息和文件将不可撤回地丢失。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
         <target>该组有超过 %lld 个成员，不发送送货单。</target>
@@ -4970,14 +4733,6 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>该群组已不存在。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>此设置适用于您当前聊天资料 **%@** 中的消息。</target>
@@ -5037,7 +4792,6 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
         <source>Toggle incognito when connecting.</source>
-        <target>在连接时切换隐身模式。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
@@ -5075,18 +4829,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>无法录制语音消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>意外错误： ％@</target>
@@ -5149,14 +4891,6 @@ To connect, please ask your contact to create another connection link and check
 如果要连接，请让您的联系人创建另一个连接链接，并检查您的网络连接是否稳定。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
         <source>Unlock</source>
         <target>解锁</target>
@@ -5247,10 +4981,6 @@ To connect, please ask your contact to create another connection link and check
         <target>用于新连接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
         <source>Use iOS call interface</source>
         <target>使用 iOS 通话界面</target>
@@ -5281,23 +5011,11 @@ To connect, please ask your contact to create another connection link and check
         <target>使用 SimpleX Chat 服务器。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
         <source>Verify connection security</source>
         <target>验证连接安全</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
         <source>Verify security code</source>
         <target>验证安全码</target>
@@ -5458,35 +5176,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="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
         <target>您已连接到用于接收该联系人消息的服务器。</target>
@@ -5582,15 +5271,6 @@ Repeat join request?</source>
         <target>您的身份无法验证，请再试一次。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
         <source>You have no chats</source>
         <target>您没有聊天记录</target>
@@ -5641,10 +5321,6 @@ Repeat connection request?</source>
         <target>您将在组主设备上线时连接到该群组，请稍等或稍后再检查！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
         <target>当您的连接请求被接受后，您将可以连接，请稍等或稍后检查！</target>
@@ -5660,8 +5336,9 @@ Repeat connection request?</source>
         <target>当您启动应用或在应用程序驻留后台超过30 秒后，您将需要进行身份验证。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>您将加入此链接指向的群组并连接到其群组成员。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5729,6 +5406,11 @@ Repeat connection request?</source>
         <target>您的聊天数据库未加密——设置密码来加密。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>您的聊天资料将被发送给群组成员</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>您的聊天资料</target>
@@ -5783,10 +5465,6 @@ You can change it in Settings.</source>
         <target>您的隐私设置</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
         <target>您的个人资料 **%@** 将被共享。</target>
@@ -5879,10 +5557,6 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>始终</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
         <source>audio call (not e2e encrypted)</source>
         <target>语音通话（非端到端加密）</target>
@@ -5898,10 +5572,6 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>错误消息散列</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
         <target>加粗</target>
@@ -5974,7 +5644,6 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
-        <target>已直连</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6072,10 +5741,6 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>已删除</target>
         <note>deleted chat item</note>
       </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
         <target>已删除群组</target>
@@ -6360,8 +6025,7 @@ SimpleX 服务器无法看到您的资料。</target>
         <source>off</source>
         <target>关闭</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -6378,6 +6042,11 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>开启</target>
         <note>group pref value</note>
       </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>或与开发者聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
         <source>owner</source>
         <target>群主</target>
@@ -6440,7 +6109,6 @@ SimpleX 服务器无法看到您的资料。</target>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
-        <target>发送私信</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -6468,10 +6136,6 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>已更新的群组资料</target>
         <note>rcv group event chat item</note>
       </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <target>v%@ (%@)</target>
@@ -6609,10 +6273,6 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>SimpleX 使用Face ID进行本地身份验证</target>
         <note>Privacy - Face ID Usage Description</note>
       </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
         <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
         <target>SimpleX 需要麦克风访问权限才能进行音频和视频通话，以及录制语音消息。</target>

apps/ios/SimpleX Localizations/zh-Hans.xcloc/Source Contents/en.lproj/SimpleX--iOS--InfoPlist.strings

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */

apps/ios/SimpleX NSE/NotificationService.swift

@@ -216,7 +216,6 @@ func startChat() -> DBMigrationResult? {
             try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
             try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
             try setXFTPConfig(xftpConfig)
-            try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
             let justStarted = try apiStartChat()
             chatStarted = true
             if justStarted {
@@ -352,12 +351,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
-func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = sendSimpleXCmd(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
     guard apiGetActiveUser() != nil else {
         logger.debug("no active user")

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		18415C6C56DBCEC2CBBD2F11 /* WebRTCClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415323A4082FC92887F906 /* WebRTCClient.swift */; };
 		18415F9A2D551F9757DA4654 /* CIVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415FD2E36F13F596A45BB4 /* CIVideoView.swift */; };
 		18415FEFE153C5920BFB7828 /* GroupWelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1841516F0CE5992B0EDFB377 /* GroupWelcomeView.swift */; };
+		3C71477A281C0F6800CB4D4B /* www in Resources */ = {isa = PBXBuildFile; fileRef = 3C714779281C0F6800CB4D4B /* www */; };
 		3C8C548928133C84000A3EC7 /* PasteToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */; };
 		3CDBCF4227FAE51000354CDD /* ComposeLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */; };
 		3CDBCF4827FF621E00354CDD /* CILinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4727FF621E00354CDD /* CILinkView.swift */; };
@@ -39,7 +40,6 @@
 		5C36027327F47AD5009F19D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C36027227F47AD5009F19D9 /* AppDelegate.swift */; };
 		5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
 		5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
-		5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */; };
 		5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; };
 		5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */; };
 		5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B3B09285FB130003915F2 /* DatabaseView.swift */; };
@@ -114,15 +114,15 @@
 		5CC1C99527A6CF7F000D9FF6 /* ShareSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1C99427A6CF7F000D9FF6 /* ShareSheet.swift */; };
 		5CC2C0FC2809BF11000C35E3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FA2809BF11000C35E3 /* Localizable.strings */; };
 		5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */; };
+		5CC739A12AD468E4009470A9 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC7399C2AD468E4009470A9 /* libgmpxx.a */; };
+		5CC739A22AD468E4009470A9 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC7399D2AD468E4009470A9 /* libffi.a */; };
+		5CC739A32AD468E4009470A9 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC7399E2AD468E4009470A9 /* libgmp.a */; };
+		5CC739A42AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC7399F2AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a */; };
+		5CC739A52AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC739A02AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a */; };
 		5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */; };
 		5CCB939C297EFCB100399E78 /* NavStackCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCB939B297EFCB100399E78 /* NavStackCompat.swift */; };
 		5CCD403427A5F6DF00368C90 /* AddContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403327A5F6DF00368C90 /* AddContactView.swift */; };
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
-		5CDA5A2D2B04FE2D00A71D61 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A282B04FE2D00A71D61 /* libgmp.a */; };
-		5CDA5A2E2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */; };
-		5CDA5A2F2B04FE2D00A71D61 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2A2B04FE2D00A71D61 /* libffi.a */; };
-		5CDA5A302B04FE2D00A71D61 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */; };
-		5CDA5A312B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -257,6 +257,7 @@
 		18415B08031E8FB0F7FC27F9 /* CallViewRenderers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewRenderers.swift; sourceTree = "<group>"; };
 		18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerView.swift; sourceTree = "<group>"; };
 		18415FD2E36F13F596A45BB4 /* CIVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CIVideoView.swift; sourceTree = "<group>"; };
+		3C714779281C0F6800CB4D4B /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../multiplatform/android/src/main/assets/www; sourceTree = "<group>"; };
 		3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteToConnectView.swift; sourceTree = "<group>"; };
 		3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeLinkView.swift; sourceTree = "<group>"; };
 		3CDBCF4727FF621E00354CDD /* CILinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CILinkView.swift; sourceTree = "<group>"; };
@@ -283,7 +284,6 @@
 		5C36027227F47AD5009F19D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetermineWidth.swift; sourceTree = "<group>"; };
 		5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = "<group>"; };
-		5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectDesktopView.swift; sourceTree = "<group>"; };
 		5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrityErrorItemView.swift; sourceTree = "<group>"; };
 		5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacySettings.swift; sourceTree = "<group>"; };
 		5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = "<group>"; };
@@ -395,15 +395,15 @@
 		5CC1C99427A6CF7F000D9FF6 /* ShareSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareSheet.swift; sourceTree = "<group>"; };
 		5CC2C0FB2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CC2C0FE2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
+		5CC7399C2AD468E4009470A9 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CC7399D2AD468E4009470A9 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5CC7399E2AD468E4009470A9 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CC7399F2AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5CC739A02AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a"; sourceTree = "<group>"; };
 		5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIRcvDecryptionError.swift; sourceTree = "<group>"; };
 		5CCB939B297EFCB100399E78 /* NavStackCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavStackCompat.swift; sourceTree = "<group>"; };
 		5CCD403327A5F6DF00368C90 /* AddContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactView.swift; sourceTree = "<group>"; };
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
-		5CDA5A282B04FE2D00A71D61 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5CDA5A2A2B04FE2D00A71D61 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a"; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -507,13 +507,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CDA5A302B04FE2D00A71D61 /* libgmpxx.a in Frameworks */,
+				5CC739A12AD468E4009470A9 /* libgmpxx.a in Frameworks */,
+				5CC739A32AD468E4009470A9 /* libgmp.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CDA5A2D2B04FE2D00A71D61 /* libgmp.a in Frameworks */,
-				5CDA5A2E2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a in Frameworks */,
-				5CDA5A2F2B04FE2D00A71D61 /* libffi.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5CDA5A312B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a in Frameworks */,
+				5CC739A42AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a in Frameworks */,
+				5CC739A22AD468E4009470A9 /* libffi.a in Frameworks */,
+				5CC739A52AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -546,7 +546,6 @@
 				5CB924DD27A8622200ACCCDD /* NewChat */,
 				5CFA59C22860B04D00863A68 /* Database */,
 				5CB634AB29E46CDB0066AD6B /* LocalAuth */,
-				5CA8D01B2AD9B076001FD661 /* RemoteAccess */,
 				5CB924DF27A8678B00ACCCDD /* UserSettings */,
 				5C2E261127A30FEA00F70299 /* TerminalView.swift */,
 			);
@@ -575,11 +574,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CDA5A2A2B04FE2D00A71D61 /* libffi.a */,
-				5CDA5A282B04FE2D00A71D61 /* libgmp.a */,
-				5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */,
-				5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */,
-				5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */,
+				5CC7399D2AD468E4009470A9 /* libffi.a */,
+				5CC7399E2AD468E4009470A9 /* libgmp.a */,
+				5CC7399C2AD468E4009470A9 /* libgmpxx.a */,
+				5CC7399F2AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI-ghc8.10.7.a */,
+				5CC739A02AD468E4009470A9 /* libHSsimplex-chat-5.3.2.0-CqvLUli0CbhHnscdGdNqYI.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -639,6 +638,7 @@
 			isa = PBXGroup;
 			children = (
 				5C55A92D283D0FDE00C4E99E /* sounds */,
+				3C714779281C0F6800CB4D4B /* www */,
 				5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */,
 				5CC2C0FA2809BF11000C35E3 /* Localizable.strings */,
 				5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */,
@@ -687,14 +687,6 @@
 			path = "Tests iOS";
 			sourceTree = "<group>";
 		};
-		5CA8D01B2AD9B076001FD661 /* RemoteAccess */ = {
-			isa = PBXGroup;
-			children = (
-				5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */,
-			);
-			path = RemoteAccess;
-			sourceTree = "<group>";
-		};
 		5CB0BA8C282711BC00B3292C /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
@@ -1058,6 +1050,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5C55A92E283D0FDE00C4E99E /* sounds in Resources */,
+				3C71477A281C0F6800CB4D4B /* www in Resources */,
 				5CA059EF279559F40002BEB4 /* Assets.xcassets in Resources */,
 				5CC2C0FC2809BF11000C35E3 /* Localizable.strings in Resources */,
 				5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */,
@@ -1181,7 +1174,6 @@
 				6454036F2822A9750090DDFF /* ComposeFileView.swift in Sources */,
 				5C5DB70E289ABDD200730FFF /* AppearanceSettings.swift in Sources */,
 				5C5F2B6D27EBC3FE006A9D5F /* ImagePicker.swift in Sources */,
-				5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */,
 				5C9C2DA92899DA6F00CC63B1 /* NetworkAndServers.swift in Sources */,
 				5C6BA667289BD954009B8ECC /* DismissSheets.swift in Sources */,
 				5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */,
@@ -1494,7 +1486,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1502,7 +1494,6 @@
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "SimpleX uses Face ID for local authentication";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "SimpleX needs access to Photo Library for saving captured and received media";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -1516,7 +1507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1537,7 +1528,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1545,7 +1536,6 @@
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "SimpleX uses Face ID for local authentication";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "SimpleX needs access to Photo Library for saving captured and received media";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -1559,7 +1549,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1618,7 +1608,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1631,7 +1621,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1650,7 +1640,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1663,7 +1653,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1682,7 +1672,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1706,7 +1696,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1728,7 +1718,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 178;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1752,7 +1742,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -139,11 +139,8 @@ public func chatResponse(_ s: String) -> ChatResponse {
     var type: String?
     var json: String?
     if let j = try? JSONSerialization.jsonObject(with: d) as? NSDictionary {
-        if let jResp = j["resp"] as? NSDictionary, jResp.count == 1 || jResp.count == 2 {
+        if let jResp = j["resp"] as? NSDictionary, jResp.count == 1 {
             type = jResp.allKeys[0] as? String
-            if jResp.count == 2 && type == "_owsf" {
-                type = jResp.allKeys[1] as? String
-            }
             if type == "apiChats" {
                 if let jApiChats = jResp["apiChats"] as? NSDictionary,
                    let user: UserRef = try? decodeObject(jApiChats["user"] as Any),

apps/ios/SimpleXChat/APITypes.swift

@@ -32,7 +32,6 @@ public enum ChatCommand {
     case setTempFolder(tempFolder: String)
     case setFilesFolder(filesFolder: String)
     case apiSetXFTPConfig(config: XFTPFileConfig?)
-    case apiSetEncryptLocalFiles(enable: Bool)
     case apiExportArchive(config: ArchiveConfig)
     case apiImportArchive(config: ArchiveConfig)
     case apiDeleteStorage
@@ -50,7 +49,7 @@ public enum ChatCommand {
     case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
     case apiDeleteToken(token: DeviceToken)
     case apiGetNtfMessage(nonce: String, encNtfInfo: String)
-    case apiNewGroup(userId: Int64, incognito: Bool, groupProfile: GroupProfile)
+    case apiNewGroup(userId: Int64, groupProfile: GroupProfile)
     case apiAddMember(groupId: Int64, contactId: Int64, memberRole: GroupMemberRole)
     case apiJoinGroup(groupId: Int64)
     case apiMemberRole(groupId: Int64, memberId: Int64, memberRole: GroupMemberRole)
@@ -73,7 +72,6 @@ public enum ChatCommand {
     case apiGetNetworkConfig
     case reconnectAllServers
     case apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings)
-    case apiSetMemberSettings(groupId: Int64, groupMemberId: Int64, memberSettings: GroupMemberSettings)
     case apiContactInfo(contactId: Int64)
     case apiGroupMemberInfo(groupId: Int64, groupMemberId: Int64)
     case apiSwitchContact(contactId: Int64)
@@ -88,10 +86,8 @@ public enum ChatCommand {
     case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
     case apiAddContact(userId: Int64, incognito: Bool)
     case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
-    case apiConnectPlan(userId: Int64, connReq: String)
     case apiConnect(userId: Int64, incognito: Bool, connReq: String)
-    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
-    case apiDeleteChat(type: ChatType, id: Int64, notify: Bool?)
+    case apiDeleteChat(type: ChatType, id: Int64)
     case apiClearChat(type: ChatType, id: Int64)
     case apiListContacts(userId: Int64)
     case apiUpdateProfile(userId: Int64, profile: Profile)
@@ -114,22 +110,11 @@ public enum ChatCommand {
     case apiEndCall(contact: Contact)
     case apiGetCallInvitations
     case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
-    case apiGetNetworkStatuses
     case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
     case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, encrypted: Bool?, inline: Bool?)
-    case setFileToReceive(fileId: Int64, encrypted: Bool?)
+    case receiveFile(fileId: Int64, encrypted: Bool, inline: Bool?)
+    case setFileToReceive(fileId: Int64, encrypted: Bool)
     case cancelFile(fileId: Int64)
-    // remote desktop commands
-    case setLocalDeviceName(displayName: String)
-    case connectRemoteCtrl(xrcpInvitation: String)
-    case findKnownRemoteCtrl
-    case confirmRemoteCtrl(remoteCtrlId: Int64)
-    case verifyRemoteCtrlSession(sessionCode: String)
-    case listRemoteCtrls
-    case stopRemoteCtrl
-    case deleteRemoteCtrl(remoteCtrlId: Int64)
-    // misc
     case showVersion
     case string(String)
 
@@ -165,7 +150,6 @@ public enum ChatCommand {
             } else {
                 return "/_xftp off"
             }
-            case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
             case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
             case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
             case .apiDeleteStorage: return "/_db delete"
@@ -187,7 +171,7 @@ public enum ChatCommand {
             case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
             case let .apiDeleteToken(token): return "/_ntf delete \(token.cmdString)"
             case let .apiGetNtfMessage(nonce, encNtfInfo): return "/_ntf message \(nonce) \(encNtfInfo)"
-            case let .apiNewGroup(userId, incognito, groupProfile): return "/_group \(userId) incognito=\(onOff(incognito)) \(encodeJSON(groupProfile))"
+            case let .apiNewGroup(userId, groupProfile): return "/_group \(userId) \(encodeJSON(groupProfile))"
             case let .apiAddMember(groupId, contactId, memberRole): return "/_add #\(groupId) \(contactId) \(memberRole)"
             case let .apiJoinGroup(groupId): return "/_join #\(groupId)"
             case let .apiMemberRole(groupId, memberId, memberRole): return "/_member role #\(groupId) \(memberId) \(memberRole.rawValue)"
@@ -210,7 +194,6 @@ public enum ChatCommand {
             case .apiGetNetworkConfig: return "/network"
             case .reconnectAllServers: return "/reconnect"
             case let .apiSetChatSettings(type, id, chatSettings): return "/_settings \(ref(type, id)) \(encodeJSON(chatSettings))"
-            case let .apiSetMemberSettings(groupId, groupMemberId, memberSettings): return "/_member settings #\(groupId) \(groupMemberId) \(encodeJSON(memberSettings))"
             case let .apiContactInfo(contactId): return "/_info @\(contactId)"
             case let .apiGroupMemberInfo(groupId, groupMemberId): return "/_info #\(groupId) \(groupMemberId)"
             case let .apiSwitchContact(contactId): return "/_switch @\(contactId)"
@@ -235,14 +218,8 @@ public enum ChatCommand {
             case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
             case let .apiAddContact(userId, incognito): return "/_connect \(userId) incognito=\(onOff(incognito))"
             case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
-            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
             case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
-            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
-            case let .apiDeleteChat(type, id, notify): if let notify = notify {
-                return "/_delete \(ref(type, id)) notify=\(onOff(notify))"
-            } else {
-                return "/_delete \(ref(type, id))"
-            }
+            case let .apiDeleteChat(type, id): return "/_delete \(ref(type, id))"
             case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
             case let .apiListContacts(userId): return "/_contacts \(userId)"
             case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
@@ -264,20 +241,16 @@ public enum ChatCommand {
             case let .apiEndCall(contact): return "/_call end @\(contact.apiId)"
             case .apiGetCallInvitations: return "/_call get"
             case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
-            case .apiGetNetworkStatuses: return "/_network_statuses"
             case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
             case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, encrypt, inline): return "/freceive \(fileId)\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
-            case let .setFileToReceive(fileId, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("encrypt", encrypt))"
+            case let .receiveFile(fileId, encrypted, inline):
+                let s = "/freceive \(fileId) encrypt=\(onOff(encrypted))"
+                if let inline = inline {
+                    return s + " inline=\(onOff(inline))"
+                }
+                return s
+            case let .setFileToReceive(fileId, encrypted): return "/_set_file_to_receive \(fileId) encrypt=\(onOff(encrypted))"
             case let .cancelFile(fileId): return "/fcancel \(fileId)"
-            case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
-            case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
-            case .findKnownRemoteCtrl: return "/find remote ctrl"
-            case let .confirmRemoteCtrl(rcId): return "/confirm remote ctrl \(rcId)"
-            case let .verifyRemoteCtrlSession(sessCode): return "/verify remote ctrl \(sessCode)"
-            case .listRemoteCtrls: return "/list remote ctrls"
-            case .stopRemoteCtrl: return "/stop remote ctrl"
-            case let .deleteRemoteCtrl(rcId): return "/delete remote ctrl \(rcId)"
             case .showVersion: return "/version"
             case let .string(str): return str
             }
@@ -306,7 +279,6 @@ public enum ChatCommand {
             case .setTempFolder: return "setTempFolder"
             case .setFilesFolder: return "setFilesFolder"
             case .apiSetXFTPConfig: return "apiSetXFTPConfig"
-            case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
             case .apiExportArchive: return "apiExportArchive"
             case .apiImportArchive: return "apiImportArchive"
             case .apiDeleteStorage: return "apiDeleteStorage"
@@ -317,7 +289,6 @@ public enum ChatCommand {
             case .apiSendMessage: return "apiSendMessage"
             case .apiUpdateChatItem: return "apiUpdateChatItem"
             case .apiDeleteChatItem: return "apiDeleteChatItem"
-            case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
             case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
             case .apiChatItemReaction: return "apiChatItemReaction"
             case .apiGetNtfToken: return "apiGetNtfToken"
@@ -348,7 +319,6 @@ public enum ChatCommand {
             case .apiGetNetworkConfig: return "apiGetNetworkConfig"
             case .reconnectAllServers: return "reconnectAllServers"
             case .apiSetChatSettings: return "apiSetChatSettings"
-            case .apiSetMemberSettings: return "apiSetMemberSettings"
             case .apiContactInfo: return "apiContactInfo"
             case .apiGroupMemberInfo: return "apiGroupMemberInfo"
             case .apiSwitchContact: return "apiSwitchContact"
@@ -363,7 +333,6 @@ public enum ChatCommand {
             case .apiVerifyGroupMember: return "apiVerifyGroupMember"
             case .apiAddContact: return "apiAddContact"
             case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
-            case .apiConnectPlan: return "apiConnectPlan"
             case .apiConnect: return "apiConnect"
             case .apiDeleteChat: return "apiDeleteChat"
             case .apiClearChat: return "apiClearChat"
@@ -387,20 +356,11 @@ public enum ChatCommand {
             case .apiEndCall: return "apiEndCall"
             case .apiGetCallInvitations: return "apiGetCallInvitations"
             case .apiCallStatus: return "apiCallStatus"
-            case .apiGetNetworkStatuses: return "apiGetNetworkStatuses"
             case .apiChatRead: return "apiChatRead"
             case .apiChatUnread: return "apiChatUnread"
             case .receiveFile: return "receiveFile"
             case .setFileToReceive: return "setFileToReceive"
             case .cancelFile: return "cancelFile"
-            case .setLocalDeviceName: return "setLocalDeviceName"
-            case .connectRemoteCtrl: return "connectRemoteCtrl"
-            case .findKnownRemoteCtrl: return "findKnownRemoteCtrl"
-            case .confirmRemoteCtrl: return "confirmRemoteCtrl"
-            case .verifyRemoteCtrlSession: return "verifyRemoteCtrlSession"
-            case .listRemoteCtrls: return "listRemoteCtrls"
-            case .stopRemoteCtrl: return "stopRemoteCtrl"
-            case .deleteRemoteCtrl: return "deleteRemoteCtrl"
             case .showVersion: return "showVersion"
             case .string: return "console command"
             }
@@ -454,13 +414,6 @@ public enum ChatCommand {
         b ? "on" : "off"
     }
 
-    private func onOffParam(_ param: String, _ b: Bool?) -> String {
-        if let b = b {
-            return " \(param)=\(onOff(b))"
-        }
-        return ""
-    }
-
     private func maybePwd(_ pwd: String?) -> String {
         pwd == "" || pwd == nil ? "" : " " + encodeJSON(pwd)
     }
@@ -485,7 +438,7 @@ public enum ChatResponse: Decodable, Error {
     case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
     case chatItemTTL(user: UserRef, chatItemTTL: Int64?)
     case networkConfig(networkConfig: NetCfg)
-    case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
+    case contactInfo(user: UserRef, contact: Contact, connectionStats: ConnectionStats, customUserProfile: Profile?)
     case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
     case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
     case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
@@ -504,14 +457,11 @@ public enum ChatResponse: Decodable, Error {
     case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
     case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
     case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
-    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
     case sentConfirmation(user: UserRef)
     case sentInvitation(user: UserRef)
-    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
     case contactAlreadyExists(user: UserRef, contact: Contact)
     case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
     case contactDeleted(user: UserRef, contact: Contact)
-    case contactDeletedByContact(user: UserRef, contact: Contact)
     case chatCleared(user: UserRef, chatInfo: ChatInfo)
     case userProfileNoChange(user: User)
     case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
@@ -529,15 +479,11 @@ public enum ChatResponse: Decodable, Error {
     case acceptingContactRequest(user: UserRef, contact: Contact)
     case contactRequestRejected(user: UserRef)
     case contactUpdated(user: UserRef, toContact: Contact)
-    case groupMemberUpdated(user: UserRef, groupInfo: GroupInfo, fromMember: GroupMember, toMember: GroupMember)
-    // TODO remove events below
     case contactsSubscribed(server: String, contactRefs: [ContactRef])
     case contactsDisconnected(server: String, contactRefs: [ContactRef])
+    case contactSubError(user: UserRef, contact: Contact, chatError: ChatError)
     case contactSubSummary(user: UserRef, contactSubscriptions: [ContactSubStatus])
-    // TODO remove events above
-    case networkStatus(networkStatus: NetworkStatus, connections: [String])
-    case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
-    case groupSubscribed(user: UserRef, groupInfo: GroupRef)
+    case groupSubscribed(user: UserRef, groupInfo: GroupInfo)
     case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
     case groupEmpty(user: UserRef, groupInfo: GroupInfo)
     case userContactLinkSubscribed
@@ -552,7 +498,6 @@ public enum ChatResponse: Decodable, Error {
     case groupCreated(user: UserRef, groupInfo: GroupInfo)
     case sentGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, member: GroupMember)
     case userAcceptedGroupSent(user: UserRef, groupInfo: GroupInfo, hostContact: Contact?)
-    case groupLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember)
     case userDeletedMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
     case leftMemberUser(user: UserRef, groupInfo: GroupInfo)
     case groupMembers(user: UserRef, group: Group)
@@ -607,14 +552,6 @@ public enum ChatResponse: Decodable, Error {
     case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
     case newContactConnection(user: UserRef, connection: PendingContactConnection)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
-    // remote desktop responses/events
-    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
-    case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo)
-    case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
-    case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
-    case remoteCtrlStopped
-    // misc
     case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
     case cmdOk(user: UserRef?)
     case chatCmdError(user_: UserRef?, chatError: ChatError)
@@ -657,14 +594,11 @@ public enum ChatResponse: Decodable, Error {
             case .connectionVerified: return "connectionVerified"
             case .invitation: return "invitation"
             case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
-            case .connectionPlan: return "connectionPlan"
             case .sentConfirmation: return "sentConfirmation"
             case .sentInvitation: return "sentInvitation"
-            case .sentInvitationToContact: return "sentInvitationToContact"
             case .contactAlreadyExists: return "contactAlreadyExists"
             case .contactRequestAlreadyAccepted: return "contactRequestAlreadyAccepted"
             case .contactDeleted: return "contactDeleted"
-            case .contactDeletedByContact: return "contactDeletedByContact"
             case .chatCleared: return "chatCleared"
             case .userProfileNoChange: return "userProfileNoChange"
             case .userProfileUpdated: return "userProfileUpdated"
@@ -682,12 +616,10 @@ public enum ChatResponse: Decodable, Error {
             case .acceptingContactRequest: return "acceptingContactRequest"
             case .contactRequestRejected: return "contactRequestRejected"
             case .contactUpdated: return "contactUpdated"
-            case .groupMemberUpdated: return "groupMemberUpdated"
             case .contactsSubscribed: return "contactsSubscribed"
             case .contactsDisconnected: return "contactsDisconnected"
+            case .contactSubError: return "contactSubError"
             case .contactSubSummary: return "contactSubSummary"
-            case .networkStatus: return "networkStatus"
-            case .networkStatuses: return "networkStatuses"
             case .groupSubscribed: return "groupSubscribed"
             case .memberSubErrors: return "memberSubErrors"
             case .groupEmpty: return "groupEmpty"
@@ -702,7 +634,6 @@ public enum ChatResponse: Decodable, Error {
             case .groupCreated: return "groupCreated"
             case .sentGroupInvitation: return "sentGroupInvitation"
             case .userAcceptedGroupSent: return "userAcceptedGroupSent"
-            case .groupLinkConnecting: return "groupLinkConnecting"
             case .userDeletedMember: return "userDeletedMember"
             case .leftMemberUser: return "leftMemberUser"
             case .groupMembers: return "groupMembers"
@@ -754,12 +685,6 @@ public enum ChatResponse: Decodable, Error {
             case .ntfMessages: return "ntfMessages"
             case .newContactConnection: return "newContactConnection"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
-            case .remoteCtrlList: return "remoteCtrlList"
-            case .remoteCtrlFound: return "remoteCtrlFound"
-            case .remoteCtrlConnecting: return "remoteCtrlConnecting"
-            case .remoteCtrlSessionCode: return "remoteCtrlSessionCode"
-            case .remoteCtrlConnected: return "remoteCtrlConnected"
-            case .remoteCtrlStopped: return "remoteCtrlStopped"
             case .versionInfo: return "versionInfo"
             case .cmdOk: return "cmdOk"
             case .chatCmdError: return "chatCmdError"
@@ -786,7 +711,7 @@ public enum ChatResponse: Decodable, Error {
             case let .serverTestResult(u, server, testFailure): return withUser(u, "server: \(server)\nresult: \(String(describing: testFailure))")
             case let .chatItemTTL(u, chatItemTTL): return withUser(u, String(describing: chatItemTTL))
             case let .networkConfig(networkConfig): return String(describing: networkConfig)
-            case let .contactInfo(u, contact, connectionStats_, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats_: \(String(describing: connectionStats_))\ncustomUserProfile: \(String(describing: customUserProfile))")
+            case let .contactInfo(u, contact, connectionStats, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))\ncustomUserProfile: \(String(describing: customUserProfile))")
             case let .groupMemberInfo(u, groupInfo, member, connectionStats_): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats_: \(String(describing: connectionStats_))")
             case let .contactSwitchStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
             case let .groupMemberSwitchStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
@@ -805,14 +730,11 @@ public enum ChatResponse: Decodable, Error {
             case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
             case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
             case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
-            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
             case .sentConfirmation: return noDetails
             case .sentInvitation: return noDetails
-            case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
             case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
             case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
             case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
-            case let .contactDeletedByContact(u, contact): return withUser(u, String(describing: contact))
             case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
             case .userProfileNoChange: return noDetails
             case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
@@ -830,12 +752,10 @@ public enum ChatResponse: Decodable, Error {
             case let .acceptingContactRequest(u, contact): return withUser(u, String(describing: contact))
             case .contactRequestRejected: return noDetails
             case let .contactUpdated(u, toContact): return withUser(u, String(describing: toContact))
-            case let .groupMemberUpdated(u, groupInfo, fromMember, toMember): return withUser(u, "groupInfo: \(groupInfo)\nfromMember: \(fromMember)\ntoMember: \(toMember)")
             case let .contactsSubscribed(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
             case let .contactsDisconnected(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
+            case let .contactSubError(u, contact, chatError): return withUser(u, "contact:\n\(String(describing: contact))\nerror:\n\(String(describing: chatError))")
             case let .contactSubSummary(u, contactSubscriptions): return withUser(u, String(describing: contactSubscriptions))
-            case let .networkStatus(status, conns): return "networkStatus: \(String(describing: status))\nconnections: \(String(describing: conns))"
-            case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
             case let .groupSubscribed(u, groupInfo): return withUser(u, String(describing: groupInfo))
             case let .memberSubErrors(u, memberSubErrors): return withUser(u, String(describing: memberSubErrors))
             case let .groupEmpty(u, groupInfo): return withUser(u, String(describing: groupInfo))
@@ -850,7 +770,6 @@ public enum ChatResponse: Decodable, Error {
             case let .groupCreated(u, groupInfo): return withUser(u, String(describing: groupInfo))
             case let .sentGroupInvitation(u, groupInfo, contact, member): return withUser(u, "groupInfo: \(groupInfo)\ncontact: \(contact)\nmember: \(member)")
             case let .userAcceptedGroupSent(u, groupInfo, hostContact): return withUser(u, "groupInfo: \(groupInfo)\nhostContact: \(String(describing: hostContact))")
-            case let .groupLinkConnecting(u, groupInfo, hostMember): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))")
             case let .userDeletedMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
             case let .leftMemberUser(u, groupInfo): return withUser(u, String(describing: groupInfo))
             case let .groupMembers(u, group): return withUser(u, String(describing: group))
@@ -902,12 +821,6 @@ public enum ChatResponse: Decodable, Error {
             case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
             case let .newContactConnection(u, connection): return withUser(u, String(describing: connection))
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
-            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
-            case let .remoteCtrlFound(remoteCtrl): return String(describing: remoteCtrl)
-            case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
-            case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nsessionCode: \(sessionCode)"
-            case let .remoteCtrlConnected(remoteCtrl): return String(describing: remoteCtrl)
-            case .remoteCtrlStopped: return noDetails
             case let .versionInfo(versionInfo, chatMigrations, agentMigrations): return "\(String(describing: versionInfo))\n\nchat migrations: \(chatMigrations.map(\.upName))\n\nagent migrations: \(agentMigrations.map(\.upName))"
             case .cmdOk: return noDetails
             case let .chatCmdError(u, chatError): return withUser(u, String(describing: chatError))
@@ -935,36 +848,6 @@ public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
     }
 }
 
-public enum ConnectionPlan: Decodable {
-    case invitationLink(invitationLinkPlan: InvitationLinkPlan)
-    case contactAddress(contactAddressPlan: ContactAddressPlan)
-    case groupLink(groupLinkPlan: GroupLinkPlan)
-}
-
-public enum InvitationLinkPlan: Decodable {
-    case ok
-    case ownLink
-    case connecting(contact_: Contact?)
-    case known(contact: Contact)
-}
-
-public enum ContactAddressPlan: Decodable {
-    case ok
-    case ownLink
-    case connectingConfirmReconnect
-    case connectingProhibit(contact: Contact)
-    case known(contact: Contact)
-    case contactViaAddress(contact: Contact)
-}
-
-public enum GroupLinkPlan: Decodable {
-    case ok
-    case ownLink(groupInfo: GroupInfo)
-    case connectingConfirmReconnect
-    case connectingProhibit(groupInfo_: GroupInfo?)
-    case known(groupInfo: GroupInfo)
-}
-
 struct NewUser: Encodable {
     var profile: Profile?
     var sameServers: Bool
@@ -1295,67 +1178,18 @@ public struct KeepAliveOpts: Codable, Equatable {
     public static let defaults: KeepAliveOpts = KeepAliveOpts(keepIdle: 30, keepIntvl: 15, keepCnt: 4)
 }
 
-public enum NetworkStatus: Decodable, Equatable {
-    case unknown
-    case connected
-    case disconnected
-    case error(connectionError: String)
-
-    public var statusString: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "connected"
-            case .error: return "error"
-            default: return "connecting"
-            }
-        }
-    }
-
-    public var statusExplanation: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "You are connected to the server used to receive messages from this contact."
-            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-            default: return "Trying to connect to the server used to receive messages from this contact."
-            }
-        }
-    }
-
-    public var imageName: String {
-        get {
-            switch self {
-            case .unknown: return "circle.dotted"
-            case .connected: return "circle.fill"
-            case .disconnected: return "ellipsis.circle.fill"
-            case .error: return "exclamationmark.circle.fill"
-            }
-        }
-    }
-}
-
-public struct ConnNetworkStatus: Decodable {
-    public var agentConnId: String
-    public var networkStatus: NetworkStatus
-}
-
 public struct ChatSettings: Codable {
-    public var enableNtfs: MsgFilter
+    public var enableNtfs: Bool
     public var sendRcpts: Bool?
     public var favorite: Bool
 
-    public init(enableNtfs: MsgFilter, sendRcpts: Bool?, favorite: Bool) {
+    public init(enableNtfs: Bool, sendRcpts: Bool?, favorite: Bool) {
         self.enableNtfs = enableNtfs
         self.sendRcpts = sendRcpts
         self.favorite = favorite
     }
 
-    public static let defaults: ChatSettings = ChatSettings(enableNtfs: .all, sendRcpts: nil, favorite: false)
-}
-
-public enum MsgFilter: String, Codable {
-    case none
-    case all
-    case mentions
+    public static let defaults: ChatSettings = ChatSettings(enableNtfs: true, sendRcpts: nil, favorite: false)
 }
 
 public struct UserMsgReceiptSettings: Codable {
@@ -1534,33 +1368,6 @@ public enum NotificationPreviewMode: String, SelectableItem {
     public static var values: [NotificationPreviewMode] = [.message, .contact, .hidden]
 }
 
-public struct RemoteCtrlInfo: Decodable {
-    public var remoteCtrlId: Int64
-    public var ctrlDeviceName: String
-    public var sessionState: RemoteCtrlSessionState?
-
-    public var deviceViewName: String {
-        ctrlDeviceName == "" ? "\(remoteCtrlId)" : ctrlDeviceName
-    }
-}
-
-public enum RemoteCtrlSessionState: Decodable {
-    case starting
-    case connecting
-    case pendingConfirmation(sessionCode: String)
-    case connected(sessionCode: String)
-}
-
-public struct CtrlAppInfo: Decodable {
-    public var appVersionRange: AppVersionRange
-    public var deviceName: String
-}
-
-public struct AppVersionRange: Decodable {
-    public var minVersion: String
-    public var maxVersion: String
-}
-
 public struct CoreVersionInfo: Decodable {
     public var version: String
     public var simplexmqVersion: String
@@ -1588,7 +1395,6 @@ public enum ChatError: Decodable {
     case errorAgent(agentError: AgentErrorType)
     case errorStore(storeError: StoreError)
     case errorDatabase(databaseError: DatabaseError)
-    case errorRemoteCtrl(remoteCtrlError: RemoteCtrlError)
     case invalidJSON(json: String)
 }
 
@@ -1611,11 +1417,9 @@ public enum ChatErrorType: Decodable {
     case chatNotStarted
     case chatNotStopped
     case chatStoreChanged
-    case connectionPlan(connectionPlan: ConnectionPlan)
     case invalidConnReq
     case invalidChatMessage(connection: Connection, message: String)
     case contactNotReady(contact: Contact)
-    case contactNotActive(contact: Contact)
     case contactDisabled(contact: Contact)
     case connectionDisabled(connection: Connection)
     case groupUserRole(groupInfo: GroupInfo, requiredRole: GroupMemberRole)
@@ -1748,7 +1552,6 @@ public enum AgentErrorType: Decodable {
     case SMP(smpErr: ProtocolErrorType)
     case NTF(ntfErr: ProtocolErrorType)
     case XFTP(xftpErr: XFTPErrorType)
-    case RCP(rcpErr: RCErrorType)
     case BROKER(brokerAddress: String, brokerErr: BrokerErrorType)
     case AGENT(agentErr: SMPAgentError)
     case INTERNAL(internalErr: String)
@@ -1806,22 +1609,6 @@ public enum XFTPErrorType: Decodable {
     case INTERNAL
 }
 
-public enum RCErrorType: Decodable {
-    case `internal`(internalErr: String)
-    case identity
-    case noLocalAddress
-    case tlsStartFailed
-    case exception(exception: String)
-    case ctrlAuth
-    case ctrlNotFound
-    case ctrlError(ctrlErr: String)
-    case version
-    case encrypt
-    case decrypt
-    case blockSize
-    case syntax(syntaxErr: String)
-}
-
 public enum ProtocolCommandError: Decodable {
     case UNKNOWN
     case SYNTAX
@@ -1857,14 +1644,3 @@ public enum ArchiveError: Decodable {
     case `import`(chatError: ChatError)
     case importFile(file: String, chatError: ChatError)
 }
-
-public enum RemoteCtrlError: Decodable {
-    case inactive
-    case badState
-    case busy
-    case timeout
-    case disconnected(remoteCtrlId: Int64, reason: String)
-    case badInvitation
-    case badVersion(appVersion: String)
-//    case protocolError(protocolError: RemoteProtocolError)
-}

apps/ios/SimpleXChat/AppGroup.swift

@@ -83,9 +83,9 @@ public enum AppState: String {
 
     public var canSuspend: Bool {
         switch self {
-        case .active: return true
-        case .bgRefresh: return true
-        default: return false
+        case .active: true
+        case .bgRefresh: true
+        default: false
         }
     }
 }