rename option

pass ChatOpts
simplify, make passed user active
2024-12-17 17:20:21 +01:00 · 2024-11-30 20:40:30 +00:00 · 2024-11-30 20:33:29 +00:00 · 2024-11-30 20:29:38 +00:00 · 2024-11-30 20:19:12 +00:00 · 2024-11-19 07:48:01 +08:00
245 changed files with 4387 additions and 13094 deletions
@@ -233,7 +233,7 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

-[Dec 10, 2024. SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
+[Nov 25, 2025. Servers operated by Flux - true privacy and decentralization for all users](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md)

 [Oct 14, 2024. SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)

@@ -243,14 +243,20 @@ Recent and important updates:

 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)

+[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
+
 [Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).

+[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
+
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).

 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).

 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

+[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
+
 [All updates](./blog)

 ## :zap: Quick installation of a terminal app
@@ -378,11 +384,9 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Improve sending videos (including encryption of locally stored videos).
 - ✅ Post-quantum resistant key exchange in double ratchet protocol.
 - ✅ Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
- ✅ Support multiple network operators in the app.
- 🏗 Large groups, communities and public channels.
- 🏗 Short links to connect and join groups.
 - 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
+- 🏗 Large groups, communities and public channels.
 - Privacy & security slider - a simple way to set all settings at once.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
@@ -26,7 +26,6 @@ enum NtfCallAction {
 class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
    static let shared = NtfManager()

-    public var navigatingToChat = false
    private var granted = false
    private var prevNtfTime: Dictionary<ChatId, Date> = [:]

@@ -75,10 +74,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
            }
        } else {
            if let chatId = content.targetContentIdentifier {
-                self.navigatingToChat = true
-                ItemsModel.shared.loadOpenChat(chatId) {
-                    self.navigatingToChat = false
-                }
+                ItemsModel.shared.loadOpenChat(chatId)
            }
        }
    }
@@ -519,14 +519,7 @@ func testProtoServer(server: String) async throws -> Result<(), ProtocolTestFail
    throw r
 }

-func getServerOperators() async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiGetServerOperators)
-    if case let .serverOperatorConditions(conditions) = r { return conditions }
-    logger.error("getServerOperators error: \(String(describing: r))")
-    throw r
-}
-
-func getServerOperatorsSync() throws -> ServerOperatorConditions {
+func getServerOperators() throws -> ServerOperatorConditions {
    let r = chatSendCmdSync(.apiGetServerOperators)
    if case let .serverOperatorConditions(conditions) = r { return conditions }
    logger.error("getServerOperators error: \(String(describing: r))")
@@ -1606,7 +1599,7 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
-    m.conditions = try getServerOperatorsSync()
+    m.conditions = try getServerOperators()
    if shouldImportAppSettingsDefault.get() {
        do {
            let appSettings = try apiGetAppSettings(settings: AppSettings.current.prepareForExport())
@@ -2021,18 +2014,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.removeChat(hostConn.id)
            }
        }
-    case let .businessLinkConnecting(user, groupInfo, _, fromContact):
-        if !active(user) { return }
-
-        await MainActor.run {
-            m.updateGroup(groupInfo)
-        }
-        if m.chatId == fromContact.id {
-            ItemsModel.shared.loadOpenChat(groupInfo.id)
-        }
-        await MainActor.run {
-            m.removeChat(fromContact.id)
-        }
    case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
        if active(user) {
            await MainActor.run {
@@ -143,8 +143,7 @@ struct SimpleXApp: App {
            let chats = try await apiGetChatsAsync()
            await MainActor.run { chatModel.updateChats(chats) }
            if let id = chatModel.chatId,
-               let chat = chatModel.getChat(id),
-               !NtfManager.shared.navigatingToChat {
+               let chat = chatModel.getChat(id) {
                Task { await loadChat(chat: chat, clearItems: false) }
            }
            if let ncr = chatModel.ntfContactRequest {
@@ -96,8 +96,6 @@ struct ChatInfoView: View {
    @ObservedObject var chat: Chat
    @State var contact: Contact
    @State var localAlias: String
-    @State var featuresAllowed: ContactFeaturesAllowed
-    @State var currentFeaturesAllowed: ContactFeaturesAllowed
    var onSearch: () -> Void
    @State private var connectionStats: ConnectionStats? = nil
    @State private var customUserProfile: Profile? = nil
@@ -156,8 +154,8 @@ struct ChatInfoView: View {
                    HStack(alignment: .center, spacing: 8) {
                        let buttonWidth = g.size.width / 4
                        searchButton(width: buttonWidth)
-                        AudioCallButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                        VideoButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
                        muteButton(width: buttonWidth)
                    }
                }
@@ -314,15 +312,7 @@ struct ChatInfoView: View {
            case .networkStatusAlert: return networkStatusAlert()
            case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
-            case .syncConnectionForceAlert:
-                return syncConnectionForceAlert({
-                    Task {
-                        if let stats = await syncContactConnection(contact, force: true, showAlert: { alert = .someAlert(alert: $0) }) {
-                            connectionStats = stats
-                            dismiss()
-                        }
-                    }
-                })
+            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
            case let .queueInfo(info): return queueInfoAlert(info)
            case let .someAlert(a): return a.alert
            case let .error(title, error): return mkAlert(title: title, message: error)
@@ -337,16 +327,6 @@ struct ChatInfoView: View {
                $0.content
            }
        }
-        .onDisappear {
-            if currentFeaturesAllowed != featuresAllowed {
-                showAlert(
-                    title: NSLocalizedString("Save preferences?", comment: "alert title"),
-                    buttonTitle: NSLocalizedString("Save and notify contact", comment: "alert button"),
-                    buttonAction: { savePreferences() },
-                    cancelButton: true
-                )
-            }
-        }
    }
    
    private func contactInfoHeader() -> some View {
@@ -467,9 +447,8 @@ struct ChatInfoView: View {
        NavigationLink {
            ContactPreferencesView(
                contact: $contact,
-                featuresAllowed: $featuresAllowed,
-                currentFeaturesAllowed: $currentFeaturesAllowed,
-                savePreferences: savePreferences
+                featuresAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
+                currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences)
            )
            .navigationBarTitle("Contact preferences")
            .modifier(ThemedBackground(grouped: true))
@@ -501,12 +480,7 @@ struct ChatInfoView: View {
    
    private func synchronizeConnectionButton() -> some View {
        Button {
-            Task {
-                if let stats = await syncContactConnection(contact, force: false, showAlert: { alert = .someAlert(alert: $0) }) {
-                    connectionStats = stats
-                    dismiss()
-                }
-            }
+            syncContactConnection(force: false)
        } label: {
            Label("Fix connection", systemImage: "exclamationmark.arrow.triangle.2.circlepath")
                .foregroundColor(.orange)
@@ -625,50 +599,29 @@ struct ChatInfoView: View {
        }
    }
    
-    private func savePreferences() {
+    private func syncContactConnection(force: Bool) {
        Task {
            do {
-                let prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
-                if let toContact = try await apiSetContactPrefs(contactId: contact.contactId, preferences: prefs) {
-                    await MainActor.run {
-                        contact = toContact
-                        chatModel.updateContact(toContact)
-                        currentFeaturesAllowed = featuresAllowed
-                    }
+                let stats = try apiSyncContactRatchet(contact.apiId, force)
+                connectionStats = stats
+                await MainActor.run {
+                    chatModel.updateContactConnectionStats(contact, stats)
+                    dismiss()
+                }
+            } catch let error {
+                logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error synchronizing connection")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
                }
-            } catch {
-                logger.error("ContactPreferencesView apiSetContactPrefs error: \(responseError(error))")
            }
        }
    }
 }

-func syncContactConnection(_ contact: Contact, force: Bool, showAlert: (SomeAlert) -> Void) async -> ConnectionStats? {
-    do {
-        let stats = try apiSyncContactRatchet(contact.apiId, force)
-        await MainActor.run {
-            ChatModel.shared.updateContactConnectionStats(contact, stats)
-        }
-        return stats
-    } catch let error {
-        logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
-        let a = getErrorAlert(error, "Error synchronizing connection")
-        await MainActor.run {
-            showAlert(
-                SomeAlert(
-                    alert: mkAlert(title: a.title, message: a.message),
-                    id: "syncContactConnection error"
-                )
-            )
-        }
-        return nil
-    }
-}
-
 struct AudioCallButton: View {
    var chat: Chat
    var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
    var width: CGFloat
    var showAlert: (SomeAlert) -> Void

@@ -676,7 +629,6 @@ struct AudioCallButton: View {
        CallButton(
            chat: chat,
            contact: contact,
-            connectionStats: $connectionStats,
            image: "phone.fill",
            title: "call",
            mediaType: .audio,
@@ -689,7 +641,6 @@ struct AudioCallButton: View {
 struct VideoButton: View {
    var chat: Chat
    var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
    var width: CGFloat
    var showAlert: (SomeAlert) -> Void

@@ -697,7 +648,6 @@ struct VideoButton: View {
        CallButton(
            chat: chat,
            contact: contact,
-            connectionStats: $connectionStats,
            image: "video.fill",
            title: "video",
            mediaType: .video,
@@ -710,7 +660,6 @@ struct VideoButton: View {
 private struct CallButton: View {
    var chat: Chat
    var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
    var image: String
    var title: LocalizedStringKey
    var mediaType: CallMediaType
@@ -722,40 +671,12 @@ private struct CallButton: View {

        InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
            if canCall {
-                if let connStats = connectionStats {
-                    if connStats.ratchetSyncState == .ok {
-                        if CallController.useCallKit() {
-                            CallController.shared.startCall(contact, mediaType)
-                        } else {
-                            // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
-                            dismissAllSheets(animated: true) {
-                                CallController.shared.startCall(contact, mediaType)
-                            }
-                        }
-                    } else if connStats.ratchetSyncAllowed {
-                        showAlert(SomeAlert(
-                            alert: Alert(
-                                title: Text("Fix connection?"),
-                                message: Text("Connection requires encryption renegotiation."),
-                                primaryButton: .default(Text("Fix")) {
-                                    Task {
-                                        if let stats = await syncContactConnection(contact, force: false, showAlert: showAlert) {
-                                            connectionStats = stats
-                                        }
-                                    }
-                                },
-                                secondaryButton: .cancel()
-                            ),
-                            id: "can't call contact, fix connection"
-                        ))
-                    } else {
-                        showAlert(SomeAlert(
-                            alert: mkAlert(
-                                title: "Can't call contact",
-                                message: "Encryption renegotiation in progress."
-                            ),
-                            id: "can't call contact, encryption renegotiation in progress"
-                        ))
+                if CallController.useCallKit() {
+                    CallController.shared.startCall(contact, mediaType)
+                } else {
+                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
+                    dismissAllSheets(animated: true) {
+                        CallController.shared.startCall(contact, mediaType)
                    }
                }
            } else if contact.nextSendGrpInv {
@@ -1252,8 +1173,6 @@ struct ChatInfoView_Previews: PreviewProvider {
            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
            contact: Contact.sampleData,
            localAlias: "",
-            featuresAllowed: contactUserPrefsToFeaturesAllowed(Contact.sampleData.mergedPreferences),
-            currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(Contact.sampleData.mergedPreferences),
            onSearch: {}
        )
    }
@@ -23,7 +23,7 @@ struct CIMemberCreatedContactView: View {
                        .onTapGesture {
                            dismissAllSheets(animated: true)
                            DispatchQueue.main.async {
-                                ItemsModel.shared.loadOpenChat("@\(contactId)")
+                                m.chatId = "@\(contactId)"
                            }
                        }
                } else {
@@ -133,12 +133,7 @@ struct ChatView: View {
        .appSheet(item: $selectedMember) { member in
            Group {
                if case let .group(groupInfo) = chat.chatInfo {
-                    GroupMemberInfoView(
-                        groupInfo: groupInfo,
-                        chat: chat,
-                        groupMember: member,
-                        navigation: true
-                    )
+                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
                }
            }
        }
@@ -231,8 +226,6 @@ struct ChatView: View {
                            chat: chat,
                            contact: contact,
                            localAlias: chat.chatInfo.localAlias,
-                            featuresAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
-                            currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
                            onSearch: { focusSearch() }
                        )
                    }
@@ -1129,7 +1122,6 @@ struct ChatView: View {
                                        } else {
                                            let mem = GMember.init(member)
                                            m.groupMembers.append(mem)
-                                            m.groupMembersIndexes[member.groupMemberId] = m.groupMembers.count - 1
                                            selectedMember = mem
                                        }
                                    }
@@ -1885,7 +1877,6 @@ struct ReactionContextMenu: View {
                    } else {
                        let member = GMember.init(mem)
                        m.groupMembers.append(member)
-                        m.groupMembersIndexes[member.groupMemberId] = m.groupMembers.count - 1
                        selectedMember = member
                    }
                } label: {
@@ -14,10 +14,9 @@ struct ContactPreferencesView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Binding var contact: Contact
-    @Binding var featuresAllowed: ContactFeaturesAllowed
-    @Binding var currentFeaturesAllowed: ContactFeaturesAllowed
+    @State var featuresAllowed: ContactFeaturesAllowed
+    @State var currentFeaturesAllowed: ContactFeaturesAllowed
    @State private var showSaveDialogue = false
-    let savePreferences: () -> Void

    var body: some View {
        let user: User = chatModel.currentUser!
@@ -49,10 +48,7 @@ struct ContactPreferencesView: View {
                savePreferences()
                dismiss()
            }
-            Button("Exit without saving") {
-                featuresAllowed = currentFeaturesAllowed
-                dismiss()
-            }
+            Button("Exit without saving") { dismiss() }
        }
    }

@@ -122,15 +118,31 @@ struct ContactPreferencesView: View {
    private func featureFooter(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
        Text(feature.enabledDescription(enabled))
    }
+
+    private func savePreferences() {
+        Task {
+            do {
+                let prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
+                if let toContact = try await apiSetContactPrefs(contactId: contact.contactId, preferences: prefs) {
+                    await MainActor.run {
+                        contact = toContact
+                        chatModel.updateContact(toContact)
+                        currentFeaturesAllowed = featuresAllowed
+                    }
+                }
+            } catch {
+                logger.error("ContactPreferencesView apiSetContactPrefs error: \(responseError(error))")
+            }
+        }
+    }
 }

 struct ContactPreferencesView_Previews: PreviewProvider {
    static var previews: some View {
        ContactPreferencesView(
            contact: Binding.constant(Contact.sampleData),
-            featuresAllowed: Binding.constant(ContactFeaturesAllowed.sampleData),
-            currentFeaturesAllowed: Binding.constant(ContactFeaturesAllowed.sampleData),
-            savePreferences: {}
+            featuresAllowed: ContactFeaturesAllowed.sampleData,
+            currentFeaturesAllowed: ContactFeaturesAllowed.sampleData
        )
    }
 }
@@ -78,12 +78,7 @@ struct AddGroupMembersViewCommon: View {
                    let count = selectedContacts.count
                    Section {
                        if creatingGroup {
-                            GroupPreferencesButton(
-                                groupInfo: $groupInfo,
-                                preferences: groupInfo.fullGroupPreferences,
-                                currentPreferences: groupInfo.fullGroupPreferences,
-                                creatingGroup: true
-                            )
+                            groupPreferencesButton($groupInfo, true)
                        }
                        rolePicker()
                        inviteMembersButton()
@@ -145,13 +140,12 @@ struct AddGroupMembersViewCommon: View {
        return dummy
    }()

-    @ViewBuilder private func inviteMembersButton() -> some View {
-        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Invite to group" : "Invite to chat"
+    private func inviteMembersButton() -> some View {
        Button {
            inviteMembers()
        } label: {
            HStack {
-                Text(label)
+                Text("Invite to group")
                Image(systemName: "checkmark")
            }
        }
@@ -237,7 +231,6 @@ func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding,
            .focused(focussed)
            .foregroundColor(onBackgroundColor)
            .frame(maxWidth: .infinity)
-            .autocorrectionDisabled(true)
        Image(systemName: "xmark.circle.fill")
            .resizable()
            .scaledToFit()
@@ -81,13 +81,13 @@ struct GroupChatInfoView: View {
                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

                Section {
-                    if groupInfo.isOwner && groupInfo.businessChat == nil {
+                    if groupInfo.canEdit {
                        editGroupButton()
                    }
-                    if groupInfo.groupProfile.description != nil || (groupInfo.isOwner && groupInfo.businessChat == nil) {
+                    if groupInfo.groupProfile.description != nil || groupInfo.canEdit {
                        addOrEditWelcomeMessage()
                    }
-                    GroupPreferencesButton(groupInfo: $groupInfo, preferences: groupInfo.fullGroupPreferences, currentPreferences: groupInfo.fullGroupPreferences)
+                    groupPreferencesButton($groupInfo)
                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                        sendReceiptsOption()
                    } else {
@@ -101,20 +101,13 @@ struct GroupChatInfoView: View {
                } header: {
                    Text("")
                } footer: {
-                    let label: LocalizedStringKey = (
-                        groupInfo.businessChat == nil
-                        ? "Only group owners can change group preferences."
-                        : "Only chat owners can change preferences."
-                    )
-                    Text(label)
+                    Text("Only group owners can change group preferences.")
                        .foregroundColor(theme.colors.secondary)
                }

                Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
                    if groupInfo.canAddMembers {
-                        if groupInfo.businessChat == nil {
-                            groupLinkButton()
-                        }
+                        groupLinkButton()
                        if (chat.chatInfo.incognito) {
                            Label("Invite members", systemImage: "plus")
                                .foregroundColor(Color(uiColor: .tertiaryLabel))
@@ -283,15 +276,10 @@ struct GroupChatInfoView: View {
    }

    private func addMembersButton() -> some View {
-        let label: LocalizedStringKey = switch groupInfo.businessChat?.chatType {
-            case .customer: "Add team members"
-            case .business: "Add friends"
-            case .none: "Invite members"
-        }
-        return NavigationLink {
+        NavigationLink {
            addMembersDestinationView()
        } label: {
-            Label(label, systemImage: "plus")
+            Label("Invite members", systemImage: "plus")
        }
    }

@@ -439,7 +427,7 @@ struct GroupChatInfoView: View {
    }

    private func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember)
+        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
            .navigationBarHidden(false)
    }

@@ -499,12 +487,11 @@ struct GroupChatInfoView: View {
        }
    }

-    @ViewBuilder private func deleteGroupButton() -> some View {
-        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Delete group" : "Delete chat"
+    private func deleteGroupButton() -> some View {
        Button(role: .destructive) {
            alert = .deleteGroupAlert
        } label: {
-            Label(label, systemImage: "trash")
+            Label("Delete group", systemImage: "trash")
                .foregroundColor(Color.red)
        }
    }
@@ -518,22 +505,20 @@ struct GroupChatInfoView: View {
        }
    }

-    @ViewBuilder private func leaveGroupButton() -> some View {
-        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Leave group" : "Leave chat"
+    private func leaveGroupButton() -> some View {
        Button(role: .destructive) {
            alert = .leaveGroupAlert
        } label: {
-            Label(label, systemImage: "rectangle.portrait.and.arrow.right")
+            Label("Leave group", systemImage: "rectangle.portrait.and.arrow.right")
                .foregroundColor(Color.red)
        }
    }

    // TODO reuse this and clearChatAlert with ChatInfoView
    private func deleteGroupAlert() -> Alert {
-        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Delete group?" : "Delete chat?"
        return Alert(
-            title: Text(label),
-            message: deleteGroupAlertMessage(groupInfo),
+            title: Text("Delete group?"),
+            message: deleteGroupAlertMessage(),
            primaryButton: .destructive(Text("Delete")) {
                Task {
                    do {
@@ -552,6 +537,10 @@ struct GroupChatInfoView: View {
        )
    }

+    private func deleteGroupAlertMessage() -> Text {
+        groupInfo.membership.memberCurrent ? Text("Group will be deleted for all members - this cannot be undone!") : Text("Group will be deleted for you - this cannot be undone!")
+    }
+
    private func clearChatAlert() -> Alert {
        Alert(
            title: Text("Clear conversation?"),
@@ -567,15 +556,9 @@ struct GroupChatInfoView: View {
    }

    private func leaveGroupAlert() -> Alert {
-        let titleLabel: LocalizedStringKey = groupInfo.businessChat == nil ? "Leave group?" : "Leave chat?"
-        let messageLabel: LocalizedStringKey = (
-            groupInfo.businessChat == nil
-            ? "You will stop receiving messages from this group. Chat history will be preserved."
-            : "You will stop receiving messages from this chat. Chat history will be preserved."
-        )
-        return Alert(
-            title: Text(titleLabel),
-            message: Text(messageLabel),
+        Alert(
+            title: Text("Leave group?"),
+            message: Text("You will stop receiving messages from this group. Chat history will be preserved."),
            primaryButton: .destructive(Text("Leave")) {
                Task {
                    await leaveGroup(chat.chatInfo.apiId)
@@ -619,14 +602,9 @@ struct GroupChatInfoView: View {
    }

    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
-        let messageLabel: LocalizedStringKey = (
-            groupInfo.businessChat == nil
-            ? "Member will be removed from group - this cannot be undone!"
-            : "Member will be removed from chat - this cannot be undone!"
-        )
-        return Alert(
+        Alert(
            title: Text("Remove member?"),
-            message: Text(messageLabel),
+            message: Text("Member will be removed from group - this cannot be undone!"),
            primaryButton: .destructive(Text("Remove")) {
                Task {
                    do {
@@ -646,80 +624,26 @@ struct GroupChatInfoView: View {
    }
 }

-func deleteGroupAlertMessage(_ groupInfo: GroupInfo) -> Text {
-    groupInfo.businessChat == nil ? (
-        groupInfo.membership.memberCurrent ? Text("Group will be deleted for all members - this cannot be undone!") : Text("Group will be deleted for you - this cannot be undone!")
-    ) : (
-        groupInfo.membership.memberCurrent ? Text("Chat will be deleted for all members - this cannot be undone!") : Text("Chat will be deleted for you - this cannot be undone!")
-    )
-}
-
-struct GroupPreferencesButton: View {
-    @Binding var groupInfo: GroupInfo
-    @State var preferences: FullGroupPreferences
-    @State var currentPreferences: FullGroupPreferences
-    var creatingGroup: Bool = false
-    
-    private var label: LocalizedStringKey {
-        groupInfo.businessChat == nil ? "Group preferences" : "Chat preferences"
-    }
-    
-    var body: some View {
-        NavigationLink {
-            GroupPreferencesView(
-                groupInfo: $groupInfo,
-                preferences: $preferences,
-                currentPreferences: currentPreferences,
-                creatingGroup: creatingGroup,
-                savePreferences: savePreferences
-            )
-            .navigationBarTitle(label)
-            .modifier(ThemedBackground(grouped: true))
-            .navigationBarTitleDisplayMode(.large)
-            .onDisappear {
-                let saveText = NSLocalizedString(
-                    creatingGroup ? "Save" : "Save and notify group members",
-                    comment: "alert button"
-                )
-                
-                if groupInfo.fullGroupPreferences != preferences {
-                    showAlert(
-                        title: NSLocalizedString("Save preferences?", comment: "alert title"),
-                        buttonTitle: saveText,
-                        buttonAction: { savePreferences() },
-                        cancelButton: true
-                    )
-                }
-            }
-        } label: {
-            if creatingGroup {
-                Text("Set group preferences")
-            } else {
-                Label(label, systemImage: "switch.2")
-            }
+func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
+    NavigationLink {
+        GroupPreferencesView(
+            groupInfo: groupInfo,
+            preferences: groupInfo.wrappedValue.fullGroupPreferences,
+            currentPreferences: groupInfo.wrappedValue.fullGroupPreferences,
+            creatingGroup: creatingGroup
+        )
+        .navigationBarTitle("Group preferences")
+        .modifier(ThemedBackground(grouped: true))
+        .navigationBarTitleDisplayMode(.large)
+    } label: {
+        if creatingGroup {
+            Text("Set group preferences")
+        } else {
+            Label("Group preferences", systemImage: "switch.2")
        }
    }
-    
-    private func savePreferences() {
-        Task {
-            do {
-                var gp = groupInfo.groupProfile
-                gp.groupPreferences = toGroupPreferences(preferences)
-                let gInfo = try await apiUpdateGroup(groupInfo.groupId, gp)
-                await MainActor.run {
-                    groupInfo = gInfo
-                    ChatModel.shared.updateGroup(gInfo)
-                    currentPreferences = preferences
-                }
-            } catch {
-                logger.error("GroupPreferencesView apiUpdateGroup error: \(responseError(error))")
-            }
-        }
-    }
-
 }

-
 func cantInviteIncognitoAlert() -> Alert {
    Alert(
        title: Text("Can't invite contacts!"),
@@ -14,15 +14,11 @@ struct GroupMemberInfoView: View {
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
    @State var groupInfo: GroupInfo
-    @ObservedObject var chat: Chat
    @ObservedObject var groupMember: GMember
    var navigation: Bool = false
    @State private var connectionStats: ConnectionStats? = nil
    @State private var connectionCode: String? = nil
    @State private var connectionLoaded: Bool = false
-    @State private var knownContactChat: Chat? = nil
-    @State private var knownContact: Contact? = nil
-    @State private var knownContactConnectionStats: ConnectionStats? = nil
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
    @State private var sheet: PlanAndConnectActionSheet?
@@ -122,8 +118,8 @@ struct GroupMemberInfoView: View {
                            } label: {
                                Label("Share address", systemImage: "square.and.arrow.up")
                            }
-                            if member.memberContactId != nil {
-                                if knownContactChat == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                            if let contactId = member.memberContactId {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                                    connectViaAddressButton(contactLink)
                                }
                            } else {
@@ -139,8 +135,7 @@ struct GroupMemberInfoView: View {
                    }

                    Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
-                        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Group" : "Chat"
-                        infoRow(label, groupInfo.displayName)
+                        infoRow("Group", groupInfo.displayName)

                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
                            Picker("Change role", selection: $newRole) {
@@ -232,18 +227,6 @@ struct GroupMemberInfoView: View {
                    }
                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                }
-                if let contactId = member.memberContactId, let (contactChat, contact) = knownDirectChat(contactId) {
-                    knownContactChat = contactChat
-                    knownContact = contact
-                    do {
-                        let (stats, _) = try await apiContactInfo(contactChat.chatInfo.apiId)
-                        await MainActor.run {
-                            knownContactConnectionStats = stats
-                        }
-                    } catch let error {
-                        logger.error("apiContactInfo error: \(responseError(error))")
-                    }
-                }
            }
            .onChange(of: newRole) { newRole in
                if newRole != member.memberRole {
@@ -277,11 +260,6 @@ struct GroupMemberInfoView: View {
                ProgressView().scaleEffect(2)
            }
        }
-        .onChange(of: chat.chatInfo) { c in
-            if case let .group(gI) = chat.chatInfo {
-                groupInfo = gI
-            }
-        }
        .modifier(ThemedBackground(grouped: true))
    }

@@ -289,10 +267,10 @@ struct GroupMemberInfoView: View {
        GeometryReader { g in
            let buttonWidth = g.size.width / 4
            HStack(alignment: .center, spacing: 8) {
-                if let chat = knownContactChat, let contact = knownContact {
+                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
                    knownDirectChatButton(chat, width: buttonWidth)
-                    AudioCallButton(chat: chat, contact: contact, connectionStats: $knownContactConnectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                    VideoButton(chat: chat, contact: contact, connectionStats: $knownContactConnectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
                } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                    if let contactId = member.memberContactId {
                        newDirectChatButton(contactId, width: buttonWidth)
@@ -327,15 +305,10 @@ struct GroupMemberInfoView: View {
    }

    func showDirectMessagesProhibitedAlert(_ title: LocalizedStringKey) {
-        let messageLabel: LocalizedStringKey = (
-            groupInfo.businessChat == nil
-            ? "Direct messages between members are prohibited."
-            : "Direct messages between members are prohibited in this chat."
-        )
        alert = .someAlert(alert: SomeAlert(
            alert: mkAlert(
                title: title,
-                message: messageLabel
+                message: "Direct messages between members are prohibited in this group."
            ),
            id: "can't message member, direct messages prohibited"
        ))
@@ -381,49 +354,25 @@ struct GroupMemberInfoView: View {

    func createMemberContactButton(width: CGFloat) -> some View {
        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            if let connStats = connectionStats {
-                if connStats.ratchetSyncState == .ok {
-                    progressIndicator = true
-                    Task {
-                        do {
-                            let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
-                            await MainActor.run {
-                                progressIndicator = false
-                                chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                                ItemsModel.shared.loadOpenChat(memberContact.id) {
-                                    dismissAllSheets(animated: true)
-                                }
-                                NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
-                            }
-                        } catch let error {
-                            logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
-                            let a = getErrorAlert(error, "Error creating member contact")
-                            await MainActor.run {
-                                progressIndicator = false
-                                alert = .error(title: a.title, error: a.message)
-                            }
+            progressIndicator = true
+            Task {
+                do {
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    await MainActor.run {
+                        progressIndicator = false
+                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
+                        ItemsModel.shared.loadOpenChat(memberContact.id) {
+                            dismissAllSheets(animated: true)
                        }
+                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
+                    }
+                } catch let error {
+                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
+                    let a = getErrorAlert(error, "Error creating member contact")
+                    await MainActor.run {
+                        progressIndicator = false
+                        alert = .error(title: a.title, error: a.message)
                    }
-                } else if connStats.ratchetSyncAllowed {
-                    alert = .someAlert(alert: SomeAlert(
-                        alert: Alert(
-                            title: Text("Fix connection?"),
-                            message: Text("Connection requires encryption renegotiation."),
-                            primaryButton: .default(Text("Fix")) {
-                                syncMemberConnection(force: false)
-                            },
-                            secondaryButton: .cancel()
-                        ),
-                        id: "can't message member, fix connection"
-                    ))
-                } else {
-                    alert = .someAlert(alert: SomeAlert(
-                        alert: mkAlert(
-                            title: "Can't message member",
-                            message: "Encryption renegotiation in progress."
-                        ),
-                        id: "can't message contact, encryption renegotiation in progress"
-                    ))
                }
            }
        }
@@ -588,14 +537,9 @@ struct GroupMemberInfoView: View {
    }

    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
-        let label: LocalizedStringKey = (
-            groupInfo.businessChat == nil
-            ? "Member will be removed from group - this cannot be undone!"
-            : "Member will be removed from chat - this cannot be undone!"
-        )
-        return Alert(
+        Alert(
            title: Text("Remove member?"),
-            message: Text(label),
+            message: Text("Member will be removed from group - this cannot be undone!"),
            primaryButton: .destructive(Text("Remove")) {
                Task {
                    do {
@@ -618,15 +562,7 @@ struct GroupMemberInfoView: View {
    private func changeMemberRoleAlert(_ mem: GroupMember) -> Alert {
        Alert(
            title: Text("Change member role?"),
-            message: (
-                mem.memberCurrent
-                ? (
-                    groupInfo.businessChat == nil
-                    ? Text("Member role will be changed to \"\(newRole.text)\". All group members will be notified.")
-                    : Text("Member role will be changed to \"\(newRole.text)\". All chat members will be notified.")
-                )
-                : Text("Member role will be changed to \"\(newRole.text)\". The member will receive a new invitation.")
-            ),
+            message: mem.memberCurrent ? Text("Member role will be changed to \"\(newRole.text)\". All group members will be notified.") : Text("Member role will be changed to \"\(newRole.text)\". The member will receive a new invitation."),
            primaryButton: .default(Text("Change")) {
                Task {
                    do {
@@ -634,7 +570,7 @@ struct GroupMemberInfoView: View {
                        await MainActor.run {
                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                        }
-
+                        
                    } catch let error {
                        newRole = mem.memberRole
                        logger.error("apiMemberRole error: \(responseError(error))")
@@ -803,7 +739,6 @@ struct GroupMemberInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupMemberInfoView(
            groupInfo: GroupInfo.sampleData,
-            chat: Chat.sampleData,
            groupMember: GMember.sampleData
        )
    }
@@ -20,10 +20,9 @@ struct GroupPreferencesView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Binding var groupInfo: GroupInfo
-    @Binding var preferences: FullGroupPreferences
-    var currentPreferences: FullGroupPreferences
+    @State var preferences: FullGroupPreferences
+    @State var currentPreferences: FullGroupPreferences
    let creatingGroup: Bool
-    let savePreferences: () -> Void
    @State private var showSaveDialogue = false

    var body: some View {
@@ -39,7 +38,7 @@ struct GroupPreferencesView: View {
                featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
                featureSection(.history, $preferences.history.enable)

-                if groupInfo.isOwner {
+                if groupInfo.canEdit {
                    Section {
                        Button("Reset") { preferences = currentPreferences }
                        Button(saveText) { savePreferences() }
@@ -69,10 +68,7 @@ struct GroupPreferencesView: View {
                savePreferences()
                dismiss()
            }
-            Button("Exit without saving") {
-                preferences = currentPreferences
-                dismiss()
-            }
+            Button("Exit without saving") { dismiss() }
        }
    }

@@ -81,7 +77,7 @@ struct GroupPreferencesView: View {
            let color: Color = enableFeature.wrappedValue == .on ? .green : theme.colors.secondary
            let icon = enableFeature.wrappedValue == .on ? feature.iconFilled : feature.icon
            let timedOn = feature == .timedMessages && enableFeature.wrappedValue == .on
-            if groupInfo.isOwner {
+            if groupInfo.canEdit {
                let enable = Binding(
                    get: { enableFeature.wrappedValue == .on },
                    set: { on, _ in enableFeature.wrappedValue = on ? .on : .off }
@@ -127,7 +123,7 @@ struct GroupPreferencesView: View {
                }
            }
        } footer: {
-            Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.isOwner))
+            Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.canEdit))
                .foregroundColor(theme.colors.secondary)
        }
        .onChange(of: enableFeature.wrappedValue) { enabled in
@@ -136,16 +132,32 @@ struct GroupPreferencesView: View {
            }
        }
    }
+
+    private func savePreferences() {
+        Task {
+            do {
+                var gp = groupInfo.groupProfile
+                gp.groupPreferences = toGroupPreferences(preferences)
+                let gInfo = try await apiUpdateGroup(groupInfo.groupId, gp)
+                await MainActor.run {
+                    groupInfo = gInfo
+                    chatModel.updateGroup(gInfo)
+                    currentPreferences = preferences
+                }
+            } catch {
+                logger.error("GroupPreferencesView apiUpdateGroup error: \(responseError(error))")
+            }
+        }
+    }
 }

 struct GroupPreferencesView_Previews: PreviewProvider {
    static var previews: some View {
        GroupPreferencesView(
            groupInfo: Binding.constant(GroupInfo.sampleData),
-            preferences: Binding.constant(FullGroupPreferences.sampleData),
+            preferences: FullGroupPreferences.sampleData,
            currentPreferences: FullGroupPreferences.sampleData,
-            creatingGroup: false,
-            savePreferences: {}
+            creatingGroup: false
        )
    }
 }
@@ -23,7 +23,7 @@ struct GroupWelcomeView: View {

    var body: some View {
        VStack {
-            if groupInfo.isOwner && groupInfo.businessChat == nil {
+            if groupInfo.canEdit {
                editorView()
                    .modifier(BackButton(disabled: Binding.constant(false)) {
                        if welcomeTextUnchanged() {
@@ -404,9 +404,8 @@ struct ChatListNavLink: View {
    }

    private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
-        let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Delete group?" : "Delete chat?"
-        return Alert(
-            title: Text(label),
+        Alert(
+            title: Text("Delete group?"),
            message: deleteGroupAlertMessage(groupInfo),
            primaryButton: .destructive(Text("Delete")) {
                Task { await deleteChat(chat) }
@@ -415,6 +414,10 @@ struct ChatListNavLink: View {
        )
    }

+    private func deleteGroupAlertMessage(_ groupInfo: GroupInfo) -> Text {
+        groupInfo.membership.memberCurrent ? Text("Group will be deleted for all members - this cannot be undone!") : Text("Group will be deleted for you - this cannot be undone!")
+    }
+
    private func clearChatAlert() -> Alert {
        Alert(
            title: Text("Clear conversation?"),
@@ -438,15 +441,9 @@ struct ChatListNavLink: View {
    }

    private func leaveGroupAlert(_ groupInfo: GroupInfo) -> Alert {
-        let titleLabel: LocalizedStringKey = groupInfo.businessChat == nil ? "Leave group?" : "Leave chat?"
-        let messageLabel: LocalizedStringKey = (
-            groupInfo.businessChat == nil
-            ? "You will stop receiving messages from this group. Chat history will be preserved."
-            : "You will stop receiving messages from this chat. Chat history will be preserved."
-        )
-        return Alert(
-            title: Text(titleLabel),
-            message: Text(messageLabel),
+        Alert(
+            title: Text("Leave group?"),
+            message: Text("You will stop receiving messages from this group. Chat history will be preserved."),
            primaryButton: .destructive(Text("Leave")) {
                Task { await leaveGroup(groupInfo.groupId) }
            },
@@ -587,7 +587,7 @@ struct SMPStatsView: View {
        } header: {
            Text("Statistics")
        } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is private to your device.")
        }
    }
 }
@@ -703,7 +703,7 @@ struct XFTPStatsView: View {
        } header: {
            Text("Statistics")
        } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is private to your device.")
        }
    }
 }
@@ -916,17 +916,11 @@ func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (
        )
    case let .groupLinkConnecting(_, groupInfo):
        if let groupInfo = groupInfo {
-            return groupInfo.businessChat == nil
-            ? Alert(
+            return Alert(
                title: Text("Group already exists!"),
                message: Text("You are already joining the group \(groupInfo.displayName)."),
                dismissButton: .default(Text("OK")) { cleanup?() }
            )
-            : Alert(
-                title: Text("Chat already exists!"),
-                message: Text("You are already connecting to \(groupInfo.displayName)."),
-                dismissButton: .default(Text("OK")) { cleanup?() }
-            )
        } else {
            return Alert(
                title: Text("Already joining the group!"),
@@ -1243,15 +1237,10 @@ func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
 }

 func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    groupInfo.businessChat == nil
-    ? mkAlert(
+    mkAlert(
        title: "Group already exists",
        message: "You are already in group \(groupInfo.displayName)."
    )
-    : mkAlert(
-        title: "Chat already exists",
-        message: "You are already connected with \(groupInfo.displayName)."
-    )
 }

 enum ConnReqType: Equatable {
@@ -62,6 +62,7 @@ struct ChooseServerOperators: View {
    var onboarding: Bool
    @State private var serverOperators: [ServerOperator] = []
    @State private var selectedOperatorIds = Set<Int64>()
+    @State private var reviewConditionsNavLinkActive = false
    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
    @State private var notificationsModeNavLinkActive = false
    @State private var justOpened = true
@@ -78,7 +79,7 @@ struct ChooseServerOperators: View {
                        .frame(maxWidth: .infinity, alignment: .center)
                    
                    if onboarding {
-                        title.padding(.top, 25)
+                        title.padding(.top, 50)
                    } else {
                        title
                    }
@@ -91,14 +92,11 @@ struct ChooseServerOperators: View {
                    ForEach(serverOperators) { srvOperator in
                        operatorCheckView(srvOperator)
                    }
-                    VStack {
-                        Text("SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.").padding(.bottom, 8)
-                        Text("You can configure servers via settings.")
-                    }
-                    .font(.footnote)
-                    .multilineTextAlignment(.center)
-                    .frame(maxWidth: .infinity, alignment: .center)
-                    .padding(.horizontal, 16)
+                    Text("You can configure servers via settings.")
+                        .font(.footnote)
+                        .multilineTextAlignment(.center)
+                        .frame(maxWidth: .infinity, alignment: .center)
+                        .padding(.horizontal, 32)
                    
                    Spacer()
                    
@@ -168,9 +166,8 @@ struct ChooseServerOperators: View {
                    .modifier(ThemedBackground(grouped: true))
                }
            }
-            .frame(maxHeight: .infinity, alignment: .top)
        }
-        .frame(maxHeight: .infinity, alignment: .top)
+        .frame(maxHeight: .infinity)
        .padding(onboarding ? 25 : 16)
    }

@@ -217,15 +214,23 @@ struct ChooseServerOperators: View {
    }

    private func reviewConditionsButton() -> some View {
-        NavigationLink("Review conditions") {
-            reviewConditionsView()
-                .navigationTitle("Conditions of use")
-                .navigationBarTitleDisplayMode(.large)
-                .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-                .modifier(ThemedBackground(grouped: true))
+        ZStack {
+            Button {
+                reviewConditionsNavLinkActive = true
+            } label: {
+                Text("Review conditions")
+            }
+            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
+            .disabled(selectedOperatorIds.isEmpty)
+
+            NavigationLink(isActive: $reviewConditionsNavLinkActive) {
+                reviewConditionsDestinationView()
+            } label: {
+                EmptyView()
+            }
+            .frame(width: 1, height: 1)
+            .hidden()
        }
-        .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-        .disabled(selectedOperatorIds.isEmpty)
    }

    private func setOperatorsButton() -> some View {
@@ -304,13 +309,21 @@ struct ChooseServerOperators: View {
            .modifier(ThemedBackground())
    }

+    private func reviewConditionsDestinationView() -> some View {
+        reviewConditionsView()
+            .navigationTitle("Conditions of use")
+            .navigationBarTitleDisplayMode(.large)
+            .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
+            .modifier(ThemedBackground(grouped: true))
+    }
+
    @ViewBuilder private func reviewConditionsView() -> some View {
        let operatorsWithConditionsAccepted = ChatModel.shared.conditions.serverOperators.filter { $0.conditionsAcceptance.conditionsAccepted }
        let acceptForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
        VStack(alignment: .leading, spacing: 20) {
            if !operatorsWithConditionsAccepted.isEmpty {
-                Text("Conditions are already accepted for these operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                Text("The same conditions will apply to operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
+                Text("Conditions are already accepted for following operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
+                Text("Same conditions will apply to operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
            } else {
                Text("Conditions will be accepted for operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
            }
@@ -396,53 +409,26 @@ struct ChooseServerOperators: View {
 let operatorsPostLink = URL(string: "https://simplex.chat/blog/20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.html")!

 struct ChooseServerOperatorsInfoView: View {
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-    @EnvironmentObject var theme: AppTheme
-
    var body: some View {
-        NavigationView {
-            List {
-                VStack(alignment: .leading, spacing: 12) {
-                    Text("The app protects your privacy by using different operators in each conversation.")
-                    Text("When more than one operator is enabled, none of them has metadata to learn who communicates with whom.")
-                    Text("For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.")
-                }
-                .fixedSize(horizontal: false, vertical: true)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .padding(.top)
-
-                Section {
-                    ForEach(ChatModel.shared.conditions.serverOperators) { op in
-                        operatorInfoNavLinkView(op)
+        VStack(alignment: .leading) {
+            Text("Server operators")
+                .font(.largeTitle)
+                .bold()
+                .padding(.vertical)
+            ScrollView {
+                VStack(alignment: .leading) {
+                    Group {
+                        Text("The app protects your privacy by using different operators in each conversation.")
+                        Text("When more than one operator is enabled, none of them has metadata to learn who communicates with whom.")
+                        Text("For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.")
                    }
-                } header: {
-                    Text("About operators")
-                        .foregroundColor(theme.colors.secondary)
+                    .padding(.bottom)
                }
            }
-            .navigationTitle("Server operators")
-            .navigationBarTitleDisplayMode(.large)
-            .modifier(ThemedBackground(grouped: true))
-        }
-    }
-
-    private func operatorInfoNavLinkView(_ op: ServerOperator) -> some View {
-        NavigationLink() {
-            OperatorInfoView(serverOperator: op)
-                .navigationBarTitle("Network operator")
-                .modifier(ThemedBackground(grouped: true))
-                .navigationBarTitleDisplayMode(.large)
-        } label: {
-            HStack {
-                Image(op.logo(colorScheme))
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 24, height: 24)
-                Text(op.tradeName)
-            }
        }
+        .padding()
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .modifier(ThemedBackground())
    }
 }

@@ -136,6 +136,7 @@ struct CreateFirstProfile: View {
                    .multilineTextAlignment(.center)
            }
            .frame(maxWidth: .infinity) // Ensures it takes up the full width
+            .padding(.top, 25)
            .padding(.horizontal, 10)

            HStack {
@@ -19,10 +19,10 @@ struct SetNotificationsMode: View {
        GeometryReader { g in
            ScrollView {
                VStack(alignment: .center, spacing: 20) {
-                    Text("Push notifications")
+                    Text("Push Notifications")
                        .font(.largeTitle)
                        .bold()
-                        .padding(.top, 25)
+                        .padding(.top, 50)
                    
                    infoText()
                    
@@ -119,7 +119,6 @@ struct NtfModeSelector: View {
                    Text(ntfModeShortDescription(mode))
                        .lineLimit(2)
                        .font(.callout)
-                        .fixedSize(horizontal: false, vertical: true)
                }
            }
            .padding(.vertical, 12)
@@ -520,19 +520,14 @@ private let versionDescriptions: [VersionDescription] = [
        ]
    ),
    VersionDescription(
-        version: "v6.2",
-        post: URL(string: "https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html"),
+        version: "v6.2 (beta.1)",
+        post: URL(string: "https://simplex.chat/blog/20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.html"),
        features: [
            .view(FeatureView(
                icon: nil,
                title: "Network decentralization",
                view: { NewOperatorsView() }
            )),
-            .feature(Description(
-                icon: "briefcase",
-                title: "Business chats",
-                description: "Privacy for your customers."
-            )),
            .feature(Description(
                icon: "bolt",
                title: "More reliable notifications",
@@ -65,7 +65,6 @@ extension AppSettings {
        if let val = uiCurrentThemeIds { currentThemeIdsDefault.set(val) }
        if let val = uiThemes { themeOverridesDefault.set(val.skipDuplicates()) }
        if let val = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
-        if let val = chatBottomBar { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_CHAT_BOTTOM_BAR) }
    }

    public static var current: AppSettings {
@@ -101,7 +100,6 @@ extension AppSettings {
        c.uiCurrentThemeIds = currentThemeIdsDefault.get()
        c.uiThemes = themeOverridesDefault.get()
        c.oneHandUI = groupDefaults.bool(forKey: GROUP_DEFAULT_ONE_HAND_UI)
-        c.chatBottomBar = groupDefaults.bool(forKey: GROUP_DEFAULT_CHAT_BOTTOM_BAR)
        return c
    }
 }
@@ -331,12 +331,9 @@ struct OperatorInfoView: View {
                            Text(d)
                        }
                    }
-                    Link(serverOperator.info.website.absoluteString, destination: serverOperator.info.website)
                }
-                if let selfhost = serverOperator.info.selfhost {
-                    Section {
-                        Link(selfhost.text, destination: selfhost.link)
-                    }
+                Section {
+                    Link("\(serverOperator.info.website)", destination: URL(string: serverOperator.info.website)!)
                }
            }
        }
@@ -424,6 +421,7 @@ struct SingleOperatorUsageConditionsView: View {
    @Binding var userServers: [UserOperatorServers]
    @Binding var serverErrors: [UserServersError]
    var operatorIndex: Int
+    @State private var usageConditionsNavLinkActive: Bool = false

    var body: some View {
        viewBody()
@@ -435,45 +433,52 @@ struct SingleOperatorUsageConditionsView: View {

            // In current UI implementation this branch doesn't get shown - as conditions can't be opened from inside operator once accepted
            VStack(alignment: .leading, spacing: 20) {
-                viewHeader()
-                ConditionsTextView()
+                Group {
+                    viewHeader()
+                    ConditionsTextView()
+                        .padding(.bottom)
+                        .padding(.bottom)
+                }
+                .padding(.horizontal)
            }
-            .padding(.bottom)
-            .padding(.bottom)
-            .padding(.horizontal)
            .frame(maxHeight: .infinity)

        } else if !operatorsWithConditionsAccepted.isEmpty {

            NavigationView {
                VStack(alignment: .leading, spacing: 20) {
-                    viewHeader()
-                    Text("Conditions are already accepted for these operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                    Text("The same conditions will apply to operator **\(userServers[operatorIndex].operator_.legalName_)**.")
-                    conditionsAppliedToOtherOperatorsText()
-                    Spacer()
+                    Group {
+                        viewHeader()
+                        Text("Conditions are already accepted for following operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
+                        Text("Same conditions will apply to operator **\(userServers[operatorIndex].operator_.legalName_)**.")
+                        conditionsAppliedToOtherOperatorsText()
+                        usageConditionsNavLinkButton()

-                    acceptConditionsButton()
-                    usageConditionsNavLinkButton()
+                        Spacer()
+
+                        acceptConditionsButton()
+                            .padding(.bottom)
+                            .padding(.bottom)
+                    }
+                    .padding(.horizontal)
                }
-                .padding(.bottom)
-                .padding(.bottom)
-                .padding(.horizontal)
                .frame(maxHeight: .infinity)
            }

        } else {

            VStack(alignment: .leading, spacing: 20) {
-                viewHeader()
-                Text("To use the servers of **\(userServers[operatorIndex].operator_.legalName_)**, accept conditions of use.")
-                conditionsAppliedToOtherOperatorsText()
-                ConditionsTextView()
-                acceptConditionsButton()
-                    .padding(.bottom)
-                    .padding(.bottom)
+                Group {
+                    viewHeader()
+                    Text("To use the servers of **\(userServers[operatorIndex].operator_.legalName_)**, accept conditions of use.")
+                    conditionsAppliedToOtherOperatorsText()
+                    ConditionsTextView()
+                    acceptConditionsButton()
+                        .padding(.bottom)
+                        .padding(.bottom)
+                }
+                .padding(.horizontal)
            }
-            .padding(.horizontal)
            .frame(maxHeight: .infinity)

        }
@@ -540,16 +545,31 @@ struct SingleOperatorUsageConditionsView: View {
    }

    private func usageConditionsNavLinkButton() -> some View {
-        NavigationLink("View conditions") {
-            ConditionsTextView()
-                .padding()
-                .navigationTitle("Conditions of use")
-                .navigationBarTitleDisplayMode(.large)
-                .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-                .modifier(ThemedBackground(grouped: true))
+        ZStack {
+            Button {
+                usageConditionsNavLinkActive = true
+            } label: {
+                Text("View conditions")
+            }
+
+            NavigationLink(isActive: $usageConditionsNavLinkActive) {
+                usageConditionsDestinationView()
+            } label: {
+                EmptyView()
+            }
+            .frame(width: 1, height: 1)
+            .hidden()
        }
-        .font(.callout)
-        .frame(maxWidth: .infinity, alignment: .center)
+    }
+
+    private func usageConditionsDestinationView() -> some View {
+        ConditionsTextView()
+            .padding()
+            .padding(.bottom)
+            .navigationTitle("Conditions of use")
+            .navigationBarTitleDisplayMode(.large)
+            .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
+            .modifier(ThemedBackground(grouped: true))
    }
 }

@@ -16,8 +16,6 @@ struct UserAddressView: View {
    @EnvironmentObject var theme: AppTheme
    @State var shareViaProfile = false
    @State var autoCreate = false
-    @State private var aas = AutoAcceptState()
-    @State private var savedAAS = AutoAcceptState()
    @State private var showMailView = false
    @State private var mailViewResult: Result<MFMailComposeResult, Error>? = nil
    @State private var alert: UserAddressAlert?
@@ -64,10 +62,6 @@ struct UserAddressView: View {
        List {
            if let userAddress = chatModel.userAddress {
                existingAddressView(userAddress)
-                    .onAppear {
-                        aas = AutoAcceptState(userAddress: userAddress)
-                        savedAAS = aas
-                    }
            } else {
                Section {
                    createAddressButton()
@@ -141,25 +135,10 @@ struct UserAddressView: View {
            // if MFMailComposeViewController.canSendMail() {
            //     shareViaEmailButton(userAddress)
            // }
-            settingsRow("briefcase", color: theme.colors.secondary) {
-                Toggle("Business address", isOn: $aas.business)
-                    .onChange(of: aas.business) { ba in
-                        if ba {
-                            aas.enable = true
-                            aas.incognito = false
-                        }
-                        saveAAS($aas, $savedAAS)
-                    }
-            }
            addressSettingsButton(userAddress)
        } header: {
            Text("For social media")
                .foregroundColor(theme.colors.secondary)
-        } footer: {
-            if aas.business {
-                Text("Add your team members to the conversations.")
-                    .foregroundColor(theme.colors.secondary)
-            }
        }

        Section {
@@ -297,13 +276,11 @@ struct UserAddressView: View {
 private struct AutoAcceptState: Equatable {
    var enable = false
    var incognito = false
-    var business = false
    var welcomeText = ""

-    init(enable: Bool = false, incognito: Bool = false, business: Bool = false, welcomeText: String = "") {
+    init(enable: Bool = false, incognito: Bool = false, welcomeText: String = "") {
        self.enable = enable
        self.incognito = incognito
-        self.business = business
        self.welcomeText = welcomeText
    }

@@ -311,7 +288,6 @@ private struct AutoAcceptState: Equatable {
        if let aa = userAddress.autoAccept {
            enable = true
            incognito = aa.acceptIncognito
-            business = aa.businessAddress
            if let msg = aa.autoReply {
                welcomeText = msg.text
            } else {
@@ -320,7 +296,6 @@ private struct AutoAcceptState: Equatable {
        } else {
            enable = false
            incognito = false
-            business = false
            welcomeText = ""
        }
    }
@@ -330,7 +305,7 @@ private struct AutoAcceptState: Equatable {
            var autoReply: MsgContent? = nil
            let s = welcomeText.trimmingCharacters(in: .whitespacesAndNewlines)
            if s != "" { autoReply = .text(s) }
-            return AutoAccept(businessAddress: business, acceptIncognito: incognito, autoReply: autoReply)
+            return AutoAccept(acceptIncognito: incognito, autoReply: autoReply)
        }
        return nil
    }
@@ -380,7 +355,7 @@ struct UserAddressSettingsView: View {
                                title: NSLocalizedString("Auto-accept settings", comment: "alert title"),
                                message: NSLocalizedString("Settings were changed.", comment: "alert message"),
                                buttonTitle: NSLocalizedString("Save", comment: "alert button"),
-                                buttonAction: { saveAAS($aas, $savedAAS) },
+                                buttonAction: saveAAS,
                                cancelButton: true
                            )
                        }
@@ -398,7 +373,7 @@ struct UserAddressSettingsView: View {
        List {
            Section {
                shareWithContactsButton()
-                autoAcceptToggle().disabled(aas.business)
+                autoAcceptToggle()
            }

            if aas.enable {
@@ -468,16 +443,14 @@ struct UserAddressSettingsView: View {
        settingsRow("checkmark", color: theme.colors.secondary) {
            Toggle("Auto-accept", isOn: $aas.enable)
                .onChange(of: aas.enable) { _ in
-                    saveAAS($aas, $savedAAS)
+                    saveAAS()
                }
        }
    }

    private func autoAcceptSection() -> some View {
        Section {
-            if !aas.business {
-                acceptIncognitoToggle()
-            }
+            acceptIncognitoToggle()
            welcomeMessageEditor()
            saveAASButton()
                .disabled(aas == savedAAS)
@@ -517,24 +490,22 @@ struct UserAddressSettingsView: View {
    private func saveAASButton() -> some View {
        Button {
            keyboardVisible = false
-            saveAAS($aas, $savedAAS)
+            saveAAS()
        } label: {
            Text("Save")
        }
    }
-}

-private func saveAAS(_ aas: Binding<AutoAcceptState>, _ savedAAS: Binding<AutoAcceptState>) {
-    Task {
-        do {
-            if let address = try await userAddressAutoAccept(aas.wrappedValue.autoAccept) {
-                await MainActor.run {
+    private func saveAAS() {
+        Task {
+            do {
+                if let address = try await userAddressAutoAccept(aas.autoAccept) {
                    ChatModel.shared.userAddress = address
-                    savedAAS.wrappedValue = aas.wrappedValue
+                    savedAAS = aas
                }
+            } catch let error {
+                logger.error("userAddressAutoAccept error: \(responseError(error))")
            }
-        } catch let error {
-            logger.error("userAddressAutoAccept error: \(responseError(error))")
        }
    }
 }
@@ -197,7 +197,7 @@ struct UserProfilesView: View {
            action()
        } else {
            authenticate(
-                reason: NSLocalizedString("Change chat profiles", comment: "authentication reason")
+                reason: NSLocalizedString("Change user profiles", comment: "authentication reason")
            ) { laResult in
                switch laResult {
                case .success, .unavailable:
@@ -1043,8 +1043,8 @@
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1059,8 +1059,8 @@
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1423,16 +1423,16 @@
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1620,8 +1620,8 @@
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -2855,8 +2855,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -566,10 +566,6 @@
        <target>За SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <note>No comment provided by engineer.</note>
@@ -622,10 +618,6 @@
        <target>Добавете адрес към вашия профил, така че вашите контакти да могат да го споделят с други хора. Актуализацията на профила ще бъде изпратена до вашите контакти.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Добави профил</target>
@@ -641,10 +633,6 @@
        <target>Добави сървъри чрез сканиране на QR кодове.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Добави към друго устройство</target>
@@ -655,10 +643,6 @@
        <target>Добави съобщение при посрещане</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -731,8 +715,8 @@
        <target>Всички данни се изтриват при въвеждане.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1199,14 +1183,6 @@
        <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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Чрез чат профил (по подразбиране) или [чрез връзка](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).</target>
@@ -1292,10 +1268,6 @@
        <target>Промени</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Промяна на паролата на базата данни?</target>
@@ -1342,17 +1314,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1424,14 +1388,6 @@
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Чатове</target>
@@ -1537,8 +1493,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2142,10 +2098,6 @@ This is your own one-time link!</source>
        <target>Изтрий и уведоми контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Изтрий чат профила</target>
@@ -2156,10 +2108,6 @@ This is your own one-time link!</source>
        <target>Изтриване на чат профила?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Изтрий връзката</target>
@@ -2412,12 +2360,8 @@ This is your own one-time link!</source>
        <target>Лични съобщения</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Личните съобщения между членовете са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2455,8 +2399,8 @@ This is your own one-time link!</source>
        <target>Изчезващите съобщения са забранени в този чат.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Изчезващите съобщения са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3278,8 +3222,8 @@ This is your own one-time link!</source>
        <target>Файлове и медия</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Файловете и медията са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3534,6 +3478,41 @@ Error: %2$@</source>
        <target>Групови линкове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Членовете на групата могат да добавят реакции към съобщенията.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>Членовете на групата могат да изпращат SimpleX линкове.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Членовете на групата могат да изпращат лични съобщения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Членовете на групата могат да изпращат изчезващи съобщения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Членовете на групата могат да изпращат файлове и медия.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Членовете на групата могат да изпращат гласови съобщения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Групово съобщение:</target>
@@ -3926,10 +3905,6 @@ More improvements are coming soon!</source>
        <target>Покани членове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Покани в групата</target>
@@ -3945,8 +3920,8 @@ More improvements are coming soon!</source>
        <target>Необратимото изтриване на съобщения е забранено в този чат.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>Необратимото изтриване на съобщения е забранено в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4086,14 +4061,6 @@ This is your link for group %@!</source>
        <target>Напусни</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Напусни групата</target>
@@ -4221,10 +4188,6 @@ This is your link for group %@!</source>
        <source>Member inactive</source>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Ролята на члена ще бъде променена на "%@". Всички членове на групата ще бъдат уведомени.</target>
@@ -4235,50 +4198,11 @@ This is your link for group %@!</source>
        <target>Ролята на члена ще бъде променена на "%@". Членът ще получи нова покана.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Членът ще бъде премахнат от групата - това не може да бъде отменено!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Членовете на групата могат да добавят реакции към съобщенията.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>Членовете на групата могат да изпращат SimpleX линкове.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Членовете на групата могат да изпращат лични съобщения.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Членовете на групата могат да изпращат изчезващи съобщения.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Членовете на групата могат да изпращат файлове и медия.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Членовете на групата могат да изпращат гласови съобщения.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <note>No comment provided by engineer.</note>
@@ -4324,8 +4248,8 @@ This is your link for group %@!</source>
        <target>Реакциите на съобщения са забранени в този чат.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Реакциите на съобщения са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4816,10 +4740,6 @@ Requires compatible VPN.</source>
        <target>Няма се използват Onion хостове.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Само потребителските устройства съхраняват потребителски профили, контакти, групи и съобщения, изпратени с **двуслойно криптиране от край до край**.</target>
@@ -5198,10 +5118,6 @@ Error: %@</source>
        <target>Поверителност и сигурност</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Поверителността преосмислена</target>
@@ -5348,6 +5264,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push известия</target>
@@ -5752,6 +5672,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>По-безопасни групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Запази</target>
@@ -5766,7 +5694,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Запази и уведоми контакта</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5800,7 +5728,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Запази настройките?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6380,10 +6308,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX Адрес</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>Сигурността на SimpleX Chat беше одитирана от Trail of Bits.</target>
@@ -6442,8 +6366,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX линкове</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <target>SimpleX линкове са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -6846,14 +6770,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Профилът се споделя само с вашите контакти.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7487,8 +7403,8 @@ To connect, please ask your contact to create another connection link and check
        <target>Гласовите съобщения са забранени в този чат.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Гласовите съобщения са забранени в тази група.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7674,10 +7590,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>Вече се свързвате с %@.</target>
@@ -7942,10 +7854,6 @@ Repeat connection request?</source>
        <target>Все още ще получавате обаждания и известия от заглушени профили, когато са активни.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Ще спрете да получавате съобщения от тази група. Историята на чата ще бъде запазена.</target>
@@ -8126,10 +8034,6 @@ Repeat connection request?</source>
        <target>обаждането прието</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>админ</target>
@@ -8316,7 +8220,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>свързване…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -8800,10 +8704,6 @@ Repeat connection request?</source>
        <target>ви острани</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>запазено</target>
@@ -1247,8 +1247,8 @@
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1267,8 +1267,8 @@
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappears at" xml:space="preserve">
@@ -1747,24 +1747,24 @@
        <source>Group links</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -2016,8 +2016,8 @@
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -2203,8 +2203,8 @@
        <source>Message reactions are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3720,8 +3720,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -548,10 +548,6 @@
        <target>O SimpleX chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <note>No comment provided by engineer.</note>
@@ -604,10 +600,6 @@
        <target>Přidejte adresu do svého profilu, aby ji vaše kontakty mohly sdílet s dalšími lidmi. Aktualizace profilu bude zaslána vašim kontaktům.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Přidat profil</target>
@@ -623,10 +615,6 @@
        <target>Přidejte servery skenováním QR kódů.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Přidat do jiného zařízení</target>
@@ -637,10 +625,6 @@
        <target>Přidat uvítací zprávu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -712,8 +696,8 @@
        <target>Všechna data se při zadání vymažou.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1161,14 +1145,6 @@
        <target>Bulharský, finský, thajský a ukrajinský - díky uživatelům a [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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Podle chat profilu (výchozí) nebo [podle připojení](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1251,10 +1227,6 @@
        <target>Změnit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Změnit přístupovou frázi databáze?</target>
@@ -1301,17 +1273,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1381,14 +1345,6 @@
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Chaty</target>
@@ -1492,8 +1448,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2071,10 +2027,6 @@ This is your own one-time link!</source>
        <source>Delete and notify contact</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Smazat chat profil</target>
@@ -2085,10 +2037,6 @@ This is your own one-time link!</source>
        <target>Smazat chat profil?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Smazat připojení</target>
@@ -2337,12 +2285,8 @@ This is your own one-time link!</source>
        <target>Přímé zprávy</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Přímé zprávy mezi členy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2380,8 +2324,8 @@ This is your own one-time link!</source>
        <target>Mizící zprávy jsou v tomto chatu zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Mizící zprávy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3176,8 +3120,8 @@ This is your own one-time link!</source>
        <target>Soubory a média</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Soubory a média jsou zakázány v této skupině.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3421,6 +3365,40 @@ Error: %2$@</source>
        <target>Odkazy na skupiny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Členové skupin mohou přidávat reakce na zprávy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Členové skupiny mohou posílat přímé zprávy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Členové skupiny mohou posílat mizící zprávy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Členové skupiny mohou posílat soubory a média.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Členové skupiny mohou posílat hlasové zprávy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Skupinová zpráva:</target>
@@ -3798,10 +3776,6 @@ More improvements are coming soon!</source>
        <target>Pozvat členy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Pozvat do skupiny</target>
@@ -3817,8 +3791,8 @@ More improvements are coming soon!</source>
        <target>Nevratné mazání zpráv je v tomto chatu zakázáno.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>Nevratné mazání zpráv je v této skupině zakázáno.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3950,14 +3924,6 @@ This is your link for group %@!</source>
        <target>Opustit</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Opustit skupinu</target>
@@ -4082,10 +4048,6 @@ This is your link for group %@!</source>
        <source>Member inactive</source>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Role člena se změní na "%@". Všichni členové skupiny budou upozorněni.</target>
@@ -4096,49 +4058,11 @@ This is your link for group %@!</source>
        <target>Role člena se změní na "%@". Člen obdrží novou pozvánku.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Člen bude odstraněn ze skupiny - toto nelze vzít zpět!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Členové skupin mohou přidávat reakce na zprávy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Členové skupiny mohou posílat přímé zprávy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Členové skupiny mohou posílat mizící zprávy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Členové skupiny mohou posílat soubory a média.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Členové skupiny mohou posílat hlasové zprávy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <note>No comment provided by engineer.</note>
@@ -4184,8 +4108,8 @@ This is your link for group %@!</source>
        <target>Reakce na zprávy jsou v tomto chatu zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Reakce na zprávy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4657,10 +4581,6 @@ Vyžaduje povolení sítě VPN.</target>
        <target>Onion hostitelé nebudou použiti.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy odeslané s **2vrstvým šifrováním typu end-to-end**.</target>
@@ -5023,10 +4943,6 @@ Error: %@</source>
        <target>Ochrana osobních údajů a zabezpečení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Nové vymezení soukromí</target>
@@ -5170,6 +5086,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Nabízená oznámení</target>
@@ -5562,6 +5482,14 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Safer groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Uložit</target>
@@ -5576,7 +5504,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Uložit a upozornit kontakt</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5610,7 +5538,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Uložit předvolby?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6178,10 +6106,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX Adresa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>Zabezpečení SimpleX chatu bylo auditováno společností Trail of Bits.</target>
@@ -6240,8 +6164,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Odkazy na SimpleX</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -6634,14 +6558,6 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Profil je sdílen pouze s vašimi kontakty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7246,8 +7162,8 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Hlasové zprávy jsou v tomto chatu zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Hlasové zprávy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7422,10 +7338,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Již jste připojeni k %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -7674,10 +7586,6 @@ Repeat connection request?</source>
        <target>Stále budete přijímat volání a upozornění od umlčených profilů pokud budou aktivní.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Přestanete dostávat zprávy z této skupiny. Historie chatu bude zachována.</target>
@@ -7857,10 +7765,6 @@ Repeat connection request?</source>
        <target>přijatý hovor</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>správce</target>
@@ -8040,7 +7944,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>připojení…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -8515,10 +8419,6 @@ Repeat connection request?</source>
        <target>odstranil vás</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <note>No comment provided by engineer.</note>
@@ -1124,8 +1124,8 @@ Available in v5.1</source>
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1140,8 +1140,8 @@ Available in v5.1</source>
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1576,16 +1576,16 @@ Available in v5.1</source>
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1817,8 +1817,8 @@ Available in v5.1</source>
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -3333,8 +3333,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -577,11 +577,6 @@
        <target>About SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <target>About operators</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <target>Accent</target>
@@ -640,11 +635,6 @@
        <target>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <target>Add friends</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Add profile</target>
@@ -660,11 +650,6 @@
        <target>Add servers by scanning QR codes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <target>Add team members</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Add to another device</target>
@@ -675,11 +660,6 @@
        <target>Add welcome message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <target>Add your team members to the conversations.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <target>Added media &amp; file servers</target>
@@ -760,9 +740,9 @@
        <target>All data is erased when it is entered.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
-        <target>All data is kept private on your device.</target>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
+        <target>All data is private to your device.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1250,16 +1230,6 @@
        <target>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <target>Business address</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <target>Business chats</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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1351,11 +1321,6 @@
        <target>Change</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <target>Change chat profiles</target>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Change database passphrase?</target>
@@ -1402,20 +1367,10 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <target>Chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <target>Chat already exists</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <target>Chat already exists!</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <target>Change user profiles</target>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1492,16 +1447,6 @@
        <target>Chat theme</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <target>Chat will be deleted for all members - this cannot be undone!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <target>Chat will be deleted for you - this cannot be undone!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Chats</target>
@@ -1617,9 +1562,9 @@
        <target>Conditions are accepted for the operator(s): **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
-        <target>Conditions are already accepted for these operator(s): **%@**.</target>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
+        <target>Conditions are already accepted for following operator(s): **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2256,11 +2201,6 @@ This is your own one-time link!</target>
        <target>Delete and notify contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <target>Delete chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Delete chat profile</target>
@@ -2271,11 +2211,6 @@ This is your own one-time link!</target>
        <target>Delete chat profile?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <target>Delete chat?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Delete connection</target>
@@ -2541,14 +2476,9 @@ This is your own one-time link!</target>
        <target>Direct messages</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <target>Direct messages between members are prohibited in this chat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
-        <target>Direct messages between members are prohibited.</target>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
+        <target>Direct messages between members are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2586,9 +2516,9 @@ This is your own one-time link!</target>
        <target>Disappearing messages are prohibited in this chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
-        <target>Disappearing messages are prohibited.</target>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
+        <target>Disappearing messages are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappears at" xml:space="preserve">
@@ -3444,9 +3374,9 @@ This is your own one-time link!</target>
        <target>Files and media</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
-        <target>Files and media are prohibited.</target>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
+        <target>Files and media are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Files and media not allowed" xml:space="preserve">
@@ -3718,6 +3648,41 @@ Error: %2$@</target>
        <target>Group links</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Group members can add message reactions.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Group members can irreversibly delete sent messages. (24 hours)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>Group members can send SimpleX links.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Group members can send direct messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Group members can send disappearing messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Group members can send files and media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Group members can send voice messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Group message:</target>
@@ -4117,11 +4082,6 @@ More improvements are coming soon!</target>
        <target>Invite members</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <target>Invite to chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Invite to group</target>
@@ -4137,9 +4097,9 @@ More improvements are coming soon!</target>
        <target>Irreversible message deletion is prohibited in this chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
-        <target>Irreversible message deletion is prohibited.</target>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
+        <target>Irreversible message deletion is prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -4280,16 +4240,6 @@ This is your link for group %@!</target>
        <target>Leave</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <target>Leave chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <target>Leave chat?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Leave group</target>
@@ -4420,11 +4370,6 @@ This is your link for group %@!</target>
        <target>Member inactive</target>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <target>Member role will be changed to "%@". All chat members will be notified.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Member role will be changed to "%@". All group members will be notified.</target>
@@ -4435,51 +4380,11 @@ This is your link for group %@!</target>
        <target>Member role will be changed to "%@". The member will receive a new invitation.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <target>Member will be removed from chat - this cannot be undone!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Member will be removed from group - this cannot be undone!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Members can add message reactions.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Members can irreversibly delete sent messages. (24 hours)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>Members can send SimpleX links.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Members can send direct messages.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Members can send disappearing messages.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Members can send files and media.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Members can send voice messages.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <target>Menus</target>
@@ -4530,9 +4435,9 @@ This is your link for group %@!</target>
        <target>Message reactions are prohibited in this chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
-        <target>Message reactions are prohibited.</target>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
+        <target>Message reactions are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message reception" xml:space="preserve">
@@ -5053,11 +4958,6 @@ Requires compatible VPN.</target>
        <target>Onion hosts will not be used.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <target>Only chat owners can change preferences.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Only client devices store user profiles, contacts, groups, and messages.</target>
@@ -5454,11 +5354,6 @@ Error: %@</target>
        <target>Privacy &amp; security</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <target>Privacy for your customers.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Privacy redefined</target>
@@ -5616,6 +5511,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Proxy requires password</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <target>Push Notifications</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push notifications</target>
@@ -6042,6 +5942,16 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Safer groups</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <target>Same conditions will apply to operator **%@**.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <target>Same conditions will apply to operator(s): **%@**.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Save</target>
@@ -6056,7 +5966,7 @@ Enable in *Network &amp; servers* settings.</target>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Save and notify contact</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -6091,7 +6001,7 @@ Enable in *Network &amp; servers* settings.</target>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Save preferences?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6714,11 +6624,6 @@ Enable in *Network &amp; servers* settings.</target>
        <target>SimpleX Address</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <target>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>SimpleX Chat security was audited by Trail of Bits.</target>
@@ -6779,9 +6684,9 @@ Enable in *Network &amp; servers* settings.</target>
        <target>SimpleX links</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
-        <target>SimpleX links are prohibited.</target>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
+        <target>SimpleX links are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -7208,16 +7113,6 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The profile is only shared with your contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <target>The same conditions will apply to operator **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>The same conditions will apply to operator(s): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <target>The second preset operator in the app!</target>
@@ -7887,9 +7782,9 @@ To connect, please ask your contact to create another connection link and check
        <target>Voice messages are prohibited in this chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
-        <target>Voice messages are prohibited.</target>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
+        <target>Voice messages are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages not allowed" xml:space="preserve">
@@ -8082,11 +7977,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <target>You are already connected with %@.</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>
@@ -8361,11 +8251,6 @@ Repeat connection request?</target>
        <target>You will still receive calls and notifications from muted profiles when they are active.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <target>You will stop receiving messages from this chat. Chat history will be preserved.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>You will stop receiving messages from this group. Chat history will be preserved.</target>
@@ -8551,11 +8436,6 @@ Repeat connection request?</target>
        <target>accepted call</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <target>accepted invitation</target>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>admin</target>
@@ -8744,7 +8624,7 @@ Repeat connection request?</target>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>connecting…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -9238,11 +9118,6 @@ Repeat connection request?</target>
        <target>removed you</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <target>requested to connect</target>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>saved</target>
@@ -543,10 +543,6 @@
        <target>Tietoja SimpleX Chatistä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <note>No comment provided by engineer.</note>
@@ -599,10 +595,6 @@
        <target>Lisää osoite profiiliisi, jotta kontaktisi voivat jakaa sen muiden kanssa. Profiilipäivitys lähetetään kontakteillesi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Lisää profiili</target>
@@ -618,10 +610,6 @@
        <target>Lisää palvelimia skannaamalla QR-koodeja.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Lisää toiseen laitteeseen</target>
@@ -632,10 +620,6 @@
        <target>Lisää tervetuloviesti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -707,8 +691,8 @@
        <target>Kaikki tiedot poistetaan, kun se syötetään.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1154,14 +1138,6 @@
        <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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Chat-profiilin mukaan (oletus) tai [yhteyden mukaan](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1244,10 +1220,6 @@
        <target>Muuta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Muutetaanko tietokannan tunnuslause?</target>
@@ -1294,17 +1266,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1374,14 +1338,6 @@
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Keskustelut</target>
@@ -1485,8 +1441,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2064,10 +2020,6 @@ This is your own one-time link!</source>
        <source>Delete and notify contact</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Poista keskusteluprofiili</target>
@@ -2078,10 +2030,6 @@ This is your own one-time link!</source>
        <target>Poista keskusteluprofiili?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Poista yhteys</target>
@@ -2330,12 +2278,8 @@ This is your own one-time link!</source>
        <target>Yksityisviestit</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Yksityisviestit jäsenten välillä ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2373,8 +2317,8 @@ This is your own one-time link!</source>
        <target>Katoavat viestit ovat kiellettyjä tässä keskustelussa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Katoavat viestit ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3166,8 +3110,8 @@ This is your own one-time link!</source>
        <target>Tiedostot ja media</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Tiedostot ja media ovat tässä ryhmässä kiellettyjä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3411,6 +3355,40 @@ Error: %2$@</source>
        <target>Ryhmälinkit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Ryhmän jäsenet voivat lisätä viestireaktioita.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Ryhmän jäsenet voivat lähettää suoraviestejä.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Ryhmän jäsenet voivat lähettää katoavia viestejä.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Ryhmän jäsenet voivat lähettää tiedostoja ja mediaa.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Ryhmän jäsenet voivat lähettää ääniviestejä.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Ryhmäviesti:</target>
@@ -3788,10 +3766,6 @@ More improvements are coming soon!</source>
        <target>Kutsu jäseniä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Kutsu ryhmään</target>
@@ -3807,8 +3781,8 @@ More improvements are coming soon!</source>
        <target>Viestien peruuttamaton poisto on kielletty tässä keskustelussa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>Viestien peruuttamaton poisto on kielletty tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3940,14 +3914,6 @@ This is your link for group %@!</source>
        <target>Poistu</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Poistu ryhmästä</target>
@@ -4072,10 +4038,6 @@ This is your link for group %@!</source>
        <source>Member inactive</source>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Jäsenen rooli muuttuu muotoon "%@". Kaikille ryhmän jäsenille ilmoitetaan asiasta.</target>
@@ -4086,49 +4048,11 @@ This is your link for group %@!</source>
        <target>Jäsenen rooli muutetaan muotoon "%@". Jäsen saa uuden kutsun.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Jäsen poistetaan ryhmästä - tätä ei voi perua!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Ryhmän jäsenet voivat lisätä viestireaktioita.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Ryhmän jäsenet voivat lähettää suoraviestejä.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Ryhmän jäsenet voivat lähettää katoavia viestejä.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Ryhmän jäsenet voivat lähettää tiedostoja ja mediaa.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Ryhmän jäsenet voivat lähettää ääniviestejä.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <note>No comment provided by engineer.</note>
@@ -4174,8 +4098,8 @@ This is your link for group %@!</source>
        <target>Viestireaktiot ovat kiellettyjä tässä keskustelussa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Viestireaktiot ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4646,10 +4570,6 @@ Edellyttää VPN:n sallimista.</target>
        <target>Onion-isäntiä ei käytetä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Vain asiakaslaitteet tallentavat käyttäjäprofiileja, yhteystietoja, ryhmiä ja viestejä, jotka on lähetetty **kaksinkertaisella päästä päähän -salauksella**.</target>
@@ -5011,10 +4931,6 @@ Error: %@</source>
        <target>Yksityisyys ja turvallisuus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Yksityisyys uudelleen määritettynä</target>
@@ -5158,6 +5074,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push-ilmoitukset</target>
@@ -5550,6 +5470,14 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Safer groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Tallenna</target>
@@ -5564,7 +5492,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Tallenna ja ilmoita kontaktille</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5598,7 +5526,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Tallenna asetukset?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6165,10 +6093,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX-osoite</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>Trail of Bits on tarkastanut SimpleX Chatin tietoturvan.</target>
@@ -6227,8 +6151,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX-linkit</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -6620,14 +6544,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Profiili jaetaan vain kontaktiesi kanssa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7231,8 +7147,8 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Ääniviestit ovat kiellettyjä tässä keskustelussa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Ääniviestit ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7407,10 +7323,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -7659,10 +7571,6 @@ Repeat connection request?</source>
        <target>Saat edelleen puheluita ja ilmoituksia mykistetyiltä profiileilta, kun ne ovat aktiivisia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Et enää saa viestejä tästä ryhmästä. Keskusteluhistoria säilytetään.</target>
@@ -7842,10 +7750,6 @@ Repeat connection request?</source>
        <target>hyväksytty puhelu</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>ylläpitäjä</target>
@@ -8024,7 +7928,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>yhdistää…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -8500,10 +8404,6 @@ Repeat connection request?</source>
        <target>poisti sinut</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <note>No comment provided by engineer.</note>
@@ -572,10 +572,6 @@
        <target>À propos de SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <target>Principale</target>
@@ -632,10 +628,6 @@
        <target>Ajoutez une adresse à votre profil, afin que vos contacts puissent la partager avec d'autres personnes. La mise à jour du profil sera envoyée à vos contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Ajouter un profil</target>
@@ -651,10 +643,6 @@
        <target>Ajoutez des serveurs en scannant des codes QR.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Ajouter à un autre appareil</target>
@@ -665,10 +653,6 @@
        <target>Ajouter un message d'accueil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -745,8 +729,8 @@
        <target>Toutes les données sont effacées lorsqu'il est saisi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <target>Toutes les données restent confinées dans votre appareil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1234,14 +1218,6 @@
        <target>Bulgare, finnois, thaïlandais et ukrainien - grâce aux utilisateurs et à [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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1333,10 +1309,6 @@
        <target>Changer</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Changer la phrase secrète de la base de données ?</target>
@@ -1383,17 +1355,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1470,14 +1434,6 @@
        <target>Thème de chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Discussions</target>
@@ -1589,8 +1545,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2218,10 +2174,6 @@ Il s'agit de votre propre lien unique !</target>
        <target>Supprimer et en informer le contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Supprimer le profil de chat</target>
@@ -2232,10 +2184,6 @@ Il s'agit de votre propre lien unique !</target>
        <target>Supprimer le profil du chat ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Supprimer la connexion</target>
@@ -2500,12 +2448,8 @@ Il s'agit de votre propre lien unique !</target>
        <target>Messages directs</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Les messages directs entre membres sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2544,8 +2488,8 @@ Il s'agit de votre propre lien unique !</target>
        <target>Les messages éphémères sont interdits dans cette discussion.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Les messages éphémères sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3394,8 +3338,8 @@ Il s'agit de votre propre lien unique !</target>
        <target>Fichiers et médias</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Les fichiers et les médias sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3664,6 +3608,41 @@ Erreur : %2$@</target>
        <target>Liens de groupe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Les membres du groupe peuvent ajouter des réactions aux messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>Les membres du groupe peuvent envoyer des liens SimpleX.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Les membres du groupe peuvent envoyer des messages directs.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Les membres du groupes peuvent envoyer des messages éphémères.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Les membres du groupe peuvent envoyer des fichiers et des médias.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Les membres du groupe peuvent envoyer des messages vocaux.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Message du groupe :</target>
@@ -4061,10 +4040,6 @@ D'autres améliorations sont à venir !</target>
        <target>Inviter des membres</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Inviter au groupe</target>
@@ -4080,8 +4055,8 @@ D'autres améliorations sont à venir !</target>
        <target>La suppression irréversible de message est interdite dans ce chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>La suppression irréversible de messages est interdite dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4223,14 +4198,6 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Quitter</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Quitter le groupe</target>
@@ -4361,10 +4328,6 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Membre inactif</target>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Le rôle du membre sera changé pour "%@". Tous les membres du groupe en seront informés.</target>
@@ -4375,50 +4338,11 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Le rôle du membre sera changé pour "%@". Ce membre recevra une nouvelle invitation.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Ce membre sera retiré du groupe - impossible de revenir en arrière !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Les membres du groupe peuvent ajouter des réactions aux messages.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>Les membres du groupe peuvent envoyer des liens SimpleX.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Les membres du groupe peuvent envoyer des messages directs.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Les membres du groupes peuvent envoyer des messages éphémères.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Les membres du groupe peuvent envoyer des fichiers et des médias.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Les membres du groupe peuvent envoyer des messages vocaux.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <target>Menus</target>
@@ -4469,8 +4393,8 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Les réactions aux messages sont interdites dans ce chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Les réactions aux messages sont interdites dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4980,10 +4904,6 @@ Nécessite l'activation d'un VPN.</target>
        <target>Les hôtes .onion ne seront pas utilisés.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un **chiffrement de bout en bout à deux couches**.</target>
@@ -5373,10 +5293,6 @@ Erreur : %@</target>
        <target>Vie privée et sécurité</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>La vie privée redéfinie</target>
@@ -5534,6 +5450,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Le proxy est protégé par un mot de passe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Notifications push</target>
@@ -5958,6 +5878,14 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Groupes plus sûrs</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Enregistrer</target>
@@ -5972,7 +5900,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Enregistrer et en informer le contact</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -6007,7 +5935,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Enregistrer les préférences ?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6623,10 +6551,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Adresse SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>La sécurité de SimpleX Chat a été auditée par Trail of Bits.</target>
@@ -6685,8 +6609,8 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Liens SimpleX</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <target>Les liens SimpleX sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7109,14 +7033,6 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
        <target>Le profil n'est partagé qu'avec vos contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7772,8 +7688,8 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Les messages vocaux sont interdits dans ce chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Les messages vocaux sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7966,10 +7882,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -8241,10 +8153,6 @@ Répéter la demande de connexion ?</target>
        <target>Vous continuerez à recevoir des appels et des notifications des profils mis en sourdine lorsqu'ils sont actifs.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Vous ne recevrez plus de messages de ce groupe. L'historique du chat sera conservé.</target>
@@ -8429,10 +8337,6 @@ Répéter la demande de connexion ?</target>
        <target>appel accepté</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>admin</target>
@@ -8621,7 +8525,7 @@ Répéter la demande de connexion ?</target>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>connexion…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -9114,10 +9018,6 @@ Répéter la demande de connexion ?</target>
        <target>vous a retiré</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>enregistré</target>
@@ -1386,8 +1386,8 @@ Available in v5.1</source>
        <target state="translated">הודעות ישירות</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve" approved="no">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target state="translated">הודעות ישירות בין חברי קבוצה אסורות בקבוצה זו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1406,8 +1406,8 @@ Available in v5.1</source>
        <target state="translated">הודעות נעלמות אסורות בצ׳אט זה.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve" approved="no">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target state="translated">הודעות נעלמות אסורות בקבוצה זו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1951,18 +1951,18 @@ Available in v5.1</source>
        <target state="translated">חברי הקבוצה יכולים למחוק באופן בלתי הפיך הודעות שנשלחו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve" approved="no">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve" approved="no">
+        <source>Group members can send direct messages.</source>
        <target state="translated">חברי הקבוצה יכולים לשלוח הודעות ישירות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve" approved="no">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve" approved="no">
+        <source>Group members can send disappearing messages.</source>
        <target state="translated">חברי הקבוצה יכולים לשלוח הודעות נעלמות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve" approved="no">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve" approved="no">
+        <source>Group members can send voice messages.</source>
        <target state="translated">חברי הקבוצה יכולים לשלוח הודעות קוליות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2252,8 +2252,8 @@ Available in v5.1</source>
        <target state="translated">מחיקה בלתי הפיכה של הודעות אסורה בצ׳אט זה.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve" approved="no">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve" approved="no">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target state="translated">מחיקה בלתי הפיכה של הודעות אסורה בקבוצה זו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3859,8 +3859,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -4958,8 +4958,8 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">נמחק</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve" approved="no">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Files and media are prohibited in this group.</source>
        <target state="translated">קבצים ומדיה אסורים בקבוצה זו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5018,13 +5018,13 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">הזמן חברים</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve" approved="no">
-        <source>Members can add message reactions.</source>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve" approved="no">
+        <source>Group members can add message reactions.</source>
        <target state="translated">חברי הקבוצה יכולים להוסיף תגובות אמוג׳י להודעות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve" approved="no">
-        <source>Members can send files and media.</source>
+      <trans-unit id="Group members can send files and media." xml:space="preserve" approved="no">
+        <source>Group members can send files and media.</source>
        <target state="translated">חברי הקבוצה יכולים לשלוח קבצים ומדיה.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5222,8 +5222,8 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">תגובות אמוג׳י להודעות אסורות בצ׳אט זה.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve" approved="no">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Message reactions are prohibited in this group.</source>
        <target state="translated">תגובות אמוג׳י להודעות אסורות בקבוצה זו.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1034,8 +1034,8 @@
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1050,8 +1050,8 @@
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1414,16 +1414,16 @@
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1611,8 +1611,8 @@
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -2842,8 +2842,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -560,10 +560,6 @@
        <target>SimpleX Chat について</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <note>No comment provided by engineer.</note>
@@ -616,10 +612,6 @@
        <target>プロフィールにアドレスを追加し、連絡先があなたのアドレスを他の人と共有できるようにします。プロフィールの更新は連絡先に送信されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>プロフィールを追加</target>
@@ -635,10 +627,6 @@
        <target>QRコードでサーバを追加する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>別の端末に追加</target>
@@ -649,10 +637,6 @@
        <target>ウェルカムメッセージを追加</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -724,8 +708,8 @@
        <target>入力するとすべてのデータが消去されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1178,14 +1162,6 @@
        <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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>チャット プロファイル経由 (デフォルト) または [接続経由](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1268,10 +1244,6 @@
        <target>変更</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>データベースのパスフレーズを更新しますか？</target>
@@ -1318,17 +1290,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1396,15 +1360,6 @@
      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
-        <target>チャットテーマ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
@@ -1446,12 +1401,10 @@
      </trans-unit>
      <trans-unit id="Chunks deleted" xml:space="preserve">
        <source>Chunks deleted</source>
-        <target>チャンクが削除されました</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chunks downloaded" xml:space="preserve">
        <source>Chunks downloaded</source>
-        <target>チャンクがダウンロードされました</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chunks uploaded" xml:space="preserve">
@@ -1475,7 +1428,6 @@
      </trans-unit>
      <trans-unit id="Clear private notes?" xml:space="preserve">
        <source>Clear private notes?</source>
-        <target>プライベートノートを消しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear verification" xml:space="preserve">
@@ -1489,7 +1441,6 @@
      </trans-unit>
      <trans-unit id="Color mode" xml:space="preserve">
        <source>Color mode</source>
-        <target>色設定</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Compare file" xml:space="preserve">
@@ -1504,7 +1455,6 @@
      </trans-unit>
      <trans-unit id="Completed" xml:space="preserve">
        <source>Completed</source>
-        <target>完了</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
@@ -1515,8 +1465,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -1609,12 +1559,10 @@
      </trans-unit>
      <trans-unit id="Connect to desktop" xml:space="preserve">
        <source>Connect to desktop</source>
-        <target>デスクトップに接続</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect to your friends faster." xml:space="preserve">
        <source>Connect to your friends faster.</source>
-        <target>友達ともっと速くつながりましょう。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -1651,27 +1599,22 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connected" xml:space="preserve">
        <source>Connected</source>
-        <target>接続中</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connected desktop" xml:space="preserve">
        <source>Connected desktop</source>
-        <target>デスクトップに接続済</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connected servers" xml:space="preserve">
        <source>Connected servers</source>
-        <target>接続中のサーバ</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>デスクトップに接続済</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting" xml:space="preserve">
        <source>Connecting</source>
-        <target>接続待ち</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1686,12 +1629,10 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
        <source>Connecting to contact, please wait or check later!</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>
-        <target>デスクトップに接続中</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
@@ -1701,7 +1642,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connection and servers status." xml:space="preserve">
        <source>Connection and servers status.</source>
-        <target>接続とサーバーのステータス</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection error" xml:space="preserve">
@@ -1729,7 +1669,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connection terminated" xml:space="preserve">
        <source>Connection terminated</source>
-        <target>接続停止</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
@@ -1943,7 +1882,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
-        <target>カスタムテーマ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Dark" xml:space="preserve">
@@ -1953,7 +1891,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Dark mode colors" xml:space="preserve">
        <source>Dark mode colors</source>
-        <target>ダークモードカラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database ID" xml:space="preserve">
@@ -2056,7 +1993,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Debug delivery" xml:space="preserve">
        <source>Debug delivery</source>
-        <target>配信のデバッグ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Decentralized" xml:space="preserve">
@@ -2108,10 +2044,6 @@ This is your own one-time link!</source>
        <source>Delete and notify contact</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>チャットのプロフィールを削除する</target>
@@ -2122,10 +2054,6 @@ This is your own one-time link!</source>
        <target>チャットのプロフィールを削除しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>接続を削除する</target>
@@ -2313,7 +2241,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Desktop devices" xml:space="preserve">
        <source>Desktop devices</source>
-        <target>デスクトップ機器</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Destination server address of %@ is incompatible with forwarding server %@ settings." xml:space="preserve">
@@ -2343,7 +2270,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Developer options" xml:space="preserve">
        <source>Developer options</source>
-        <target>開発者向けの設定</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Developer tools" xml:space="preserve">
@@ -2376,12 +2302,8 @@ This is your own one-time link!</source>
        <target>ダイレクトメッセージ</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>このグループではメンバー間のダイレクトメッセージが使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2419,8 +2341,8 @@ This is your own one-time link!</source>
        <target>このチャットでは消えるメッセージが使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>このグループでは消えるメッセージが使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3213,8 +3135,8 @@ This is your own one-time link!</source>
        <target>ファイルとメディア</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>このグループでは、ファイルとメディアは禁止されています。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3458,6 +3380,40 @@ Error: %2$@</source>
        <target>グループのリンク</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>グループメンバーはメッセージへのリアクションを追加できます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>グループのメンバーがメッセージを完全削除することができます。(24時間)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>グループのメンバーがダイレクトメッセージを送信できます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>グループのメンバーが消えるメッセージを送信できます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>グループメンバーはファイルやメディアを送信できます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>グループのメンバーが音声メッセージを送信できます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>グループメッセージ:</target>
@@ -3835,10 +3791,6 @@ More improvements are coming soon!</source>
        <target>メンバーを招待する</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>グループに招待する</target>
@@ -3854,8 +3806,8 @@ More improvements are coming soon!</source>
        <target>このチャットではメッセージの完全削除が使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>このグループではメッセージの完全削除が使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3987,14 +3939,6 @@ This is your link for group %@!</source>
        <target>脱退</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>グループを脱退</target>
@@ -4119,10 +4063,6 @@ This is your link for group %@!</source>
        <source>Member inactive</source>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>メンバーの役割が "%@" に変更されます。 グループメンバー全員に通知されます。</target>
@@ -4133,49 +4073,11 @@ This is your link for group %@!</source>
        <target>メンバーの役割が "%@" に変更されます。 メンバーは新たな招待を受け取ります。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>メンバーをグループから除名する (※元に戻せません※)！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>グループメンバーはメッセージへのリアクションを追加できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>グループのメンバーがメッセージを完全削除することができます。(24時間)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>グループのメンバーがダイレクトメッセージを送信できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>グループのメンバーが消えるメッセージを送信できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>グループメンバーはファイルやメディアを送信できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>グループのメンバーが音声メッセージを送信できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <note>No comment provided by engineer.</note>
@@ -4220,8 +4122,8 @@ This is your link for group %@!</source>
        <target>このチャットではメッセージへのリアクションは禁止されています。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>このグループではメッセージへのリアクションは禁止されています。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4695,10 +4597,6 @@ VPN を有効にする必要があります。</target>
        <target>オニオンのホストが使われません。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>**2 レイヤーのエンドツーエンド暗号化**を使用して送信されたユーザー プロファイル、連絡先、グループ、メッセージを保存できるのはクライアント デバイスのみです。</target>
@@ -5061,10 +4959,6 @@ Error: %@</source>
        <target>プライバシーとセキュリティ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>プライバシーの基準を新境地に</target>
@@ -5208,6 +5102,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>プッシュ通知</target>
@@ -5599,6 +5497,14 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Safer groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>保存</target>
@@ -5613,7 +5519,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>保存して、連絡先にに知らせる</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5647,7 +5553,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>この設定でよろしいですか？</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6207,10 +6113,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleXアドレス</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>SimpleX Chat のセキュリティは Trail of Bits によって監査されました。</target>
@@ -6269,8 +6171,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleXリンク</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -6663,14 +6565,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>プロフィールは連絡先にしか共有されません。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7273,8 +7167,8 @@ To connect, please ask your contact to create another connection link and check
        <target>このチャットでは音声メッセージが使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>このグループでは音声メッセージが使用禁止です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7449,10 +7343,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -7701,10 +7591,6 @@ Repeat connection request?</source>
        <target>ミュートされたプロフィールがアクティブな場合でも、そのプロフィールからの通話や通知は引き続き受信します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>このグループからのメッセージが届かなくなります。チャットの履歴が残ります。</target>
@@ -7884,10 +7770,6 @@ Repeat connection request?</source>
        <target>受けた通話</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>管理者</target>
@@ -8066,7 +7948,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>接続待ち…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -8542,10 +8424,6 @@ Repeat connection request?</source>
        <target>あなたを除名しました</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <note>No comment provided by engineer.</note>
@@ -1009,8 +1009,8 @@
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1025,8 +1025,8 @@
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1417,16 +1417,16 @@
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1638,8 +1638,8 @@
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -2964,8 +2964,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -1029,8 +1029,8 @@
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1045,8 +1045,8 @@
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1413,16 +1413,16 @@
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1610,8 +1610,8 @@
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -2869,8 +2869,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -572,10 +572,6 @@
        <target>O SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <target>Akcent</target>
@@ -632,10 +628,6 @@
        <target>Dodaj adres do swojego profilu, aby Twoje kontakty mogły go udostępnić innym osobom. Aktualizacja profilu zostanie wysłana do Twoich kontaktów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Dodaj profil</target>
@@ -651,10 +643,6 @@
        <target>Dodaj serwery, skanując kody QR.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Dodaj do innego urządzenia</target>
@@ -665,10 +653,6 @@
        <target>Dodaj wiadomość powitalną</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -745,8 +729,8 @@
        <target>Wszystkie dane są usuwane po jego wprowadzeniu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <target>Wszystkie dane są prywatne na Twoim urządzeniu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1229,14 +1213,6 @@
        <target>Bułgarski, fiński, tajski i ukraiński – dzięki użytkownikom i [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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Według profilu czatu (domyślnie) lub [według połączenia](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1328,10 +1304,6 @@
        <target>Zmień</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Zmienić hasło bazy danych?</target>
@@ -1378,17 +1350,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1465,14 +1429,6 @@
        <target>Motyw czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Czaty</target>
@@ -1584,8 +1540,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2212,10 +2168,6 @@ To jest twój jednorazowy link!</target>
        <target>Usuń i powiadom kontakt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Usuń profil czatu</target>
@@ -2226,10 +2178,6 @@ To jest twój jednorazowy link!</target>
        <target>Usunąć profil czatu?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Usuń połączenie</target>
@@ -2493,12 +2441,8 @@ To jest twój jednorazowy link!</target>
        <target>Bezpośrednie wiadomości</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Bezpośrednie wiadomości między członkami są zabronione w tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2537,8 +2481,8 @@ To jest twój jednorazowy link!</target>
        <target>Znikające wiadomości są zabronione na tym czacie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Znikające wiadomości są zabronione w tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3387,8 +3331,8 @@ To jest twój jednorazowy link!</target>
        <target>Pliki i media</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Pliki i media są zabronione w tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3656,6 +3600,41 @@ Błąd: %2$@</target>
        <target>Linki grupowe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Członkowie grupy mogą dodawać reakcje wiadomości.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Członkowie grupy mogą nieodwracalnie usuwać wysłane wiadomości. (24 godziny)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>Członkowie grupy mogą wysyłać linki SimpleX.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Członkowie grupy mogą wysyłać bezpośrednie wiadomości.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Członkowie grupy mogą wysyłać znikające wiadomości.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Członkowie grupy mogą wysyłać pliki i media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Członkowie grupy mogą wysyłać wiadomości głosowe.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Wiadomość grupowa:</target>
@@ -4051,10 +4030,6 @@ More improvements are coming soon!</source>
        <target>Zaproś członków</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Zaproś do grupy</target>
@@ -4070,8 +4045,8 @@ More improvements are coming soon!</source>
        <target>Nieodwracalne usuwanie wiadomości jest na tym czacie zabronione.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>Nieodwracalne usuwanie wiadomości jest w tej grupie zabronione.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4213,14 +4188,6 @@ To jest twój link do grupy %@!</target>
        <target>Opuść</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Opuść grupę</target>
@@ -4351,10 +4318,6 @@ To jest twój link do grupy %@!</target>
        <target>Członek nieaktywny</target>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Rola członka grupy zostanie zmieniona na "%@". Wszyscy członkowie grupy zostaną powiadomieni.</target>
@@ -4365,50 +4328,11 @@ To jest twój link do grupy %@!</target>
        <target>Rola członka zostanie zmieniona na "%@". Członek otrzyma nowe zaproszenie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Członek zostanie usunięty z grupy - nie można tego cofnąć!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Członkowie grupy mogą dodawać reakcje wiadomości.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Członkowie grupy mogą nieodwracalnie usuwać wysłane wiadomości. (24 godziny)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>Członkowie grupy mogą wysyłać linki SimpleX.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Członkowie grupy mogą wysyłać bezpośrednie wiadomości.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Członkowie grupy mogą wysyłać znikające wiadomości.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Członkowie grupy mogą wysyłać pliki i media.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Członkowie grupy mogą wysyłać wiadomości głosowe.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <target>Menu</target>
@@ -4459,8 +4383,8 @@ To jest twój link do grupy %@!</target>
        <target>Reakcje wiadomości są zabronione na tym czacie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Reakcje wiadomości są zabronione w tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4970,10 +4894,6 @@ Wymaga włączenia VPN.</target>
        <target>Hosty onion nie będą używane.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Tylko urządzenia klienckie przechowują profile użytkowników, kontakty, grupy i wiadomości wysyłane za pomocą **2-warstwowego szyfrowania end-to-end**.</target>
@@ -5363,10 +5283,6 @@ Błąd: %@</target>
        <target>Prywatność i bezpieczeństwo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Redefinicja prywatności</target>
@@ -5524,6 +5440,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Proxy wymaga hasła</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Powiadomienia push</target>
@@ -5948,6 +5868,14 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Bezpieczniejsze grupy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Zapisz</target>
@@ -5962,7 +5890,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Zapisz i powiadom kontakt</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5997,7 +5925,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Zapisać preferencje?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6613,10 +6541,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Adres SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>Bezpieczeństwo SimpleX Chat zostało zaudytowane przez Trail of Bits.</target>
@@ -6675,8 +6599,8 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Linki SimpleX</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <target>Linki SimpleX są zablokowane na tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7096,14 +7020,6 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
        <target>Profil jest udostępniany tylko Twoim kontaktom.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7759,8 +7675,8 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Wiadomości głosowe są zabronione na tym czacie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Wiadomości głosowe są zabronione w tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7953,10 +7869,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -8228,10 +8140,6 @@ Powtórzyć prośbę połączenia?</target>
        <target>Nadal będziesz otrzymywać połączenia i powiadomienia z wyciszonych profili, gdy są one aktywne.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Przestaniesz otrzymywać wiadomości od tej grupy. Historia czatu zostanie zachowana.</target>
@@ -8416,10 +8324,6 @@ Powtórzyć prośbę połączenia?</target>
        <target>zaakceptowane połączenie</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>administrator</target>
@@ -8608,7 +8512,7 @@ Powtórzyć prośbę połączenia?</target>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>łączenie…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -9101,10 +9005,6 @@ Powtórzyć prośbę połączenia?</target>
        <target>usunął cię</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>zapisane</target>
@@ -1204,8 +1204,8 @@
        <target state="translated">Mensagens diretas</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve" approved="no">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target state="translated">Mensagens diretas entre membros são proibidas neste grupo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1224,8 +1224,8 @@
        <target state="translated">Mensagens temporárias são proibidas nesse chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve" approved="no">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target state="translated">Mensagens que temporárias são proibidas neste grupo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1638,18 +1638,18 @@
        <target state="translated">Os membros do grupo podem excluir mensagens enviadas de forma irreversível.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve" approved="no">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve" approved="no">
+        <source>Group members can send direct messages.</source>
        <target state="translated">Os membros do grupo podem enviar DMs.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve" approved="no">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve" approved="no">
+        <source>Group members can send disappearing messages.</source>
        <target state="translated">Os membros do grupo podem enviar mensagens que desaparecem.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve" approved="no">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve" approved="no">
+        <source>Group members can send voice messages.</source>
        <target state="translated">Os membros do grupo podem enviar mensagens de voz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1873,8 +1873,8 @@
        <target state="translated">A exclusão irreversível de mensagens é proibida neste chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve" approved="no">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve" approved="no">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target state="translated">A exclusão irreversível de mensagens é proibida neste grupo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3269,8 +3269,8 @@ Para se conectar, peça ao seu contato para criar outro link de conexão e verif
        <target state="translated">Mensagens de voz são proibidas neste chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve" approved="no">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Voice messages are prohibited in this group.</source>
        <target state="translated">Mensagens de voz são proibidas neste grupo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5425,8 +5425,8 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
        <source>Advanced settings</source>
        <target state="translated">Configurações avançadas</target>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve" approved="no">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve" approved="no">
+        <source>All data is private to your device.</source>
        <target state="translated">Toda informação é privada em seu dispositivo.</target>
      </trans-unit>
      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
@@ -1227,8 +1227,8 @@ Available in v5.1</source>
        <source>Direct messages</source>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1243,8 +1243,8 @@ Available in v5.1</source>
        <source>Disappearing messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1679,16 +1679,16 @@ Available in v5.1</source>
        <source>Group members can irreversibly delete sent messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
@@ -1920,8 +1920,8 @@ Available in v5.1</source>
        <source>Irreversible message deletion is prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
@@ -3436,8 +3436,8 @@ To connect, please ask your contact to create another connection link and check
        <source>Voice messages are prohibited in this chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -536,10 +536,6 @@
        <target>เกี่ยวกับ SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <note>No comment provided by engineer.</note>
@@ -591,10 +587,6 @@
        <target>เพิ่มที่อยู่ลงในโปรไฟล์ของคุณ เพื่อให้ผู้ติดต่อของคุณสามารถแชร์กับผู้อื่นได้ การอัปเดตโปรไฟล์จะถูกส่งไปยังผู้ติดต่อของคุณ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>เพิ่มโปรไฟล์</target>
@@ -610,10 +602,6 @@
        <target>เพิ่มเซิร์ฟเวอร์โดยการสแกนรหัสคิวอาร์โค้ด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>เพิ่มเข้าไปในอุปกรณ์อื่น</target>
@@ -624,10 +612,6 @@
        <target>เพิ่มข้อความต้อนรับ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -699,8 +683,8 @@
        <target>ข้อมูลทั้งหมดจะถูกลบเมื่อถูกป้อน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -1146,14 +1130,6 @@
        <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>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>ตามโปรไฟล์แชท (ค่าเริ่มต้น) หรือ [โดยการเชื่อมต่อ](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (เบต้า)</target>
@@ -1236,10 +1212,6 @@
        <target>เปลี่ยน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>เปลี่ยนรหัสผ่านฐานข้อมูล?</target>
@@ -1286,17 +1258,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1366,14 +1330,6 @@
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>แชท</target>
@@ -1477,8 +1433,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2053,10 +2009,6 @@ This is your own one-time link!</source>
        <source>Delete and notify contact</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>ลบโปรไฟล์แชท</target>
@@ -2067,10 +2019,6 @@ This is your own one-time link!</source>
        <target>ลบโปรไฟล์แชทไหม?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>ลบการเชื่อมต่อ</target>
@@ -2318,12 +2266,8 @@ This is your own one-time link!</source>
        <target>ข้อความโดยตรง</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>ข้อความโดยตรงระหว่างสมาชิกเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2361,8 +2305,8 @@ This is your own one-time link!</source>
        <target>ข้อความที่จะหายไปหลังเวลาที่กําหนด (disappearing message) เป็นสิ่งต้องห้ามในแชทนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>ข้อความที่จะหายไปหลังเวลาที่กําหนด (disappearing message) เป็นสิ่งต้องห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3151,8 +3095,8 @@ This is your own one-time link!</source>
        <target>ไฟล์และสื่อ</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>ไฟล์และสื่อเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3396,6 +3340,40 @@ Error: %2$@</source>
        <target>ลิงค์กลุ่ม</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>สมาชิกกลุ่มสามารถส่งข้อความโดยตรงได้</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>สมาชิกกลุ่มสามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>สมาชิกกลุ่มสามารถส่งไฟล์และสื่อ</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>สมาชิกกลุ่มสามารถส่งข้อความเสียง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>ข้อความกลุ่ม:</target>
@@ -3771,10 +3749,6 @@ More improvements are coming soon!</source>
        <target>เชิญสมาชิก</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>เชิญเข้าร่วมกลุ่ม</target>
@@ -3790,8 +3764,8 @@ More improvements are coming soon!</source>
        <target>ไม่สามารถลบข้อความแบบแก้ไขไม่ได้ในแชทนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>การลบข้อความแบบแก้ไขไม่ได้เป็นสิ่งที่ห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3923,14 +3897,6 @@ This is your link for group %@!</source>
        <target>ออกจาก</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>ออกจากกลุ่ม</target>
@@ -4055,10 +4021,6 @@ This is your link for group %@!</source>
        <source>Member inactive</source>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>บทบาทของสมาชิกจะถูกเปลี่ยนเป็น "%@" สมาชิกกลุ่มทั้งหมดจะได้รับแจ้ง</target>
@@ -4069,49 +4031,11 @@ This is your link for group %@!</source>
        <target>บทบาทของสมาชิกจะถูกเปลี่ยนเป็น "%@" สมาชิกจะได้รับคำเชิญใหม่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>สมาชิกจะถูกลบออกจากกลุ่ม - ไม่สามารถยกเลิกได้!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>สมาชิกกลุ่มสามารถส่งข้อความโดยตรงได้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>สมาชิกกลุ่มสามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>สมาชิกกลุ่มสามารถส่งไฟล์และสื่อ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>สมาชิกกลุ่มสามารถส่งข้อความเสียง</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <note>No comment provided by engineer.</note>
@@ -4157,8 +4081,8 @@ This is your link for group %@!</source>
        <target>ห้ามแสดงปฏิกิริยาบนข้อความในแชทนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>ปฏิกิริยาบนข้อความเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4625,10 +4549,6 @@ Requires compatible VPN.</source>
        <target>โฮสต์หัวหอมจะไม่ถูกใช้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>เฉพาะอุปกรณ์ไคลเอนต์เท่านั้นที่จัดเก็บโปรไฟล์ผู้ใช้ ผู้ติดต่อ กลุ่ม และข้อความที่ส่งด้วย **การเข้ารหัส encrypt แบบ 2 ชั้น**</target>
@@ -4990,10 +4910,6 @@ Error: %@</source>
        <target>ความเป็นส่วนตัวและความปลอดภัย</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>นิยามความเป็นส่วนตัวใหม่</target>
@@ -5137,6 +5053,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>การแจ้งเตือนแบบทันที</target>
@@ -5527,6 +5447,14 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Safer groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>บันทึก</target>
@@ -5541,7 +5469,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>บันทึกและแจ้งผู้ติดต่อ</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5575,7 +5503,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>บันทึกการตั้งค่า?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6139,10 +6067,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>ที่อยู่ SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>ความปลอดภัยของ SimpleX Chat ได้รับการตรวจสอบโดย Trail of Bits</target>
@@ -6201,8 +6125,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>ลิงก์ SimpleX</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -6594,14 +6518,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>โปรไฟล์นี้แชร์กับผู้ติดต่อของคุณเท่านั้น</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7201,8 +7117,8 @@ To connect, please ask your contact to create another connection link and check
        <target>ห้ามส่งข้อความเสียงในแชทนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>ข้อความเสียงเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7377,10 +7293,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>
@@ -7628,10 +7540,6 @@ Repeat connection request?</source>
        <target>คุณจะยังได้รับสายเรียกเข้าและการแจ้งเตือนจากโปรไฟล์ที่ปิดเสียงเมื่อโปรไฟล์ของเขามีการใช้งาน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>คุณจะหยุดได้รับข้อความจากกลุ่มนี้ ประวัติการแชทจะถูกรักษาไว้</target>
@@ -7810,10 +7718,6 @@ Repeat connection request?</source>
        <target>รับสายแล้ว</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>ผู้ดูแลระบบ</target>
@@ -7992,7 +7896,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>กำลังเชื่อมต่อ…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -8466,10 +8370,6 @@ Repeat connection request?</source>
        <target>ลบคุณออกแล้ว</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <note>No comment provided by engineer.</note>
@@ -572,10 +572,6 @@
        <target>SimpleX Chat hakkında</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <target>Ana renk</target>
@@ -632,10 +628,6 @@
        <target>Kişilerinizin başkalarıyla paylaşabilmesi için profilinize adres ekleyin. Profil güncellemesi kişilerinize gönderilecek.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>Profil ekle</target>
@@ -651,10 +643,6 @@
        <target>Karekod taratarak sunucuları ekleyin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>Başka bir cihaza ekle</target>
@@ -665,10 +653,6 @@
        <target>Karşılama mesajı ekleyin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -745,8 +729,8 @@
        <target>Kullanıldığında bütün veriler silinir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <target>Tüm veriler cihazınıza özeldir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1234,14 +1218,6 @@
        <target>Bulgarca, Fince, Tayca ve Ukraynaca - kullanıcılara ve [Weblate] e teşekkürler! (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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>Sohbet profiline göre (varsayılan) veya [bağlantıya göre](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1333,10 +1309,6 @@
        <target>Değiştir</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>Veritabanı parolasını değiştir?</target>
@@ -1383,17 +1355,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1470,14 +1434,6 @@
        <target>Sohbet teması</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>Sohbetler</target>
@@ -1589,8 +1545,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2218,10 +2174,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Sil ve kişiye bildir</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>Sohbet profilini sil</target>
@@ -2232,10 +2184,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Sohbet profili silinsin mi?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>Bağlantıyı sil</target>
@@ -2500,12 +2448,8 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Doğrudan mesajlar</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>Bu grupta üyeler arasında direkt mesajlaşma yasaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2544,8 +2488,8 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Kaybolan mesajlar bu sohbette yasaklanmış.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>Kaybolan mesajlar bu grupta yasaklanmış.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3394,8 +3338,8 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Dosyalar ve medya</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>Dosyalar ve medya bu grupta yasaklandı.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3664,6 +3608,41 @@ Hata: %2$@</target>
        <target>Grup bağlantıları</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>Grup üyeleri mesaj tepkileri ekleyebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>Grup üyeleri SimpleX bağlantıları gönderebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>Grup üyeleri doğrudan mesajlar gönderebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>Grup üyeleri kaybolan mesajlar gönderebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>Grup üyeleri dosyalar ve medya gönderebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>Grup üyeleri sesli mesajlar gönderebilir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>Grup mesajı:</target>
@@ -4061,10 +4040,6 @@ Daha fazla iyileştirme yakında geliyor!</target>
        <target>Üyeleri davet et</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>Gruba davet et</target>
@@ -4080,8 +4055,8 @@ Daha fazla iyileştirme yakında geliyor!</target>
        <target>Bu sohbette geri döndürülemez mesaj silme yasaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>Bu grupta geri döndürülemez mesaj silme yasaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4223,14 +4198,6 @@ Bu senin grup için bağlantın %@!</target>
        <target>Ayrıl</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>Gruptan ayrıl</target>
@@ -4361,10 +4328,6 @@ Bu senin grup için bağlantın %@!</target>
        <target>Üye inaktif</target>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>Üye rolü "%@" olarak değiştirilecektir. Ve tüm grup üyeleri bilgilendirilecektir.</target>
@@ -4375,50 +4338,11 @@ Bu senin grup için bağlantın %@!</target>
        <target>Üye rolü "%@" olarak değiştirilecektir. Ve üye yeni bir davetiye alacaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>Üye gruptan çıkarılacaktır - bu geri alınamaz!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>Grup üyeleri mesaj tepkileri ekleyebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>Grup üyeleri SimpleX bağlantıları gönderebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>Grup üyeleri doğrudan mesajlar gönderebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>Grup üyeleri kaybolan mesajlar gönderebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>Grup üyeleri dosyalar ve medya gönderebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>Grup üyeleri sesli mesajlar gönderebilir.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <target>Menüler</target>
@@ -4469,8 +4393,8 @@ Bu senin grup için bağlantın %@!</target>
        <target>Mesaj tepkileri bu sohbette yasaklandı.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>Mesaj tepkileri bu grupta yasaklandı.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4980,10 +4904,6 @@ VPN'nin etkinleştirilmesi gerekir.</target>
        <target>Onion ana bilgisayarları kullanılmayacaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>Yalnızca istemci cihazlar kullanıcı profillerini, kişileri, grupları ve **2 katmanlı uçtan uca şifreleme** ile gönderilen mesajları depolar.</target>
@@ -5373,10 +5293,6 @@ Hata: %@</target>
        <target>Gizlilik &amp; güvenlik</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>Gizlilik yeniden tanımlandı</target>
@@ -5534,6 +5450,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Proxy şifre gerektirir</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Anında bildirimler</target>
@@ -5958,6 +5878,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Daha güvenli gruplar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Kaydet</target>
@@ -5972,7 +5900,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>Kaydet ve kişilere bildir</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -6007,7 +5935,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>Tercihler kaydedilsin mi?</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6623,10 +6551,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX Adresi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>SimpleX Chat güvenliği Trails of Bits tarafından denetlenmiştir.</target>
@@ -6685,8 +6609,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX bağlantıları</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <target>SimpleX bağlantıları bu grupta yasaklandı.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7109,14 +7033,6 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
        <target>Profil sadece kişilerinle paylaşılacak.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7772,8 +7688,8 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
        <target>Bu sohbette sesli mesajlar yasaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>Bu grupta sesli mesajlar yasaktır.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7966,10 +7882,6 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
        <target>Zaten %@'a bağlısınız.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>Zaten %@'a bağlanıyorsunuz.</target>
@@ -8241,10 +8153,6 @@ Bağlantı isteği tekrarlansın mı?</target>
        <target>Aktif olduklarında sessize alınmış profillerden arama ve bildirim almaya devam edersiniz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>Bu gruptan artık mesaj almayacaksınız. Sohbet geçmişi korunacaktır.</target>
@@ -8429,10 +8337,6 @@ Bağlantı isteği tekrarlansın mı?</target>
        <target>kabul edilen arama</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>yönetici</target>
@@ -8621,7 +8525,7 @@ Bağlantı isteği tekrarlansın mı?</target>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>bağlanılıyor…</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -9114,10 +9018,6 @@ Bağlantı isteği tekrarlansın mı?</target>
        <target>sen kaldırıldın</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>kaydedildi</target>
@@ -566,10 +566,6 @@
        <target>关于SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="About operators" xml:space="preserve">
-        <source>About operators</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Accent" xml:space="preserve">
        <source>Accent</source>
        <target>强调</target>
@@ -626,10 +622,6 @@
        <target>将地址添加到您的个人资料，以便您的联系人可以与其他人共享。个人资料更新将发送给您的联系人。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add friends" xml:space="preserve">
-        <source>Add friends</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add profile" xml:space="preserve">
        <source>Add profile</source>
        <target>添加个人资料</target>
@@ -645,10 +637,6 @@
        <target>扫描二维码来添加服务器。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add team members" xml:space="preserve">
-        <source>Add team members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Add to another device" xml:space="preserve">
        <source>Add to another device</source>
        <target>添加另一设备</target>
@@ -659,10 +647,6 @@
        <target>添加欢迎信息</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add your team members to the conversations." xml:space="preserve">
-        <source>Add your team members to the conversations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Added media &amp; file servers" xml:space="preserve">
        <source>Added media &amp; file servers</source>
        <note>No comment provided by engineer.</note>
@@ -739,8 +723,8 @@
        <target>所有数据在输入后将被删除。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
        <target>所有数据都是您设备的私有数据.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1221,14 +1205,6 @@
        <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="Business address" xml:space="preserve">
-        <source>Business address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Business chats" xml:space="preserve">
-        <source>Business chats</source>
-        <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">
        <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
        <target>通过聊天资料（默认）或者[通过连接](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)。</target>
@@ -1320,10 +1296,6 @@
        <target>更改</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Change chat profiles" xml:space="preserve">
-        <source>Change chat profiles</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Change database passphrase?" xml:space="preserve">
        <source>Change database passphrase?</source>
        <target>更改数据库密码？</target>
@@ -1370,17 +1342,9 @@
        <note>authentication reason
   set passcode view</note>
      </trans-unit>
-      <trans-unit id="Chat" xml:space="preserve">
-        <source>Chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists" xml:space="preserve">
-        <source>Chat already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat already exists!" xml:space="preserve">
-        <source>Chat already exists!</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Change user profiles" xml:space="preserve">
+        <source>Change user profiles</source>
+        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Chat colors" xml:space="preserve">
        <source>Chat colors</source>
@@ -1456,14 +1420,6 @@
        <target>聊天主题</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
-        <source>Chat will be deleted for you - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chats" xml:space="preserve">
        <source>Chats</source>
        <target>聊天</target>
@@ -1575,8 +1531,8 @@
        <source>Conditions are accepted for the operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
-        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+      <trans-unit id="Conditions are already accepted for following operator(s): **%@**." xml:space="preserve">
+        <source>Conditions are already accepted for following operator(s): **%@**.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Conditions of use" xml:space="preserve">
@@ -2202,10 +2158,6 @@ This is your own one-time link!</source>
        <target>删除并通知联系人</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat" xml:space="preserve">
-        <source>Delete chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete chat profile" xml:space="preserve">
        <source>Delete chat profile</source>
        <target>删除聊天资料</target>
@@ -2216,10 +2168,6 @@ This is your own one-time link!</source>
        <target>删除聊天资料？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete chat?" xml:space="preserve">
-        <source>Delete chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete connection" xml:space="preserve">
        <source>Delete connection</source>
        <target>删除连接</target>
@@ -2483,12 +2431,8 @@ This is your own one-time link!</source>
        <target>私信</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
-        <source>Direct messages between members are prohibited in this chat.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target>此群中禁止成员之间私信。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2527,8 +2471,8 @@ This is your own one-time link!</source>
        <target>此聊天中禁止显示限时消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target>该组禁止限时消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3369,8 +3313,8 @@ This is your own one-time link!</source>
        <target>文件和媒体</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Files and media are prohibited." xml:space="preserve">
-        <source>Files and media are prohibited.</source>
+      <trans-unit id="Files and media are prohibited in this group." xml:space="preserve">
+        <source>Files and media are prohibited in this group.</source>
        <target>此群组中禁止文件和媒体。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3634,6 +3578,41 @@ Error: %2$@</source>
        <target>群组链接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve">
+        <source>Group members can add message reactions.</source>
+        <target>群组成员可以添加信息回应。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>群组成员可以不可撤回地删除已发送的消息</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
+        <source>Group members can send SimpleX links.</source>
+        <target>群成员可发送 SimpleX 链接。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve">
+        <source>Group members can send direct messages.</source>
+        <target>群组成员可以私信。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve">
+        <source>Group members can send disappearing messages.</source>
+        <target>群组成员可以发送限时消息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send files and media." xml:space="preserve">
+        <source>Group members can send files and media.</source>
+        <target>群组成员可以发送文件和媒体。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve">
+        <source>Group members can send voice messages.</source>
+        <target>群组成员可以发送语音消息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group message:" xml:space="preserve">
        <source>Group message:</source>
        <target>群组消息：</target>
@@ -4028,10 +4007,6 @@ More improvements are coming soon!</source>
        <target>邀请成员</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invite to chat" xml:space="preserve">
-        <source>Invite to chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invite to group" xml:space="preserve">
        <source>Invite to group</source>
        <target>邀请加入群组</target>
@@ -4047,8 +4022,8 @@ More improvements are coming soon!</source>
        <target>此聊天中禁止不可撤回消息移除。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target>此群组中禁止不可撤回消息移除。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4190,14 +4165,6 @@ This is your link for group %@!</source>
        <target>离开</target>
        <note>swipe action</note>
      </trans-unit>
-      <trans-unit id="Leave chat" xml:space="preserve">
-        <source>Leave chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Leave chat?" xml:space="preserve">
-        <source>Leave chat?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Leave group" xml:space="preserve">
        <source>Leave group</source>
        <target>离开群组</target>
@@ -4328,10 +4295,6 @@ This is your link for group %@!</source>
        <target>成员不活跃</target>
        <note>item status text</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
-        <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
        <target>成员角色将更改为 "%@"。所有群成员将收到通知。</target>
@@ -4342,50 +4305,11 @@ This is your link for group %@!</source>
        <target>成员角色将更改为 "%@"。该成员将收到一份新的邀请。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
-        <source>Member will be removed from chat - this cannot be undone!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
        <source>Member will be removed from group - this cannot be undone!</source>
        <target>成员将被移出群组——此操作无法撤消！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve">
-        <source>Members can add message reactions.</source>
-        <target>群组成员可以添加信息回应。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
-        <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>群组成员可以不可撤回地删除已发送的消息</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send SimpleX links." xml:space="preserve">
-        <source>Members can send SimpleX links.</source>
-        <target>群成员可发送 SimpleX 链接。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve">
-        <source>Members can send direct messages.</source>
-        <target>群组成员可以私信。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve">
-        <source>Members can send disappearing messages.</source>
-        <target>群组成员可以发送限时消息。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send files and media." xml:space="preserve">
-        <source>Members can send files and media.</source>
-        <target>群组成员可以发送文件和媒体。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve">
-        <source>Members can send voice messages.</source>
-        <target>群组成员可以发送语音消息。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Menus" xml:space="preserve">
        <source>Menus</source>
        <target>菜单</target>
@@ -4436,8 +4360,8 @@ This is your link for group %@!</source>
        <target>该聊天禁用了消息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve">
+        <source>Message reactions are prohibited in this group.</source>
        <target>该群组禁用了消息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -4940,10 +4864,6 @@ Requires compatible VPN.</source>
        <target>将不会使用 Onion 主机。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
-        <source>Only chat owners can change preferences.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages.</source>
        <target>只有客户端设备存储用户资料、联系人、群组和**双层端到端加密**发送的消息。</target>
@@ -5329,10 +5249,6 @@ Error: %@</source>
        <target>隐私和安全</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Privacy for your customers." xml:space="preserve">
-        <source>Privacy for your customers.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Privacy redefined" xml:space="preserve">
        <source>Privacy redefined</source>
        <target>重新定义隐私</target>
@@ -5489,6 +5405,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxy requires password</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Push Notifications" xml:space="preserve">
+        <source>Push Notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>推送通知</target>
@@ -5911,6 +5831,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>更安全的群组</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Same conditions will apply to operator(s): **%@**." xml:space="preserve">
+        <source>Same conditions will apply to operator(s): **%@**.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>保存</target>
@@ -5925,7 +5853,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
        <target>保存并通知联系人</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and notify group members" xml:space="preserve">
        <source>Save and notify group members</source>
@@ -5960,7 +5888,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save preferences?" xml:space="preserve">
        <source>Save preferences?</source>
        <target>保存偏好设置？</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
@@ -6570,10 +6498,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX 地址</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
-        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
        <source>SimpleX Chat security was audited by Trail of Bits.</source>
        <target>SimpleX Chat 的安全性 由 Trail of Bits 审核。</target>
@@ -6632,8 +6556,8 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX 链接</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
-        <source>SimpleX links are prohibited.</source>
+      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
+        <source>SimpleX links are prohibited in this group.</source>
        <target>此群禁止 SimpleX 链接。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7051,14 +6975,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>该资料仅与您的联系人共享。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The second preset operator in the app!" xml:space="preserve">
        <source>The second preset operator in the app!</source>
        <note>No comment provided by engineer.</note>
@@ -7709,8 +7625,8 @@ To connect, please ask your contact to create another connection link and check
        <target>语音信息在此聊天中被禁止。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve">
+        <source>Voice messages are prohibited in this group.</source>
        <target>语音信息在该群组中被禁用。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -7903,10 +7819,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 connected with %@." xml:space="preserve">
-        <source>You are already connected with %@.</source>
-        <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>您已连接到 %@。</target>
@@ -8178,10 +8090,6 @@ Repeat connection request?</source>
        <target>当静音配置文件处于活动状态时，您仍会收到来自静音配置文件的电话和通知。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
-        <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
        <source>You will stop receiving messages from this group. Chat history will be preserved.</source>
        <target>您将停止接收来自该群组的消息。聊天记录将被保留。</target>
@@ -8362,10 +8270,6 @@ Repeat connection request?</source>
        <target>已接受通话</target>
        <note>call status</note>
      </trans-unit>
-      <trans-unit id="accepted invitation" xml:space="preserve">
-        <source>accepted invitation</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="admin" xml:space="preserve">
        <source>admin</source>
        <target>管理员</target>
@@ -8554,7 +8458,7 @@ Repeat connection request?</source>
      <trans-unit id="connecting…" xml:space="preserve">
        <source>connecting…</source>
        <target>连接中……</target>
-        <note>No comment provided by engineer.</note>
+        <note>chat list item title</note>
      </trans-unit>
      <trans-unit id="connection established" xml:space="preserve">
        <source>connection established</source>
@@ -9047,10 +8951,6 @@ Repeat connection request?</source>
        <target>已将您移除</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="requested to connect" xml:space="preserve">
-        <source>requested to connect</source>
-        <note>chat list item title</note>
-      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
        <target>已保存</target>
@@ -1173,8 +1173,8 @@
        <target state="translated">私訊</target>
        <note>chat feature</note>
      </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve" approved="no">
-        <source>Direct messages between members are prohibited.</source>
+      <trans-unit id="Direct messages between members are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Direct messages between members are prohibited in this group.</source>
        <target state="translated">私訊群組內的成員於這個群組內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1193,8 +1193,8 @@
        <target state="translated">自動銷毀訊息已被禁止於此聊天室。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve" approved="no">
-        <source>Disappearing messages are prohibited.</source>
+      <trans-unit id="Disappearing messages are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Disappearing messages are prohibited in this group.</source>
        <target state="translated">自動銷毀訊息於這個群組內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1618,18 +1618,18 @@
        <target state="translated">群組內的成員可以不可逆地刪除訊息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send direct messages." xml:space="preserve" approved="no">
-        <source>Members can send direct messages.</source>
+      <trans-unit id="Group members can send direct messages." xml:space="preserve" approved="no">
+        <source>Group members can send direct messages.</source>
        <target state="translated">群組內的成員可以私訊群組內的成員。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send disappearing messages." xml:space="preserve" approved="no">
-        <source>Members can send disappearing messages.</source>
+      <trans-unit id="Group members can send disappearing messages." xml:space="preserve" approved="no">
+        <source>Group members can send disappearing messages.</source>
        <target state="translated">群組內的成員可以傳送自動銷毀的訊息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Members can send voice messages." xml:space="preserve" approved="no">
-        <source>Members can send voice messages.</source>
+      <trans-unit id="Group members can send voice messages." xml:space="preserve" approved="no">
+        <source>Group members can send voice messages.</source>
        <target state="translated">群組內的成員可以傳送語音訊息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1864,8 +1864,8 @@
        <target state="translated">不可逆地刪除訊息於這個聊天室內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve" approved="no">
-        <source>Irreversible message deletion is prohibited.</source>
+      <trans-unit id="Irreversible message deletion is prohibited in this group." xml:space="preserve" approved="no">
+        <source>Irreversible message deletion is prohibited in this group.</source>
        <target state="translated">不可逆地刪除訊息於這個群組內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3316,8 +3316,8 @@ To connect, please ask your contact to create another connection link and check
        <target state="translated">語音訊息於這個聊天窒是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages are prohibited." xml:space="preserve" approved="no">
-        <source>Voice messages are prohibited.</source>
+      <trans-unit id="Voice messages are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Voice messages are prohibited in this group.</source>
        <target state="translated">語音訊息於這個群組內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5513,8 +5513,8 @@ It can happen because of some bug or when the connection is compromised.</source
        <target state="translated">啟用自毀密碼</target>
        <note>set passcode view</note>
      </trans-unit>
-      <trans-unit id="Members can add message reactions." xml:space="preserve" approved="no">
-        <source>Members can add message reactions.</source>
+      <trans-unit id="Group members can add message reactions." xml:space="preserve" approved="no">
+        <source>Group members can add message reactions.</source>
        <target state="translated">群組內的成員可以新增訊息互動。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5689,8 +5689,8 @@ It can happen because of some bug or when the connection is compromised.</source
        <target state="translated">已移除在</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message reactions are prohibited." xml:space="preserve" approved="no">
-        <source>Message reactions are prohibited.</source>
+      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve" approved="no">
+        <source>Message reactions are prohibited in this group.</source>
        <target state="translated">訊息互動於這個群組內是禁用的。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d neue Ereignisse";
-
-/* notification body */
-"From: %@" = "Von: %@";
-
-/* notification */
-"New events" = "Neue Ereignisse";
-
-/* notification */
-"New messages" = "Neue Nachrichten";
-
-/* notification body */
-"New messages in %d chats" = "Neue Nachrichten in %d Chats";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d evento(s) nuevo(s)";
-
-/* notification body */
-"From: %@" = "De: %@";
-
-/* notification */
-"New events" = "Eventos nuevos";
-
-/* notification */
-"New messages" = "Mensajes nuevos";
-
-/* notification body */
-"New messages in %d chats" = "Mensajes nuevos en %d chat(s)";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d új esemény";
-
-/* notification body */
-"From: %@" = "Tőle: %@";
-
-/* notification */
-"New events" = "Új események";
-
-/* notification */
-"New messages" = "Új üzenetek";
-
-/* notification body */
-"New messages in %d chats" = "Új üzenetek %d csevegésben";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d nuovi eventi";
-
-/* notification body */
-"From: %@" = "Da: %@";
-
-/* notification */
-"New events" = "Nuovi eventi";
-
-/* notification */
-"New messages" = "Nuovi messaggi";
-
-/* notification body */
-"New messages in %d chats" = "Nuovi messaggi in %d chat";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "‐%d nieuwe gebeurtenissen";
-
-/* notification body */
-"From: %@" = "Van: %@";
-
-/* notification */
-"New events" = "Nieuwe gebeurtenissen";
-
-/* notification */
-"New messages" = "Nieuwe berichten";
-
-/* notification body */
-"New messages in %d chats" = "Nieuwe berichten in %d chats";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d новых сообщений";
-
-/* notification body */
-"From: %@" = "От: %@";
-
-/* notification */
-"New events" = "Новые события";
-
-/* notification */
-"New messages" = "Новые сообщения";
-
-/* notification body */
-"New messages in %d chats" = "Новые сообщения в %d разговоре(ах)";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -1,15 +1,7 @@
-/* notification body */
-"%d new events" = "%d нових подій";
-
-/* notification body */
-"From: %@" = "Від: %@";
-
-/* notification */
-"New events" = "Нові події";
-
-/* notification */
-"New messages" = "Нові повідомлення";
-
-/* notification body */
-"New messages in %d chats" = "Нові повідомлення в чатах %d";
+/* 
+  Localizable.strings
+  SimpleX

+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/
@@ -148,6 +148,11 @@
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
 		642BA82D2CE50495005E9412 /* NewServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 642BA82C2CE50495005E9412 /* NewServerView.swift */; };
+		642BA8332CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642BA82E2CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a */; };
+		642BA8342CEB3D4B005E9412 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642BA82F2CEB3D4B005E9412 /* libffi.a */; };
+		642BA8352CEB3D4B005E9412 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642BA8302CEB3D4B005E9412 /* libgmp.a */; };
+		642BA8362CEB3D4B005E9412 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642BA8312CEB3D4B005E9412 /* libgmpxx.a */; };
+		642BA8372CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642BA8322CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a */; };
 		6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */; };
 		643B3B4E2CCFD6400083A2CF /* OperatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643B3B4D2CCFD6400083A2CF /* OperatorView.swift */; };
 		6440CA00288857A10062C672 /* CIEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440C9FF288857A10062C672 /* CIEventView.swift */; };
@@ -166,11 +171,6 @@
 		647F090E288EA27B00644C40 /* GroupMemberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647F090D288EA27B00644C40 /* GroupMemberInfoView.swift */; };
 		648010AB281ADD15009009B9 /* CIFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648010AA281ADD15009009B9 /* CIFileView.swift */; };
 		648679AB2BC96A74006456E7 /* ChatItemForwardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */; };
-		649B28DD2CFE07CF00536B68 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28D82CFE07CF00536B68 /* libffi.a */; };
-		649B28DE2CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a */; };
-		649B28DF2CFE07CF00536B68 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DA2CFE07CF00536B68 /* libgmpxx.a */; };
-		649B28E02CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a */; };
-		649B28E12CFE07CF00536B68 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DC2CFE07CF00536B68 /* libgmp.a */; };
 		649BCDA0280460FD00C3A862 /* ComposeImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCD9F280460FD00C3A862 /* ComposeImageView.swift */; };
 		649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCDA12805D6EF00C3A862 /* CIImageView.swift */; };
 		64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
@@ -496,6 +496,11 @@
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
 		642BA82C2CE50495005E9412 /* NewServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewServerView.swift; sourceTree = "<group>"; };
+		642BA82E2CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a"; sourceTree = "<group>"; };
+		642BA82F2CEB3D4B005E9412 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		642BA8302CEB3D4B005E9412 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		642BA8312CEB3D4B005E9412 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		642BA8322CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a"; sourceTree = "<group>"; };
 		6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupPreferencesView.swift; sourceTree = "<group>"; };
 		643B3B4D2CCFD6400083A2CF /* OperatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperatorView.swift; sourceTree = "<group>"; };
 		6440C9FF288857A10062C672 /* CIEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIEventView.swift; sourceTree = "<group>"; };
@@ -515,11 +520,6 @@
 		648010AA281ADD15009009B9 /* CIFileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIFileView.swift; sourceTree = "<group>"; };
 		648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemForwardingView.swift; sourceTree = "<group>"; };
 		6493D667280ED77F007A76FB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		649B28D82CFE07CF00536B68 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a"; sourceTree = "<group>"; };
-		649B28DA2CFE07CF00536B68 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a"; sourceTree = "<group>"; };
-		649B28DC2CFE07CF00536B68 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 		649BCD9F280460FD00C3A862 /* ComposeImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeImageView.swift; sourceTree = "<group>"; };
 		649BCDA12805D6EF00C3A862 /* CIImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIImageView.swift; sourceTree = "<group>"; };
 		64AA1C6827EE10C800AC7277 /* ContextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextItemView.swift; sourceTree = "<group>"; };
@@ -667,14 +667,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				649B28DF2CFE07CF00536B68 /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				649B28E12CFE07CF00536B68 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				649B28E02CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				649B28DE2CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a in Frameworks */,
-				649B28DD2CFE07CF00536B68 /* libffi.a in Frameworks */,
+				642BA8342CEB3D4B005E9412 /* libffi.a in Frameworks */,
+				642BA8352CEB3D4B005E9412 /* libgmp.a in Frameworks */,
+				642BA8372CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a in Frameworks */,
+				642BA8332CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a in Frameworks */,
+				642BA8362CEB3D4B005E9412 /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -751,11 +751,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				649B28D82CFE07CF00536B68 /* libffi.a */,
-				649B28DC2CFE07CF00536B68 /* libgmp.a */,
-				649B28DA2CFE07CF00536B68 /* libgmpxx.a */,
-				649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E-ghc9.6.3.a */,
-				649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.2.0.7-3p784Fmu4gOAiEiFcsHj1E.a */,
+				642BA82F2CEB3D4B005E9412 /* libffi.a */,
+				642BA8302CEB3D4B005E9412 /* libgmp.a */,
+				642BA8312CEB3D4B005E9412 /* libgmpxx.a */,
+				642BA8322CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14-ghc9.6.3.a */,
+				642BA82E2CEB3D4B005E9412 /* libHSsimplex-chat-6.2.0.1-3FFlorLJSLlCbWWiG2Vp14.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1931,7 +1931,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1980,7 +1980,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -2021,7 +2021,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2041,7 +2041,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2066,7 +2066,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2103,7 +2103,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2140,7 +2140,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2191,7 +2191,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2242,7 +2242,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2276,7 +2276,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 247;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -598,6 +598,7 @@ public enum ChatResponse: Decodable, Error {
    case sentInvitation(user: UserRef, connection: PendingContactConnection)
    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)
@@ -639,7 +640,6 @@ public enum ChatResponse: Decodable, Error {
    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 businessLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, fromContact: Contact)
    case userDeletedMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
    case leftMemberUser(user: UserRef, groupInfo: GroupInfo)
    case groupMembers(user: UserRef, group: Group)
@@ -775,6 +775,7 @@ public enum ChatResponse: Decodable, Error {
            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"
@@ -815,7 +816,6 @@ public enum ChatResponse: Decodable, Error {
            case .sentGroupInvitation: return "sentGroupInvitation"
            case .userAcceptedGroupSent: return "userAcceptedGroupSent"
            case .groupLinkConnecting: return "groupLinkConnecting"
-            case .businessLinkConnecting: return "businessLinkConnecting"
            case .userDeletedMember: return "userDeletedMember"
            case .leftMemberUser: return "leftMemberUser"
            case .groupMembers: return "groupMembers"
@@ -950,6 +950,7 @@ public enum ChatResponse: Decodable, Error {
            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
            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))
@@ -997,7 +998,6 @@ public enum ChatResponse: Decodable, Error {
            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 .businessLinkConnecting(u, groupInfo, hostMember, fromContact): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))\nfromContact: \(String(describing: fromContact))")
            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))
@@ -1212,12 +1212,13 @@ public enum ServerProtocol: String, Decodable {
 public enum OperatorTag: String, Codable {
    case simplex = "simplex"
    case flux = "flux"
+    case xyz = "xyz"
+    case demo = "demo"
 }

-public struct ServerOperatorInfo {
+public struct ServerOperatorInfo: Decodable {
    public var description: [String]
-    public var website: URL
-    public var selfhost: (text: String, link: URL)? = nil
+    public var website: String
    public var logo: String
    public var largeLogo: String
    public var logoDarkMode: String
@@ -1227,10 +1228,10 @@ public struct ServerOperatorInfo {
 public let operatorsInfo: Dictionary<OperatorTag, ServerOperatorInfo> = [
    .simplex: ServerOperatorInfo(
        description: [
-            "SimpleX Chat is the first communication network that has no user profile IDs of any kind, not even random numbers or identity keys.",
+            "SimpleX Chat is the first communication network that has no user profile IDs of any kind, not even random numbers or keys that identify the users.",
            "SimpleX Chat Ltd develops the communication software for SimpleX network."
        ],
-        website: URL(string: "https://simplex.chat")!,
+        website: "https://simplex.chat",
        logo: "decentralized",
        largeLogo: "logo",
        logoDarkMode: "decentralized-light",
@@ -1238,17 +1239,31 @@ public let operatorsInfo: Dictionary<OperatorTag, ServerOperatorInfo> = [
    ),
    .flux: ServerOperatorInfo(
        description: [
-            "Flux is the largest decentralized cloud, based on a global network of user-operated nodes.",
-            "Flux offers a powerful, scalable, and affordable cutting edge technology platform for all.",
-            "Flux operates servers in SimpleX network to improve its privacy and decentralization."
+            "Flux is the largest decentralized cloud infrastructure, leveraging a global network of user-operated computational nodes.",
+            "Flux offers a powerful, scalable, and affordable platform designed to support individuals, businesses, and cutting-edge technologies like AI. With high uptime and worldwide distribution, Flux ensures reliable, accessible cloud computing for all."
        ],
-        website: URL(string: "https://runonflux.com")!,
-        selfhost: (text: "Self-host SimpleX servers on Flux", link: URL(string: "https://home.runonflux.io/apps/marketplace?q=simplex")!),
+        website: "https://runonflux.com",
        logo: "flux_logo_symbol",
        largeLogo: "flux_logo",
        logoDarkMode: "flux_logo_symbol",
        largeLogoDarkMode: "flux_logo-light"
    ),
+    .xyz: ServerOperatorInfo(
+        description: ["XYZ servers"],
+        website: "XYZ website",
+        logo: "shield",
+        largeLogo: "logo",
+        logoDarkMode: "shield",
+        largeLogoDarkMode: "logo-light"
+    ),
+    .demo: ServerOperatorInfo(
+        description: ["Demo operator"],
+        website: "Demo website",
+        logo: "decentralized",
+        largeLogo: "logo",
+        logoDarkMode: "decentralized-light",
+        largeLogoDarkMode: "logo-light"
+    )
 ]

 public struct UsageConditions: Decodable {
@@ -1343,7 +1358,7 @@ public struct ServerOperator: Identifiable, Equatable, Codable {

    public static let dummyOperatorInfo = ServerOperatorInfo(
        description: ["Default"],
-        website: URL(string: "https://simplex.chat")!,
+        website: "Default",
        logo: "decentralized",
        largeLogo: "logo",
        logoDarkMode: "decentralized-light",
@@ -1369,6 +1384,30 @@ public struct ServerOperator: Identifiable, Equatable, Codable {
        smpRoles: ServerRoles(storage: true, proxy: true),
        xftpRoles: ServerRoles(storage: true, proxy: true)
    )
+
+    public static var sampleData2 = ServerOperator(
+        operatorId: 2,
+        operatorTag: .xyz,
+        tradeName: "XYZ",
+        legalName: nil,
+        serverDomains: ["xyz.com"],
+        conditionsAcceptance: .required(deadline: nil),
+        enabled: false,
+        smpRoles: ServerRoles(storage: false, proxy: true),
+        xftpRoles: ServerRoles(storage: false, proxy: true)
+    )
+
+    public static var sampleData3 = ServerOperator(
+        operatorId: 3,
+        operatorTag: .demo,
+        tradeName: "Demo",
+        legalName: nil,
+        serverDomains: ["demo.com"],
+        conditionsAcceptance: .required(deadline: nil),
+        enabled: false,
+        smpRoles: ServerRoles(storage: true, proxy: false),
+        xftpRoles: ServerRoles(storage: true, proxy: false)
+    )
 }

 public struct ServerRoles: Equatable, Codable {
@@ -2064,24 +2103,17 @@ public struct UserContactLink: Decodable, Hashable {
 }

 public struct AutoAccept: Codable, Hashable {
-    public var businessAddress: Bool
    public var acceptIncognito: Bool
    public var autoReply: MsgContent?

-    public init(businessAddress: Bool, acceptIncognito: Bool, autoReply: MsgContent? = nil) {
-        self.businessAddress = businessAddress
+    public init(acceptIncognito: Bool, autoReply: MsgContent? = nil) {
        self.acceptIncognito = acceptIncognito
        self.autoReply = autoReply
    }

    static func cmdString(_ autoAccept: AutoAccept?) -> String {
        guard let autoAccept = autoAccept else { return "off" }
-        var s = "on"
-        if autoAccept.acceptIncognito {
-            s += " incognito=on"
-        } else if autoAccept.businessAddress {
-            s += " business"
-        }
+        let s = "on" + (autoAccept.acceptIncognito ? " incognito=on" : "")
        guard let msg = autoAccept.autoReply else { return s }
        return s + " " + msg.cmdString
    }
@@ -2616,7 +2648,6 @@ public struct AppSettings: Codable, Equatable {
    public var uiCurrentThemeIds: [String: String]? = nil
    public var uiThemes: [ThemeOverrides]? = nil
    public var oneHandUI: Bool? = nil
-    public var chatBottomBar: Bool? = nil
    
    public func prepareForExport() -> AppSettings {
        var empty = AppSettings()
@@ -2651,7 +2682,6 @@ public struct AppSettings: Codable, Equatable {
        if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
        if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
        if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
-        if chatBottomBar != def.chatBottomBar { empty.chatBottomBar = chatBottomBar }
        return empty
    }

@@ -2686,8 +2716,7 @@ public struct AppSettings: Codable, Equatable {
            uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
            uiCurrentThemeIds: nil as [String: String]?,
            uiThemes: nil as [ThemeOverrides]?,
-            oneHandUI: true,
-            chatBottomBar: true
+            oneHandUI: false
        )
    }
 }
@@ -57,7 +57,6 @@ public let GROUP_DEFAULT_CONFIRM_DB_UPGRADES = "confirmDBUpgrades"
 public let GROUP_DEFAULT_CALL_KIT_ENABLED = "callKitEnabled"
 public let GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED = "pqExperimentalEnabled" // no longer used
 public let GROUP_DEFAULT_ONE_HAND_UI = "oneHandUI"
-public let GROUP_DEFAULT_CHAT_BOTTOM_BAR = "chatBottomBar"

 public let APP_GROUP_NAME = "group.chat.simplex.app"

@@ -95,8 +94,7 @@ public func registerGroupDefaults() {
        GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
        GROUP_DEFAULT_CALL_KIT_ENABLED: true,
        GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED: false,
-        GROUP_DEFAULT_ONE_HAND_UI: true,
-        GROUP_DEFAULT_CHAT_BOTTOM_BAR: true
+        GROUP_DEFAULT_ONE_HAND_UI: true
    ])
 }

@@ -821,38 +821,38 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
            switch self {
            case .timedMessages:
                switch enabled {
-                case .on: return "Members can send disappearing messages."
-                case .off: return "Disappearing messages are prohibited."
+                case .on: return "Group members can send disappearing messages."
+                case .off: return "Disappearing messages are prohibited in this group."
                }
            case .directMessages:
                switch enabled {
-                case .on: return "Members can send direct messages."
-                case .off: return "Direct messages between members are prohibited."
+                case .on: return "Group members can send direct messages."
+                case .off: return "Direct messages between members are prohibited in this group."
                }
            case .fullDelete:
                switch enabled {
-                case .on: return "Members can irreversibly delete sent messages. (24 hours)"
-                case .off: return "Irreversible message deletion is prohibited."
+                case .on: return "Group members can irreversibly delete sent messages. (24 hours)"
+                case .off: return "Irreversible message deletion is prohibited in this group."
                }
            case .reactions:
                switch enabled {
-                case .on: return "Members can add message reactions."
-                case .off: return "Message reactions are prohibited."
+                case .on: return "Group members can add message reactions."
+                case .off: return "Message reactions are prohibited in this group."
                }
            case .voice:
                switch enabled {
-                case .on: return "Members can send voice messages."
-                case .off: return "Voice messages are prohibited."
+                case .on: return "Group members can send voice messages."
+                case .off: return "Voice messages are prohibited in this group."
                }
            case .files:
                switch enabled {
-                case .on: return "Members can send files and media."
-                case .off: return "Files and media are prohibited."
+                case .on: return "Group members can send files and media."
+                case .off: return "Files and media are prohibited in this group."
                }
            case .simplexLinks:
                switch enabled {
-                case .on: return "Members can send SimpleX links."
-                case .off: return "SimpleX links are prohibited."
+                case .on: return "Group members can send SimpleX links."
+                case .off: return "SimpleX links are prohibited in this group."
                }
            case .history:
                switch enabled {
@@ -1782,11 +1782,9 @@ public struct PendingContactConnection: Decodable, NamedChat, Hashable {
    public var displayName: String {
        get {
            if let initiated = pccConnStatus.initiated {
-                return viaContactUri
-                ? NSLocalizedString("requested to connect", comment: "chat list item title")
-                : initiated
+                return initiated && !viaContactUri
                ? NSLocalizedString("invited to connect", comment: "chat list item title")
-                : NSLocalizedString("accepted invitation", comment: "chat list item title")
+                : NSLocalizedString("connecting…", comment: "chat list item title")
            } else {
                // this should not be in the list
                return NSLocalizedString("connection established", comment: "chat list item title (it should not be shown")
@@ -1892,7 +1890,6 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
    public var groupId: Int64
    var localDisplayName: GroupName
    public var groupProfile: GroupProfile
-    public var businessChat: BusinessChatInfo?
    public var fullGroupPreferences: FullGroupPreferences
    public var membership: GroupMember
    public var hostConnCustomUserProfileId: Int64?
@@ -1911,7 +1908,7 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
    public var image: String? { get { groupProfile.image } }
    public var localAlias: String { "" }

-    public var isOwner: Bool {
+    public var canEdit: Bool {
        return membership.memberRole == .owner && membership.memberCurrent
    }

@@ -1963,17 +1960,6 @@ public struct GroupProfile: Codable, NamedChat, Hashable {
    )
 }

-public struct BusinessChatInfo: Decodable, Hashable {
-    public var chatType: BusinessChatType
-    public var businessId: String
-    public var customerId: String
-}
-
-public enum BusinessChatType: String, Codable, Hashable {
-    case business
-    case customer
-}
-
 public struct GroupMember: Identifiable, Decodable, Hashable {
    public var groupMemberId: Int64
    public var groupId: Int64
@@ -93,12 +93,7 @@ private func canForwardToChat(_ cInfo: ChatInfo) -> Bool {
 public func chatIconName(_ cInfo: ChatInfo) -> String {
    switch cInfo {
    case .direct: "person.crop.circle.fill"
-    case let .group(groupInfo):
-        switch groupInfo.businessChat?.chatType {
-        case .none: "person.2.circle.fill"
-        case .business: "briefcase.circle.fill"
-        case .customer: "person.crop.circle.fill"
-        }
+    case .group: "person.2.circle.fill"
    case .local: "folder.circle.fill"
    case .contactRequest: "person.crop.circle.fill"
    default:  "circle.fill"
@@ -918,7 +918,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Свързване с настолно устройство";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "свързване…";

 /* No comment provided by engineer. */
@@ -1299,7 +1299,7 @@
 "Direct messages" = "Лични съобщения";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Личните съобщения между членовете са забранени в тази група.";
+"Direct messages between members are prohibited in this group." = "Личните съобщения между членовете са забранени в тази група.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Деактивиране (запазване на промените)";
@@ -1323,7 +1323,7 @@
 "Disappearing messages are prohibited in this chat." = "Изчезващите съобщения са забранени в този чат.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Изчезващите съобщения са забранени в тази група.";
+"Disappearing messages are prohibited in this group." = "Изчезващите съобщения са забранени в тази група.";

 /* No comment provided by engineer. */
 "Disappears at" = "Изчезва в";
@@ -1786,7 +1786,7 @@
 "Files and media" = "Файлове и медия";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Файловете и медията са забранени в тази група.";
+"Files and media are prohibited in this group." = "Файловете и медията са забранени в тази група.";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "Файлове и медия не са разрешени";
@@ -1905,6 +1905,27 @@
 /* No comment provided by engineer. */
 "Group links" = "Групови линкове";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Членовете на групата могат да добавят реакции към съобщенията.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Членовете на групата могат да изпращат лични съобщения.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Членовете на групата могат да изпращат изчезващи съобщения.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Членовете на групата могат да изпращат файлове и медия.";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Членовете на групата могат да изпращат SimpleX линкове.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Членовете на групата могат да изпращат гласови съобщения.";
+
 /* notification */
 "Group message:" = "Групово съобщение:";

@@ -2182,7 +2203,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Необратимото изтриване на съобщения е забранено в този чат.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Необратимото изтриване на съобщения е забранено в тази група.";
+"Irreversible message deletion is prohibited in this group." = "Необратимото изтриване на съобщения е забранено в тази група.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Позволява да имате много анонимни връзки без споделени данни между тях в един чат профил .";
@@ -2355,27 +2376,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Членът ще бъде премахнат от групата - това не може да бъде отменено!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Членовете на групата могат да добавят реакции към съобщенията.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Членовете на групата могат да изпращат лични съобщения.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Членовете на групата могат да изпращат изчезващи съобщения.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Членовете на групата могат да изпращат файлове и медия.";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "Членовете на групата могат да изпращат SimpleX линкове.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Членовете на групата могат да изпращат гласови съобщения.";
-
 /* item status text */
 "Message delivery error" = "Грешка при доставката на съобщението";

@@ -2392,7 +2392,7 @@
 "Message reactions are prohibited in this chat." = "Реакциите на съобщения са забранени в този чат.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Реакциите на съобщения са забранени в тази група.";
+"Message reactions are prohibited in this group." = "Реакциите на съобщения са забранени в тази група.";

 /* notification */
 "message received" = "получено съобщение";
@@ -3139,7 +3139,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Запази (и уведоми контактите)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Запази и уведоми контакта";

 /* No comment provided by engineer. */
@@ -3157,7 +3157,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Запази паролата в Keychain";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Запази настройките?";

 /* No comment provided by engineer. */
@@ -3450,7 +3450,7 @@
 "SimpleX links" = "SimpleX линкове";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "SimpleX линкове са забранени в тази група.";
+"SimpleX links are prohibited in this group." = "SimpleX линкове са забранени в тази група.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "SimpleX линковете не са разрешени";
@@ -3987,7 +3987,7 @@
 "Voice messages are prohibited in this chat." = "Гласовите съобщения са забранени в този чат.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Гласовите съобщения са забранени в тази група.";
+"Voice messages are prohibited in this group." = "Гласовите съобщения са забранени в тази група.";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "Гласовите съобщения не са разрешени";
@@ -729,7 +729,7 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Připojování k serveru... (chyba: %@)";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "připojení…";

 /* No comment provided by engineer. */
@@ -1059,7 +1059,7 @@
 "Direct messages" = "Přímé zprávy";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Přímé zprávy mezi členy jsou v této skupině zakázány.";
+"Direct messages between members are prohibited in this group." = "Přímé zprávy mezi členy jsou v této skupině zakázány.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Vypnout (zachovat přepsání)";
@@ -1083,7 +1083,7 @@
 "Disappearing messages are prohibited in this chat." = "Mizící zprávy jsou v tomto chatu zakázány.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Mizící zprávy jsou v této skupině zakázány.";
+"Disappearing messages are prohibited in this group." = "Mizící zprávy jsou v této skupině zakázány.";

 /* No comment provided by engineer. */
 "Disappears at" = "Zmizí v";
@@ -1461,7 +1461,7 @@
 "Files and media" = "Soubory a média";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Soubory a média jsou zakázány v této skupině.";
+"Files and media are prohibited in this group." = "Soubory a média jsou zakázány v této skupině.";

 /* No comment provided by engineer. */
 "Files and media prohibited!" = "Soubory a média jsou zakázány!";
@@ -1544,6 +1544,24 @@
 /* No comment provided by engineer. */
 "Group links" = "Odkazy na skupiny";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Členové skupin mohou přidávat reakce na zprávy.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Členové skupiny mohou posílat přímé zprávy.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Členové skupiny mohou posílat mizící zprávy.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Členové skupiny mohou posílat soubory a média.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Členové skupiny mohou posílat hlasové zprávy.";
+
 /* notification */
 "Group message:" = "Skupinová zpráva:";

@@ -1776,7 +1794,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Nevratné mazání zpráv je v tomto chatu zakázáno.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Nevratné mazání zpráv je v této skupině zakázáno.";
+"Irreversible message deletion is prohibited in this group." = "Nevratné mazání zpráv je v této skupině zakázáno.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Umožňuje mít v jednom profilu chatu mnoho anonymních spojení bez jakýchkoli sdílených údajů mezi nimi.";
@@ -1916,24 +1934,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Člen bude odstraněn ze skupiny - toto nelze vzít zpět!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Členové skupin mohou přidávat reakce na zprávy.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Členové skupiny mohou posílat přímé zprávy.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Členové skupiny mohou posílat mizící zprávy.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Členové skupiny mohou posílat soubory a média.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Členové skupiny mohou posílat hlasové zprávy.";
-
 /* item status text */
 "Message delivery error" = "Chyba doručení zprávy";

@@ -1950,7 +1950,7 @@
 "Message reactions are prohibited in this chat." = "Reakce na zprávy jsou v tomto chatu zakázány.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Reakce na zprávy jsou v této skupině zakázány.";
+"Message reactions are prohibited in this group." = "Reakce na zprávy jsou v této skupině zakázány.";

 /* notification */
 "message received" = "zpráva přijata";
@@ -2538,7 +2538,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Uložit (a informovat kontakty)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Uložit a upozornit kontakt";

 /* No comment provided by engineer. */
@@ -2556,7 +2556,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Uložit přístupovou frázi do Klíčenky";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Uložit předvolby?";

 /* No comment provided by engineer. */
@@ -3206,7 +3206,7 @@
 "Voice messages are prohibited in this chat." = "Hlasové zprávy jsou v tomto chatu zakázány.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Hlasové zprávy jsou v této skupině zakázány.";
+"Voice messages are prohibited in this group." = "Hlasové zprávy jsou v této skupině zakázány.";

 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "Hlasové zprávy jsou zakázány!";
@@ -711,7 +711,7 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Yhteyden muodostaminen palvelimeen... (virhe: %@)";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "yhdistää…";

 /* No comment provided by engineer. */
@@ -1041,7 +1041,7 @@
 "Direct messages" = "Yksityisviestit";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Yksityisviestit jäsenten välillä ovat kiellettyjä tässä ryhmässä.";
+"Direct messages between members are prohibited in this group." = "Yksityisviestit jäsenten välillä ovat kiellettyjä tässä ryhmässä.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Poista käytöstä (pidä ohitukset)";
@@ -1065,7 +1065,7 @@
 "Disappearing messages are prohibited in this chat." = "Katoavat viestit ovat kiellettyjä tässä keskustelussa.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Katoavat viestit ovat kiellettyjä tässä ryhmässä.";
+"Disappearing messages are prohibited in this group." = "Katoavat viestit ovat kiellettyjä tässä ryhmässä.";

 /* No comment provided by engineer. */
 "Disappears at" = "Katoaa klo";
@@ -1437,7 +1437,7 @@
 "Files and media" = "Tiedostot ja media";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Tiedostot ja media ovat tässä ryhmässä kiellettyjä.";
+"Files and media are prohibited in this group." = "Tiedostot ja media ovat tässä ryhmässä kiellettyjä.";

 /* No comment provided by engineer. */
 "Files and media prohibited!" = "Tiedostot ja media kielletty!";
@@ -1520,6 +1520,24 @@
 /* No comment provided by engineer. */
 "Group links" = "Ryhmälinkit";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Ryhmän jäsenet voivat lisätä viestireaktioita.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Ryhmän jäsenet voivat lähettää suoraviestejä.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Ryhmän jäsenet voivat lähettää katoavia viestejä.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Ryhmän jäsenet voivat lähettää tiedostoja ja mediaa.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Ryhmän jäsenet voivat lähettää ääniviestejä.";
+
 /* notification */
 "Group message:" = "Ryhmäviesti:";

@@ -1752,7 +1770,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Viestien peruuttamaton poisto on kielletty tässä keskustelussa.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Viestien peruuttamaton poisto on kielletty tässä ryhmässä.";
+"Irreversible message deletion is prohibited in this group." = "Viestien peruuttamaton poisto on kielletty tässä ryhmässä.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Se mahdollistaa useiden nimettömien yhteyksien muodostamisen yhdessä keskusteluprofiilissa ilman, että niiden välillä on jaettuja tietoja.";
@@ -1892,24 +1910,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Jäsen poistetaan ryhmästä - tätä ei voi perua!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Ryhmän jäsenet voivat lisätä viestireaktioita.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Ryhmän jäsenet voivat lähettää suoraviestejä.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Ryhmän jäsenet voivat lähettää katoavia viestejä.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Ryhmän jäsenet voivat lähettää tiedostoja ja mediaa.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Ryhmän jäsenet voivat lähettää ääniviestejä.";
-
 /* item status text */
 "Message delivery error" = "Viestin toimitusvirhe";

@@ -1926,7 +1926,7 @@
 "Message reactions are prohibited in this chat." = "Viestireaktiot ovat kiellettyjä tässä keskustelussa.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Viestireaktiot ovat kiellettyjä tässä ryhmässä.";
+"Message reactions are prohibited in this group." = "Viestireaktiot ovat kiellettyjä tässä ryhmässä.";

 /* notification */
 "message received" = "viesti vastaanotettu";
@@ -2508,7 +2508,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Tallenna (ja ilmoita kontakteille)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Tallenna ja ilmoita kontaktille";

 /* No comment provided by engineer. */
@@ -2526,7 +2526,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Tallenna tunnuslause Avainnippuun";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Tallenna asetukset?";

 /* No comment provided by engineer. */
@@ -3164,7 +3164,7 @@
 "Voice messages are prohibited in this chat." = "Ääniviestit ovat kiellettyjä tässä keskustelussa.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Ääniviestit ovat kiellettyjä tässä ryhmässä.";
+"Voice messages are prohibited in this group." = "Ääniviestit ovat kiellettyjä tässä ryhmässä.";

 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "Ääniviestit kielletty!";
@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Toutes les données sont effacées lorsqu'il est saisi.";

 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Toutes les données restent confinées dans votre appareil.";
+"All data is private to your device." = "Toutes les données restent confinées dans votre appareil.";

 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tous les membres du groupe resteront connectés.";
@@ -1101,7 +1101,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Connexion au bureau";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "connexion…";

 /* No comment provided by engineer. */
@@ -1572,7 +1572,7 @@
 "Direct messages" = "Messages directs";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Les messages directs entre membres sont interdits dans ce groupe.";
+"Direct messages between members are prohibited in this group." = "Les messages directs entre membres sont interdits dans ce groupe.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Désactiver (conserver les remplacements)";
@@ -1599,7 +1599,7 @@
 "Disappearing messages are prohibited in this chat." = "Les messages éphémères sont interdits dans cette discussion.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Les messages éphémères sont interdits dans ce groupe.";
+"Disappearing messages are prohibited in this group." = "Les messages éphémères sont interdits dans ce groupe.";

 /* No comment provided by engineer. */
 "Disappears at" = "Disparaîtra le";
@@ -2146,7 +2146,7 @@
 "Files and media" = "Fichiers et médias";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Les fichiers et les médias sont interdits dans ce groupe.";
+"Files and media are prohibited in this group." = "Les fichiers et les médias sont interdits dans ce groupe.";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "Fichiers et médias non autorisés";
@@ -2301,6 +2301,27 @@
 /* No comment provided by engineer. */
 "Group links" = "Liens de groupe";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Les membres du groupe peuvent ajouter des réactions aux messages.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Les membres du groupe peuvent envoyer des messages directs.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Les membres du groupes peuvent envoyer des messages éphémères.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Les membres du groupe peuvent envoyer des fichiers et des médias.";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Les membres du groupe peuvent envoyer des liens SimpleX.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Les membres du groupe peuvent envoyer des messages vocaux.";
+
 /* notification */
 "Group message:" = "Message du groupe :";

@@ -2596,7 +2617,7 @@
 "Irreversible message deletion is prohibited in this chat." = "La suppression irréversible de message est interdite dans ce chat.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "La suppression irréversible de messages est interdite dans ce groupe.";
+"Irreversible message deletion is prohibited in this group." = "La suppression irréversible de messages est interdite dans ce groupe.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Cela permet d'avoir plusieurs connections anonymes sans aucune données partagées entre elles sur un même profil.";
@@ -2784,27 +2805,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Ce membre sera retiré du groupe - impossible de revenir en arrière !";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Les membres du groupe peuvent ajouter des réactions aux messages.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Les membres du groupe peuvent envoyer des messages directs.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Les membres du groupes peuvent envoyer des messages éphémères.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Les membres du groupe peuvent envoyer des fichiers et des médias.";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "Les membres du groupe peuvent envoyer des liens SimpleX.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Les membres du groupe peuvent envoyer des messages vocaux.";
-
 /* No comment provided by engineer. */
 "Menus" = "Menus";

@@ -2839,7 +2839,7 @@
 "Message reactions are prohibited in this chat." = "Les réactions aux messages sont interdites dans ce chat.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Les réactions aux messages sont interdites dans ce groupe.";
+"Message reactions are prohibited in this group." = "Les réactions aux messages sont interdites dans ce groupe.";

 /* notification */
 "message received" = "message reçu";
@@ -3763,7 +3763,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Enregistrer (et en informer les contacts)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Enregistrer et en informer le contact";

 /* No comment provided by engineer. */
@@ -3784,7 +3784,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Enregistrer la phrase secrète dans la Keychain";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Enregistrer les préférences ?";

 /* No comment provided by engineer. */
@@ -4191,7 +4191,7 @@
 "SimpleX links" = "Liens SimpleX";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "Les liens SimpleX sont interdits dans ce groupe.";
+"SimpleX links are prohibited in this group." = "Les liens SimpleX sont interdits dans ce groupe.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "Les liens SimpleX ne sont pas autorisés";
@@ -4872,7 +4872,7 @@
 "Voice messages are prohibited in this chat." = "Les messages vocaux sont interdits dans ce chat.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Les messages vocaux sont interdits dans ce groupe.";
+"Voice messages are prohibited in this group." = "Les messages vocaux sont interdits dans ce groupe.";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "Les messages vocaux ne sont pas autorisés";
@@ -684,9 +684,6 @@
 /* No comment provided by engineer. */
 "Chat profile" = "ユーザープロフィール";

-/* No comment provided by engineer. */
-"Chat theme" = "チャットテーマ";
-
 /* No comment provided by engineer. */
 "Chats" = "チャット";

@@ -702,12 +699,6 @@
 /* No comment provided by engineer. */
 "Choose from library" = "ライブラリから選択";

-/* No comment provided by engineer. */
-"Chunks deleted" = "チャンクが削除されました";
-
-/* No comment provided by engineer. */
-"Chunks downloaded" = "チャンクがダウンロードされました";
-
 /* swipe action */
 "Clear" = "消す";

@@ -717,15 +708,9 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "ダイアログのクリアしますか？";

-/* No comment provided by engineer. */
-"Clear private notes?" = "プライベートノートを消しますか？";
-
 /* No comment provided by engineer. */
 "Clear verification" = "検証を消す";

-/* No comment provided by engineer. */
-"Color mode" = "色設定";
-
 /* No comment provided by engineer. */
 "colored" = "色付き";

@@ -738,9 +723,6 @@
 /* No comment provided by engineer. */
 "complete" = "完了";

-/* No comment provided by engineer. */
-"Completed" = "完了";
-
 /* No comment provided by engineer. */
 "Configure ICE servers" = "ICEサーバを設定";

@@ -765,15 +747,9 @@
 /* No comment provided by engineer. */
 "Connect incognito" = "シークレットモードで接続";

-/* No comment provided by engineer. */
-"Connect to desktop" = "デスクトップに接続";
-
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "SimpleX Chat 開発者に接続します。";

-/* No comment provided by engineer. */
-"Connect to your friends faster." = "友達ともっと速くつながりましょう。";
-
 /* No comment provided by engineer. */
 "Connect via link" = "リンク経由で接続";

@@ -783,24 +759,9 @@
 /* No comment provided by engineer. */
 "connected" = "接続中";

-/* No comment provided by engineer. */
-"Connected" = "接続中";
-
-/* No comment provided by engineer. */
-"Connected desktop" = "デスクトップに接続済";
-
-/* No comment provided by engineer. */
-"Connected servers" = "接続中のサーバ";
-
-/* No comment provided by engineer. */
-"Connected to desktop" = "デスクトップに接続済";
-
 /* No comment provided by engineer. */
 "connecting" = "接続待ち";

-/* No comment provided by engineer. */
-"Connecting" = "接続待ち";
-
 /* No comment provided by engineer. */
 "connecting (accepted)" = "接続待ち (承諾済み)";

@@ -822,21 +783,12 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "サーバーに接続中… (エラー: %@)";

-/* No comment provided by engineer. */
-"Connecting to contact, please wait or check later!" = "連絡先に接続中です。しばらくお待ちいただくか、後で確認してください！";
-
-/* No comment provided by engineer. */
-"Connecting to desktop" = "デスクトップに接続中";
-
-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "接続待ち…";

 /* No comment provided by engineer. */
 "Connection" = "接続";

-/* No comment provided by engineer. */
-"Connection and servers status." = "接続とサーバーのステータス";
-
 /* No comment provided by engineer. */
 "Connection error" = "接続エラー";

@@ -849,9 +801,6 @@
 /* No comment provided by engineer. */
 "Connection request sent!" = "接続リクエストを送信しました！";

-/* No comment provided by engineer. */
-"Connection terminated" = "接続停止";
-
 /* No comment provided by engineer. */
 "Connection timeout" = "接続タイムアウト";

@@ -942,15 +891,9 @@
 /* No comment provided by engineer. */
 "Custom time" = "カスタム時間";

-/* No comment provided by engineer. */
-"Customize theme" = "カスタムテーマ";
-
 /* No comment provided by engineer. */
 "Dark" = "ダークモード";

-/* No comment provided by engineer. */
-"Dark mode colors" = "ダークモードカラー";
-
 /* No comment provided by engineer. */
 "Database downgrade" = "データーベースのダウングレード";

@@ -1011,9 +954,6 @@
 /* time unit */
 "days" = "日";

-/* No comment provided by engineer. */
-"Debug delivery" = "配信のデバッグ";
-
 /* No comment provided by engineer. */
 "Decentralized" = "分散型";

@@ -1145,15 +1085,9 @@
 /* No comment provided by engineer. */
 "Description" = "説明";

-/* No comment provided by engineer. */
-"Desktop devices" = "デスクトップ機器";
-
 /* No comment provided by engineer. */
 "Develop" = "開発";

-/* No comment provided by engineer. */
-"Developer options" = "開発者向けの設定";
-
 /* No comment provided by engineer. */
 "Developer tools" = "開発ツール";

@@ -1179,7 +1113,7 @@
 "Direct messages" = "ダイレクトメッセージ";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "このグループではメンバー間のダイレクトメッセージが使用禁止です。";
+"Direct messages between members are prohibited in this group." = "このグループではメンバー間のダイレクトメッセージが使用禁止です。";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "無効にする（設定の優先を維持）";
@@ -1203,7 +1137,7 @@
 "Disappearing messages are prohibited in this chat." = "このチャットでは消えるメッセージが使用禁止です。";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "このグループでは消えるメッセージが使用禁止です。";
+"Disappearing messages are prohibited in this group." = "このグループでは消えるメッセージが使用禁止です。";

 /* No comment provided by engineer. */
 "Disappears at" = "に消えます";
@@ -1578,7 +1512,7 @@
 "Files and media" = "ファイルとメディア";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "このグループでは、ファイルとメディアは禁止されています。";
+"Files and media are prohibited in this group." = "このグループでは、ファイルとメディアは禁止されています。";

 /* No comment provided by engineer. */
 "Files and media prohibited!" = "ファイルとメディアは禁止されています!";
@@ -1661,6 +1595,24 @@
 /* No comment provided by engineer. */
 "Group links" = "グループのリンク";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "グループメンバーはメッセージへのリアクションを追加できます。";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "グループのメンバーがメッセージを完全削除することができます。(24時間)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "グループのメンバーがダイレクトメッセージを送信できます。";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "グループのメンバーが消えるメッセージを送信できます。";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "グループメンバーはファイルやメディアを送信できます。";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "グループのメンバーが音声メッセージを送信できます。";
+
 /* notification */
 "Group message:" = "グループメッセージ:";

@@ -1893,7 +1845,7 @@
 "Irreversible message deletion is prohibited in this chat." = "このチャットではメッセージの完全削除が使用禁止です。";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "このグループではメッセージの完全削除が使用禁止です。";
+"Irreversible message deletion is prohibited in this group." = "このグループではメッセージの完全削除が使用禁止です。";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "これにより単一のチャット プロファイル内で、データを共有せずに多数の匿名の接続をすることができます。";
@@ -2033,24 +1985,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "メンバーをグループから除名する (※元に戻せません※)！";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "グループメンバーはメッセージへのリアクションを追加できます。";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "グループのメンバーがメッセージを完全削除することができます。(24時間)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "グループのメンバーがダイレクトメッセージを送信できます。";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "グループのメンバーが消えるメッセージを送信できます。";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "グループメンバーはファイルやメディアを送信できます。";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "グループのメンバーが音声メッセージを送信できます。";
-
 /* item status text */
 "Message delivery error" = "メッセージ送信エラー";

@@ -2064,7 +1998,7 @@
 "Message reactions are prohibited in this chat." = "このチャットではメッセージへのリアクションは禁止されています。";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "このグループではメッセージへのリアクションは禁止されています。";
+"Message reactions are prohibited in this group." = "このグループではメッセージへのリアクションは禁止されています。";

 /* notification */
 "message received" = "メッセージを受信";
@@ -2655,7 +2589,7 @@
 /* alert button */
 "Save (and notify contacts)" = "保存（連絡先に通知）";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "保存して、連絡先にに知らせる";

 /* No comment provided by engineer. */
@@ -2673,7 +2607,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "パスフレーズをキーチェーンに保存";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "この設定でよろしいですか？";

 /* No comment provided by engineer. */
@@ -3290,7 +3224,7 @@
 "Voice messages are prohibited in this chat." = "このチャットでは音声メッセージが使用禁止です。";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "このグループでは音声メッセージが使用禁止です。";
+"Voice messages are prohibited in this group." = "このグループでは音声メッセージが使用禁止です。";

 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "音声メッセージは使用禁止です！";
@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Wszystkie dane są usuwane po jego wprowadzeniu.";

 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Wszystkie dane są prywatne na Twoim urządzeniu.";
+"All data is private to your device." = "Wszystkie dane są prywatne na Twoim urządzeniu.";

 /* No comment provided by engineer. */
 "All group members will remain connected." = "Wszyscy członkowie grupy pozostaną połączeni.";
@@ -1086,7 +1086,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Łączenie z komputerem";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "łączenie…";

 /* No comment provided by engineer. */
@@ -1551,7 +1551,7 @@
 "Direct messages" = "Bezpośrednie wiadomości";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Bezpośrednie wiadomości między członkami są zabronione w tej grupie.";
+"Direct messages between members are prohibited in this group." = "Bezpośrednie wiadomości między członkami są zabronione w tej grupie.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Wyłącz (zachowaj nadpisania)";
@@ -1578,7 +1578,7 @@
 "Disappearing messages are prohibited in this chat." = "Znikające wiadomości są zabronione na tym czacie.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Znikające wiadomości są zabronione w tej grupie.";
+"Disappearing messages are prohibited in this group." = "Znikające wiadomości są zabronione w tej grupie.";

 /* No comment provided by engineer. */
 "Disappears at" = "Znika o";
@@ -2125,7 +2125,7 @@
 "Files and media" = "Pliki i media";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Pliki i media są zabronione w tej grupie.";
+"Files and media are prohibited in this group." = "Pliki i media są zabronione w tej grupie.";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "Pliki i multimedia nie są dozwolone";
@@ -2277,6 +2277,27 @@
 /* No comment provided by engineer. */
 "Group links" = "Linki grupowe";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Członkowie grupy mogą dodawać reakcje wiadomości.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Członkowie grupy mogą nieodwracalnie usuwać wysłane wiadomości. (24 godziny)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Członkowie grupy mogą wysyłać bezpośrednie wiadomości.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Członkowie grupy mogą wysyłać znikające wiadomości.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Członkowie grupy mogą wysyłać pliki i media.";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Członkowie grupy mogą wysyłać linki SimpleX.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Członkowie grupy mogą wysyłać wiadomości głosowe.";
+
 /* notification */
 "Group message:" = "Wiadomość grupowa:";

@@ -2569,7 +2590,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Nieodwracalne usuwanie wiadomości jest na tym czacie zabronione.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Nieodwracalne usuwanie wiadomości jest w tej grupie zabronione.";
+"Irreversible message deletion is prohibited in this group." = "Nieodwracalne usuwanie wiadomości jest w tej grupie zabronione.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "To pozwala na posiadanie wielu anonimowych połączeń bez żadnych wspólnych danych między nimi w pojedynczym profilu czatu.";
@@ -2757,27 +2778,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Członek zostanie usunięty z grupy - nie można tego cofnąć!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Członkowie grupy mogą dodawać reakcje wiadomości.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Członkowie grupy mogą nieodwracalnie usuwać wysłane wiadomości. (24 godziny)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Członkowie grupy mogą wysyłać bezpośrednie wiadomości.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Członkowie grupy mogą wysyłać znikające wiadomości.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Członkowie grupy mogą wysyłać pliki i media.";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "Członkowie grupy mogą wysyłać linki SimpleX.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Członkowie grupy mogą wysyłać wiadomości głosowe.";
-
 /* No comment provided by engineer. */
 "Menus" = "Menu";

@@ -2812,7 +2812,7 @@
 "Message reactions are prohibited in this chat." = "Reakcje wiadomości są zabronione na tym czacie.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Reakcje wiadomości są zabronione w tej grupie.";
+"Message reactions are prohibited in this group." = "Reakcje wiadomości są zabronione w tej grupie.";

 /* notification */
 "message received" = "wiadomość otrzymana";
@@ -3736,7 +3736,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Zapisz (i powiadom kontakty)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Zapisz i powiadom kontakt";

 /* No comment provided by engineer. */
@@ -3757,7 +3757,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Zapisz hasło w pęku kluczy";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Zapisać preferencje?";

 /* No comment provided by engineer. */
@@ -4164,7 +4164,7 @@
 "SimpleX links" = "Linki SimpleX";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "Linki SimpleX są zablokowane na tej grupie.";
+"SimpleX links are prohibited in this group." = "Linki SimpleX są zablokowane na tej grupie.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "Linki SimpleX są niedozwolone";
@@ -4836,7 +4836,7 @@
 "Voice messages are prohibited in this chat." = "Wiadomości głosowe są zabronione na tym czacie.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Wiadomości głosowe są zabronione w tej grupie.";
+"Voice messages are prohibited in this group." = "Wiadomości głosowe są zabronione w tej grupie.";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "Wiadomości głosowe są niedozwolone";
@@ -82,9 +82,6 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Рекомендовано**: токен устройства и уведомления отправляются на сервер SimpleX Chat, но сервер не получает сами сообщения, их размер или от кого они.";

-/* No comment provided by engineer. */
-"**Scan / Paste link**: to connect via a link you received." = "**Сканировать / Вставить ссылку**: чтобы соединиться через полученную ссылку.";
-
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Внимание**: для работы мгновенных уведомлений пароль должен быть сохранен в Keychain.";

@@ -145,12 +142,6 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ подтверждён";

-/* No comment provided by engineer. */
-"%@ server" = "%@ сервер";
-
-/* No comment provided by engineer. */
-"%@ servers" = "%@ серверы";
-
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ загружено";

@@ -304,12 +295,6 @@
 /* time interval */
 "1 week" = "1 неделю";

-/* No comment provided by engineer. */
-"1-time link" = "Одноразовая ссылка";
-
-/* No comment provided by engineer. */
-"1-time link can be used *with one contact only* - share in person or via any messenger." = "Одноразовая ссылка может быть использована *только с одним контактом* - поделитесь при встрече или через любой мессенджер.";
-
 /* No comment provided by engineer. */
 "5 minutes" = "5 минут";

@@ -343,9 +328,6 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Прекратить изменение адреса?";

-/* No comment provided by engineer. */
-"About operators" = "Об операторах";
-
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "Информация о SimpleX Chat";

@@ -360,9 +342,6 @@
   swipe action */
 "Accept" = "Принять";

-/* No comment provided by engineer. */
-"Accept conditions" = "Принять условия";
-
 /* No comment provided by engineer. */
 "Accept connection request?" = "Принять запрос?";

@@ -376,12 +355,6 @@
 /* call status */
 "accepted call" = "принятый звонок";

-/* No comment provided by engineer. */
-"Accepted conditions" = "Принятые условия";
-
-/* chat list item title */
-"accepted invitation" = "принятое приглашение";
-
 /* No comment provided by engineer. */
 "Acknowledged" = "Подтверждено";

@@ -394,9 +367,6 @@
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Добавьте адрес в свой профиль, чтобы Ваши контакты могли поделиться им. Профиль будет отправлен Вашим контактам.";

-/* No comment provided by engineer. */
-"Add friends" = "Добавить друзей";
-
 /* No comment provided by engineer. */
 "Add profile" = "Добавить профиль";

@@ -406,24 +376,12 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Добавить серверы через QR код.";

-/* No comment provided by engineer. */
-"Add team members" = "Добавить сотрудников";
-
 /* No comment provided by engineer. */
 "Add to another device" = "Добавить на другое устройство";

 /* No comment provided by engineer. */
 "Add welcome message" = "Добавить приветственное сообщение";

-/* No comment provided by engineer. */
-"Add your team members to the conversations." = "Добавьте сотрудников в разговор.";
-
-/* No comment provided by engineer. */
-"Added media & file servers" = "Дополнительные серверы файлов и медиа";
-
-/* No comment provided by engineer. */
-"Added message servers" = "Дополнительные серверы сообщений";
-
 /* No comment provided by engineer. */
 "Additional accent" = "Дополнительный акцент";

@@ -439,12 +397,6 @@
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "Изменение адреса будет прекращено. Будет использоваться старый адрес.";

-/* No comment provided by engineer. */
-"Address or 1-time link?" = "Адрес или одноразовая ссылка?";
-
-/* No comment provided by engineer. */
-"Address settings" = "Настройки адреса";
-
 /* member role */
 "admin" = "админ";

@@ -479,7 +431,7 @@
 "All data is erased when it is entered." = "Все данные удаляются при его вводе.";

 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Все данные хранятся только на вашем устройстве.";
+"All data is private to your device." = "Все данные хранятся только на вашем устройстве.";

 /* No comment provided by engineer. */
 "All group members will remain connected." = "Все члены группы, которые соединились через эту ссылку, останутся в группе.";
@@ -808,12 +760,6 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Болгарский, финский, тайский и украинский - благодаря пользователям и [Weblate] (https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";

-/* No comment provided by engineer. */
-"Business address" = "Бизнес адрес";
-
-/* No comment provided by engineer. */
-"Business chats" = "Бизнес разговоры";
-
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "По профилю чата или [по соединению](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).";

@@ -884,9 +830,6 @@
 /* No comment provided by engineer. */
 "Change" = "Поменять";

-/* authentication reason */
-"Change chat profiles" = "Поменять профили";
-
 /* No comment provided by engineer. */
 "Change database passphrase?" = "Поменять пароль базы данных?";

@@ -930,15 +873,6 @@
 /* chat item text */
 "changing address…" = "смена адреса…";

-/* No comment provided by engineer. */
-"Chat" = "Разговор";
-
-/* No comment provided by engineer. */
-"Chat already exists" = "Разговор уже существует";
-
-/* No comment provided by engineer. */
-"Chat already exists!" = "Разговор уже существует!";
-
 /* No comment provided by engineer. */
 "Chat colors" = "Цвета чата";

@@ -984,21 +918,9 @@
 /* No comment provided by engineer. */
 "Chat theme" = "Тема чата";

-/* No comment provided by engineer. */
-"Chat will be deleted for all members - this cannot be undone!" = "Разговор будет удален для всех участников - это действие нельзя отменить!";
-
-/* No comment provided by engineer. */
-"Chat will be deleted for you - this cannot be undone!" = "Разговор будет удален для Вас - это действие нельзя отменить!";
-
 /* No comment provided by engineer. */
 "Chats" = "Чаты";

-/* No comment provided by engineer. */
-"Check messages every 20 min." = "Проверять сообщения каждые 20 минут.";
-
-/* No comment provided by engineer. */
-"Check messages when allowed." = "Проверять сообщения по возможности.";
-
 /* alert title */
 "Check server address and try again." = "Проверьте адрес сервера и попробуйте снова.";

@@ -1059,33 +981,6 @@
 /* No comment provided by engineer. */
 "Completed" = "Готово";

-/* No comment provided by engineer. */
-"Conditions accepted on: %@." = "Условия приняты: %@.";
-
-/* No comment provided by engineer. */
-"Conditions are accepted for the operator(s): **%@**." = "Условия приняты для оператора(ов): **%@**.";
-
-/* No comment provided by engineer. */
-"Conditions are already accepted for these operator(s): **%@**." = "Условия уже приняты для следующих оператора(ов): **%@**.";
-
-/* No comment provided by engineer. */
-"Conditions of use" = "Условия использования";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Условия будут приняты для включенных операторов через 30 дней.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Условия будут приняты для оператора(ов): **%@**.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for the operator(s): **%@**." = "Условия будут приняты для оператора(ов): **%@**.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted on: %@." = "Условия будут приняты: %@.";
-
-/* No comment provided by engineer. */
-"Conditions will be automatically accepted for enabled operators on: %@." = "Условия будут автоматически приняты для включенных операторов: %@.";
-
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Настройка ICE серверов";

@@ -1209,7 +1104,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Подключение к компьютеру";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "соединяется…";

 /* No comment provided by engineer. */
@@ -1233,9 +1128,6 @@
 /* No comment provided by engineer. */
 "Connection request sent!" = "Запрос на соединение отправлен!";

-/* No comment provided by engineer. */
-"Connection security" = "Безопасность соединения";
-
 /* No comment provided by engineer. */
 "Connection terminated" = "Подключение прервано";

@@ -1317,9 +1209,6 @@
 /* No comment provided by engineer. */
 "Create" = "Создать";

-/* No comment provided by engineer. */
-"Create 1-time link" = "Создать одноразовую ссылку";
-
 /* No comment provided by engineer. */
 "Create a group using a random profile." = "Создайте группу, используя случайный профиль.";

@@ -1371,9 +1260,6 @@
 /* No comment provided by engineer. */
 "creator" = "создатель";

-/* No comment provided by engineer. */
-"Current conditions text couldn't be loaded, you can review conditions via this link:" = "Текст условий использования не может быть показан, вы можете посмотреть их через ссылку:";
-
 /* No comment provided by engineer. */
 "Current Passcode" = "Текущий Код";

@@ -1511,18 +1397,12 @@
 /* No comment provided by engineer. */
 "Delete and notify contact" = "Удалить и уведомить контакт";

-/* No comment provided by engineer. */
-"Delete chat" = "Удалить разговор";
-
 /* No comment provided by engineer. */
 "Delete chat profile" = "Удалить профиль чата";

 /* No comment provided by engineer. */
 "Delete chat profile?" = "Удалить профиль?";

-/* No comment provided by engineer. */
-"Delete chat?" = "Удалить разговор?";
-
 /* No comment provided by engineer. */
 "Delete connection" = "Удалить соединение";

@@ -1628,9 +1508,6 @@
 /* No comment provided by engineer. */
 "Deletion errors" = "Ошибки удаления";

-/* No comment provided by engineer. */
-"Delivered even when Apple drops them." = "Доставляются даже тогда, когда Apple их теряет.";
-
 /* No comment provided by engineer. */
 "Delivery" = "Доставка";

@@ -1698,10 +1575,7 @@
 "Direct messages" = "Прямые сообщения";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited in this chat." = "Прямые сообщения между членами запрещены в этом разговоре.";
-
-/* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Прямые сообщения между членами группы запрещены.";
+"Direct messages between members are prohibited in this group." = "Прямые сообщения между членами группы запрещены.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Выключить (кроме исключений)";
@@ -1728,7 +1602,7 @@
 "Disappearing messages are prohibited in this chat." = "Исчезающие сообщения запрещены в этом чате.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Исчезающие сообщения запрещены в этой группе.";
+"Disappearing messages are prohibited in this group." = "Исчезающие сообщения запрещены в этой группе.";

 /* No comment provided by engineer. */
 "Disappears at" = "Исчезает";
@@ -1821,9 +1695,6 @@
 /* No comment provided by engineer. */
 "e2e encrypted" = "e2e зашифровано";

-/* No comment provided by engineer. */
-"E2E encrypted notifications." = "E2E зашифрованные нотификации.";
-
 /* chat item action */
 "Edit" = "Редактировать";

@@ -1842,9 +1713,6 @@
 /* No comment provided by engineer. */
 "Enable camera access" = "Включить доступ к камере";

-/* No comment provided by engineer. */
-"Enable Flux" = "Включить Flux";
-
 /* No comment provided by engineer. */
 "Enable for all" = "Включить для всех";

@@ -2004,18 +1872,12 @@
 /* No comment provided by engineer. */
 "Error aborting address change" = "Ошибка при прекращении изменения адреса";

-/* alert title */
-"Error accepting conditions" = "Ошибка приема условий";
-
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Ошибка при принятии запроса на соединение";

 /* No comment provided by engineer. */
 "Error adding member(s)" = "Ошибка при добавлении членов группы";

-/* alert title */
-"Error adding server" = "Ошибка добавления сервера";
-
 /* No comment provided by engineer. */
 "Error changing address" = "Ошибка при изменении адреса";

@@ -2100,9 +1962,6 @@
 /* No comment provided by engineer. */
 "Error joining group" = "Ошибка при вступлении в группу";

-/* alert title */
-"Error loading servers" = "Ошибка загрузки серверов";
-
 /* No comment provided by engineer. */
 "Error migrating settings" = "Ошибка миграции настроек";

@@ -2136,9 +1995,6 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Ошибка сохранения пароля в Keychain";

-/* alert title */
-"Error saving servers" = "Ошибка сохранения серверов";
-
 /* when migrating */
 "Error saving settings" = "Ошибка сохранения настроек";

@@ -2181,9 +2037,6 @@
 /* No comment provided by engineer. */
 "Error updating message" = "Ошибка при обновлении сообщения";

-/* alert title */
-"Error updating server" = "Ошибка сохранения сервера";
-
 /* No comment provided by engineer. */
 "Error updating settings" = "Ошибка при сохранении настроек сети";

@@ -2211,9 +2064,6 @@
 /* No comment provided by engineer. */
 "Errors" = "Ошибки";

-/* servers error */
-"Errors in servers configuration." = "Ошибки в настройках серверов.";
-
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Даже когда они выключены в разговоре.";

@@ -2299,7 +2149,7 @@
 "Files and media" = "Файлы и медиа";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Файлы и медиа запрещены в этой группе.";
+"Files and media are prohibited in this group." = "Файлы и медиа запрещены в этой группе.";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "Файлы и медиа не разрешены";
@@ -2340,24 +2190,9 @@
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "Починка не поддерживается членом группы";

-/* No comment provided by engineer. */
-"for better metadata privacy." = "для лучшей конфиденциальности метаданных.";
-
-/* servers error */
-"For chat profile %@:" = "Для профиля чата %@:";
-
 /* No comment provided by engineer. */
 "For console" = "Для консоли";

-/* No comment provided by engineer. */
-"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Например, если Ваш контакт получает сообщения через сервер SimpleX Chat, Ваше приложение доставит их через сервер Flux.";
-
-/* No comment provided by engineer. */
-"For private routing" = "Для доставки сообщений";
-
-/* No comment provided by engineer. */
-"For social media" = "Для социальных сетей";
-
 /* chat item action */
 "Forward" = "Переслать";

@@ -2469,6 +2304,27 @@
 /* No comment provided by engineer. */
 "Group links" = "Ссылки групп";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Члены группы могут добавлять реакции на сообщения.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Члены группы могут необратимо удалять отправленные сообщения. (24 часа)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Члены группы могут посылать прямые сообщения.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Члены группы могут посылать исчезающие сообщения.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Члены группы могут слать файлы и медиа.";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Члены группы могут отправлять ссылки SimpleX.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Члены группы могут отправлять голосовые сообщения.";
+
 /* notification */
 "Group message:" = "Групповое сообщение:";

@@ -2529,12 +2385,6 @@
 /* time unit */
 "hours" = "часов";

-/* No comment provided by engineer. */
-"How it affects privacy" = "Как это влияет на конфиденциальность";
-
-/* No comment provided by engineer. */
-"How it helps privacy" = "Как это улучшает конфиденциальность";
-
 /* No comment provided by engineer. */
 "How SimpleX works" = "Как SimpleX работает";

@@ -2739,9 +2589,6 @@
 /* No comment provided by engineer. */
 "Invite members" = "Пригласить членов группы";

-/* No comment provided by engineer. */
-"Invite to chat" = "Пригласить в разговор";
-
 /* No comment provided by engineer. */
 "Invite to group" = "Пригласить в группу";

@@ -2773,7 +2620,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Необратимое удаление сообщений запрещено в этом чате.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Необратимое удаление сообщений запрещено в этой группе.";
+"Irreversible message deletion is prohibited in this group." = "Необратимое удаление сообщений запрещено в этой группе.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Это позволяет иметь много анонимных соединений без общих данных между ними в одном профиле пользователя.";
@@ -2856,12 +2703,6 @@
 /* swipe action */
 "Leave" = "Выйти";

-/* No comment provided by engineer. */
-"Leave chat" = "Покинуть разговор";
-
-/* No comment provided by engineer. */
-"Leave chat?" = "Покинуть разговор?";
-
 /* No comment provided by engineer. */
 "Leave group" = "Выйти из группы";

@@ -2958,42 +2799,15 @@
 /* item status text */
 "Member inactive" = "Член неактивен";

-/* No comment provided by engineer. */
-"Member role will be changed to \"%@\". All chat members will be notified." = "Роль участника будет изменена на \"%@\". Все участники разговора получат уведомление.";
-
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "Роль члена группы будет изменена на \"%@\". Все члены группы получат сообщение.";

 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". The member will receive a new invitation." = "Роль члена группы будет изменена на \"%@\". Будет отправлено новое приглашение.";

-/* No comment provided by engineer. */
-"Member will be removed from chat - this cannot be undone!" = "Член будет удален из разговора - это действие нельзя отменить!";
-
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Член группы будет удален - это действие нельзя отменить!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Члены группы могут добавлять реакции на сообщения.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Члены группы могут необратимо удалять отправленные сообщения. (24 часа)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Члены группы могут посылать прямые сообщения.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Члены группы могут посылать исчезающие сообщения.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Члены группы могут слать файлы и медиа.";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "Члены группы могут отправлять ссылки SimpleX.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Члены группы могут отправлять голосовые сообщения.";
-
 /* No comment provided by engineer. */
 "Menus" = "Меню";

@@ -3028,7 +2842,7 @@
 "Message reactions are prohibited in this chat." = "Реакции на сообщения в этом чате запрещены.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Реакции на сообщения запрещены в этой группе.";
+"Message reactions are prohibited in this group." = "Реакции на сообщения запрещены в этой группе.";

 /* notification */
 "message received" = "получено сообщение";
@@ -3147,9 +2961,6 @@
 /* No comment provided by engineer. */
 "More reliable network connection." = "Более надежное соединение с сетью.";

-/* No comment provided by engineer. */
-"More reliable notifications" = "Более надежные уведомления";
-
 /* item status description */
 "Most likely this connection is deleted." = "Скорее всего, соединение удалено.";

@@ -3174,18 +2985,12 @@
 /* No comment provided by engineer. */
 "Network connection" = "Интернет-соединение";

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

 /* No comment provided by engineer. */
 "Network management" = "Статус сети";

-/* No comment provided by engineer. */
-"Network operator" = "Оператор сети";
-
 /* No comment provided by engineer. */
 "Network settings" = "Настройки сети";

@@ -3213,9 +3018,6 @@
 /* No comment provided by engineer. */
 "New display name" = "Новое имя";

-/* notification */
-"New events" = "Новые события";
-
 /* No comment provided by engineer. */
 "New in %@" = "Новое в %@";

@@ -3237,9 +3039,6 @@
 /* No comment provided by engineer. */
 "New passphrase…" = "Новый пароль…";

-/* No comment provided by engineer. */
-"New server" = "Новый сервер";
-
 /* No comment provided by engineer. */
 "New SOCKS credentials will be used every time you start the app." = "Новые учетные данные SOCKS будут использоваться при каждом запуске приложения.";

@@ -3285,12 +3084,6 @@
 /* No comment provided by engineer. */
 "No info, try to reload" = "Нет информации, попробуйте перезагрузить";

-/* servers error */
-"No media & file servers." = "Нет серверов файлов и медиа.";
-
-/* servers error */
-"No message servers." = "Нет серверов сообщений.";
-
 /* No comment provided by engineer. */
 "No network connection" = "Нет интернет-соединения";

@@ -3309,18 +3102,6 @@
 /* No comment provided by engineer. */
 "No received or sent files" = "Нет полученных или отправленных файлов";

-/* servers error */
-"No servers for private message routing." = "Нет серверов для доставки сообщений.";
-
-/* servers error */
-"No servers to receive files." = "Нет серверов для приема файлов.";
-
-/* servers error */
-"No servers to receive messages." = "Нет серверов для приема сообщений.";
-
-/* servers error */
-"No servers to send files." = "Нет серверов для отправки файлов.";
-
 /* copied message info in history */
 "no text" = "нет текста";

@@ -3342,9 +3123,6 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Уведомления выключены";

-/* No comment provided by engineer. */
-"Notifications privacy" = "Конфиденциальность уведомлений";
-
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Теперь админы могут:\n- удалять сообщения членов.\n- приостанавливать членов (роль \"наблюдатель\")";

@@ -3389,9 +3167,6 @@
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion хосты не используются.";

-/* No comment provided by engineer. */
-"Only chat owners can change preferences." = "Только владельцы разговора могут поменять предпочтения.";
-
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages." = "Только пользовательские устройства хранят контакты, группы и сообщения.";

@@ -3440,18 +3215,12 @@
 /* No comment provided by engineer. */
 "Open" = "Открыть";

-/* No comment provided by engineer. */
-"Open changes" = "Открыть изменения";
-
 /* No comment provided by engineer. */
 "Open chat" = "Открыть чат";

 /* authentication reason */
 "Open chat console" = "Открыть консоль";

-/* No comment provided by engineer. */
-"Open conditions" = "Открыть условия";
-
 /* No comment provided by engineer. */
 "Open group" = "Открыть группу";

@@ -3464,15 +3233,6 @@
 /* No comment provided by engineer. */
 "Opening app…" = "Приложение отрывается…";

-/* No comment provided by engineer. */
-"Operator" = "Оператор";
-
-/* alert title */
-"Operator server" = "Сервер оператора";
-
-/* No comment provided by engineer. */
-"Or import archive file" = "Или импортировать файл архива";
-
 /* No comment provided by engineer. */
 "Or paste archive link" = "Или вставьте ссылку архива";

@@ -3485,9 +3245,6 @@
 /* No comment provided by engineer. */
 "Or show this code" = "Или покажите этот код";

-/* No comment provided by engineer. */
-"Or to share privately" = "Или поделиться конфиденциально";
-
 /* No comment provided by engineer. */
 "other" = "другое";

@@ -3629,9 +3386,6 @@
 /* No comment provided by engineer. */
 "Preset server address" = "Адрес сервера по умолчанию";

-/* No comment provided by engineer. */
-"Preset servers" = "Серверы по умолчанию";
-
 /* No comment provided by engineer. */
 "Preview" = "Просмотр";

@@ -3641,9 +3395,6 @@
 /* No comment provided by engineer. */
 "Privacy & security" = "Конфиденциальность";

-/* No comment provided by engineer. */
-"Privacy for your customers." = "Конфиденциальность для ваших покупателей.";
-
 /* No comment provided by engineer. */
 "Privacy redefined" = "Более конфиденциальный";

@@ -3720,7 +3471,7 @@
 "Protect your chat profiles with a password!" = "Защитите Ваши профили чата паролем!";

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

 /* No comment provided by engineer. */
 "Protocol timeout" = "Таймаут протокола";
@@ -3936,9 +3687,6 @@
 /* chat item action */
 "Reply" = "Ответить";

-/* chat list item title */
-"requested to connect" = "запрошено соединение";
-
 /* No comment provided by engineer. */
 "Required" = "Обязательно";

@@ -3990,12 +3738,6 @@
 /* chat item action */
 "Reveal" = "Показать";

-/* No comment provided by engineer. */
-"Review conditions" = "Посмотреть условия";
-
-/* No comment provided by engineer. */
-"Review later" = "Посмотреть позже";
-
 /* No comment provided by engineer. */
 "Revoke" = "Отозвать";

@@ -4024,7 +3766,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Сохранить (и уведомить контакты)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Сохранить и уведомить контакт";

 /* No comment provided by engineer. */
@@ -4045,7 +3787,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Сохранить пароль в Keychain";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Сохранить предпочтения?";

 /* No comment provided by engineer. */
@@ -4282,9 +4024,6 @@
 /* No comment provided by engineer. */
 "Server" = "Сервер";

-/* alert message */
-"Server added to operator %@." = "Сервер добавлен к оператору %@.";
-
 /* No comment provided by engineer. */
 "Server address" = "Адрес сервера";

@@ -4294,15 +4033,6 @@
 /* srv error text. */
 "Server address is incompatible with network settings." = "Адрес сервера несовместим с настройками сети.";

-/* alert title */
-"Server operator changed." = "Оператор серверов изменен.";
-
-/* No comment provided by engineer. */
-"Server operators" = "Операторы серверов";
-
-/* alert title */
-"Server protocol changed." = "Протокол сервера изменен.";
-
 /* queue info */
 "server queue info: %@\n\nlast received msg: %@" = "информация сервера об очереди: %1$@\n\nпоследнее полученное сообщение: %2$@";

@@ -4388,15 +4118,9 @@
 /* No comment provided by engineer. */
 "Share 1-time link" = "Поделиться одноразовой ссылкой";

-/* No comment provided by engineer. */
-"Share 1-time link with a friend" = "Поделитесь одноразовой ссылкой с другом";
-
 /* No comment provided by engineer. */
 "Share address" = "Поделиться адресом";

-/* No comment provided by engineer. */
-"Share address publicly" = "Поделитесь адресом";
-
 /* alert title */
 "Share address with contacts?" = "Поделиться адресом с контактами?";

@@ -4409,9 +4133,6 @@
 /* No comment provided by engineer. */
 "Share profile" = "Поделиться профилем";

-/* No comment provided by engineer. */
-"Share SimpleX address on social media." = "Поделитесь SimpleX адресом в социальных сетях.";
-
 /* No comment provided by engineer. */
 "Share this 1-time invite link" = "Поделиться одноразовой ссылкой-приглашением";

@@ -4457,15 +4178,6 @@
 /* No comment provided by engineer. */
 "SimpleX Address" = "Адрес SimpleX";

-/* No comment provided by engineer. */
-"SimpleX address and 1-time links are safe to share via any messenger." = "Адрес SimpleX и одноразовые ссылки безопасно отправлять через любой мессенджер.";
-
-/* No comment provided by engineer. */
-"SimpleX address or 1-time link?" = "Адрес SimpleX или одноразовая ссылка?";
-
-/* No comment provided by engineer. */
-"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat и Flux заключили соглашение добавить серверы под управлением Flux в приложение.";
-
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "Безопасность SimpleX Chat была проверена Trail of Bits.";

@@ -4482,7 +4194,7 @@
 "SimpleX links" = "SimpleX ссылки";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "Ссылки SimpleX запрещены в этой группе.";
+"SimpleX links are prohibited in this group." = "Ссылки SimpleX запрещены в этой группе.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "Ссылки SimpleX не разрешены";
@@ -4541,9 +4253,6 @@
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import:" = "Во время импорта произошли некоторые ошибки:";

-/* alert message */
-"Some servers failed the test:\n%@" = "Серверы не прошли тест:\n%@";
-
 /* notification title */
 "Somebody" = "Контакт";

@@ -4646,9 +4355,6 @@
 /* No comment provided by engineer. */
 "Tap button " = "Нажмите кнопку ";

-/* No comment provided by engineer. */
-"Tap Create SimpleX address in the menu to create it later." = "Нажмите Создать адрес SimpleX в меню, чтобы создать его позже.";
-
 /* No comment provided by engineer. */
 "Tap to activate profile." = "Нажмите, чтобы сделать профиль активным.";

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

-/* No comment provided by engineer. */
-"The app protects your privacy by using different operators in each conversation." = "Приложение улучшает конфиденциальность используя разных операторов в каждом разговоре.";
-
 /* No comment provided by engineer. */
 "The app will ask to confirm downloads from unknown file servers (except .onion)." = "Приложение будет запрашивать подтверждение загрузки с неизвестных серверов (за исключением .onion адресов).";

@@ -4721,9 +4424,6 @@
 /* No comment provided by engineer. */
 "The code you scanned is not a SimpleX link QR code." = "Этот QR код не является SimpleX-ccылкой.";

-/* No comment provided by engineer. */
-"The connection reached the limit of undelivered messages, your contact may be offline." = "Соединение достигло предела недоставленных сообщений. Возможно, Ваш контакт не в сети.";
-
 /* No comment provided by engineer. */
 "The connection you accepted will be cancelled!" = "Подтвержденное соединение будет отменено!";

@@ -4763,15 +4463,6 @@
 /* No comment provided by engineer. */
 "The profile is only shared with your contacts." = "Профиль отправляется только Вашим контактам.";

-/* No comment provided by engineer. */
-"The same conditions will apply to operator **%@**." = "Те же самые условия будут приняты для оператора **%@**.";
-
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Те же самые условия будут приняты для оператора(ов): **%@**.";
-
-/* No comment provided by engineer. */
-"The second preset operator in the app!" = "Второй оператор серверов в приложении!";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Вторая галочка - знать, что доставлено! ✅";

@@ -4781,9 +4472,6 @@
 /* No comment provided by engineer. */
 "The servers for new connections of your current chat profile **%@**." = "Серверы для новых соединений Вашего текущего профиля чата **%@**.";

-/* No comment provided by engineer. */
-"The servers for new files of your current chat profile **%@**." = "Серверы для новых файлов Вашего текущего профиля **%@**.";
-
 /* No comment provided by engineer. */
 "The text you pasted is not a SimpleX link." = "Вставленный текст не является SimpleX-ссылкой.";

@@ -4793,9 +4481,6 @@
 /* No comment provided by engineer. */
 "Themes" = "Темы";

-/* No comment provided by engineer. */
-"These conditions will also apply for: **%@**." = "Эти условия также будут применены к: **%@**.";
-
 /* No comment provided by engineer. */
 "These settings are for your current profile **%@**." = "Установки для Вашего активного профиля **%@**.";

@@ -4859,9 +4544,6 @@
 /* No comment provided by engineer. */
 "To make a new connection" = "Чтобы соединиться";

-/* No comment provided by engineer. */
-"To protect against your link being replaced, you can compare contact security codes." = "Чтобы защитить Вашу ссылку от замены, Вы можете сравнить код безопасности.";
-
 /* No comment provided by engineer. */
 "To protect timezone, image/voice files use UTC." = "Чтобы защитить Ваш часовой пояс, файлы картинок и голосовых сообщений используют UTC.";

@@ -4874,9 +4556,6 @@
 /* No comment provided by engineer. */
 "To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Чтобы защитить Вашу конфиденциальность, SimpleX использует разные идентификаторы для каждого Вашeго контакта.";

-/* No comment provided by engineer. */
-"To receive" = "Для получения";
-
 /* No comment provided by engineer. */
 "To record speech please grant permission to use Microphone." = "Для записи речи, пожалуйста, дайте разрешение на использование микрофона.";

@@ -4889,15 +4568,9 @@
 /* No comment provided by engineer. */
 "To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Чтобы показать Ваш скрытый профиль, введите его пароль в поле поиска на странице **Ваши профили чата**.";

-/* No comment provided by engineer. */
-"To send" = "Для оправки";
-
 /* No comment provided by engineer. */
 "To support instant push notifications the chat database has to be migrated." = "Для поддержки мгновенный доставки уведомлений данные чата должны быть перемещены.";

-/* No comment provided by engineer. */
-"To use the servers of **%@**, accept conditions of use." = "Чтобы использовать серверы оператора **%@**, примите условия использования.";
-
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Чтобы подтвердить end-to-end шифрование с Вашим контактом сравните (или сканируйте) код безопасности на Ваших устройствах.";

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

-/* No comment provided by engineer. */
-"Undelivered messages" = "Недоставленные сообщения";
-
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неожиданная ошибка при перемещении данных чата";

@@ -5075,21 +4745,12 @@
 /* No comment provided by engineer. */
 "Use .onion hosts" = "Использовать .onion хосты";

-/* No comment provided by engineer. */
-"Use %@" = "Использовать %@";
-
 /* No comment provided by engineer. */
 "Use chat" = "Использовать чат";

 /* No comment provided by engineer. */
 "Use current profile" = "Использовать активный профиль";

-/* No comment provided by engineer. */
-"Use for files" = "Использовать для файлов";
-
-/* No comment provided by engineer. */
-"Use for messages" = "Использовать для сообщений";
-
 /* No comment provided by engineer. */
 "Use for new connections" = "Использовать для новых соединений";

@@ -5114,9 +4775,6 @@
 /* No comment provided by engineer. */
 "Use server" = "Использовать сервер";

-/* No comment provided by engineer. */
-"Use servers" = "Использовать серверы";
-
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Использовать серверы предосталенные SimpleX Chat?";

@@ -5201,15 +4859,9 @@
 /* No comment provided by engineer. */
 "Videos and files up to 1gb" = "Видео и файлы до 1гб";

-/* No comment provided by engineer. */
-"View conditions" = "Посмотреть условия";
-
 /* No comment provided by engineer. */
 "View security code" = "Показать код безопасности";

-/* No comment provided by engineer. */
-"View updated conditions" = "Посмотреть измененные условия";
-
 /* chat feature */
 "Visible history" = "Доступ к истории";

@@ -5223,7 +4875,7 @@
 "Voice messages are prohibited in this chat." = "Голосовые сообщения запрещены в этом чате.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Голосовые сообщения запрещены в этой группе.";
+"Voice messages are prohibited in this group." = "Голосовые сообщения запрещены в этой группе.";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "Голосовые сообщения не разрешены";
@@ -5291,9 +4943,6 @@
 /* No comment provided by engineer. */
 "when IP hidden" = "когда IP защищен";

-/* No comment provided by engineer. */
-"When more than one operator is enabled, none of them has metadata to learn who communicates with whom." = "Когда больше чем один оператор включен, ни один из них не видит метаданные, чтобы определить, кто соединен с кем.";
-
 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Когда Вы соединены с контактом инкогнито, тот же самый инкогнито профиль будет использоваться для групп с этим контактом.";

@@ -5357,9 +5006,6 @@
 /* No comment provided by engineer. */
 "You are already connected to %@." = "Вы уже соединены с контактом %@.";

-/* No comment provided by engineer. */
-"You are already connected with %@." = "Вы уже соединены с %@.";
-
 /* No comment provided by engineer. */
 "You are already connecting to %@." = "Вы уже соединяетесь с %@.";

@@ -5405,12 +5051,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Вы можете изменить это в настройках Интерфейса.";

-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Вы можете настроить операторов в настройках Сети и серверов.";
-
-/* No comment provided by engineer. */
-"You can configure servers via settings." = "Вы можете настроить серверы позже.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "Вы можете создать его позже";

@@ -5435,9 +5075,6 @@
 /* No comment provided by engineer. */
 "You can send messages to %@ from Archived contacts." = "Вы можете отправлять сообщения %@ из Архивированных контактов.";

-/* No comment provided by engineer. */
-"You can set connection name, to remember who the link was shared with." = "Вы можете установить имя соединения, чтобы запомнить кому Вы отправили ссылку.";
-
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Вы можете установить просмотр уведомлений на экране блокировки в настройках.";

@@ -5558,9 +5195,6 @@
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Вы все равно получите звонки и уведомления в профилях без звука, когда они активные.";

-/* No comment provided by engineer. */
-"You will stop receiving messages from this chat. Chat history will be preserved." = "Вы прекратите получать сообщения в этом разговоре. История будет сохранена.";
-
 /* No comment provided by engineer. */
 "You will stop receiving messages from this group. Chat history will be preserved." = "Вы перестанете получать сообщения от этой группы. История чата будет сохранена.";

@@ -5642,9 +5276,6 @@
 /* No comment provided by engineer. */
 "Your server address" = "Адрес Вашего сервера";

-/* No comment provided by engineer. */
-"Your servers" = "Ваши серверы";
-
 /* No comment provided by engineer. */
 "Your settings" = "Настройки";

@@ -681,7 +681,7 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "กำลังเชื่อมต่อกับเซิร์ฟเวอร์... (ข้อผิดพลาด: %@)";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "กำลังเชื่อมต่อ…";

 /* No comment provided by engineer. */
@@ -1005,7 +1005,7 @@
 "Direct messages" = "ข้อความโดยตรง";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "ข้อความโดยตรงระหว่างสมาชิกเป็นสิ่งต้องห้ามในกลุ่มนี้";
+"Direct messages between members are prohibited in this group." = "ข้อความโดยตรงระหว่างสมาชิกเป็นสิ่งต้องห้ามในกลุ่มนี้";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "ปิดใช้งาน (เก็บการแทนที่)";
@@ -1026,7 +1026,7 @@
 "Disappearing messages are prohibited in this chat." = "ข้อความที่จะหายไปหลังเวลาที่กําหนด (disappearing message) เป็นสิ่งต้องห้ามในแชทนี้";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "ข้อความที่จะหายไปหลังเวลาที่กําหนด (disappearing message) เป็นสิ่งต้องห้ามในกลุ่มนี้";
+"Disappearing messages are prohibited in this group." = "ข้อความที่จะหายไปหลังเวลาที่กําหนด (disappearing message) เป็นสิ่งต้องห้ามในกลุ่มนี้";

 /* No comment provided by engineer. */
 "Disappears at" = "หายไปที่";
@@ -1386,7 +1386,7 @@
 "Files and media" = "ไฟล์และสื่อ";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "ไฟล์และสื่อเป็นสิ่งต้องห้ามในกลุ่มนี้";
+"Files and media are prohibited in this group." = "ไฟล์และสื่อเป็นสิ่งต้องห้ามในกลุ่มนี้";

 /* No comment provided by engineer. */
 "Files and media prohibited!" = "ไฟล์และสื่อต้องห้าม!";
@@ -1469,6 +1469,24 @@
 /* No comment provided by engineer. */
 "Group links" = "ลิงค์กลุ่ม";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "สมาชิกกลุ่มสามารถส่งข้อความโดยตรงได้";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "สมาชิกกลุ่มสามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "สมาชิกกลุ่มสามารถส่งไฟล์และสื่อ";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "สมาชิกกลุ่มสามารถส่งข้อความเสียง";
+
 /* notification */
 "Group message:" = "ข้อความกลุ่ม:";

@@ -1695,7 +1713,7 @@
 "Irreversible message deletion is prohibited in this chat." = "ไม่สามารถลบข้อความแบบแก้ไขไม่ได้ในแชทนี้";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "การลบข้อความแบบแก้ไขไม่ได้เป็นสิ่งที่ห้ามในกลุ่มนี้";
+"Irreversible message deletion is prohibited in this group." = "การลบข้อความแบบแก้ไขไม่ได้เป็นสิ่งที่ห้ามในกลุ่มนี้";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "อนุญาตให้มีการเชื่อมต่อที่ไม่ระบุตัวตนจำนวนมากโดยไม่มีข้อมูลที่ใช้ร่วมกันระหว่างกันในโปรไฟล์การแชทเดียว";
@@ -1835,24 +1853,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "สมาชิกจะถูกลบออกจากกลุ่ม - ไม่สามารถยกเลิกได้!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "สมาชิกกลุ่มสามารถส่งข้อความโดยตรงได้";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "สมาชิกกลุ่มสามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "สมาชิกกลุ่มสามารถส่งไฟล์และสื่อ";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "สมาชิกกลุ่มสามารถส่งข้อความเสียง";
-
 /* item status text */
 "Message delivery error" = "ข้อผิดพลาดในการส่งข้อความ";

@@ -1869,7 +1869,7 @@
 "Message reactions are prohibited in this chat." = "ห้ามแสดงปฏิกิริยาบนข้อความในแชทนี้";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "ปฏิกิริยาบนข้อความเป็นสิ่งต้องห้ามในกลุ่มนี้";
+"Message reactions are prohibited in this group." = "ปฏิกิริยาบนข้อความเป็นสิ่งต้องห้ามในกลุ่มนี้";

 /* notification */
 "message received" = "ข้อความที่ได้รับ";
@@ -2439,7 +2439,7 @@
 /* alert button */
 "Save (and notify contacts)" = "บันทึก (และแจ้งผู้ติดต่อ)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "บันทึกและแจ้งผู้ติดต่อ";

 /* No comment provided by engineer. */
@@ -2457,7 +2457,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "บันทึกข้อความรหัสผ่านใน Keychain";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "บันทึกการตั้งค่า?";

 /* No comment provided by engineer. */
@@ -3071,7 +3071,7 @@
 "Voice messages are prohibited in this chat." = "ห้ามส่งข้อความเสียงในแชทนี้";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "ข้อความเสียงเป็นสิ่งต้องห้ามในกลุ่มนี้";
+"Voice messages are prohibited in this group." = "ข้อความเสียงเป็นสิ่งต้องห้ามในกลุ่มนี้";

 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "ห้ามข้อความเสียง!";
@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Kullanıldığında bütün veriler silinir.";

 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Tüm veriler cihazınıza özeldir.";
+"All data is private to your device." = "Tüm veriler cihazınıza özeldir.";

 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tüm grup üyeleri bağlı kalacaktır.";
@@ -1101,7 +1101,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Bilgisayara bağlanıyor";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "bağlanılıyor…";

 /* No comment provided by engineer. */
@@ -1572,7 +1572,7 @@
 "Direct messages" = "Doğrudan mesajlar";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Bu grupta üyeler arasında direkt mesajlaşma yasaktır.";
+"Direct messages between members are prohibited in this group." = "Bu grupta üyeler arasında direkt mesajlaşma yasaktır.";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Devre dışı bırak (geçersiz kılmaları koru)";
@@ -1599,7 +1599,7 @@
 "Disappearing messages are prohibited in this chat." = "Kaybolan mesajlar bu sohbette yasaklanmış.";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Kaybolan mesajlar bu grupta yasaklanmış.";
+"Disappearing messages are prohibited in this group." = "Kaybolan mesajlar bu grupta yasaklanmış.";

 /* No comment provided by engineer. */
 "Disappears at" = "da kaybolur";
@@ -2146,7 +2146,7 @@
 "Files and media" = "Dosyalar ve medya";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "Dosyalar ve medya bu grupta yasaklandı.";
+"Files and media are prohibited in this group." = "Dosyalar ve medya bu grupta yasaklandı.";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "Dosyalar ve medyaya izin verilmiyor";
@@ -2301,6 +2301,27 @@
 /* No comment provided by engineer. */
 "Group links" = "Grup bağlantıları";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "Grup üyeleri mesaj tepkileri ekleyebilir.";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "Grup üyeleri doğrudan mesajlar gönderebilir.";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "Grup üyeleri kaybolan mesajlar gönderebilir.";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "Grup üyeleri dosyalar ve medya gönderebilir.";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Grup üyeleri SimpleX bağlantıları gönderebilir.";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "Grup üyeleri sesli mesajlar gönderebilir.";
+
 /* notification */
 "Group message:" = "Grup mesajı:";

@@ -2596,7 +2617,7 @@
 "Irreversible message deletion is prohibited in this chat." = "Bu sohbette geri döndürülemez mesaj silme yasaktır.";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Bu grupta geri döndürülemez mesaj silme yasaktır.";
+"Irreversible message deletion is prohibited in this group." = "Bu grupta geri döndürülemez mesaj silme yasaktır.";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "Tek bir sohbet profilinde aralarında herhangi bir veri paylaşımı olmadan birçok anonim bağlantıya sahip olmaya izin verir.";
@@ -2784,27 +2805,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Üye gruptan çıkarılacaktır - bu geri alınamaz!";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "Grup üyeleri mesaj tepkileri ekleyebilir.";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "Grup üyeleri doğrudan mesajlar gönderebilir.";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "Grup üyeleri kaybolan mesajlar gönderebilir.";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "Grup üyeleri dosyalar ve medya gönderebilir.";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "Grup üyeleri SimpleX bağlantıları gönderebilir.";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "Grup üyeleri sesli mesajlar gönderebilir.";
-
 /* No comment provided by engineer. */
 "Menus" = "Menüler";

@@ -2839,7 +2839,7 @@
 "Message reactions are prohibited in this chat." = "Mesaj tepkileri bu sohbette yasaklandı.";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Mesaj tepkileri bu grupta yasaklandı.";
+"Message reactions are prohibited in this group." = "Mesaj tepkileri bu grupta yasaklandı.";

 /* notification */
 "message received" = "mesaj alındı";
@@ -3763,7 +3763,7 @@
 /* alert button */
 "Save (and notify contacts)" = "Kaydet (ve kişilere bildir)";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "Kaydet ve kişilere bildir";

 /* No comment provided by engineer. */
@@ -3784,7 +3784,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Parolayı Anahtar Zincirinde kaydet";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "Tercihler kaydedilsin mi?";

 /* No comment provided by engineer. */
@@ -4191,7 +4191,7 @@
 "SimpleX links" = "SimpleX bağlantıları";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "SimpleX bağlantıları bu grupta yasaklandı.";
+"SimpleX links are prohibited in this group." = "SimpleX bağlantıları bu grupta yasaklandı.";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "SimpleX bağlantılarına izin verilmiyor";
@@ -4872,7 +4872,7 @@
 "Voice messages are prohibited in this chat." = "Bu sohbette sesli mesajlar yasaktır.";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "Bu grupta sesli mesajlar yasaktır.";
+"Voice messages are prohibited in this group." = "Bu grupta sesli mesajlar yasaktır.";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "Sesli mesajlara izin verilmiyor";
@@ -413,7 +413,7 @@
 "All data is erased when it is entered." = "所有数据在输入后将被删除。";

 /* No comment provided by engineer. */
-"All data is kept private on your device." = "所有数据都是您设备的私有数据.";
+"All data is private to your device." = "所有数据都是您设备的私有数据.";

 /* No comment provided by engineer. */
 "All group members will remain connected." = "所有群组成员将保持连接。";
@@ -1059,7 +1059,7 @@
 /* No comment provided by engineer. */
 "Connecting to desktop" = "正连接到桌面";

-/* No comment provided by engineer. */
+/* chat list item title */
 "connecting…" = "连接中……";

 /* No comment provided by engineer. */
@@ -1521,7 +1521,7 @@
 "Direct messages" = "私信";

 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "此群中禁止成员之间私信。";
+"Direct messages between members are prohibited in this group." = "此群中禁止成员之间私信。";

 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "禁用（保留覆盖）";
@@ -1548,7 +1548,7 @@
 "Disappearing messages are prohibited in this chat." = "此聊天中禁止显示限时消息。";

 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "该组禁止限时消息。";
+"Disappearing messages are prohibited in this group." = "该组禁止限时消息。";

 /* No comment provided by engineer. */
 "Disappears at" = "消失于";
@@ -2074,7 +2074,7 @@
 "Files and media" = "文件和媒体";

 /* No comment provided by engineer. */
-"Files and media are prohibited." = "此群组中禁止文件和媒体。";
+"Files and media are prohibited in this group." = "此群组中禁止文件和媒体。";

 /* No comment provided by engineer. */
 "Files and media not allowed" = "不允许文件和媒体";
@@ -2214,6 +2214,27 @@
 /* No comment provided by engineer. */
 "Group links" = "群组链接";

+/* No comment provided by engineer. */
+"Group members can add message reactions." = "群组成员可以添加信息回应。";
+
+/* No comment provided by engineer. */
+"Group members can irreversibly delete sent messages. (24 hours)" = "群组成员可以不可撤回地删除已发送的消息";
+
+/* No comment provided by engineer. */
+"Group members can send direct messages." = "群组成员可以私信。";
+
+/* No comment provided by engineer. */
+"Group members can send disappearing messages." = "群组成员可以发送限时消息。";
+
+/* No comment provided by engineer. */
+"Group members can send files and media." = "群组成员可以发送文件和媒体。";
+
+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "群成员可发送 SimpleX 链接。";
+
+/* No comment provided by engineer. */
+"Group members can send voice messages." = "群组成员可以发送语音消息。";
+
 /* notification */
 "Group message:" = "群组消息：";

@@ -2503,7 +2524,7 @@
 "Irreversible message deletion is prohibited in this chat." = "此聊天中禁止不可撤回消息移除。";

 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "此群组中禁止不可撤回消息移除。";
+"Irreversible message deletion is prohibited in this group." = "此群组中禁止不可撤回消息移除。";

 /* No comment provided by engineer. */
 "It allows having many anonymous connections without any shared data between them in a single chat profile." = "它允许在一个聊天资料中有多个匿名连接，而它们之间没有任何共享数据。";
@@ -2691,27 +2712,6 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "成员将被移出群组——此操作无法撤消！";

-/* No comment provided by engineer. */
-"Members can add message reactions." = "群组成员可以添加信息回应。";
-
-/* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "群组成员可以不可撤回地删除已发送的消息";
-
-/* No comment provided by engineer. */
-"Members can send direct messages." = "群组成员可以私信。";
-
-/* No comment provided by engineer. */
-"Members can send disappearing messages." = "群组成员可以发送限时消息。";
-
-/* No comment provided by engineer. */
-"Members can send files and media." = "群组成员可以发送文件和媒体。";
-
-/* No comment provided by engineer. */
-"Members can send SimpleX links." = "群成员可发送 SimpleX 链接。";
-
-/* No comment provided by engineer. */
-"Members can send voice messages." = "群组成员可以发送语音消息。";
-
 /* No comment provided by engineer. */
 "Menus" = "菜单";

@@ -2746,7 +2746,7 @@
 "Message reactions are prohibited in this chat." = "该聊天禁用了消息回应。";

 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "该群组禁用了消息回应。";
+"Message reactions are prohibited in this group." = "该群组禁用了消息回应。";

 /* notification */
 "message received" = "消息已收到";
@@ -3634,7 +3634,7 @@
 /* alert button */
 "Save (and notify contacts)" = "保存（并通知联系人）";

-/* alert button */
+/* No comment provided by engineer. */
 "Save and notify contact" = "保存并通知联系人";

 /* No comment provided by engineer. */
@@ -3655,7 +3655,7 @@
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "在钥匙串中保存密码";

-/* alert title */
+/* No comment provided by engineer. */
 "Save preferences?" = "保存偏好设置？";

 /* No comment provided by engineer. */
@@ -4044,7 +4044,7 @@
 "SimpleX links" = "SimpleX 链接";

 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "此群禁止 SimpleX 链接。";
+"SimpleX links are prohibited in this group." = "此群禁止 SimpleX 链接。";

 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "不允许SimpleX 链接";
@@ -4692,7 +4692,7 @@
 "Voice messages are prohibited in this chat." = "语音信息在此聊天中被禁止。";

 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "语音信息在该群组中被禁用。";
+"Voice messages are prohibited in this group." = "语音信息在该群组中被禁用。";

 /* No comment provided by engineer. */
 "Voice messages not allowed" = "不允许语音消息";
@@ -115,6 +115,7 @@
        android:launchMode="singleInstance"
        android:supportsPictureInPicture="true"
        android:autoRemoveFromRecents="true"
+        android:screenOrientation="portrait"
        android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>

    <provider
@@ -332,8 +332,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        NetworkObserver.shared.restartNetworkObserver()
      }

-      override fun androidIsXiaomiDevice(): Boolean = setOf("xiaomi", "redmi", "poco").contains(Build.BRAND.lowercase())
-
      @SuppressLint("SourceLockedOrientationActivity")
      @Composable
      override fun androidLockPortraitOrientation() {
@@ -360,8 +358,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        return true
      }

-      override fun androidCreateActiveCallState(): Closeable = ActiveCallState()
-
      override val androidApiLevel: Int get() = Build.VERSION.SDK_INT
    }
  }
@@ -10,8 +10,6 @@ import android.os.*
 import android.os.SystemClock
 import android.provider.Settings
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -464,8 +462,7 @@ class SimplexService: Service() {
        },
        confirmButton = {
          TextButton(onClick = AlertManager.shared::hideAlert) { Text(stringResource(MR.strings.ok)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        }
      )
    }

@@ -500,12 +497,6 @@ class SimplexService: Service() {
              Modifier.padding(bottom = 8.dp)
            )
            Text(annotatedStringResource(MR.strings.turn_off_battery_optimization))
-
-            if (platform.androidIsXiaomiDevice() && (mode == NotificationsMode.PERIODIC || mode == NotificationsMode.SERVICE)) {
-              Text(annotatedStringResource(MR.strings.xiaomi_ignore_battery_optimization),
-                Modifier.padding(top = 8.dp)
-              )
-            }
          }
        },
        dismissButton = {
@@ -513,8 +504,7 @@ class SimplexService: Service() {
        },
        confirmButton = {
          TextButton(onClick = ignoreOptimization) { Text(stringResource(MR.strings.turn_off_battery_optimization_button)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        }
      )
    }

@@ -556,8 +546,7 @@ class SimplexService: Service() {
        },
        confirmButton = {
          TextButton(onClick = unrestrict) { Text(stringResource(MR.strings.turn_off_system_restriction_button)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        }
      )
    }

@@ -584,8 +573,7 @@ class SimplexService: Service() {
        },
        confirmButton = {
          TextButton(onClick = unrestrict) { Text(stringResource(MR.strings.turn_off_system_restriction_button)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        }
      )
      val scope = rememberCoroutineScope()
      DisposableEffect(Unit) {
@@ -629,14 +617,13 @@ class SimplexService: Service() {
        },
        confirmButton = {
          TextButton(onClick = AlertManager.shared::hideAlert) { Text(stringResource(MR.strings.ok)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        }
      )
    }

    fun isBackgroundAllowed(): Boolean = isIgnoringBatteryOptimizations() && !isBackgroundRestricted()

-    private fun isIgnoringBatteryOptimizations(): Boolean {
+    fun isIgnoringBatteryOptimizations(): Boolean {
      val powerManager = androidAppContext.getSystemService(Application.POWER_SERVICE) as PowerManager
      return powerManager.isIgnoringBatteryOptimizations(androidAppContext.packageName)
    }
@@ -19,8 +19,6 @@ actual val wallpapersDir: File = File(filesDir.absolutePath + File.separator + "
 actual val coreTmpDir: File = File(filesDir.absolutePath + File.separator + "temp_files")
 actual val dbAbsolutePrefixPath: String = dataDir.absolutePath + File.separator + "files"
 actual val preferencesDir = File(dataDir.absolutePath + File.separator + "shared_prefs")
-actual val preferencesTmpDir = File(tmpDir, "prefs_tmp")
-  .also { it.deleteRecursively() }

 actual val chatDatabaseFileName: String = "files_chat.db"
 actual val agentDatabaseFileName: String = "files_agent.db"
@@ -29,7 +29,6 @@ actual fun LazyColumnWithScrollBar(
  flingBehavior: FlingBehavior,
  userScrollEnabled: Boolean,
  additionalBarOffset: State<Dp>?,
-  chatBottomBar: State<Boolean>,
  fillMaxSize: Boolean,
  content: LazyListScope.() -> Unit
 ) {
@@ -92,7 +91,6 @@ actual fun LazyColumnWithScrollBarNoAppBar(
  flingBehavior: FlingBehavior,
  userScrollEnabled: Boolean,
  additionalBarOffset: State<Dp>?,
-  chatBottomBar: State<Boolean>,
  content: LazyListScope.() -> Unit
 ) {
  val state = state ?: rememberLazyListState()
@@ -71,12 +71,8 @@ class PostSCallAudioDeviceManager: CallAudioDeviceManagerInterface {
  }

  override fun stop() {
-    try {
-      am.unregisterAudioDeviceCallback(audioCallback)
-      am.removeOnCommunicationDeviceChangedListener(listener)
-    } catch (e: Exception) {
-      Log.e(TAG, e.stackTraceToString())
-    }
+    am.unregisterAudioDeviceCallback(audioCallback)
+    am.removeOnCommunicationDeviceChangedListener(listener)
  }

  override fun selectLastExternalDeviceOrDefault(speaker: Boolean, keepAnyExternal: Boolean) {
@@ -6,12 +6,12 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.*
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.media.*
 import android.os.Build
 import android.os.PowerManager
 import android.os.PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK
-import android.os.PowerManager.WakeLock
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.*
@@ -23,6 +23,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -46,6 +47,7 @@ import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.res.MR
 import com.google.accompanist.permissions.*
 import dev.icerock.moko.resources.StringResource
@@ -56,7 +58,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.datetime.Clock
 import kotlinx.serialization.encodeToString
-import java.io.Closeable

 // Should be destroy()'ed and set as null when call is ended. Otherwise, it will be a leak
@SuppressLint("StaticFieldLeak")
@@ -71,62 +72,49 @@ fun activeCallDestroyWebView() = withApi {
  Log.d(TAG, "CallView: webview was destroyed")
 }

-class ActiveCallState: Closeable {
-  val proximityLock: WakeLock? = screenOffWakeLock()
-  var wasConnected = false
-  val callAudioDeviceManager = CallAudioDeviceManagerInterface.new()
-  private var closed = false
-
-  init {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      callAudioDeviceManager.start()
-    }
-  }
-
-  override fun close() {
-    if (closed) return
-    closed = true
-    CallSoundsPlayer.stop()
-    if (wasConnected) {
-      CallSoundsPlayer.vibrate()
-    }
-    callAudioDeviceManager.stop()
-    dropAudioManagerOverrides()
-    if (proximityLock?.isHeld == true) {
-      proximityLock.release()
-    }
-  }
-
-  private fun screenOffWakeLock(): WakeLock? {
+@SuppressLint("SourceLockedOrientationActivity")
+@Composable
+actual fun ActiveCallView() {
+  val call = remember { chatModel.activeCall }.value
+  val scope = rememberCoroutineScope()
+  val proximityLock = remember {
    val pm = (androidAppContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
-    return if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+    if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, androidAppContext.packageName + ":proximityLock")
    } else {
      null
    }
  }
-}
-
-
-@SuppressLint("SourceLockedOrientationActivity")
-@Composable
-actual fun ActiveCallView() {
-  val call = remember { chatModel.activeCall }.value
-  val callState = call?.androidCallState as ActiveCallState?
-  val scope = rememberCoroutineScope()
+  val wasConnected = rememberSaveable { mutableStateOf(false) }
  LaunchedEffect(call) {
-    if (call?.callState == CallState.Connected && callState != null && !callState.wasConnected) {
+    if (call?.callState == CallState.Connected && !wasConnected.value) {
      CallSoundsPlayer.vibrate(2)
-      callState.wasConnected = true
+      wasConnected.value = true
    }
  }
-  LaunchedEffect(callState, chatModel.activeCallViewIsCollapsed.value) {
-    callState ?: return@LaunchedEffect
+  val callAudioDeviceManager = remember { CallAudioDeviceManagerInterface.new() }
+  DisposableEffect(Unit) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      callAudioDeviceManager.start()
+    }
+    onDispose {
+      CallSoundsPlayer.stop()
+      if (wasConnected.value) {
+        CallSoundsPlayer.vibrate()
+      }
+      callAudioDeviceManager.stop()
+      dropAudioManagerOverrides()
+      if (proximityLock?.isHeld == true) {
+        proximityLock.release()
+      }
+    }
+  }
+  LaunchedEffect(chatModel.activeCallViewIsCollapsed.value) {
    if (chatModel.activeCallViewIsCollapsed.value) {
-      if (callState.proximityLock?.isHeld == true) callState.proximityLock.release()
+      if (proximityLock?.isHeld == true) proximityLock.release()
    } else {
      delay(1000)
-      if (callState.proximityLock?.isHeld == false) callState.proximityLock.acquire()
+      if (proximityLock?.isHeld == false) proximityLock.acquire()
    }
  }
  Box(Modifier.fillMaxSize()) {
@@ -134,7 +122,6 @@ actual fun ActiveCallView() {
      Log.d(TAG, "received from WebRTCView: $apiMsg")
      val call = chatModel.activeCall.value
      if (call != null) {
-        val callState = call.androidCallState as ActiveCallState
        Log.d(TAG, "has active call $call")
        val callRh = call.remoteHostId
        when (val r = apiMsg.resp) {
@@ -144,9 +131,9 @@ actual fun ActiveCallView() {
            updateActiveCall(call) { it.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities) }
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
              // Starting is delayed to make Android <= 11 working good with Bluetooth
-              callState.callAudioDeviceManager.start()
+              callAudioDeviceManager.start()
            } else {
-              callState.callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
+              callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
            }
            CallSoundsPlayer.startConnectingCallSound(scope)
            activeCallWaitDeliveryReceipt(scope)
@@ -156,9 +143,9 @@ actual fun ActiveCallView() {
            updateActiveCall(call) { it.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities) }
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
              // Starting is delayed to make Android <= 11 working good with Bluetooth
-              callState.callAudioDeviceManager.start()
+              callAudioDeviceManager.start()
            } else {
-              callState.callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
+              callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
            }
          }
          is WCallResponse.Answer -> withBGApi {
@@ -241,14 +228,14 @@ actual fun ActiveCallView() {
      !chatModel.activeCallViewIsCollapsed.value -> true
      else -> false
    }
-    if (call != null && showOverlay && callState != null) {
-      ActiveCallOverlay(call, chatModel, callState.callAudioDeviceManager)
+    if (call != null && showOverlay) {
+      ActiveCallOverlay(call, chatModel, callAudioDeviceManager)
    }
  }
-  KeyChangeEffect(callState, call?.localMediaSources?.hasVideo) {
-    if (call != null && call.hasVideo && callState != null && callState.callAudioDeviceManager.currentDevice.value?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) {
+  KeyChangeEffect(call?.localMediaSources?.hasVideo) {
+    if (call != null && call.hasVideo && callAudioDeviceManager.currentDevice.value?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) {
      // enabling speaker on user action (peer action ignored) and not disabling it again
-      callState.callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
+      callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
    }
  }
  val context = LocalContext.current
@@ -256,12 +243,16 @@ actual fun ActiveCallView() {
    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
    val prevVolumeControlStream = activity.volumeControlStream
    activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
+    // Lock orientation to portrait in order to have good experience with calls
+    activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
    chatModel.activeCallViewIsVisible.value = true
    // After the first call, End command gets added to the list which prevents making another calls
    chatModel.callCommand.removeAll { it is WCallCommand.End }
    keepScreenOn(true)
    onDispose {
      activity.volumeControlStream = prevVolumeControlStream
+      // Unlock orientation
+      activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
      chatModel.activeCallViewIsVisible.value = false
      chatModel.callCommand.clear()
      keepScreenOn(false)
@@ -273,8 +264,8 @@ actual fun ActiveCallView() {
 private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, callAudioDeviceManager: CallAudioDeviceManagerInterface) {
  ActiveCallOverlayLayout(
    call = call,
-    devices = remember(callAudioDeviceManager) { callAudioDeviceManager.devices }.value,
-    currentDevice = remember(callAudioDeviceManager) { callAudioDeviceManager.currentDevice },
+    devices = remember { callAudioDeviceManager.devices }.value,
+    currentDevice = remember { callAudioDeviceManager.currentDevice },
    dismiss = { withBGApi { chatModel.callManager.endCall(call) } },
    toggleAudio = { chatModel.callCommand.add(WCallCommand.Media(CallMediaSource.Mic, enable = !call.localMediaSources.mic)) },
    selectDevice = { callAudioDeviceManager.selectDevice(it.id) },
@@ -841,8 +832,7 @@ fun PreviewActiveCallOverlayVideo() {
        connectionInfo = ConnectionInfo(
          RTCIceCandidate(RTCIceCandidateType.Host, "tcp"),
          RTCIceCandidate(RTCIceCandidateType.Host, "tcp")
-        ),
-        androidCallState = {}
+        )
      ),
      devices = emptyList(),
      currentDevice = remember { mutableStateOf(null) },
@@ -851,7 +841,7 @@ fun PreviewActiveCallOverlayVideo() {
      selectDevice = {},
      toggleVideo = {},
      toggleSound = {},
-      flipCamera = {},
+      flipCamera = {}
    )
  }
 }
@@ -872,8 +862,7 @@ fun PreviewActiveCallOverlayAudio() {
        connectionInfo = ConnectionInfo(
          RTCIceCandidate(RTCIceCandidateType.Host, "udp"),
          RTCIceCandidate(RTCIceCandidateType.Host, "udp")
-        ),
-        androidCallState = {}
+        )
      ),
      devices = emptyList(),
      currentDevice = remember { mutableStateOf(null) },
@@ -33,7 +33,6 @@ import com.google.accompanist.permissions.rememberPermissionState
 import com.google.common.util.concurrent.ListenableFuture
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.delay
 import java.util.concurrent.*

 // Adapted from learntodroid - https://gist.github.com/learntodroid/8f839be0b29d0378f843af70607bd7f5
@@ -42,13 +41,13 @@ import java.util.concurrent.*
 actual fun QRCodeScanner(
  showQRCodeScanner: MutableState<Boolean>,
  padding: PaddingValues,
-  onBarcode: suspend (String) -> Boolean
+  onBarcode: (String) -> Unit
 ) {
  val context = LocalContext.current
  val lifecycleOwner = LocalLifecycleOwner.current
-  val preview = remember { mutableStateOf<Preview?>(null) }
-  val contactLink = remember { mutableStateOf("") }
-  val checkingLink = remember { mutableStateOf(false) }
+  var preview by remember { mutableStateOf<Preview?>(null) }
+  var lastAnalyzedTimeStamp = 0L
+  var contactLink = ""

  val cameraProviderFuture by produceState<ListenableFuture<ProcessCameraProvider>?>(initialValue = null) {
    value = ProcessCameraProvider.getInstance(context)
@@ -87,33 +86,28 @@ actual fun QRCodeScanner(
          .build()
        val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
        cameraProviderFuture?.addListener({
-          preview.value = Preview.Builder().build().also {
+          preview = Preview.Builder().build().also {
            it.setSurfaceProvider(previewView.surfaceProvider)
          }
          val detector: QrCodeDetector<GrayU8> = FactoryFiducial.qrcode(null, GrayU8::class.java)
-          suspend fun getQR(imageProxy: ImageProxy) {
-            if (checkingLink.value) return
-            checkingLink.value = true
-
-            detector.process(imageProxyToGrayU8(imageProxy))
-            val found = detector.detections
-            val qr = found.firstOrNull()
-            if (qr != null) {
-              if (qr.message != contactLink.value) {
-                // Make sure link is new and not a repeat if that link was handled successfully
-                if (onBarcode(qr.message)) {
-                  contactLink.value = qr.message
+          fun getQR(imageProxy: ImageProxy) {
+            val currentTimeStamp = System.currentTimeMillis()
+            if (currentTimeStamp - lastAnalyzedTimeStamp >= TimeUnit.SECONDS.toMillis(1)) {
+              detector.process(imageProxyToGrayU8(imageProxy))
+              val found = detector.detections
+              val qr = found.firstOrNull()
+              if (qr != null) {
+                if (qr.message != contactLink) {
+                  // Make sure link is new and not a repeat
+                  contactLink = qr.message
+                  onBarcode(contactLink)
                }
-                // just some delay to not spam endlessly with alert in case the user scan something wrong, and it fails fast
-                // (for example, scan user's address while verifying contact code - it prevents alert spam)
-                delay(1000)
              }
            }
-            checkingLink.value = false
            imageProxy.close()
          }

-          val imageAnalyzer = ImageAnalysis.Analyzer { proxy -> withApi { getQR(proxy) } }
+          val imageAnalyzer = ImageAnalysis.Analyzer { proxy -> getQR(proxy) }
          val imageAnalysis: ImageAnalysis = ImageAnalysis.Builder()
            .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
            .setImageQueueDepth(1)
@@ -121,7 +115,7 @@ actual fun QRCodeScanner(
            .also { it.setAnalyzer(cameraExecutor, imageAnalyzer) }
          try {
            cameraProviderFuture?.get()?.unbindAll()
-            cameraProviderFuture?.get()?.bindToLifecycle(lifecycleOwner, cameraSelector, preview.value, imageAnalysis)
+            cameraProviderFuture?.get()?.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
          } catch (e: Exception) {
            Log.d(TAG, "CameraPreview: ${e.localizedMessage}")
          }
@@ -106,12 +106,7 @@ fun AppearanceScope.AppearanceLayout(
      }
      //      }

-      SettingsPreferenceItem(icon = null, stringResource(MR.strings.one_hand_ui), ChatModel.controller.appPrefs.oneHandUI) { enabled ->
-        if (enabled) appPrefs.chatBottomBar.set(true)
-      }
-      if (remember { appPrefs.oneHandUI.state }.value) {
-        SettingsPreferenceItem(icon = null, stringResource(MR.strings.chat_bottom_bar), ChatModel.controller.appPrefs.chatBottomBar)
-      }
+      SettingsPreferenceItem(icon = null, stringResource(MR.strings.one_hand_ui), ChatModel.controller.appPrefs.oneHandUI)
    }

    SectionDividerSpaced()
@@ -1,19 +0,0 @@
-package chat.simplex.common.views.usersettings.networkAndServers
-
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-actual fun ConditionsBox(modifier: Modifier, scrollState: ScrollState, content: @Composable() (BoxScope.() -> Unit)){
-  Box(
-    modifier = modifier
-      .verticalScroll(scrollState)
-      .padding(8.dp)
-  ) {
-    content()
-  }
-}
@@ -1467,7 +1467,6 @@ data class GroupInfo (
  val groupId: Long,
  override val localDisplayName: String,
  val groupProfile: GroupProfile,
-  val businessChat: BusinessChatInfo? = null,
  val fullGroupPreferences: FullGroupPreferences,
  val membership: GroupMember,
  val hostConnCustomUserProfileId: Long? = null,
@@ -1498,7 +1497,7 @@ data class GroupInfo (
  override val image get() = groupProfile.image
  override val localAlias get() = ""

-  val isOwner: Boolean
+  val canEdit: Boolean
    get() = membership.memberRole == GroupMemberRole.Owner && membership.memberCurrent

  val canDelete: Boolean
@@ -1544,19 +1543,6 @@ data class GroupProfile (
  }
 }

-@Serializable
-data class BusinessChatInfo (
-  val chatType: BusinessChatType,
-  val businessId: String,
-  val customerId: String,
-)
-
-@Serializable
-enum class BusinessChatType {
-  @SerialName("business") Business,
-  @SerialName("customer") Customer,
-}
-
@Serializable
 data class GroupMember (
  val groupMemberId: Long,
@@ -1895,9 +1881,8 @@ class PendingContactConnection(
      generalGetString(MR.strings.display_name_connection_established)
    } else {
      generalGetString(
-        if (viaContactUri) MR.strings.display_name_requested_to_connect
-        else if (initiated) MR.strings.display_name_invited_to_connect
-        else MR.strings.display_name_accepted_invitation
+        if (initiated && !viaContactUri) MR.strings.display_name_invited_to_connect
+        else MR.strings.display_name_connecting
      )
    }
  }
@@ -23,7 +23,6 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.chat.item.showQuotedItemDoesNotExistAlert
-import chat.simplex.common.views.chatlist.openGroupChat
 import chat.simplex.common.views.migration.MigrationFileLinkData
 import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.common.views.usersettings.*
@@ -258,7 +257,6 @@ class AppPreferences {
  val iosCallKitCallsInRecents = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS, false)

  val oneHandUI = mkBoolPreference(SHARED_PREFS_ONE_HAND_UI, true)
-  val chatBottomBar = mkBoolPreference(SHARED_PREFS_CHAT_BOTTOM_BAR, true)

  val hintPreferences: List<Pair<SharedPreference<Boolean>, Boolean>> = listOf(
    laNoticeShown to false,
@@ -433,7 +431,6 @@ class AppPreferences {
    private const val SHARED_PREFS_SHOULD_IMPORT_APP_SETTINGS = "ShouldImportAppSettings"
    private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
    private const val SHARED_PREFS_ONE_HAND_UI = "OneHandUI"
-    private const val SHARED_PREFS_CHAT_BOTTOM_BAR = "ChatBottomBar"
    private const val SHARED_PREFS_SELF_DESTRUCT = "LocalAuthenticationSelfDestruct"
    private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
    private const val SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED = "PQExperimentalEnabled" // no longer used
@@ -441,6 +438,7 @@ class AppPreferences {
    private const val SHARED_PREFS_CURRENT_THEME_IDs = "CurrentThemeIds"
    private const val SHARED_PREFS_SYSTEM_DARK_THEME = "SystemDarkTheme"
    private const val SHARED_PREFS_THEMES_OLD = "Themes"
+    private const val SHARED_PREFS_THEME_OVERRIDES = "ThemeOverrides"
    private const val SHARED_PREFS_PROFILE_IMAGE_CORNER_RADIUS = "ProfileImageCornerRadius"
    private const val SHARED_PREFS_CHAT_ITEM_ROUNDNESS = "ChatItemRoundness"
    private const val SHARED_PREFS_CHAT_ITEM_TAIL = "ChatItemTail"
@@ -896,27 +894,8 @@ object ChatController {

  private suspend fun processSendMessageCmd(rh: Long?, cmd: CC): List<AChatItem>? {
    val r = sendCmd(rh, cmd)
-    return when {
-      r is CR.NewChatItems -> r.chatItems
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg && cmd is CC.ApiSendMessages -> {
-        val mc = cmd.composedMessages.last().msgContent
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.maximum_message_size_title),
-          if (mc is MsgContent.MCImage || mc is MsgContent.MCVideo || mc is MsgContent.MCLink) {
-            generalGetString(MR.strings.maximum_message_size_reached_non_text)
-          } else {
-            generalGetString(MR.strings.maximum_message_size_reached_text)
-          }
-        )
-        null
-      }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg && cmd is CC.ApiForwardChatItems -> {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.maximum_message_size_title),
-          generalGetString(MR.strings.maximum_message_size_reached_forwarding)
-        )
-        null
-      }
+    return when (r) {
+      is CR.NewChatItems -> r.chatItems
      else -> {
        if (!(networkErrorAlert(r))) {
          apiErrorAlert("processSendMessageCmd", generalGetString(MR.strings.error_sending_message), r)
@@ -964,21 +943,7 @@ object ChatController {

  suspend fun apiUpdateChatItem(rh: Long?, type: ChatType, id: Long, itemId: Long, mc: MsgContent, live: Boolean = false): AChatItem? {
    val r = sendCmd(rh, CC.ApiUpdateChatItem(type, id, itemId, mc, live))
-    when {
-      r is CR.ChatItemUpdated -> return r.chatItem
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg -> {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.maximum_message_size_title),
-          if (mc is MsgContent.MCImage || mc is MsgContent.MCVideo || mc is MsgContent.MCLink) {
-            generalGetString(MR.strings.maximum_message_size_reached_non_text)
-          } else {
-            generalGetString(MR.strings.maximum_message_size_reached_text)
-          }
-        )
-        return null
-      }
-    }
-
+    if (r is CR.ChatItemUpdated) return r.chatItem
    Log.e(TAG, "apiUpdateChatItem bad response: ${r.responseType} ${r.details}")
    return null
  }
@@ -2436,7 +2401,9 @@ object ChatController {
          ) {
            receiveFile(rhId, r.user, file.fileId, auto = true)
          }
-          ntfManager.notifyMessageReceived(rhId, r.user, cInfo, cItem)
+          if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
+            ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
+          }
        }
      }
      is CR.ChatItemsStatusesUpdated ->
@@ -2450,7 +2417,7 @@ object ChatController {
          }
        }
      is CR.ChatItemUpdated ->
-        chatItemUpdateNotify(rhId, r.user, r.chatItem)
+        chatItemSimpleUpdate(rhId, r.user, r.chatItem)
      is CR.ChatItemReaction -> {
        if (active(r.user)) {
          withChats {
@@ -2526,19 +2493,6 @@ object ChatController {
          }
        }
      }
-      is CR.BusinessLinkConnecting -> {
-        if (!active(r.user)) return
-
-        withChats {
-          updateGroup(rhId, r.groupInfo)
-        }
-        if (chatModel.chatId.value == r.fromContact.id) {
-          openGroupChat(rhId, r.groupInfo.groupId)
-        }
-        withChats {
-          removeChat(rhId, r.fromContact.id)
-        }
-      }
      is CR.JoinedGroupMemberConnecting ->
        if (active(r.user)) {
          withChats {
@@ -2948,17 +2902,9 @@ object ChatController {
  }

  private suspend fun chatItemSimpleUpdate(rh: Long?, user: UserLike, aChatItem: AChatItem) {
-    if (activeUser(rh, user)) {
-      val cInfo = aChatItem.chatInfo
-      val cItem = aChatItem.chatItem
-      withChats { upsertChatItem(rh, cInfo, cItem) }
-    }
-  }
-
-  private suspend fun chatItemUpdateNotify(rh: Long?, user: UserLike, aChatItem: AChatItem) {
    val cInfo = aChatItem.chatInfo
    val cItem = aChatItem.chatItem
-    val notify = { ntfManager.notifyMessageReceived(rh, user, cInfo, cItem) }
+    val notify = { ntfManager.notifyMessageReceived(user, cInfo, cItem) }
    if (!activeUser(rh, user)) {
      notify()
    } else if (withChats { upsertChatItem(rh, cInfo, cItem) }) {
@@ -3115,12 +3061,8 @@ class SharedPreference<T>(val get: () -> T, set: (T) -> Unit) {

  init {
    this.set = { value ->
-      try {
-        set(value)
-        _state.value = value
-      } catch (e: Exception) {
-        Log.e(TAG, "Error saving settings: ${e.stackTraceToString()}")
-      }
+      set(value)
+      _state.value = value
    }
  }
 }
@@ -3673,13 +3615,14 @@ enum class ServerProtocol {
@Serializable
 enum class OperatorTag {
  @SerialName("simplex") SimpleX,
-  @SerialName("flux") Flux
+  @SerialName("flux") Flux,
+  @SerialName("xyz") XYZ,
+  @SerialName("demo") Demo
 }

 data class ServerOperatorInfo(
  val description: List<String>,
  val website: String,
-  val selfhost: Pair<String, String>? = null,
  val logo: ImageResource,
  val largeLogo: ImageResource,
  val logoDarkMode: ImageResource,
@@ -3699,17 +3642,31 @@ val operatorsInfo: Map<OperatorTag, ServerOperatorInfo> = mapOf(
  ),
  OperatorTag.Flux to ServerOperatorInfo(
    description = listOf(
-      "Flux is the largest decentralized cloud, based on a global network of user-operated nodes.",
-      "Flux offers a powerful, scalable, and affordable cutting edge technology platform for all.",
-      "Flux operates servers in SimpleX network to improve its privacy and decentralization."
+      "Flux is the largest decentralized cloud infrastructure, leveraging a global network of user-operated computational nodes.",
+      "Flux offers a powerful, scalable, and affordable platform designed to support individuals, businesses, and cutting-edge technologies like AI. With high uptime and worldwide distribution, Flux ensures reliable, accessible cloud computing for all."
    ),
    website = "https://runonflux.com",
-    selfhost = "Self-host SimpleX servers on Flux" to "https://home.runonflux.io/apps/marketplace?q=simplex",
    logo = MR.images.flux_logo_symbol,
    largeLogo = MR.images.flux_logo,
    logoDarkMode = MR.images.flux_logo_symbol,
    largeLogoDarkMode = MR.images.flux_logo_light
  ),
+  OperatorTag.XYZ to ServerOperatorInfo(
+    description = listOf("XYZ servers"),
+    website = "XYZ website",
+    logo = MR.images.shield,
+    largeLogo = MR.images.logo,
+    logoDarkMode = MR.images.shield,
+    largeLogoDarkMode = MR.images.logo_light
+  ),
+  OperatorTag.Demo to ServerOperatorInfo(
+    description = listOf("Demo operator"),
+    website = "Demo website",
+    logo = MR.images.decentralized,
+    largeLogo = MR.images.logo,
+    logoDarkMode = MR.images.decentralized_light,
+    largeLogoDarkMode = MR.images.logo_light
+  )
 )

@Serializable
@@ -3789,7 +3746,7 @@ data class ServerOperator(
  companion object {
    val dummyOperatorInfo = ServerOperatorInfo(
      description = listOf("Default"),
-      website = "https://simplex.chat",
+      website = "Default",
      logo = MR.images.decentralized,
      largeLogo = MR.images.logo,
      logoDarkMode = MR.images.decentralized_light,
@@ -3807,6 +3764,30 @@ data class ServerOperator(
      smpRoles = ServerRoles(storage = true, proxy = true),
      xftpRoles = ServerRoles(storage = true, proxy = true)
    )
+
+    val sampleData2 = ServerOperator(
+      operatorId = 2,
+      operatorTag = OperatorTag.XYZ,
+      tradeName = "XYZ",
+      legalName = null,
+      serverDomains = listOf("xyz.com"),
+      conditionsAcceptance = ConditionsAcceptance.Required(deadline = null),
+      enabled = false,
+      smpRoles = ServerRoles(storage = false, proxy = true),
+      xftpRoles = ServerRoles(storage = false, proxy = true)
+    )
+
+    val sampleData3 = ServerOperator(
+      operatorId = 3,
+      operatorTag = OperatorTag.Demo,
+      tradeName = "Demo",
+      legalName = null,
+      serverDomains = listOf("demo.com"),
+      conditionsAcceptance = ConditionsAcceptance.Required(deadline = null),
+      enabled = false,
+      smpRoles = ServerRoles(storage = true, proxy = false),
+      xftpRoles = ServerRoles(storage = true, proxy = false)
+    )
  }

  val id: Long
@@ -4979,7 +4960,7 @@ enum class GroupFeature: Feature {
        }
        DirectMessages -> when(enabled) {
          GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_dms)
-          GroupFeatureEnabled.OFF -> generalGetString(MR.strings.direct_messages_are_prohibited)
+          GroupFeatureEnabled.OFF -> generalGetString(MR.strings.direct_messages_are_prohibited_in_chat)
        }
        FullDelete -> when(enabled) {
          GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_delete)
@@ -5425,6 +5406,7 @@ sealed class CR {
  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef, val connection: PendingContactConnection): CR()
  @Serializable @SerialName("sentInvitationToContact") class SentInvitationToContact(val user: UserRef, val contact: Contact, val customUserProfile: Profile?): CR()
  @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
+  @Serializable @SerialName("contactRequestAlreadyAccepted") class ContactRequestAlreadyAccepted(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("contactDeleted") class ContactDeleted(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("contactDeletedByContact") class ContactDeletedByContact(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("chatCleared") class ChatCleared(val user: UserRef, val chatInfo: ChatInfo): CR()
@@ -5470,7 +5452,6 @@ sealed class CR {
  @Serializable @SerialName("sentGroupInvitation") class SentGroupInvitation(val user: UserRef, val groupInfo: GroupInfo, val contact: Contact, val member: GroupMember): CR()
  @Serializable @SerialName("userAcceptedGroupSent") class UserAcceptedGroupSent (val user: UserRef, val groupInfo: GroupInfo, val hostContact: Contact? = null): CR()
  @Serializable @SerialName("groupLinkConnecting") class GroupLinkConnecting (val user: UserRef, val groupInfo: GroupInfo, val hostMember: GroupMember): CR()
-  @Serializable @SerialName("businessLinkConnecting") class BusinessLinkConnecting (val user: UserRef, val groupInfo: GroupInfo, val hostMember: GroupMember, val fromContact: Contact): CR()
  @Serializable @SerialName("userDeletedMember") class UserDeletedMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
  @Serializable @SerialName("leftMemberUser") class LeftMemberUser(val user: UserRef, val groupInfo: GroupInfo): CR()
  @Serializable @SerialName("groupMembers") class GroupMembers(val user: UserRef, val group: Group): CR()
@@ -5609,6 +5590,7 @@ sealed class CR {
    is SentInvitation -> "sentInvitation"
    is SentInvitationToContact -> "sentInvitationToContact"
    is ContactAlreadyExists -> "contactAlreadyExists"
+    is ContactRequestAlreadyAccepted -> "contactRequestAlreadyAccepted"
    is ContactDeleted -> "contactDeleted"
    is ContactDeletedByContact -> "contactDeletedByContact"
    is ChatCleared -> "chatCleared"
@@ -5651,7 +5633,6 @@ sealed class CR {
    is SentGroupInvitation -> "sentGroupInvitation"
    is UserAcceptedGroupSent -> "userAcceptedGroupSent"
    is GroupLinkConnecting -> "groupLinkConnecting"
-    is BusinessLinkConnecting -> "businessLinkConnecting"
    is UserDeletedMember -> "userDeletedMember"
    is LeftMemberUser -> "leftMemberUser"
    is GroupMembers -> "groupMembers"
@@ -5783,6 +5764,7 @@ sealed class CR {
    is SentInvitation -> withUser(user, json.encodeToString(connection))
    is SentInvitationToContact -> withUser(user, json.encodeToString(contact))
    is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
+    is ContactRequestAlreadyAccepted -> withUser(user, json.encodeToString(contact))
    is ContactDeleted -> withUser(user, json.encodeToString(contact))
    is ContactDeletedByContact -> withUser(user, json.encodeToString(contact))
    is ChatCleared -> withUser(user, json.encodeToString(chatInfo))
@@ -5825,7 +5807,6 @@ sealed class CR {
    is SentGroupInvitation -> withUser(user, "groupInfo: $groupInfo\ncontact: $contact\nmember: $member")
    is UserAcceptedGroupSent -> json.encodeToString(groupInfo)
    is GroupLinkConnecting -> withUser(user, "groupInfo: $groupInfo\nhostMember: $hostMember")
-    is BusinessLinkConnecting -> withUser(user, "groupInfo: $groupInfo\nhostMember: $hostMember\nfromContact: $fromContact")
    is UserDeletedMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
    is LeftMemberUser -> withUser(user, json.encodeToString(groupInfo))
    is GroupMembers -> withUser(user, json.encodeToString(group))
@@ -6097,16 +6078,11 @@ class UserContactLinkRec(val connReqContact: String, val autoAccept: AutoAccept?
 }

@Serializable
-class AutoAccept(val businessAddress: Boolean, val acceptIncognito: Boolean, val autoReply: MsgContent?) {
+class AutoAccept(val acceptIncognito: Boolean, val autoReply: MsgContent?) {
  companion object {
    fun cmdString(autoAccept: AutoAccept?): String {
      if (autoAccept == null) return "off"
-      var s = "on"
-      if (autoAccept.acceptIncognito) {
-        s += " incognito=on"
-      } else if (autoAccept.businessAddress) {
-        s += " business"
-      }
+      val s = "on" + if (autoAccept.acceptIncognito) " incognito=on" else ""
      val msg = autoAccept.autoReply ?: return s
      return s + " " + msg.cmdString
    }
@@ -6381,7 +6357,6 @@ sealed class StoreError {
      is HostMemberIdNotFound -> "hostMemberIdNotFound"
      is ContactNotFoundByFileId -> "contactNotFoundByFileId"
      is NoGroupSndStatus -> "noGroupSndStatus"
-      is LargeMsg -> "largeMsg"
    }

  @Serializable @SerialName("duplicateName") object DuplicateName: StoreError()
@@ -6441,7 +6416,6 @@ sealed class StoreError {
  @Serializable @SerialName("hostMemberIdNotFound") class HostMemberIdNotFound(val groupId: Long): StoreError()
  @Serializable @SerialName("contactNotFoundByFileId") class ContactNotFoundByFileId(val fileId: Long): StoreError()
  @Serializable @SerialName("noGroupSndStatus") class NoGroupSndStatus(val itemId: Long, val groupMemberId: Long): StoreError()
-  @Serializable @SerialName("largeMsg") object LargeMsg: StoreError()
 }

@Serializable
@@ -6469,7 +6443,7 @@ sealed class SQLiteError {
@Serializable
 sealed class AgentErrorType {
  val string: String get() = when (this) {
-    is CMD -> "CMD ${cmdErr.string} $errContext"
+    is CMD -> "CMD ${cmdErr.string}"
    is CONN -> "CONN ${connErr.string}"
    is SMP -> "SMP ${smpErr.string}"
    // is NTF -> "NTF ${ntfErr.string}"
@@ -6482,7 +6456,7 @@ sealed class AgentErrorType {
    is CRITICAL -> "CRITICAL $offerRestart $criticalErr"
    is INACTIVE -> "INACTIVE"
  }
-  @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType, val errContext: String): AgentErrorType()
+  @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType): AgentErrorType()
  @Serializable @SerialName("CONN") class CONN(val connErr: ConnectionErrorType): AgentErrorType()
  @Serializable @SerialName("SMP") class SMP(val serverAddress: String, val smpErr: SMPErrorType): AgentErrorType()
  // @Serializable @SerialName("NTF") class NTF(val ntfErr: SMPErrorType): AgentErrorType()
@@ -6860,8 +6834,7 @@ data class AppSettings(
  var uiDarkColorScheme: String? = null,
  var uiCurrentThemeIds: Map<String, String>? = null,
  var uiThemes: List<ThemeOverrides>? = null,
-  var oneHandUI: Boolean? = null,
-  var chatBottomBar: Boolean? = null
+  var oneHandUI: Boolean? = null
 ) {
  fun prepareForExport(): AppSettings {
    val empty = AppSettings()
@@ -6896,7 +6869,6 @@ data class AppSettings(
    if (uiCurrentThemeIds != def.uiCurrentThemeIds) { empty.uiCurrentThemeIds = uiCurrentThemeIds }
    if (uiThemes != def.uiThemes) { empty.uiThemes = uiThemes }
    if (oneHandUI != def.oneHandUI) { empty.oneHandUI = oneHandUI }
-    if (chatBottomBar != def.chatBottomBar) { empty.chatBottomBar = chatBottomBar }
    return empty
  }

@@ -6942,7 +6914,6 @@ data class AppSettings(
    uiCurrentThemeIds?.let { def.currentThemeIds.set(it) }
    uiThemes?.let { def.themeOverrides.set(it.skipDuplicates()) }
    oneHandUI?.let { def.oneHandUI.set(it) }
-    chatBottomBar?.let { if (appPlatform.isAndroid) def.chatBottomBar.set(it) else def.chatBottomBar.set(true) }
  }

  companion object {
@@ -6977,8 +6948,7 @@ data class AppSettings(
        uiDarkColorScheme = DefaultTheme.SIMPLEX.themeName,
        uiCurrentThemeIds = null,
        uiThemes = null,
-        oneHandUI = true,
-        chatBottomBar = true,
+        oneHandUI = true
      )

    val current: AppSettings
@@ -7014,8 +6984,7 @@ data class AppSettings(
          uiDarkColorScheme = def.systemDarkTheme.get() ?: DefaultTheme.SIMPLEX.themeName,
          uiCurrentThemeIds = def.currentThemeIds.get(),
          uiThemes = def.themeOverrides.get(),
-          oneHandUI = def.oneHandUI.get(),
-          chatBottomBar = def.chatBottomBar.get()
+          oneHandUI = def.oneHandUI.get()
        )
    }
  }
@@ -3,7 +3,7 @@ package chat.simplex.common.platform
 import androidx.compose.runtime.Composable
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
 import com.charleskorn.kaml.*
 import kotlinx.serialization.encodeToString
@@ -11,8 +11,6 @@ import java.io.*
 import java.net.URI
 import java.net.URLDecoder
 import java.net.URLEncoder
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption

 expect val dataDir: File
 expect val tmpDir: File
@@ -22,7 +20,6 @@ expect val wallpapersDir: File
 expect val coreTmpDir: File
 expect val dbAbsolutePrefixPath: String
 expect val preferencesDir: File
-expect val preferencesTmpDir: File

 expect val chatDatabaseFileName: String
 expect val agentDatabaseFileName: String
@@ -145,23 +142,16 @@ fun readThemeOverrides(): List<ThemeOverrides> {
  }
 }

-private const val lock = "themesWriter"
-
 fun writeThemeOverrides(overrides: List<ThemeOverrides>): Boolean =
-  synchronized(lock) {
-    try {
-      val themesFile = File(getPreferenceFilePath("themes.yaml"))
-      createTmpFileAndDelete(preferencesTmpDir) { tmpFile ->
-        val string = yaml.encodeToString(ThemesFile(themes = overrides))
-        tmpFile.bufferedWriter().use { it.write(string) }
-        themesFile.parentFile.mkdirs()
-        Files.move(tmpFile.toPath(), themesFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
-      }
-      true
-    } catch (e: Exception) {
-      Log.e(TAG, "Error writing themes file: ${e.stackTraceToString()}")
-      false
+  try {
+    File(getPreferenceFilePath("themes.yaml")).outputStream().use {
+      val string = yaml.encodeToString(ThemesFile(themes = overrides))
+      it.bufferedWriter().use { it.write(string) }
    }
+    true
+  } catch (e: Throwable) {
+    Log.e(TAG, "Error while writing themes file: ${e.stackTraceToString()}")
+    false
  }

 private fun fileReady(file: CIFile, filePath: String) =
@@ -36,17 +36,9 @@ abstract class NtfManager {
    )
  )

-  fun notifyMessageReceived(rhId: Long?, user: UserLike, cInfo: ChatInfo, cItem: ChatItem) {
-    if (
-      cItem.showNotification &&
-      cInfo.ntfsEnabled &&
-      (
-          allowedToShowNotification() ||
-              chatModel.chatId.value != cInfo.id ||
-              chatModel.remoteHostId() != rhId)
-    ) {
-      displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
-    }
+  fun notifyMessageReceived(user: UserLike, cInfo: ChatInfo, cItem: ChatItem) {
+    if (!cInfo.ntfsEnabled) return
+    displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
  }

  fun acceptContactRequestAction(userId: Long?, incognito: Boolean, chatId: ChatId) {
@@ -10,7 +10,6 @@ import chat.simplex.common.model.ChatId
 import chat.simplex.common.model.NotificationsMode
 import chat.simplex.common.ui.theme.CurrentColors
 import kotlinx.coroutines.Job
-import java.io.Closeable

 interface PlatformInterface {
  suspend fun androidServiceStart() {}
@@ -27,8 +26,6 @@ interface PlatformInterface {
  fun androidPictureInPictureAllowed(): Boolean = true
  fun androidCallEnded() {}
  fun androidRestartNetworkObserver() {}
-  fun androidCreateActiveCallState(): Closeable = Closeable { }
-  fun androidIsXiaomiDevice(): Boolean = false
  val androidApiLevel: Int? get() = null
  @Composable fun androidLockPortraitOrientation() {}
  suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
@@ -23,7 +23,6 @@ expect fun LazyColumnWithScrollBar(
  flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
  userScrollEnabled: Boolean = true,
  additionalBarOffset: State<Dp>? = null,
-  chatBottomBar: State<Boolean> = remember { mutableStateOf(true) },
  // by default, this function will include .fillMaxSize() without you doing anything. If you don't need it, pass `false` here
  // maxSize (at least maxHeight) is needed for blur on appBars to work correctly
  fillMaxSize: Boolean = true,
@@ -42,7 +41,6 @@ expect fun LazyColumnWithScrollBarNoAppBar(
  flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
  userScrollEnabled: Boolean = true,
  additionalBarOffset: State<Dp>? = null,
-  chatBottomBar: State<Boolean> = remember { mutableStateOf(true) },
  content: LazyListScope.() -> Unit
 )

@@ -609,7 +609,6 @@ fun themedBackgroundBrush(): Brush = Brush.linearGradient(
 )

 val DEFAULT_PADDING = 20.dp
-val DEFAULT_ONBOARDING_HORIZONTAL_PADDING = 25.dp
 val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
 val DEFAULT_BOTTOM_PADDING = 48.dp
@@ -102,9 +102,7 @@ object ThemeManager {
  }

  fun applyTheme(theme: String) {
-    if (appPrefs.currentTheme.get() != theme) {
-      appPrefs.currentTheme.set(theme)
-    }
+    appPrefs.currentTheme.set(theme)
    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
    platform.androidSetNightModeIfSupported()
    val c = CurrentColors.value.colors
@@ -156,7 +156,7 @@ fun TerminalLog(floating: Boolean, composeViewHeight: State<Dp>) {
  LazyColumnWithScrollBar (
    reverseLayout = true,
    contentPadding = PaddingValues(
-      top = topPaddingToContent(false),
+      top = topPaddingToContent(),
      bottom = composeViewHeight.value
    ),
    state = listState,
@@ -117,7 +117,7 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
      ColumnWithScrollBar {
        val displayName = rememberSaveable { mutableStateOf("") }
        val focusRequester = remember { FocusRequester() }
-        Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(start = DEFAULT_ONBOARDING_HORIZONTAL_PADDING * 2, end = DEFAULT_ONBOARDING_HORIZONTAL_PADDING * 2, bottom = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+        Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(start = DEFAULT_PADDING * 2, end = DEFAULT_PADDING * 2, bottom = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally)) {
          Box(Modifier.align(Alignment.CenterHorizontally)) {
            AppBarTitle(stringResource(MR.strings.create_your_profile), bottomPadding = DEFAULT_PADDING, withPadding = false)
          }
@@ -130,7 +130,7 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
        Spacer(Modifier.fillMaxHeight().weight(1f))
        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
          OnboardingActionButton(
-            if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+            if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
            labelId = MR.strings.create_profile_button,
            onboarding = null,
            enabled = canCreateProfile(displayName.value),
@@ -43,7 +43,6 @@ class CallManager(val chatModel: ChatModel) {

  private fun justAcceptIncomingCall(invitation: RcvCallInvitation, userProfile: Profile) {
    with (chatModel) {
-      activeCall.value?.androidCallState?.close()
      activeCall.value = Call(
        remoteHostId = invitation.remoteHostId,
        userProfile = userProfile,
@@ -52,7 +51,6 @@ class CallManager(val chatModel: ChatModel) {
        callState = CallState.InvitationAccepted,
        initialCallType = invitation.callType.media,
        sharedKey = invitation.sharedKey,
-        androidCallState = platform.androidCreateActiveCallState()
      )
      showCallView.value = true
      val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
@@ -80,7 +78,6 @@ class CallManager(val chatModel: ChatModel) {
      // Don't destroy WebView if you plan to accept next call right after this one
      if (!switchingCall.value) {
        showCallView.value = false
-        activeCall.value?.androidCallState?.close()
        activeCall.value = null
        activeCallViewIsCollapsed.value = false
        platform.androidCallEnded()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Evgeny Poberezkin	e9a443e049	rename option	2024-11-30 20:40:30 +00:00
Evgeny Poberezkin	486c19c1d6	pass ChatOpts	2024-11-30 20:33:29 +00:00
Evgeny Poberezkin	271f0dc6c1	simplify, make passed user active	2024-11-30 20:29:38 +00:00
Evgeny Poberezkin	ecbcf05218	Merge branch 'feature/cli_support_non_interactive_mode' of github.com:reply2future/simplex-chat into reply2future-feature/cli_support_non_interactive_mode	2024-11-30 20:19:12 +00:00
mervyn	2dc9c85cf2	refactor(cli): move `display-name` option to `ChatOpts` in CLI	2024-11-19 07:48:01 +08:00
mervyn	587e0a18a9	feat(cli): add `display-name` option to cli	2024-11-19 07:48:01 +08:00