Merge branch 'master' into av/rtl-animation

desktop: catch Toast exception (#3028 )
ios: update chat_read_file (#3037 )
2024-12-17 17:20:21 +01:00 · 2023-09-07 22:48:01 +01:00 · 2023-09-07 22:45:00 +01:00 · 2023-09-07 22:43:51 +01:00 · 2023-09-07 20:32:47 +01:00 · 2023-09-07 20:18:43 +01:00
580 changed files with 55068 additions and 15708 deletions
@@ -52,15 +52,19 @@ jobs:
          - os: ubuntu-20.04
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-20_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
          - os: ubuntu-22.04
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-22_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
+            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
          - os: windows-latest
            cache_path: C:/cabal
            asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
    steps:
      - name: Configure pagefile (Windows)
        if: matrix.os == 'windows-latest'
@@ -99,6 +103,10 @@ jobs:
          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
          echo "    flags: +openssl"                                        >> cabal.project.local

+      - name: Install AppImage dependencies
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        run: sudo apt install -y desktop-file-utils
+
      - name: Install pkg-config for Mac
        if: matrix.os == 'macos-latest'
        run: brew install pkg-config
@@ -111,23 +119,88 @@ jobs:
          echo "package direct-sqlcipher" >> cabal.project.local
          echo "    flags: +openssl"      >> cabal.project.local

-      - name: Unix build
-        id: unix_build
+      - name: Unix build CLI
+        id: unix_cli_build
        if: matrix.os != 'windows-latest'
        shell: bash
        run: |
          cabal build --enable-tests
          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"

-      - name: Unix upload binary to release
+      - name: Unix upload CLI binary to release
        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_build.outputs.bin_path }}
+          file: ${{ steps.unix_cli_build.outputs.bin_path }}
          asset_name: ${{ matrix.asset_name }}
          tag: ${{ github.ref }}

+      - name: Setup Java
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Linux build desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-linux.sh
+          cd apps/multiplatform
+          ./gradlew packageDeb
+          echo "::set-output name=package_path::$(echo $PWD/release/main/deb/simplex_*_amd64.deb)"
+      
+      - name: Linux make AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        shell: bash
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+          echo "::set-output name=appimage_path::$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)"
+
+      - name: Mac build desktop
+        id: mac_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        shell: bash
+        env:
+          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
+          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
+          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
+        run: |
+          scripts/desktop/build-desktop-mac-ci.sh
+          echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)"
+
+      - name: Linux upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Linux upload AppImage to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          asset_name: simplex-desktop-x86_64.AppImage
+          tag: ${{ github.ref }}
+
+      - name: Mac upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.mac_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
      - name: Unix test
        if: matrix.os != 'windows-latest'
        timeout-minutes: 30
@@ -53,6 +53,7 @@ website/src/docs/
 website/translations.json
 website/src/img/images/
 website/src/images/
+website/src/js/lottie.min.js
 # Generated files
 website/package/generated*

@@ -6,27 +6,63 @@ If you believe that some of the clauses in this document are not aligned with ou

 ## Privacy Policy

-SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and encryption to provide secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the servers via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack).

-SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol allowing to establish private connections without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 ### Information you provide

-We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+#### User profiles

-Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
+We do not store user profiles. The profile you create in the app is local to your device.

-Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+
+#### Messages and Files
+
+SimpleX Chat cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 256kb, 1mb or 8mb via all or some of the configured file servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.
+
+Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.
+
+The messages are permanently removed from the preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
+
+The files are stored on file (XFTP) servers for the time configured in the file servers you use (48 hours for preset file servers).
+
+If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).
+
+#### Connections with other users
+
+When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or the servers that you configured in the app, in case it allows such configuration. SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default.
+
+At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
+
+#### iOS Push Notifications
+
+When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
+
+Notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers.
+
+It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot observe it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+
+#### Another information stored on the servers

 Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.

-User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
+#### SimpleX Directory Service
+
+[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
+
+#### User Support.
+
+If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.

 ### Information we may share

 We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.

-We use Third party to provide email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according their privacy policies and terms of service.
+We use a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to their privacy policies and terms of service.

 The cases when SimpleX Chat may need to share the data we temporarily store on the servers:

@@ -39,19 +75,19 @@ At the time of updating this document, we have never provided or have been reque

 ### Updates

-We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
+We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.

-Please also read our Terms of Service.
+Please also read our Terms of Service below.

-If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
+If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).

 ## Terms of Service

-You accept to our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
+You accept our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").

 **Minimal age**. You must be at least 13 years old to use our Services. The minimum age to use our Services without parental approval may be higher in your country.

-**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
+**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.

 **Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.

@@ -67,15 +103,17 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a

 **Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.

-**Storing the messages on the device**. Currently the messages are stored in the database on your device without encryption. It means that if you make a backup of the app and store it unecrypted, the backup provider may be able to access the messages.
+**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.
+
+**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.

 **No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.

 **Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.

-**Your Rights**. You own the mesasges and information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices.
+**Your Rights**. You own the messages and the information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the app.

-**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 licence](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
+**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)

 **SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.

@@ -93,4 +131,4 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a

 **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.

-Updated November 8, 2022
+Updated August 17, 2023
@@ -54,7 +54,7 @@ You also can:
 - criticize the app, and make comparisons with other messengers.
 - share new messengers you think could be interesting for privacy, as long as you don't spam.
 - share some privacy related publications, infrequently.
- having preliminary approved with the admin in direct message, share the link to a group you created.
+- having preliminary approved with the admin in direct message, share the link to a group you created, but only once. Once the group has more than 10 members it can be submitted to [SimpleX Directory Service](./docs/DIRECTORY.md) where the new users will be able to discover it.

 You must:
 - be polite to other users
@@ -79,6 +79,8 @@ There are groups in other languages, that we have the apps interface translated

 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.

+You can also join the group created by other users by searching for them via the [directory service](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion). We are not responsible for the content shared in these groups.
+
 ## Make a private connection

 You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
@@ -103,16 +105,18 @@ Join our translators to help SimpleX grow!
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 en|English   | |✓|✓|✓|✓|
 |ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|🇧🇬 bg|Български |-|[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>-|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|||
+|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
+|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
+|🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||

 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -140,11 +144,14 @@ It is possible to donate via:

 - [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
 - [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- USDT:
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L

 Thank you,

@@ -164,7 +171,7 @@ SimpleX Chat founder
 - [News and updates](#news-and-updates)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
+- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -207,6 +214,8 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent updates:

+[July 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+
 [May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.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).
@@ -253,7 +262,7 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p

 See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).

-## Privacy: technical details and limitations
+## Privacy and security: technical details and limitations

 SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.

@@ -272,12 +281,15 @@ What is already implemented:
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+12. Manual messaging queue rotations to move conversation to another SMP relay.

-We plan to add soon:
+We plan to add:

-1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`.
-3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+1. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. This is currently in progress.
+2. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.

 ## For developers

@@ -337,8 +349,8 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message reactions
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
+- ✅ Message delivery confirmation (with sender opt-out per contact).
 - 🏗 Desktop client.
- 🏗 Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Local app files encryption.
@@ -61,7 +61,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
           m.notificationMode != .off {
            if let verification = ntfData["verification"] as? String,
               let nonce = ntfData["nonce"] as? String {
-                if let token = ChatModel.shared.deviceToken {
+                if let token = m.deviceToken {
                    logger.debug("AppDelegate: didReceiveRemoteNotification: verification, confirming \(verification)")
                    Task {
                        do {
@@ -81,7 +81,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                }
            } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if appStateGroupDefault.get().inactive {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                    receiveMessages(completionHandler)
                } else {
                    completionHandler(.noData)
@@ -95,7 +95,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
    }

    func applicationWillTerminate(_ application: UIApplication) {
-        logger.debug("AppDelegate: applicationWillTerminate")
+        logger.debug("DEBUGGING: AppDelegate: applicationWillTerminate")
        ChatModel.shared.filesToDelete.forEach {
            removeFile($0)
        }
@@ -28,6 +28,17 @@ struct ContentView: View {
    @State private var showWhatsNew = false
    @State private var showChooseLAMode = false
    @State private var showSetPasscode = false
+    @State private var chatListActionSheet: ChatListActionSheet? = nil
+
+    private enum ChatListActionSheet: Identifiable {
+        case connectViaUrl(action: ConnReqType, link: String)
+
+        var id: String {
+            switch self {
+            case .connectViaUrl: return "connectViaUrl \(link)"
+            }
+        }
+    }

    var body: some View {
        ZStack {
@@ -80,6 +91,11 @@ struct ContentView: View {
            if case .onboardingComplete = step,
               chatModel.currentUser != nil {
                mainView()
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
+                    }
+                }
            } else {
                OnboardingView(onboarding: step)
            }
@@ -132,7 +148,9 @@ struct ContentView: View {
                    }
                }
                prefShowLANotice = true
+                connectViaUrl()
            }
+            .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
            .sheet(isPresented: $showWhatsNew) {
                WhatsNewView()
            }
@@ -179,10 +197,13 @@ struct ContentView: View {
    }

    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
        if !prefPerformLA {
            userAuthorized = true
        } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
            dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
                chatModel.chatId = nil
                justAuthenticate()
            }
@@ -193,7 +214,7 @@ struct ContentView: View {
        userAuthorized = false
        let laMode = privacyLocalAuthModeDefault.get()
        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-            logger.debug("authenticate callback: \(String(describing: laResult))")
+            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
            switch (laResult) {
            case .success:
                userAuthorized = true
@@ -262,36 +283,38 @@ struct ContentView: View {
            secondaryButton: .cancel()
        )
    }
-}

-func connectViaUrl() {
-    let m = ChatModel.shared
-    if let url = m.appOpenUrl {
-        m.appOpenUrl = nil
-        AlertManager.shared.showAlert(connectViaUrlAlert(url))
+    func connectViaUrl() {
+        let m = ChatModel.shared
+        if let url = m.appOpenUrl {
+            m.appOpenUrl = nil
+            var path = url.path
+            logger.debug("ContentView.connectViaUrl path: \(path)")
+            if (path == "/contact" || path == "/invitation") {
+                path.removeFirst()
+                let action: ConnReqType = path == "contact" ? .contact : .invitation
+                let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
+                chatListActionSheet = .connectViaUrl(action: action, link: link)
+            } else {
+                AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
+            }
+        }
    }
-}

-func connectViaUrlAlert(_ url: URL) -> Alert {
-    var path = url.path
-    logger.debug("ChatListView.connectViaUrlAlert path: \(path)")
-    if (path == "/contact" || path == "/invitation") {
-        path.removeFirst()
-        let action: ConnReqType = path == "contact" ? .contact : .invitation
-        let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
        let title: LocalizedStringKey
-        if case .contact = action { title = "Connect via contact link?" }
-        else { title = "Connect via one-time link?" }
-        return Alert(
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
            title: Text(title),
-            message: Text("Your profile will be sent to the contact that you received this link from"),
-            primaryButton: .default(Text("Connect")) {
-                connectViaLink(link)
-            },
-            secondaryButton: .cancel()
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
        )
-    } else {
-        return Alert(title: Text("Error: URL is invalid"))
    }
 }

@@ -103,9 +103,15 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        self.onFinishPlayback = onFinishPlayback
    }

-    func start(fileName: String, at: TimeInterval?) {
-        let url = getAppFilePath(fileName)
-        audioPlayer = try? AVAudioPlayer(contentsOf: url)
+    func start(fileSource: CryptoFile, at: TimeInterval?) {
+        let url = getAppFilePath(fileSource.filePath)
+        if let cfArgs = fileSource.cryptoArgs {
+            if let data = try? readCryptoFile(path: url.path, cryptoArgs: cfArgs) {
+                audioPlayer = try? AVAudioPlayer(data: data)
+            }
+        } else {
+            audioPlayer = try? AVAudioPlayer(contentsOf: url)
+        }
        audioPlayer?.delegate = self
        audioPlayer?.prepareToPlay()
        if let at = at {
@@ -34,6 +34,10 @@ class BGManager {
    }

    func schedule() {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.schedule: disabled")
+            return
+        }
        logger.debug("BGManager.schedule")
        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
@@ -45,6 +49,10 @@ class BGManager {
    }

    private func handleRefresh(_ task: BGAppRefreshTask) {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.handleRefresh: disabled")
+            return
+        }
        logger.debug("BGManager.handleRefresh")
        schedule()
        if appStateGroupDefault.get().inactive {
@@ -11,6 +11,38 @@ import Combine
 import SwiftUI
 import SimpleXChat

+actor TerminalItems {
+    private var terminalItems: [TerminalItem] = []
+
+    static let shared = TerminalItems()
+
+    func items() -> [TerminalItem] {
+        terminalItems
+    }
+
+    func add(_ item: TerminalItem) async {
+        addTermItem(&terminalItems, item)
+        let m = ChatModel.shared
+        if m.showingTerminal {
+            await MainActor.run {
+                addTermItem(&m.terminalItems, item)
+            }
+        }
+    }
+
+    func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
+        await add(.cmd(start, cmd))
+        await add(.resp(.now, resp))
+    }
+}
+
+private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
+    if items.count >= 200 {
+        items.removeFirst()
+    }
+    items.append(item)
+}
+
 final class ChatModel: ObservableObject {
    @Published var onboardingStage: OnboardingStage?
    @Published var setDeliveryReceipts = false
@@ -33,6 +65,7 @@ final class ChatModel: ObservableObject {
    @Published var chatToTop: String?
    @Published var groupMembers: [GroupMember] = []
    // items in the terminal view
+    @Published var showingTerminal = false
    @Published var terminalItems: [TerminalItem] = []
    @Published var userAddress: UserContactLink?
    @Published var chatItemTTL: ChatItemTTL = .none
@@ -42,10 +75,9 @@ final class ChatModel: ObservableObject {
    @Published var tokenRegistered = false
    @Published var tokenStatus: NtfTknStatus?
    @Published var notificationMode = NotificationsMode.off
-    @Published var notificationPreview: NotificationPreviewMode? = ntfPreviewModeGroupDefault.get()
-    @Published var incognito: Bool = incognitoGroupDefault.get()
+    @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
    // pending notification actions
-    @Published var ntfContactRequest: ChatId?
+    @Published var ntfContactRequest: NTFContactRequest?
    @Published var ntfCallInvitationAction: (ChatId, NtfCallAction)?
    // current WebRTC call
    @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
@@ -69,6 +101,14 @@ final class ChatModel: ObservableObject {

    static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }

+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
+    }
+
+    var ntfEnablePeriodic: Bool {
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+    }
+
    func getUser(_ userId: Int64) -> User? {
        currentUser?.userId == userId
        ? currentUser
@@ -455,18 +495,18 @@ final class ChatModel: ObservableObject {
        }
    }

-    func increaseUnreadCounter(user: User) {
+    func increaseUnreadCounter(user: any UserLike) {
        changeUnreadCounter(user: user, by: 1)
        NtfManager.shared.incNtfBadgeCount()
    }

-    func decreaseUnreadCounter(user: User, by: Int = 1) {
+    func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
        changeUnreadCounter(user: user, by: -by)
        NtfManager.shared.decNtfBadgeCount(by: by)
    }

-    private func changeUnreadCounter(user: User, by: Int) {
-        if let i = users.firstIndex(where: { $0.user.id == user.id }) {
+    private func changeUnreadCounter(user: any UserLike, by: Int) {
+        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
            users[i].unreadCount += by
        }
    }
@@ -476,14 +516,27 @@ final class ChatModel: ObservableObject {
            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
    }

-    func getPrevChatItem(_ ci: ChatItem) -> ChatItem? {
-        if let i = getChatItemIndex(ci), i < reversedChatItems.count - 1  {
-            return reversedChatItems[i + 1]
+    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
+        guard var i = getChatItemIndex(ci) else { return [] }
+        var ns: [String] = []
+        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
+            ns.append(m.displayName)
+            i += 1
+        }
+        return ns
+    }
+
+    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
+        if let i = getChatItemIndex(ci)  {
+            return (
+                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
+                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
+            )
        } else {
-            return nil
+            return (nil, nil)
        }
    }
-    
+
    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
            popChat_(i)
@@ -572,13 +625,11 @@ final class ChatModel: ObservableObject {
    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
    }
+}

-    func addTerminalItem(_ item: TerminalItem) {
-        if terminalItems.count >= 500 {
-            terminalItems.remove(at: 0)
-        }
-        terminalItems.append(item)
-    }
+struct NTFContactRequest {
+    var incognito: Bool
+    var chatId: String
 }

 struct UnreadChatItemCounts {
@@ -11,42 +11,43 @@ import SimpleXChat
 import SwiftUI
 import AVKit

-func getLoadedFilePath(_ file: CIFile?) -> String? {
-    if let fileName = getLoadedFileName(file) {
-        return getAppFilePath(fileName).path
-    }
-    return nil
-}
-
-func getLoadedFileName(_ file: CIFile?) -> String? {
-    if let file = file,
-       file.loaded,
-       let fileName = file.filePath {
-        return fileName
+func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
+    if let file = file, file.loaded {
+        return file.fileSource
    }
    return nil
 }

 func getLoadedImage(_ file: CIFile?) -> UIImage? {
-    let loadedFilePath = getLoadedFilePath(file)
-    if let loadedFilePath = loadedFilePath, let fileName = file?.filePath {
-        let filePath = getAppFilePath(fileName)
+    if let fileSource = getLoadedFileSource(file) {
+        let filePath = getAppFilePath(fileSource.filePath)
        do {
-            let data = try Data(contentsOf: filePath)
+            let data = try getFileData(filePath, fileSource.cryptoArgs)
            let img = UIImage(data: data)
-            try img?.setGifFromData(data, levelOfIntegrity: 1.0)
-            return img
+            do {
+                try img?.setGifFromData(data, levelOfIntegrity: 1.0)
+                return img
+            } catch {
+                return UIImage(data: data)
+            }
        } catch {
-            return UIImage(contentsOfFile: loadedFilePath)
+            return nil
        }
    }
    return nil
 }

+func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
+    if let cfArgs = cfArgs {
+        return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
+    } else {
+        return try Data(contentsOf: path)
+    }
+}
+
 func getLoadedVideo(_ file: CIFile?) -> URL? {
-    let loadedFilePath = getLoadedFilePath(file)
-    if loadedFilePath != nil, let fileName = file?.filePath {
-        let filePath = getAppFilePath(fileName)
+    if let fileSource = getLoadedFileSource(file) {
+        let filePath = getAppFilePath(fileSource.filePath)
        if FileManager.default.fileExists(atPath: filePath.path) {
            return filePath
        }
@@ -54,18 +55,18 @@ func getLoadedVideo(_ file: CIFile?) -> URL? {
    return nil
 }

-func saveAnimImage(_ image: UIImage) -> String? {
+func saveAnimImage(_ image: UIImage) -> CryptoFile? {
    let fileName = generateNewFileName("IMG", "gif")
    guard let imageData = image.imageData else { return nil }
-    return saveFile(imageData, fileName)
+    return saveFile(imageData, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
 }

-func saveImage(_ uiImage: UIImage) -> String? {
+func saveImage(_ uiImage: UIImage) -> CryptoFile? {
    let hasAlpha = imageHasAlpha(uiImage)
    let ext = hasAlpha ? "png" : "jpg"
    if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
        let fileName = generateNewFileName("IMG", ext)
-        return saveFile(imageDataResized, fileName)
+        return saveFile(imageDataResized, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
    }
    return nil
 }
@@ -157,13 +158,19 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
    return false
 }

-func saveFileFromURL(_ url: URL) -> String? {
-    let savedFile: String?
+func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
+    let savedFile: CryptoFile?
    if url.startAccessingSecurityScopedResource() {
        do {
-            let fileData = try Data(contentsOf: url)
            let fileName = uniqueCombine(url.lastPathComponent)
-            savedFile = saveFile(fileData, fileName)
+            let toPath = getAppFilePath(fileName).path
+            if encrypted {
+                let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: toPath)
+                savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
+            } else {
+                try FileManager.default.copyItem(atPath: url.path, toPath: toPath)
+                savedFile = CryptoFile.plain(fileName)
+            }
        } catch {
            logger.error("FileUtils.saveFileFromURL error: \(error.localizedDescription)")
            savedFile = nil
@@ -176,18 +183,16 @@ func saveFileFromURL(_ url: URL) -> String? {
    return savedFile
 }

-func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
-    let savedFile: String?
+func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    do {
        let fileName = uniqueCombine(url.lastPathComponent)
        try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
        ChatModel.shared.filesToDelete.remove(url)
-        savedFile = fileName
+        return CryptoFile.plain(fileName)
    } catch {
-        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
-        savedFile = nil
+        logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
+        return nil
    }
-    return savedFile
 }

 func generateNewFileName(_ prefix: String, _ ext: String) -> String {
@@ -288,4 +293,4 @@ extension UIImage {
        }
        return self
    }
-}
+}
@@ -12,6 +12,7 @@ import UIKit
 import SimpleXChat

 let ntfActionAcceptContact = "NTF_ACT_ACCEPT_CONTACT"
+let ntfActionAcceptContactIncognito = "NTF_ACT_ACCEPT_CONTACT_INCOGNITO"
 let ntfActionAcceptCall = "NTF_ACT_ACCEPT_CALL"
 let ntfActionRejectCall = "NTF_ACT_REJECT_CALL"

@@ -41,12 +42,13 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
           userId != chatModel.currentUser?.userId {
            changeActiveUser(userId, viewPwd: nil)
        }
-        if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
+        if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
           let chatId = content.userInfo["chatId"] as? String {
+            let incognito = action == ntfActionAcceptContactIncognito
            if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                Task { await acceptContactRequest(contactRequest) }
+                Task { await acceptContactRequest(incognito: incognito, contactRequest: contactRequest) }
            } else {
-                chatModel.ntfContactRequest = chatId
+                chatModel.ntfContactRequest = NTFContactRequest(incognito: incognito, chatId: chatId)
            }
        } else if let (chatId, ntfAction) = ntfCallAction(content, action) {
            if let invitation = chatModel.callInvitations.removeValue(forKey: chatId) {
@@ -134,11 +136,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        UNUserNotificationCenter.current().setNotificationCategories([
            UNNotificationCategory(
                identifier: ntfCategoryContactRequest,
-                actions: [UNNotificationAction(
-                    identifier: ntfActionAcceptContact,
-                    title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
-                    options: .foreground
-                )],
+                actions: [
+                    UNNotificationAction(
+                        identifier: ntfActionAcceptContact,
+                        title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
+                        options: .foreground
+                    ), UNNotificationAction(
+                        identifier: ntfActionAcceptContactIncognito,
+                        title: NSLocalizedString("Accept incognito", comment: "accept contact request via notification"),
+                        options: .foreground
+                    )
+                ],
                intentIdentifiers: [],
                hiddenPreviewsBodyPlaceholder: NSLocalizedString("New contact request", comment: "notification")
            ),
@@ -203,17 +211,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        center.delegate = self
    }

-    func notifyContactRequest(_ user: User, _ contactRequest: UserContactRequest) {
+    func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
        logger.debug("NtfManager.notifyContactRequest")
        addNotification(createContactRequestNtf(user, contactRequest))
    }

-    func notifyContactConnected(_ user: User, _ contact: Contact) {
+    func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
        logger.debug("NtfManager.notifyContactConnected")
        addNotification(createContactConnectedNtf(user, contact))
    }

-    func notifyMessageReceived(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
        logger.debug("NtfManager.notifyMessageReceived")
        if cInfo.ntfsEnabled {
            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
@@ -94,9 +94,8 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
    if case let .response(_, json) = resp {
        logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
    }
-    DispatchQueue.main.async {
-        ChatModel.shared.addTerminalItem(.cmd(start, cmd.obfuscated))
-        ChatModel.shared.addTerminalItem(.resp(.now, resp))
+    Task {
+        await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
    }
    return resp
 }
@@ -171,6 +170,12 @@ func apiSetUserContactReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgR
    throw r
 }

+func apiSetUserGroupReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
+    let r = await chatSendCmd(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
    try await setUserPrivacy_(.apiHideUser(userId: userId, viewPwd: viewPwd))
 }
@@ -246,12 +251,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
    throw r
 }

-func apiSetIncognito(incognito: Bool) throws {
-    let r = chatSendCmdSync(.setIncognito(incognito: incognito))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
    try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -316,17 +315,23 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
    let chatModel = ChatModel.shared
    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
    let r: ChatResponse
    if type == .direct {
-        var cItem: ChatItem!
-        let endTask = beginBGTask({ if cItem != nil { chatModel.messageDelivery.removeValue(forKey: cItem.id) } })
+        var cItem: ChatItem? = nil
+        let endTask = beginBGTask({
+            if let cItem = cItem {
+                DispatchQueue.main.async {
+                    chatModel.messageDelivery.removeValue(forKey: cItem.id)
+                }
+            }
+        })
        r = await chatSendCmd(cmd, bgTask: false)
        if case let .newChatItem(_, aChatItem) = r {
            cItem = aChatItem.chatItem
-            chatModel.messageDelivery[cItem.id] = endTask
+            chatModel.messageDelivery[aChatItem.chatItem.id] = endTask
            return cItem
        }
        if let networkErrorAlert = networkErrorAlert(r) {
@@ -558,19 +563,25 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
    return nil
 }

-func apiAddContact() async -> String? {
+func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiAddContact: no current user")
        return nil
    }
-    let r = await chatSendCmd(.apiAddContact(userId: userId), bgTask: false)
-    if case let .invitation(_, connReqInvitation) = r { return connReqInvitation }
+    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
+    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
    AlertManager.shared.showAlert(connectionErrorAlert(r))
    return nil
 }

-func apiConnect(connReq: String) async -> ConnReqType? {
-    let (connReqType, alert) = await apiConnect_(connReq: connReq)
+func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
+    let r = await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
+    if case let .connectionIncognitoUpdated(_, toConnection) = r { return toConnection }
+    throw r
+}
+
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
    if let alert = alert {
        AlertManager.shared.showAlert(alert)
        return nil
@@ -579,12 +590,12 @@ func apiConnect(connReq: String) async -> ConnReqType? {
    }
 }

-func apiConnect_(connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiConnect: no current user")
        return (nil, nil)
    }
-    let r = await chatSendCmd(.apiConnect(userId: userId, connReq: connReq))
+    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
    switch r {
    case .sentConfirmation: return (.invitation, nil)
    case .sentInvitation: return (.contact, nil)
@@ -680,12 +691,12 @@ func apiListContacts() throws -> [Contact] {
    throw r
 }

-func apiUpdateProfile(profile: Profile) async throws -> Profile? {
+func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
    let userId = try currentUserId("apiUpdateProfile")
    let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
    switch r {
    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(_, _, toProfile): return toProfile
+    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
    default: throw r
    }
 }
@@ -695,7 +706,7 @@ func apiSetProfileAddress(on: Bool) async throws -> User? {
    let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
    switch r {
    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(user, _, _): return user
+    case let .userProfileUpdated(user, _, _, _): return user
    default: throw r
    }
 }
@@ -760,8 +771,8 @@ func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContac
    }
 }

-func apiAcceptContactRequest(contactReqId: Int64) async -> Contact? {
-    let r = await chatSendCmd(.apiAcceptContact(contactReqId: contactReqId))
+func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Contact? {
+    let r = await chatSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
    let am = AlertManager.shared

    if case let .acceptingContactRequest(_, contact) = r { return contact }
@@ -796,29 +807,35 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
    try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }

-func receiveFile(user: User, fileId: Int64) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId) {
-        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
+func receiveFile(user: any UserLike, fileId: Int64, encrypted: Bool, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: encrypted, auto: auto) {
+        await chatItemSimpleUpdate(user, chatItem)
    }
 }

-func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
+func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
    let am = AlertManager.shared
    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
    if case .rcvFileAcceptedSndCancelled = r {
-        am.showAlertMsg(
-            title: "Cannot receive file",
-            message: "Sender cancelled file transfer."
-        )
+        logger.debug("apiReceiveFile error: sender cancelled file transfer")
+        if !auto {
+            am.showAlertMsg(
+                title: "Cannot receive file",
+                message: "Sender cancelled file transfer."
+            )
+        }
    } else if let networkErrorAlert = networkErrorAlert(r) {
+        logger.error("apiReceiveFile network error: \(String(describing: r))")
        am.showAlert(networkErrorAlert)
    } else {
-        logger.error("apiReceiveFile error: \(String(describing: r))")
-        switch r {
-        case .chatCmdError(_, .error(.fileAlreadyReceiving)):
+        switch chatError(r) {
+        case .fileCancelled:
+            logger.debug("apiReceiveFile ignoring fileCancelled error")
+        case .fileAlreadyReceiving:
            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
        default:
+            logger.error("apiReceiveFile error: \(String(describing: r))")
            am.showAlertMsg(
                title: "Error receiving file",
                message: "Error: \(String(describing: r))"
@@ -830,7 +847,7 @@ func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {

 func cancelFile(user: User, fileId: Int64) async {
    if let chatItem = await apiCancelFile(fileId: fileId) {
-        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
+        await chatItemSimpleUpdate(user, chatItem)
        cleanupFile(chatItem)
    }
 }
@@ -863,8 +880,8 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
    }
 }

-func acceptContactRequest(_ contactRequest: UserContactRequest) async {
-    if let contact = await apiAcceptContactRequest(contactReqId: contactRequest.apiId) {
+func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
+    if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
        let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
        DispatchQueue.main.async { ChatModel.shared.replaceChat(contactRequest.id, chat) }
    }
@@ -1098,7 +1115,6 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
    try setXFTPConfig(getXFTPCfg())
-    try apiSetIncognito(incognito: incognitoGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
    if m.currentUser == nil {
@@ -1233,38 +1249,50 @@ class ChatReceiver {
 }

 func processReceivedMsg(_ res: ChatResponse) async {
+    Task {
+        await TerminalItems.shared.add(.resp(.now, res))
+    }
    let m = ChatModel.shared
-    await MainActor.run {
-        m.addTerminalItem(.resp(.now, res))
-        logger.debug("processReceivedMsg: \(res.responseType)")
-        switch res {
-        case let .newContactConnection(user, connection):
-            if active(user) {
+    logger.debug("processReceivedMsg: \(res.responseType)")
+    switch res {
+    case let .newContactConnection(user, connection):
+        if active(user) {
+            await MainActor.run {
                m.updateContactConnection(connection)
            }
-        case let .contactConnectionDeleted(user, connection):
-            if active(user) {
+        }
+    case let .contactConnectionDeleted(user, connection):
+        if active(user) {
+            await MainActor.run {
                m.removeChat(connection.id)
            }
-        case let .contactConnected(user, contact, _):
-            if active(user) && contact.directOrUsed {
+        }
+    case let .contactConnected(user, contact, _):
+        if active(user) && contact.directOrUsed {
+            await MainActor.run {
                m.updateContact(contact)
                m.dismissConnReqView(contact.activeConn.id)
                m.removeChat(contact.activeConn.id)
            }
-            if contact.directOrUsed {
-                NtfManager.shared.notifyContactConnected(user, contact)
-            }
+        }
+        if contact.directOrUsed {
+            NtfManager.shared.notifyContactConnected(user, contact)
+        }
+        await MainActor.run {
            m.setContactNetworkStatus(contact, .connected)
-        case let .contactConnecting(user, contact):
-            if active(user) && contact.directOrUsed {
+        }
+    case let .contactConnecting(user, contact):
+        if active(user) && contact.directOrUsed {
+            await MainActor.run {
                m.updateContact(contact)
                m.dismissConnReqView(contact.activeConn.id)
                m.removeChat(contact.activeConn.id)
            }
-        case let .receivedContactRequest(user, contactRequest):
-            if active(user) {
-                let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
+        }
+    case let .receivedContactRequest(user, contactRequest):
+        if active(user) {
+            let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
+            await MainActor.run {
                if m.hasChat(contactRequest.id) {
                    m.updateChatInfo(cInfo)
                } else {
@@ -1274,252 +1302,312 @@ func processReceivedMsg(_ res: ChatResponse) async {
                    ))
                }
            }
-            NtfManager.shared.notifyContactRequest(user, contactRequest)
-        case let .contactUpdated(user, toContact):
-            if active(user) && m.hasChat(toContact.id) {
+        }
+        NtfManager.shared.notifyContactRequest(user, contactRequest)
+    case let .contactUpdated(user, toContact):
+        if active(user) && m.hasChat(toContact.id) {
+            await MainActor.run {
                let cInfo = ChatInfo.direct(contact: toContact)
                m.updateChatInfo(cInfo)
            }
-        case let .contactsMerged(user, intoContact, mergedContact):
-            if active(user) && m.hasChat(mergedContact.id) {
+        }
+    case let .contactsMerged(user, intoContact, mergedContact):
+        if active(user) && m.hasChat(mergedContact.id) {
+            await MainActor.run {
                if m.chatId == mergedContact.id {
                    m.chatId = intoContact.id
                }
                m.removeChat(mergedContact.id)
            }
-        case let .contactsSubscribed(_, contactRefs):
-            updateContactsStatus(contactRefs, status: .connected)
-        case let .contactsDisconnected(_, contactRefs):
-            updateContactsStatus(contactRefs, status: .disconnected)
-        case let .contactSubError(user, contact, chatError):
+        }
+    case let .contactsSubscribed(_, contactRefs):
+        await updateContactsStatus(contactRefs, status: .connected)
+    case let .contactsDisconnected(_, contactRefs):
+        await updateContactsStatus(contactRefs, status: .disconnected)
+    case let .contactSubError(user, contact, chatError):
+        await MainActor.run {
            if active(user) {
                m.updateContact(contact)
            }
            processContactSubError(contact, chatError)
-        case let .contactSubSummary(user, contactSubscriptions):
+        }
+    case let .contactSubSummary(_, contactSubscriptions):
+        await MainActor.run {
            for sub in contactSubscriptions {
-                if active(user) {
-                    m.updateContact(sub.contact)
-                }
+// no need to update contact here, and it is slow
+//                if active(user) {
+//                    m.updateContact(sub.contact)
+//                }
                if let err = sub.contactError {
                    processContactSubError(sub.contact, err)
                } else {
                    m.setContactNetworkStatus(sub.contact, .connected)
                }
            }
-        case let .newChatItem(user, aChatItem):
-            let cInfo = aChatItem.chatInfo
-            let cItem = aChatItem.chatItem
+        }
+    case let .newChatItem(user, aChatItem):
+        let cInfo = aChatItem.chatInfo
+        let cItem = aChatItem.chatItem
+        await MainActor.run {
            if active(user) {
                m.addChatItem(cInfo, cItem)
            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                m.increaseUnreadCounter(user: user)
            }
-            if let file = cItem.autoReceiveFile() {
-                Task {
-                    await receiveFile(user: user, fileId: file.fileId)
-                }
+        }
+        if let file = cItem.autoReceiveFile() {
+            Task {
+                await receiveFile(user: user, fileId: file.fileId, encrypted: cItem.encryptLocalFile, auto: true)
            }
-            if cItem.showNotification {
+        }
+        if cItem.showNotification {
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
+    case let .chatItemStatusUpdated(user, aChatItem):
+        let cInfo = aChatItem.chatInfo
+        let cItem = aChatItem.chatItem
+        if !cItem.isDeletedContent {
+            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
+            if added && cItem.showNotification {
                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
            }
-        case let .chatItemStatusUpdated(user, aChatItem):
-            let cInfo = aChatItem.chatInfo
-            let cItem = aChatItem.chatItem
-            if !cItem.isDeletedContent && (!active(user) || m.upsertChatItem(cInfo, cItem)) {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
+        if let endTask = m.messageDelivery[cItem.id] {
+            switch cItem.meta.itemStatus {
+            case .sndSent: endTask()
+            case .sndErrorAuth: endTask()
+            case .sndError: endTask()
+            default: ()
            }
-            if let endTask = m.messageDelivery[cItem.id] {
-                switch cItem.meta.itemStatus {
-                case .sndSent: endTask()
-                case .sndErrorAuth: endTask()
-                case .sndError: endTask()
-                default: ()
-                }
-            }
-        case let .chatItemUpdated(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .chatItemReaction(user, _, r):
-            if active(user) {
+        }
+    case let .chatItemUpdated(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .chatItemReaction(user, _, r):
+        if active(user) {
+            await MainActor.run {
                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
            }
-        case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
-            if !active(user) {
-                if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+        }
+    case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
+        if !active(user) {
+            if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+                await MainActor.run {
                    m.decreaseUnreadCounter(user: user)
                }
-                return
            }
+            return
+        }

+        await MainActor.run {
            if let toChatItem = toChatItem {
                _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
            } else {
                m.removeChatItem(deletedChatItem.chatInfo, deletedChatItem.chatItem)
            }
-        case let .receivedGroupInvitation(user, groupInfo, _, _):
-            if active(user) {
+        }
+    case let .receivedGroupInvitation(user, groupInfo, _, _):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo) // update so that repeat group invitations are not duplicated
                // NtfManager.shared.notifyContactRequest(contactRequest) // TODO notifyGroupInvitation?
            }
-        case let .userAcceptedGroupSent(user, groupInfo, hostContact):
-            if !active(user) { return }
+        }
+    case let .userAcceptedGroupSent(user, groupInfo, hostContact):
+        if !active(user) { return }

+        await MainActor.run {
            m.updateGroup(groupInfo)
            if let hostContact = hostContact {
                m.dismissConnReqView(hostContact.activeConn.id)
                m.removeChat(hostContact.activeConn.id)
            }
-        case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
-            if active(user) {
+        }
+    case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
-            if active(user) {
+        }
+    case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .deletedMember(user, groupInfo, _, deletedMember):
-            if active(user) {
+        }
+    case let .deletedMember(user, groupInfo, _, deletedMember):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, deletedMember)
            }
-        case let .leftMember(user, groupInfo, member):
-            if active(user) {
+        }
+    case let .leftMember(user, groupInfo, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .groupDeleted(user, groupInfo, _): // TODO update user member
-            if active(user) {
+        }
+    case let .groupDeleted(user, groupInfo, _): // TODO update user member
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .userJoinedGroup(user, groupInfo):
-            if active(user) {
+        }
+    case let .userJoinedGroup(user, groupInfo):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .joinedGroupMember(user, groupInfo, member):
-            if active(user) {
+        }
+    case let .joinedGroupMember(user, groupInfo, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .connectedToGroupMember(user, groupInfo, member, memberContact):
-            if active(user) {
+        }
+    case let .connectedToGroupMember(user, groupInfo, member, memberContact):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-            if let contact = memberContact {
+        }
+        if let contact = memberContact {
+            await MainActor.run {
                m.setContactNetworkStatus(contact, .connected)
            }
-        case let .groupUpdated(user, toGroup):
-            if active(user) {
+        }
+    case let .groupUpdated(user, toGroup):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(toGroup)
            }
-        case let .memberRole(user, groupInfo, _, _, _, _):
-            if active(user) {
+        }
+    case let .memberRole(user, groupInfo, _, _, _, _):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileStart(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileComplete(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileSndCancelled(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .rcvFileProgressXFTP(user, aChatItem, _, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileError(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .sndFileStart(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .sndFileComplete(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupDirectFile(aChatItem)
-        case let .sndFileRcvCancelled(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupDirectFile(aChatItem)
-        case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .sndFileCompleteXFTP(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .sndFileError(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .callInvitation(invitation):
-            m.callInvitations[invitation.contact.id] = invitation
-            activateCall(invitation)
-        case let .callOffer(_, contact, callType, offer, sharedKey, _):
-            withCall(contact) { call in
-                call.callState = .offerReceived
-                call.peerMedia = callType.media
-                call.sharedKey = sharedKey
-                let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
-                let iceServers = getIceServers()
-                logger.debug(".callOffer useRelay \(useRelay)")
-                logger.debug(".callOffer iceServers \(String(describing: iceServers))")
-                m.callCommand = .offer(
-                    offer: offer.rtcSession,
-                    iceCandidates: offer.rtcIceCandidates,
-                    media: callType.media, aesKey: sharedKey,
-                    iceServers: iceServers,
-                    relay: useRelay
-                )
-            }
-        case let .callAnswer(_, contact, answer):
-            withCall(contact) { call in
-                call.callState = .answerReceived
-                m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
-            }
-        case let .callExtraInfo(_, contact, extraInfo):
-            withCall(contact) { _ in
-                m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
-            }
-        case let .callEnded(_, contact):
-            if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
-                CallController.shared.reportCallRemoteEnded(invitation: invitation)
-            }
-            withCall(contact) { call in
-                m.callCommand = .end
-                CallController.shared.reportCallRemoteEnded(call: call)
-            }
-        case .chatSuspended:
-            chatSuspended()
-        case let .contactSwitch(_, contact, switchProgress):
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
-        case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
-        case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
-        case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
-        default:
-            logger.debug("unsupported event: \(res.responseType)")
        }
+    case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileStart(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileComplete(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileSndCancelled(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileStart(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .sndFileComplete(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
+    case let .sndFileRcvCancelled(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
+    case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .sndFileCompleteXFTP(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .callInvitation(invitation):
+        await MainActor.run {
+            m.callInvitations[invitation.contact.id] = invitation
+        }
+        activateCall(invitation)
+    case let .callOffer(_, contact, callType, offer, sharedKey, _):
+        await withCall(contact) { call in
+            call.callState = .offerReceived
+            call.peerMedia = callType.media
+            call.sharedKey = sharedKey
+            let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
+            let iceServers = getIceServers()
+            logger.debug(".callOffer useRelay \(useRelay)")
+            logger.debug(".callOffer iceServers \(String(describing: iceServers))")
+            m.callCommand = .offer(
+                offer: offer.rtcSession,
+                iceCandidates: offer.rtcIceCandidates,
+                media: callType.media, aesKey: sharedKey,
+                iceServers: iceServers,
+                relay: useRelay
+            )
+        }
+    case let .callAnswer(_, contact, answer):
+        await withCall(contact) { call in
+            call.callState = .answerReceived
+            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
+        }
+    case let .callExtraInfo(_, contact, extraInfo):
+        await withCall(contact) { _ in
+            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
+        }
+    case let .callEnded(_, contact):
+        if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
+            CallController.shared.reportCallRemoteEnded(invitation: invitation)
+        }
+        await withCall(contact) { call in
+            m.callCommand = .end
+            CallController.shared.reportCallRemoteEnded(call: call)
+        }
+    case .chatSuspended:
+        chatSuspended()
+    case let .contactSwitch(_, contact, switchProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+        }
+    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+        }
+    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+        }
+    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+        }
+    default:
+        logger.debug("unsupported event: \(res.responseType)")
+    }

-        func withCall(_ contact: Contact, _ perform: (Call) -> Void) {
-            if let call = m.activeCall, call.contact.apiId == contact.apiId {
-                perform(call)
-            } else {
-                logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
-            }
+    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
+        if let call = m.activeCall, call.contact.apiId == contact.apiId {
+            await MainActor.run { perform(call) }
+        } else {
+            logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
        }
    }
 }

-func active(_ user: User) -> Bool {
-    user.id == ChatModel.shared.currentUser?.id
+func active(_ user: any UserLike) -> Bool {
+    user.userId == ChatModel.shared.currentUser?.id
 }

-func chatItemSimpleUpdate(_ user: User, _ aChatItem: AChatItem) {
+func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    let m = ChatModel.shared
    let cInfo = aChatItem.chatInfo
    let cItem = aChatItem.chatItem
-    if active(user) && m.upsertChatItem(cInfo, cItem) {
-        NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+    if active(user) {
+        if await MainActor.run(body: { m.upsertChatItem(cInfo, cItem) }) {
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
    }
 }

-func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) {
+func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
    let m = ChatModel.shared
-    for c in contactRefs {
-        m.networkStatuses[c.agentConnId] = status
+    await MainActor.run {
+        for c in contactRefs {
+            m.networkStatuses[c.agentConnId] = status
+        }
    }
 }

@@ -1558,7 +1646,9 @@ func activateCall(_ callInvitation: RcvCallInvitation) {
    let m = ChatModel.shared
    CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
        if let error = error {
-            m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
+            DispatchQueue.main.async {
+                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
+            }
            logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
        } else {
            logger.debug("reportNewIncomingCall success")
@@ -1570,15 +1660,3 @@ private struct UserResponse: Decodable {
    var user: User?
    var error: String?
 }
-
-struct RuntimeError: Error {
-    let message: String
-
-    init(_ message: String) {
-        self.message = message
-    }
-
-    public var localizedDescription: String {
-        return message
-    }
-}
@@ -76,9 +76,11 @@ private func _chatSuspended() {
 }

 func activateChat(appState: AppState = .active) {
+    logger.debug("DEBUGGING: activateChat")
    suspendLockQueue.sync {
        appStateGroupDefault.set(appState)
        if ChatModel.ok { apiActivateChat() }
+        logger.debug("DEBUGGING: activateChat: after apiActivateChat")
    }
 }

@@ -95,10 +97,14 @@ func initChatAndMigrate(refreshInvitations: Bool = true) {
 }

 func startChatAndActivate() {
+    logger.debug("DEBUGGING: startChatAndActivate")
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.start()
+        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
    }
    if .active != appStateGroupDefault.get()  {
+        logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
        activateChat()
+        logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
    }
 }
@@ -139,10 +139,10 @@ struct SimpleXApp: App {
               let chat = chatModel.getChat(id) {
                loadChat(chat: chat)
            }
-            if let chatId = chatModel.ntfContactRequest {
+            if let ncr = chatModel.ntfContactRequest {
                chatModel.ntfContactRequest = nil
-                if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                    Task { await acceptContactRequest(contactRequest) }
+                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
+                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                }
            }
        } catch let error {
@@ -143,7 +143,12 @@ struct ChatInfoView: View {

                if let customUserProfile = customUserProfile {
                    Section("Incognito") {
-                        infoRow("Your random profile", customUserProfile.chatViewName)
+                        HStack {
+                            Text("Your random profile")
+                            Spacer()
+                            Text(customUserProfile.chatViewName)
+                                .foregroundStyle(.indigo)
+                        }
                    }
                }

@@ -154,9 +159,10 @@ struct ChatInfoView: View {
                    if let connStats = connectionStats,
                       connStats.ratchetSyncAllowed {
                        synchronizeConnectionButton()
-                    } else if developerTools {
-                        synchronizeConnectionButtonForce()
                    }
+//                    } else if developerTools {
+//                        synchronizeConnectionButtonForce()
+//                    }
                }

                if let contactLink = contact.contactLink {
@@ -242,20 +248,30 @@ struct ChatInfoView: View {
                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
-            HStack {
-                if contact.verified {
-                    Image(systemName: "checkmark.shield")
+            if contact.verified {
+                (
+                    Text(Image(systemName: "checkmark.shield"))
                        .foregroundColor(.secondary)
-                }
+                        .font(.title2)
+                    + Text(" ")
+                    + Text(contact.profile.displayName)
+                        .font(.largeTitle)
+                )
+                .multilineTextAlignment(.center)
+                .lineLimit(2)
+                .padding(.bottom, 2)
+            } else {
                Text(contact.profile.displayName)
                    .font(.largeTitle)
-                    .lineLimit(1)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(2)
                    .padding(.bottom, 2)
            }
            if cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName {
                Text(cInfo.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(4)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
@@ -10,20 +10,11 @@ import SwiftUI
 import SimpleXChat

 struct CIEventView: View {
-    var chatItem: ChatItem
+    var eventText: Text

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if let member = chatItem.memberDisplayName {
-                Text(member)
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-                    .fontWeight(.light)
-                + Text(" ")
-                + chatEventText(chatItem)
-            } else {
-                chatEventText(chatItem)
-            }
+            eventText
        }
        .padding(.leading, 6)
        .padding(.bottom, 6)
@@ -31,20 +22,8 @@ struct CIEventView: View {
    }
 }

-func chatEventText(_ ci: ChatItem) -> Text {
-    Text(ci.content.text)
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .fontWeight(.light)
-    + Text(" ")
-    + ci.timestampText
-        .font(.caption)
-        .foregroundColor(Color.secondary)
-        .fontWeight(.light)
-}
-
 struct CIEventView_Previews: PreviewProvider {
    static var previews: some View {
-        CIEventView(chatItem: ChatItem.getGroupEventSample())
+        CIEventView(eventText: Text("event happened"))
    }
 }
@@ -16,8 +16,8 @@ struct CIFileView: View {

    var body: some View {
        let metaReserve = edited
-        ? "                         "
-        : "                     "
+        ? "                           "
+        : "                       "
        Button(action: fileAction) {
            HStack(alignment: .bottom, spacing: 6) {
                fileIndicator()
@@ -62,6 +62,7 @@ struct CIFileView: View {
            case .rcvComplete: return true
            case .rcvCancelled: return false
            case .rcvError: return false
+            case .invalid: return false
            }
        }
        return false
@@ -83,7 +84,8 @@ struct CIFileView: View {
                    Task {
                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                        if let user = ChatModel.shared.currentUser {
-                            await receiveFile(user: user, fileId: file.fileId)
+                            let encrypted = file.fileProtocol == .xftp && privacyEncryptLocalFilesGroupDefault.get()
+                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                        }
                    }
                } else {
@@ -108,9 +110,8 @@ struct CIFileView: View {
                }
            case .rcvComplete:
                logger.debug("CIFileView fileAction - in .rcvComplete")
-                if let filePath = getLoadedFilePath(file) {
-                    let url = URL(fileURLWithPath: filePath)
-                    showShareSheet(items: [url])
+                if let fileSource = getLoadedFileSource(file) {
+                    saveCryptoFile(fileSource)
                }
            default: break
            }
@@ -149,6 +150,7 @@ struct CIFileView: View {
            case .rcvComplete: fileIcon("doc.fill")
            case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
+            case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
            }
        } else {
            fileIcon("doc.fill")
@@ -191,11 +193,35 @@ struct CIFileView: View {
    }
 }

+func saveCryptoFile(_ fileSource: CryptoFile) {
+    if let cfArgs = fileSource.cryptoArgs {
+        let url = getAppFilePath(fileSource.filePath)
+        let tempUrl = getTempFilesDirectory().appendingPathComponent(fileSource.filePath)
+        Task {
+            do {
+                try decryptCryptoFile(fromPath: url.path, cryptoArgs: cfArgs, toPath: tempUrl.path)
+                await MainActor.run {
+                    showShareSheet(items: [tempUrl]) {
+                        removeFile(tempUrl)
+                    }
+                }
+            } catch {
+                await MainActor.run {
+                    AlertManager.shared.showAlertMsg(title: "Error decrypting file", message: "Error: \(error.localizedDescription)")
+                }
+            }
+        }
+    } else {
+        let url = getAppFilePath(fileSource.filePath)
+        showShareSheet(items: [url])
+    }
+}
+
 struct CIFileView_Previews: PreviewProvider {
    static var previews: some View {
        let sentFile: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .file("")),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
@@ -16,6 +16,7 @@ struct CIImageView: View {
    let maxWidth: CGFloat
    @Binding var imgWidth: CGFloat?
    @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
    @State private var showFullScreenImage = false

    var body: some View {
@@ -36,9 +37,8 @@ struct CIImageView: View {
                            case .rcvInvitation:
                                Task {
                                    if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId)
+                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                    }
-                                    // TODO image accepted alert?
                                }
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -99,6 +99,7 @@ struct CIImageView: View {
            case .rcvTransfer: progressView()
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
            default: EmptyView()
            }
        }
@@ -109,7 +110,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
            .padding(padding)
    }

@@ -13,6 +13,7 @@ struct CIMetaView: View {
    @EnvironmentObject var chat: Chat
    var chatItem: ChatItem
    var metaColor = Color.secondary
+    var paleMetaColor = Color(UIColor.tertiaryLabel)

    var body: some View {
        if chatItem.isDeletedContent {
@@ -20,16 +21,28 @@ struct CIMetaView: View {
        } else {
            let meta = chatItem.meta
            let ttl = chat.chatInfo.timedMessagesTTL
+            let encrypted = chatItem.encryptedFile
            switch meta.itemStatus {
-            case .sndSent:
-                ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .sent)
-            case .sndRcvd:
-                ZStack {
-                    ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd1)
-                    ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
+            case let .sndSent(sndProgress):
+                switch sndProgress {
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
+                }
+            case let .sndRcvd(_, sndProgress):
+                switch sndProgress {
+                case .complete:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
+                    }
+                case .partial:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
+                    }
                }
            default:
-                ciMetaText(meta, chatTTL: ttl, color: metaColor)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
            }
        }
    }
@@ -41,7 +54,7 @@ enum SentCheckmark {
    case rcvd2
 }

-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
    var r = Text("")
    if meta.itemEdited {
        r = r + statusIconText("pencil", color)
@@ -61,14 +74,18 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparen
        switch sent {
        case nil: r = r + t1
        case .sent: r = r + t1 + gap
-        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : color.opacity(0.67)) + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
        case .rcvd2: r = r + gap + t1
        }
        r = r + Text(" ")
    } else if !meta.disappearing {
        r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
    }
-    return (r + meta.timestampText.foregroundColor(color)).font(.caption)
+    if let enc = encrypted {
+        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
+    }
+    r = r + meta.timestampText.foregroundColor(color)
+    return r.font(.caption)
 }

 private func statusIconText(_ icon: String, _ color: Color) -> Text {
@@ -78,8 +95,12 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, itemEdited: true))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
        }
        .previewLayout(.fixed(width: 360, height: 100))
@@ -16,7 +16,6 @@ struct CIRcvDecryptionError: View {
    var msgDecryptError: MsgDecryptError
    var msgCount: UInt32
    var chatItem: ChatItem
-    var showMember = false
    @State private var alert: CIRcvDecryptionErrorAlert?

    enum CIRcvDecryptionErrorAlert: Identifiable {
@@ -106,9 +105,6 @@ struct CIRcvDecryptionError: View {
        ZStack(alignment: .bottomTrailing) {
            VStack(alignment: .leading, spacing: 2) {
                HStack {
-                    if showMember, let member = chatItem.memberDisplayName {
-                        Text(member).fontWeight(.medium) + Text(": ")
-                    }
                    Text(chatItem.content.text)
                        .foregroundColor(.red)
                        .italic()
@@ -122,7 +118,7 @@ struct CIRcvDecryptionError: View {
                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                )
            }
            .padding(.horizontal, 12)
@@ -137,20 +133,13 @@ struct CIRcvDecryptionError: View {
    }

    private func decryptionErrorItem(_ onClick: @escaping (() -> Void)) -> some View {
-        func text() -> Text {
-            Text(chatItem.content.text)
-                .foregroundColor(.red)
-                .italic()
-            + Text("   ")
-            + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
-        }
        return ZStack(alignment: .bottomTrailing) {
            HStack {
-                if showMember, let member = chatItem.memberDisplayName {
-                    Text(member).fontWeight(.medium) + Text(": ") + text()
-                } else {
-                    text()
-                }
+                Text(chatItem.content.text)
+                    .foregroundColor(.red)
+                    .italic()
+                + Text("   ")
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
            }
            .padding(.horizontal, 12)
            CIMetaView(chatItem: chatItem)
@@ -22,6 +22,7 @@ struct CIVideoView: View {
    @State private var scrollProxy: ScrollViewProxy?
    @State private var preview: UIImage? = nil
    @State private var player: AVPlayer?
+    @State private var fullPlayer: AVPlayer?
    @State private var url: URL?
    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
@@ -36,6 +37,7 @@ struct CIVideoView: View {
        self.scrollProxy = scrollProxy
        if let url = getLoadedVideo(chatItem.file) {
            self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
+            self._fullPlayer = State(initialValue: AVPlayer(url: url))
            self._url = State(initialValue: url)
        }
        if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -57,7 +59,7 @@ struct CIVideoView: View {
                        if let file = file {
                            switch file.fileStatus {
                            case .rcvInvitation:
-                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
                                case .xftp:
@@ -83,7 +85,7 @@ struct CIVideoView: View {
            }
            if let file = file, case .rcvInvitation = file.fileStatus {
                Button {
-                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                } label: {
                    playPauseIcon("play.fill")
                }
@@ -96,6 +98,7 @@ struct CIVideoView: View {
        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
+                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                VideoPlayerView(player: player, url: url, showControls: false)
                .frame(width: w, height: w * preview.size.height / preview.size.width)
                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
@@ -113,7 +116,9 @@ struct CIVideoView: View {
                        player.pause()
                        videoPlaying = false
                    case .paused:
-                        showFullScreenPlayer = true
+                        if canBePlayed {
+                            showFullScreenPlayer = true
+                        }
                    default: ()
                    }
                }
@@ -122,8 +127,9 @@ struct CIVideoView: View {
                        ChatModel.shared.stopPreviousRecPlay = url
                        player.play()
                    } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                    }
+                    .disabled(!canBePlayed)
                }
            }
            loadingIndicator()
@@ -212,6 +218,7 @@ struct CIVideoView: View {
                }
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
            default: EmptyView()
            }
        }
@@ -246,10 +253,11 @@ struct CIVideoView: View {
        .padding([.trailing, .top], 11)
    }

-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64) async -> Void) {
+    // TODO encrypt: where file size is checked?
+    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
        Task {
            if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId)
+                await receiveFile(user, file.fileId, encrypted, false)
            }
        }
    }
@@ -257,8 +265,7 @@ struct CIVideoView: View {
    private func fullScreenPlayer(_ url: URL) -> some View {
        ZStack {
            Color.black.edgesIgnoringSafeArea(.all)
-            VideoPlayer(player: createFullScreenPlayerAndPlay(url)) {
-            }
+            VideoPlayer(player: fullPlayer)
            .overlay(alignment: .topLeading, content: {
                Button(action: { showFullScreenPlayer = false },
                    label: {
@@ -281,28 +288,29 @@ struct CIVideoView: View {
                    }
                }
            )
+            .onAppear {
+                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                    ChatModel.shared.stopPreviousRecPlay = url
+                    if let player = fullPlayer {
+                        player.play()
+                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
+                            player.seek(to: CMTime.zero)
+                            player.play()
+                        }
+                    }
+                }
+            }
            .onDisappear {
                if let fullScreenTimeObserver = fullScreenTimeObserver {
                    NotificationCenter.default.removeObserver(fullScreenTimeObserver)
                }
                fullScreenTimeObserver = nil
+                fullPlayer?.pause()
+                fullPlayer?.seek(to: CMTime.zero)
            }
        }
    }

-    private func createFullScreenPlayerAndPlay(_ url: URL) -> AVPlayer {
-        let player = AVPlayer(url: url)
-        DispatchQueue.main.asyncAfter(deadline: .now()) {
-            ChatModel.shared.stopPreviousRecPlay = url
-            player.play()
-            fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
-                player.seek(to: CMTime.zero)
-                player.play()
-            }
-        }
-        return player
-    }
-
    private func addObserver(_ player: AVPlayer, _ url: URL) {
        timeObserver = player.addPeriodicTimeObserver(forInterval: CMTime(seconds: 0.01, preferredTimescale: CMTimeScale(NSEC_PER_SEC)), queue: .main) { time in
            if let item = player.currentItem {
@@ -144,6 +144,7 @@ struct VoiceMessagePlayer: View {
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
+                case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                }
            } else {
                playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -158,7 +159,8 @@ struct VoiceMessagePlayer: View {
            }
        }
        .onChange(of: chatModel.stopPreviousRecPlay) { it in
-            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
+            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
+               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                audioPlayer?.stop()
                playbackState = .noPlayback
                playbackTime = TimeInterval(0)
@@ -173,8 +175,8 @@ struct VoiceMessagePlayer: View {
        switch playbackState {
        case .noPlayback:
            Button {
-                if let recordingFileName = getLoadedFileName(recordingFile) {
-                    startPlayback(recordingFileName)
+                if let recordingSource = getLoadedFileSource(recordingFile) {
+                    startPlayback(recordingSource)
                }
            } label: {
                playPauseIcon("play.fill")
@@ -218,7 +220,7 @@ struct VoiceMessagePlayer: View {
        Button {
            Task {
                if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                }
            }
        } label: {
@@ -250,8 +252,8 @@ struct VoiceMessagePlayer: View {
            .clipShape(Circle())
    }

-    private func startPlayback(_ recordingFileName: String) {
-        chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
+    private func startPlayback(_ recordingSource: CryptoFile) {
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
        audioPlayer = AudioPlayer(
            onTimer: { playbackTime = $0 },
            onFinishPlayback: {
@@ -259,7 +261,7 @@ struct VoiceMessagePlayer: View {
                playbackTime = TimeInterval(0)
            }
        )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
        playbackState = .playing
    }
 }
@@ -268,7 +270,7 @@ struct CIVoiceView_Previews: PreviewProvider {
    static var previews: some View {
        let sentVoiceMessage: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
@@ -12,13 +12,9 @@ import SimpleXChat
 struct DeletedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).fontWeight(.medium) + Text(": ")
-            }
            Text(chatItem.content.text)
                .foregroundColor(.secondary)
                .italic()
@@ -37,10 +33,7 @@ struct DeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(
-                chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)),
-                showMember: true
-            )
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -32,7 +32,7 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
        }
        .previewLayout(.fixed(width: 360, height: 70))
@@ -75,14 +75,14 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
    static var previews: some View {
        let sentVoiceMessage: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "Hello there", duration: 30)),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
        )
        let voiceMessageWithQuote: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
            quotedItem: CIQuote.getSample(1, .now, "Hi", chatDir: .directRcv),
            file: CIFile.getSample(fileStatus: .sndComplete)
@@ -18,7 +18,6 @@ struct FramedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember = false
    var maxWidth: CGFloat = .infinity
    @State var scrollProxy: ScrollViewProxy? = nil
    @State var msgWidth: CGFloat = 0
@@ -57,7 +56,7 @@ struct FramedItemView: View {
                        }
                }

-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: framedMsgContentView)
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: framedMsgContentView)
                    .padding(chatItem.content.msgContent != nil ? 0 : 4)
                    .overlay(DetermineWidth())
            }
@@ -68,6 +67,7 @@ struct FramedItemView: View {
                    .padding(.horizontal, 12)
                    .padding(.bottom, 6)
                    .overlay(DetermineWidth())
+                    .accessibilityLabel("")
            }
        }
            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, colorScheme))
@@ -97,7 +97,7 @@ struct FramedItemView: View {
        } else {
            switch (chatItem.content.msgContent) {
            case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
                    .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
@@ -107,7 +107,7 @@ struct FramedItemView: View {
                            value: .white
                        )
                } else {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .video(text, image, duration):
                CIVideoView(chatItem: chatItem, image: image, duration: duration, maxWidth: maxWidth, videoWidth: $videoWidth, scrollProxy: scrollProxy)
@@ -120,27 +120,27 @@ struct FramedItemView: View {
                        value: .white
                    )
                } else {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .voice(text, duration):
                FramedCIVoiceView(chatItem: chatItem, recordingFile: chatItem.file, duration: duration, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
                    .overlay(DetermineWidth())
                if text != "" {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .file(text):
                ciFileView(chatItem, text)
            case let .link(_, preview):
                CILinkView(linkPreview: preview)
-                ciMsgContentView (chatItem, showMember)
+                ciMsgContentView(chatItem)
            case let .unknown(_, text: text):
                if chatItem.file == nil {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                } else {
                    ciFileView(chatItem, text)
                }
            default:
-                ciMsgContentView (chatItem, showMember)
+                ciMsgContentView(chatItem)
            }
        }
    }
@@ -232,17 +232,27 @@ struct FramedItemView: View {
    }
    
    private func ciQuotedMsgView(_ qi: CIQuote) -> some View {
-        MsgContentView(
-            text: qi.text,
-            formattedText: qi.formattedText,
-            sender: qi.getSender(membership())
-        )
-        .lineLimit(3)
-        .font(.subheadline)
-        .padding(.vertical, 6)
+        Group {
+            if let sender = qi.getSender(membership()) {
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    ciQuotedMsgTextView(qi, lines: 2)
+                }
+            } else {
+                ciQuotedMsgTextView(qi, lines: 3)
+            }
+        }
+        .padding(.top, 6)
        .padding(.horizontal, 12)
    }
    
+    private func ciQuotedMsgTextView(_ qi: CIQuote, lines: Int) -> some View {
+        MsgContentView(text: qi.text, formattedText: qi.formattedText)
+            .lineLimit(lines)
+            .font(.subheadline)
+            .padding(.bottom, 6)
+    }
+
    private func ciQuoteIconView(_ image: String) -> some View {
        Image(systemName: image)
            .resizable()
@@ -260,13 +270,12 @@ struct FramedItemView: View {
        }
    }
    
-    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, _ showMember: Bool = false) -> some View {
+    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem) -> some View {
        let text = ci.meta.isLive ? ci.content.msgContent?.text ?? ci.text : ci.text
        let rtl = isRightToLeft(text)
        let v = MsgContentView(
            text: text,
            formattedText: text == "" ? [] : ci.formattedText,
-            sender: showMember ? ci.memberDisplayName : nil,
            meta: ci.meta,
            rightToLeft: rtl
        )
@@ -288,7 +297,7 @@ struct FramedItemView: View {
        CIFileView(file: chatItem.file, edited: chatItem.meta.itemEdited)
            .overlay(DetermineWidth())
        if text != "" || ci.meta.isLive {
-            ciMsgContentView (chatItem, showMember)
+            ciMsgContentView (chatItem)
        }
    }

@@ -349,8 +358,8 @@ struct FramedItemView_Previews: PreviewProvider {
        Group{
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -363,10 +372,10 @@ struct FramedItemView_Previews: PreviewProvider {
 struct FramedItemView_Edited_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -381,10 +390,10 @@ struct FramedItemView_Edited_Previews: PreviewProvider {
 struct FramedItemView_Deleted_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -12,10 +12,9 @@ import SimpleXChat
 struct IntegrityErrorItemView: View {
    var msgError: MsgErrorType
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
-        CIMsgError(chatItem: chatItem, showMember: showMember) {
+        CIMsgError(chatItem: chatItem) {
            switch msgError {
            case .msgSkipped:
                AlertManager.shared.showAlertMsg(
@@ -54,14 +53,10 @@ struct IntegrityErrorItemView: View {

 struct CIMsgError: View {
    var chatItem: ChatItem
-    var showMember = false
    var onTap: () -> Void

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).fontWeight(.medium) + Text(": ")
-            }
            Text(chatItem.content.text)
                .foregroundColor(.red)
                .italic()
@@ -12,13 +12,9 @@ import SimpleXChat
 struct MarkedDeletedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).font(.caption).fontWeight(.medium) + Text(": ").font(.caption)
-            }
            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
            } else {
@@ -46,7 +42,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -80,14 +80,14 @@ struct MsgContentView: View {
    }

    private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
    }
 }

 func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
    let s = text
    var res: Text
-    if let ft = formattedText, ft.count > 0 {
+    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
        res = formatText(ft[0], preview)
        var i = 1
        while i < ft.count {
@@ -14,11 +14,23 @@ struct ChatItemInfoView: View {
    var ci: ChatItem
    @Binding var chatItemInfo: ChatItemInfo?
    @State private var selection: CIInfoTab = .history
+    @State private var alert: CIInfoViewAlert? = nil
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

    enum CIInfoTab {
        case history
        case quote
+        case delivery
+    }
+
+    enum CIInfoViewAlert: Identifiable {
+        case alert(title: String, text: String)
+
+        var id: String {
+            switch self {
+            case let .alert(title, text): return "alert \(title) \(text)"
+            }
+        }
    }
    
    var body: some View {
@@ -31,6 +43,11 @@ struct ChatItemInfoView: View {
                        }
                    }
                }
+                .alert(item: $alert) { a in
+                    switch(a) {
+                    case let .alert(title, text): return Alert(title: Text(title), message: Text(text))
+                    }
+                }
        }
    }

@@ -40,19 +57,44 @@ struct ChatItemInfoView: View {
        : NSLocalizedString("Received message", comment: "message info title")
    }

+    private var numTabs: Int {
+        var numTabs = 1
+        if chatItemInfo?.memberDeliveryStatuses != nil {
+            numTabs += 1
+        }
+        if ci.quotedItem != nil {
+            numTabs += 1
+        }
+        return numTabs
+    }
+
    @ViewBuilder private func itemInfoView() -> some View {
-        if let qi = ci.quotedItem {
+        if numTabs > 1 {
            TabView(selection: $selection) {
+                if let mdss = chatItemInfo?.memberDeliveryStatuses {
+                    deliveryTab(mdss)
+                        .tabItem {
+                            Label("Delivery", systemImage: "checkmark.message")
+                        }
+                        .tag(CIInfoTab.delivery)
+                }
                historyTab()
                    .tabItem {
                        Label("History", systemImage: "clock")
                    }
                    .tag(CIInfoTab.history)
-                quoteTab(qi)
-                    .tabItem {
-                        Label("In reply to", systemImage: "arrowshape.turn.up.left")
-                    }
-                    .tag(CIInfoTab.quote)
+                if let qi = ci.quotedItem {
+                    quoteTab(qi)
+                        .tabItem {
+                            Label("In reply to", systemImage: "arrowshape.turn.up.left")
+                        }
+                        .tag(CIInfoTab.quote)
+                }
+            }
+            .onAppear {
+                if chatItemInfo?.memberDeliveryStatuses != nil {
+                    selection = .delivery
+                }
            }
        } else {
            historyTab()
@@ -217,9 +259,87 @@ struct ChatItemInfoView: View {
        : Color(uiColor: .tertiarySystemGroupedBackground)
    }

+    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 16) {
+                details()
+                Divider().padding(.vertical)
+                Text("Delivery")
+                    .font(.title2)
+                    .padding(.bottom, 4)
+                memberDeliveryStatusesView(memberDeliveryStatuses)
+            }
+            .padding()
+        }
+        .frame(maxHeight: .infinity, alignment: .top)
+    }
+
+    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        VStack(alignment: .leading, spacing: 12) {
+            let mss = membersStatuses(memberDeliveryStatuses)
+            if !mss.isEmpty {
+                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                }
+            } else {
+                Text("No delivery information")
+                    .foregroundColor(.secondary)
+            }
+        }
+    }
+
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
+        memberDeliveryStatuses.compactMap({ mds in
+            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
+                return (mem, mds.memberDeliveryStatus)
+            } else {
+                return nil
+            }
+        })
+    }
+
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+        HStack{
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
+                .padding(.trailing, 2)
+            Text(member.chatViewName)
+                .lineLimit(1)
+            Spacer()
+            let v = Group {
+                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                    switch status {
+                    case .sndRcvd:
+                        ZStack(alignment: .trailing) {
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                                .padding(.trailing, 6)
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                        }
+                    default:
+                        Image(systemName: icon)
+                            .foregroundColor(statusColor)
+                    }
+                } else {
+                    Image(systemName: "ellipsis")
+                        .foregroundColor(Color.secondary)
+                }
+            }
+
+            if let (title, text) = status.statusInfo {
+                v.onTapGesture {
+                    alert = .alert(title: title, text: text)
+                }
+            } else {
+                v
+            }
+        }
+    }
+
    private func itemInfoShareText() -> String {
        let meta = ci.meta
-        var shareText: [String] = [title, ""]
+        var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
        shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
        if !ci.chatDir.sent {
            shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
@@ -245,7 +365,7 @@ struct ChatItemInfoView: View {
            ]
        }
        if let qi = ci.quotedItem {
-            shareText += ["", NSLocalizedString("In reply to", comment: "copied message info")]
+            shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]
            let t = qi.text
            shareText += [""]
            if let sender = qi.getSender(nil) {
@@ -264,7 +384,7 @@ struct ChatItemInfoView: View {
        }
        if let chatItemInfo = chatItemInfo,
           !chatItemInfo.itemVersions.isEmpty {
-            shareText += ["", NSLocalizedString("History", comment: "copied message info")]
+            shareText += ["", NSLocalizedString("## History", comment: "copied message info")]
            for (index, itemVersion) in chatItemInfo.itemVersions.enumerated() {
                let t = itemVersion.msgContent.text
                shareText += [
@@ -12,7 +12,6 @@ import SimpleXChat
 struct ChatItemView: View {
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember = false
    var maxWidth: CGFloat = .infinity
    @State var scrollProxy: ScrollViewProxy? = nil
    @Binding var revealed: Bool
@@ -23,7 +22,6 @@ struct ChatItemView: View {
    init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
        self.chatInfo = chatInfo
        self.chatItem = chatItem
-        self.showMember = showMember
        self.maxWidth = maxWidth
        _scrollProxy = .init(initialValue: scrollProxy)
        _revealed = revealed
@@ -36,14 +34,14 @@ struct ChatItemView: View {
    var body: some View {
        let ci = chatItem
        if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chatItem: chatItem, showMember: showMember)
+            MarkedDeletedItemView(chatItem: chatItem)
        } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
            if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                EmojiItemView(chatItem: ci)
            } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
            } else if ci.content.msgContent == nil {
-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
                framedItemView()
            }
@@ -53,14 +51,14 @@ struct ChatItemView: View {
    }

    private func framedItemView() -> some View {
-        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
    }
 }

 struct ChatItemContentView<Content: View>: View {
+    @EnvironmentObject var chatModel: ChatModel
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember: Bool
    var msgContentView: () -> Content

    var body: some View {
@@ -71,10 +69,11 @@ struct ChatItemContentView<Content: View>: View {
        case .rcvDeleted: deletedItemView()
        case let .sndCall(status, duration): callItemView(status, duration)
        case let .rcvCall(status, duration): callItemView(status, duration)
-        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem, showMember: showMember)
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem, showMember: showMember)
+        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
        case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
        case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
+        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
        case .rcvGroupEvent: eventItemView()
        case .sndGroupEvent: eventItemView()
        case .rcvConnEvent: eventItemView()
@@ -96,7 +95,7 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func deletedItemView() -> some View {
-        DeletedItemView(chatItem: chatItem, showMember: showMember)
+        DeletedItemView(chatItem: chatItem)
    }

    private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
@@ -108,12 +107,54 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func eventItemView() -> some View {
-        CIEventView(chatItem: chatItem)
+        return CIEventView(eventText: eventItemViewText())
+    }
+
+    private func eventItemViewText() -> Text {
+        if let member = chatItem.memberDisplayName {
+            return Text(member + " ")
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+                    .fontWeight(.light)
+                + chatEventText(chatItem)
+        } else {
+            return chatEventText(chatItem)
+        }
    }

    private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
    }
+
+    private var membersConnectedItemText: Text {
+        if let t = membersConnectedText {
+            return chatEventText(t, chatItem.timestampText)
+        } else {
+            return eventItemViewText()
+        }
+    }
+
+    private var membersConnectedText: LocalizedStringKey? {
+        let ns = chatModel.getConnectedMemberNames(chatItem)
+        return ns.count > 3
+            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
+            : ns.count == 3
+            ? "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
+            : ns.count == 2
+            ? "\(ns[0]) and \(ns[1]) connected"
+            : nil
+    }
+}
+
+func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
+    (Text(eventText) + Text(" ") + ts)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
+}
+
+func chatEventText(_ ci: ChatItem) -> Text {
+    chatEventText("\(ci.content.text)", ci.timestampText)
 }

 struct ChatItemView_Previews: PreviewProvider {
@@ -125,9 +166,9 @@ struct ChatItemView_Previews: PreviewProvider {
            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent, itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
        }
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
@@ -261,7 +261,7 @@ struct ChatView: View {
        return GeometryReader { g in
            ScrollViewReader { proxy in
                ScrollView {
-                    LazyVStack(spacing: 5)  {
+                    LazyVStack(spacing: 0)  {
                        ForEach(chatModel.reversedChatItems, id: \.viewId) { ci in
                            let voiceNoFrame = voiceWithoutFrame(ci)
                            let maxWidth = cInfo.chatType == .group
@@ -430,68 +430,77 @@ struct ChatView: View {
    @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
        if case let .groupRcv(member) = ci.chatDir,
           case let .group(groupInfo) = chat.chatInfo {
-            let prevItem = chatModel.getPrevChatItem(ci)
-            HStack(alignment: .top, spacing: 0) {
-                let showMember = prevItem == nil || showMemberImage(member, prevItem)
-                if showMember {
-                    ProfileImage(imageStr: member.memberProfile.image)
-                        .frame(width: memberImageSize, height: memberImageSize)
-                        .onTapGesture { selectedMember = member }
-                        .appSheet(item: $selectedMember) { member in
-                            GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
+            let (prevItem, nextItem) = chatModel.getChatItemNeighbors(ci)
+            if ci.memberConnected != nil && nextItem?.memberConnected != nil {
+                // memberConnected events are aggregated at the last chat item in a row of such events, see ChatItemView
+                ZStack {} // scroll doesn't work if it's EmptyView()
+            } else {
+                if prevItem == nil || showMemberImage(member, prevItem) {
+                    VStack(alignment: .leading, spacing: 4) {
+                        if ci.content.showMemberName {
+                            Text(member.displayName)
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                                .padding(.leading, memberImageSize + 14)
+                                .padding(.top, 7)
                        }
+                        HStack(alignment: .top, spacing: 8) {
+                            ProfileImage(imageStr: member.memberProfile.image)
+                                .frame(width: memberImageSize, height: memberImageSize)
+                                .onTapGesture { selectedMember = member }
+                                .appSheet(item: $selectedMember) { member in
+                                    GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
+                                }
+                            chatItemWithMenu(ci, maxWidth)
+                        }
+                    }
+                    .padding(.top, 5)
+                    .padding(.trailing)
+                    .padding(.leading, 12)
                } else {
-                    Rectangle().fill(.clear)
-                        .frame(width: memberImageSize, height: memberImageSize)
+                    chatItemWithMenu(ci, maxWidth)
+                        .padding(.top, 5)
+                        .padding(.trailing)
+                        .padding(.leading, memberImageSize + 8 + 12)
                }
-                ChatItemWithMenu(
-                    ci: ci,
-                    showMember: showMember,
-                    maxWidth: maxWidth,
-                    scrollProxy: scrollProxy,
-                    deleteMessage: deleteMessage,
-                    deletingItem: $deletingItem,
-                    composeState: $composeState,
-                    showDeleteMessage: $showDeleteMessage
-                )
-                .padding(.leading, 8)
-                .environmentObject(chat)
            }
-            .padding(.trailing)
-            .padding(.leading, 12)
        } else {
-            ChatItemWithMenu(
-                ci: ci,
-                maxWidth: maxWidth,
-                scrollProxy: scrollProxy,
-                deleteMessage: deleteMessage,
-                deletingItem: $deletingItem,
-                composeState: $composeState,
-                showDeleteMessage: $showDeleteMessage
-            )
-            .padding(.horizontal)
-            .environmentObject(chat)
+            chatItemWithMenu(ci, maxWidth)
+                .padding(.horizontal)
+                .padding(.top, 5)
        }
    }
-    
+
+    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
+        ChatItemWithMenu(
+            ci: ci,
+            maxWidth: maxWidth,
+            scrollProxy: scrollProxy,
+            deleteMessage: deleteMessage,
+            deletingItem: $deletingItem,
+            composeState: $composeState,
+            showDeleteMessage: $showDeleteMessage
+        )
+        .environmentObject(chat)
+    }
+
    private struct ChatItemWithMenu: View {
        @EnvironmentObject var chat: Chat
        @Environment(\.colorScheme) var colorScheme
        var ci: ChatItem
-        var showMember: Bool = false
        var maxWidth: CGFloat
        var scrollProxy: ScrollViewProxy?
        var deleteMessage: (CIDeleteMode) -> Void
        @Binding var deletingItem: ChatItem?
        @Binding var composeState: ComposeState
        @Binding var showDeleteMessage: Bool
-        
+
        @State private var revealed = false
        @State private var showChatItemInfoSheet: Bool = false
        @State private var chatItemInfo: ChatItemInfo?
-        
+
        @State private var allowMenu: Bool = true
-        
+
        @State private var audioPlayer: AudioPlayer?
        @State private var playbackState: VoiceMessagePlaybackState = .noPlayback
        @State private var playbackTime: TimeInterval?
@@ -504,8 +513,9 @@ struct ChatView: View {
            )
            
            VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
                    .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
+                    .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                    chatItemReactions()
                        .padding(.bottom, 4)
@@ -591,15 +601,15 @@ struct ChatView: View {
                }
                menu.append(shareUIAction())
                menu.append(copyUIAction())
-                if let filePath = getLoadedFilePath(ci.file) {
+                if let fileSource = getLoadedFileSource(ci.file) {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
-                            menu.append(saveFileAction(filePath))
+                            menu.append(saveFileAction(fileSource))
                        } else {
                            menu.append(saveImageAction(image))
                        }
                    } else {
-                        menu.append(saveFileAction(filePath))
+                        menu.append(saveFileAction(fileSource))
                    }
                }
                if ci.meta.editable && !mc.isVoice && !live {
@@ -627,6 +637,7 @@ struct ChatView: View {
                menu.append(viewInfoUIAction())
                menu.append(deleteUIAction())
            } else if ci.isDeletedContent {
+                menu.append(viewInfoUIAction())
                menu.append(deleteUIAction())
            }
            return menu
@@ -736,13 +747,12 @@ struct ChatView: View {
            }
        }
        
-        private func saveFileAction(_ filePath: String) -> UIAction {
+        private func saveFileAction(_ fileSource: CryptoFile) -> UIAction {
            UIAction(
                title: NSLocalizedString("Save", comment: "chat item action"),
-                image: UIImage(systemName: "square.and.arrow.down")
+                image: UIImage(systemName: fileSource.cryptoArgs == nil ? "square.and.arrow.down" : "lock.open")
            ) { _ in
-                let fileURL = URL(fileURLWithPath: filePath)
-                showShareSheet(items: [fileURL])
+                saveCryptoFile(fileSource)
            }
        }
        
@@ -769,6 +779,12 @@ struct ChatView: View {
                        await MainActor.run {
                            chatItemInfo = ciInfo
                        }
+                        if case let .group(gInfo) = chat.chatInfo {
+                            let groupMembers = await apiListMembers(gInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                            }
+                        }
                    } catch let error {
                        logger.error("apiGetChatItemInfo error: \(responseError(error))")
                    }
@@ -44,7 +44,6 @@ struct ComposeState {
    var contextItem: ComposeContextItem
    var voiceMessageRecordingState: VoiceMessageRecordingState
    var inProgress = false
-    var disabled = false
    var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)

    init(
@@ -168,25 +167,23 @@ struct ComposeState {
 }

 func chatItemPreview(chatItem: ChatItem) -> ComposePreview {
-    let chatItemPreview: ComposePreview
    switch chatItem.content.msgContent {
    case .text:
-        chatItemPreview = .noPreview
+        return .noPreview
    case let .link(_, preview: preview):
-        chatItemPreview = .linkPreview(linkPreview: preview)
+        return .linkPreview(linkPreview: preview)
    case let .image(_, image):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
    case let .video(_, image, _):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
    case let .voice(_, duration):
-        chatItemPreview = .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
+        return .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
    case .file:
        let fileName = chatItem.file?.fileName ?? ""
-        chatItemPreview = .filePreview(fileName: fileName, file: getAppFilePath(fileName))
+        return .filePreview(fileName: fileName, file: getAppFilePath(fileName))
    default:
-        chatItemPreview = .noPreview
+        return .noPreview
    }
-    return chatItemPreview
 }

 enum UploadContent: Equatable {
@@ -241,6 +238,7 @@ struct ComposeView: View {
    @State var pendingLinkUrl: URL? = nil
    @State var cancelledLinks: Set<String> = []

+    @Environment(\.colorScheme) private var colorScheme
    @State private var showChooseSource = false
    @State private var showMediaPicker = false
    @State private var showTakePhoto = false
@@ -255,6 +253,8 @@ struct ComposeView: View {
    // this is a workaround to fire an explicit event in certain cases
    @State private var stopPlayback: Bool = false

+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+
    var body: some View {
        VStack(spacing: 0) {
            contextItemView()
@@ -309,7 +309,10 @@ struct ComposeView: View {
                        allowVoiceMessagesToContact: allowVoiceMessagesToContact,
                        timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                        onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
-                        keyboardVisible: $keyboardVisible
+                        keyboardVisible: $keyboardVisible,
+                        sendButtonColor: chat.chatInfo.incognito
+                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
+                            : .accentColor
                    )
                    .padding(.trailing, 12)
                    .background(.background)
@@ -442,7 +445,15 @@ struct ComposeView: View {
            } else if (composeState.inProgress) {
                clearCurrentDraft()
            } else if !composeState.empty  {
-                saveCurrentDraft()
+                if case .recording = composeState.voiceMessageRecordingState {
+                    finishVoiceMessageRecording()
+                    if let fileName = composeState.voiceMessageRecordingFileName {
+                        chatModel.filesToDelete.insert(getAppFilePath(fileName))
+                    }
+                }
+                if saveLastDraft {
+                    saveCurrentDraft()
+                }
            } else {
                cancelCurrentVoiceRecording()
                clearCurrentDraft()
@@ -643,10 +654,10 @@ struct ComposeView: View {
                }
            case let .voicePreview(recordingFileName, duration):
                stopPlayback.toggle()
-                chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
+                let file = voiceCryptoFile(recordingFileName)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
            case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file) {
+                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                }
            }
@@ -655,10 +666,7 @@ struct ComposeView: View {
        return sent

        func sending() async {
-            await MainActor.run { composeState.disabled = true }
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                if composeState.disabled { composeState.inProgress = true }
-            }
+            await MainActor.run { composeState.inProgress = true }
        }

        func updateMessage(_ ei: ChatItem, live: Bool) async -> ChatItem? {
@@ -717,13 +725,28 @@ struct ComposeView: View {

        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
            let (image, data) = imageData
-            if case let .video(_, url, duration) = data, let savedFile = saveFileFromURLWithoutLoad(url) {
+            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
            }
            return nil
        }

-        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
+            if !privacyEncryptLocalFilesGroupDefault.get() {
+                return CryptoFile.plain(fileName)
+            }
+            let url = getAppFilePath(fileName)
+            let toFile = generateNewFileName("voice", "m4a")
+            let toUrl = getAppFilePath(toFile)
+            if let cfArgs = try? encryptCryptoFile(fromPath: url.path, toPath: toUrl.path) {
+                removeFile(url)
+                return CryptoFile(filePath: toFile, cryptoArgs: cfArgs)
+            } else {
+                return nil
+            }
+        }
+
+        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
            if let chatItem = await apiSendMessage(
                type: chat.chatInfo.chatType,
                id: chat.chatInfo.apiId,
@@ -740,7 +763,7 @@ struct ComposeView: View {
                return chatItem
            }
            if let file = file {
-                removeFile(file)
+                removeFile(file.filePath)
            }
            return nil
        }
@@ -760,7 +783,7 @@ struct ComposeView: View {
            }
        }

-        func saveAnyImage(_ img: UploadContent) -> String? {
+        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
            switch img {
            case let .simpleImage(image): return saveImage(image)
            case let .animatedImage(image): return saveAnimImage(image)
@@ -852,7 +875,6 @@ struct ComposeView: View {

    private func clearState(live: Bool = false) {
        if live {
-            composeState.disabled = false
            composeState.inProgress = false
        } else {
            composeState = ComposeState()
@@ -865,12 +887,6 @@ struct ComposeView: View {
    }

    private func saveCurrentDraft() {
-        if case .recording = composeState.voiceMessageRecordingState {
-            finishVoiceMessageRecording()
-            if let fileName = composeState.voiceMessageRecordingFileName {
-                chatModel.filesToDelete.insert(getAppFilePath(fileName))
-            }
-        }
        chatModel.draft = composeState
        chatModel.draftChatId = chat.id
    }
@@ -188,7 +188,7 @@ struct ComposeVoiceView: View {
                playbackTime = recordingTime // animate progress bar to the end
            }
        )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: CryptoFile.plain(recordingFileName), at: playbackTime)
        playbackState = .playing
    }
 }
@@ -22,13 +22,14 @@ struct ContextItemView: View {
                .aspectRatio(contentMode: .fit)
                .frame(width: 16, height: 16)
                .foregroundColor(.secondary)
-            MsgContentView(
-                text: contextItem.text,
-                formattedText: contextItem.formattedText,
-                sender: contextItem.memberDisplayName
-            )
-            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-            .lineLimit(3)
+            if let sender = contextItem.memberDisplayName {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    msgContentView(lines: 2)
+                }
+            } else {
+                msgContentView(lines: 3)
+            }
            Spacer()
            Button {
                withAnimation {
@@ -44,6 +45,15 @@ struct ContextItemView: View {
        .background(chatItemFrameColor(contextItem, colorScheme))
        .padding(.top, 8)
    }
+
+    private func msgContentView(lines: Int) -> some View {
+        MsgContentView(
+            text: contextItem.text,
+            formattedText: contextItem.formattedText
+        )
+        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+        .lineLimit(lines)
+    }
 }

 struct ContextItemView_Previews: PreviewProvider {
@@ -28,6 +28,7 @@ struct SendMessageView: View {
    @State private var holdingVMR = false
    @Namespace var namespace
    @Binding var keyboardVisible: Bool
+    var sendButtonColor = Color.accentColor
    @State private var teHeight: CGFloat = 42
    @State private var teFont: Font = .body
    @State private var teUiFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
@@ -36,6 +37,7 @@ struct SendMessageView: View {
    @State private var showCustomDisappearingMessageDialogue = false
    @State private var showCustomTimePicker = false
    @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
+    @State private var progressByTimeout = false
    var maxHeight: CGFloat = 360
    var minHeight: CGFloat = 37
    @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
@@ -81,7 +83,7 @@ struct SendMessageView: View {
                    }
                }

-                if composeState.inProgress {
+                if progressByTimeout {
                    ProgressView()
                        .scaleEffect(1.4)
                        .frame(width: 31, height: 31, alignment: .center)
@@ -102,6 +104,15 @@ struct SendMessageView: View {
                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
                .frame(height: teHeight)
        }
+        .onChange(of: composeState.inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+                    progressByTimeout = composeState.inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
+        }
        .padding(.vertical, 8)
    }

@@ -119,7 +130,7 @@ struct SendMessageView: View {
                        startVoiceMessageRecording: startVoiceMessageRecording,
                        finishVoiceMessageRecording: finishVoiceMessageRecording,
                        holdingVMR: $holdingVMR,
-                        disabled: composeState.disabled
+                        disabled: composeState.inProgress
                    )
                } else {
                    voiceMessageNotAllowedButton()
@@ -159,13 +170,13 @@ struct SendMessageView: View {
                  ? "checkmark.circle.fill"
                  : "arrow.up.circle.fill")
            .resizable()
-            .foregroundColor(.accentColor)
+            .foregroundColor(sendButtonColor)
            .frame(width: sendButtonSize, height: sendButtonSize)
            .opacity(sendButtonOpacity)
        }
        .disabled(
            !composeState.sendEnabled ||
-            composeState.disabled ||
+            composeState.inProgress ||
            (!voiceMessageAllowed && composeState.voicePreview) ||
            composeState.endLiveDisabled
        )
@@ -293,7 +304,7 @@ struct SendMessageView: View {
            Image(systemName: "mic")
                .foregroundColor(.secondary)
        }
-        .disabled(composeState.disabled)
+        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
        .padding([.bottom, .trailing], 4)
    }
@@ -378,7 +389,7 @@ struct SendMessageView: View {
            Image(systemName: "stop.fill")
                .foregroundColor(.accentColor)
        }
-        .disabled(composeState.disabled)
+        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
        .padding([.bottom, .trailing], 4)
    }
@@ -9,6 +9,8 @@
 import SwiftUI
 import SimpleXChat

+let SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
+
 struct GroupChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
@@ -21,6 +23,8 @@ struct GroupChatInfoView: View {
    @State private var showAddMembersSheet: Bool = false
    @State private var connectionStats: ConnectionStats?
    @State private var connectionCode: String?
+    @State private var sendReceipts = SendReceipts.userDefault(true)
+    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @State private var searchText: String = ""
    @FocusState private var searchFocussed
@@ -30,6 +34,7 @@ struct GroupChatInfoView: View {
        case clearChatAlert
        case leaveGroupAlert
        case cantInviteIncognitoAlert
+        case largeGroupReceiptsDisabled

        var id: GroupChatInfoViewAlert { get { self } }
    }
@@ -52,6 +57,11 @@ struct GroupChatInfoView: View {
                        addOrEditWelcomeMessage()
                    }
                    groupPreferencesButton($groupInfo)
+                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                        sendReceiptsOption()
+                    } else {
+                        sendReceiptsOptionDisabled()
+                    }
                } header: {
                    Text("")
                } footer: {
@@ -115,9 +125,14 @@ struct GroupChatInfoView: View {
            case .clearChatAlert: return clearChatAlert()
            case .leaveGroupAlert: return leaveGroupAlert()
            case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
+            case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
            }
        }
        .onAppear {
+            if let currentUser = chatModel.currentUser {
+                sendReceiptsUserDefault = currentUser.sendRcptsSmallGroups
+            }
+            sendReceipts = SendReceipts.fromBool(groupInfo.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
            do {
                if let link = try apiGetGroupLink(groupInfo.groupId) {
                    (groupLink, groupLinkMemberRole) = link
@@ -138,12 +153,14 @@ struct GroupChatInfoView: View {
                .padding()
            Text(cInfo.displayName)
                .font(.largeTitle)
-                .lineLimit(1)
+                .multilineTextAlignment(.center)
+                .lineLimit(4)
                .padding(.bottom, 2)
            if cInfo.fullName != "" && cInfo.fullName != cInfo.displayName {
                Text(cInfo.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(8)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
@@ -326,6 +343,38 @@ struct GroupChatInfoView: View {
            secondaryButton: .cancel()
        )
    }
+
+    private func sendReceiptsOption() -> some View {
+        Picker(selection: $sendReceipts) {
+            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
+                Text(opt.text)
+            }
+        } label: {
+            Label("Send receipts", systemImage: "checkmark.message")
+        }
+        .frame(height: 36)
+        .onChange(of: sendReceipts) { _ in
+            setSendReceipts()
+        }
+    }
+
+    private func setSendReceipts() {
+        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+        chatSettings.sendRcpts = sendReceipts.bool()
+        updateChatSettings(chat, chatSettings: chatSettings)
+    }
+
+    private func sendReceiptsOptionDisabled() -> some View {
+        HStack {
+            Label("Send receipts", systemImage: "checkmark.message")
+            Spacer()
+            Text("disabled")
+                .foregroundStyle(.secondary)
+        }
+        .onTapGesture {
+            alert = .largeGroupReceiptsDisabled
+        }
+    }
 }

 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -354,6 +403,13 @@ func cantInviteIncognitoAlert() -> Alert {
    )
 }

+func largeGroupReceiptsDisabledAlert() -> Alert {
+    Alert(
+        title: Text("Receipts are disabled"),
+        message: Text("This group has over \(SMALL_GROUPS_RCPS_MEM_LIMIT) members, delivery receipts are not sent.")
+    )
+}
+
 struct GroupChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
@@ -19,6 +19,7 @@ struct GroupMemberInfoView: View {
    @State private var connectionCode: String? = nil
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
+    @State private var connectToMemberDialog: Bool = false
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @State private var justOpened = true

@@ -38,8 +39,8 @@ struct GroupMemberInfoView: View {
            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
-            case .connRequestSentAlert: return "connRequestSentAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
+            case .connRequestSentAlert: return "connRequestSentAlert"
            case let .error(title, _): return "error \(title)"
            case let .other(alert): return "other \(alert)"
            }
@@ -82,9 +83,10 @@ struct GroupMemberInfoView: View {
                        if let connStats = connectionStats,
                           connStats.ratchetSyncAllowed {
                            synchronizeConnectionButton()
-                        } else if developerTools {
-                            synchronizeConnectionButtonForce()
                        }
+//                        } else if developerTools {
+//                            synchronizeConnectionButtonForce()
+//                        }
                    }
                }

@@ -141,7 +143,7 @@ struct GroupMemberInfoView: View {
                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                            || connStats.ratchetSyncSendProhibited
                        )
-                        if connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil } {
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
                            Button("Abort changing address") {
                                alert = .abortSwitchAddressAlert
                            }
@@ -209,15 +211,19 @@ struct GroupMemberInfoView: View {

    func connectViaAddressButton(_ contactLink: String) -> some View {
        Button {
-            connectViaAddress(contactLink)
+            connectToMemberDialog = true
        } label: {
            Label("Connect", systemImage: "link")
        }
+        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
+            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
+            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
+        }
    }

-    func connectViaAddress(_ contactLink: String) {
+    func connectViaAddress(incognito: Bool, contactLink: String) {
        Task {
-            let (connReqType, connectAlert) = await apiConnect_(connReq: contactLink)
+            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
            if let connReqType = connReqType {
                alert = .connRequestSentAlert(type: connReqType)
            } else if let connectAlert = connectAlert {
@@ -260,19 +266,30 @@ struct GroupMemberInfoView: View {
                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
-            HStack {
-                if mem.verified {
-                    Image(systemName: "checkmark.shield")
-                }
+            if mem.verified {
+                (
+                    Text(Image(systemName: "checkmark.shield"))
+                        .foregroundColor(.secondary)
+                        .font(.title2)
+                    + Text(" ")
+                    + Text(mem.displayName)
+                        .font(.largeTitle)
+                )
+                .multilineTextAlignment(.center)
+                .lineLimit(2)
+                .padding(.bottom, 2)
+            } else {
                Text(mem.displayName)
                    .font(.largeTitle)
-                    .lineLimit(1)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(2)
+                    .padding(.bottom, 2)
            }
-            .padding(.bottom, 2)
            if mem.fullName != "" && mem.fullName != mem.displayName {
                Text(mem.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(4)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
@@ -130,7 +130,7 @@ struct GroupProfileView: View {
                let err = responseError(error)
                saveGroupError = err
                showSaveErrorAlert = true
-                logger.error("UserProfile apiUpdateProfile error: \(err)")
+                logger.error("GroupProfile apiUpdateGroup error: \(err)")
            }
        }
    }
@@ -19,7 +19,7 @@ struct ScanCodeView: View {
        VStack(alignment: .leading) {
            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
-                .border(.gray)
+                .cornerRadius(12)
            Text("Scan security code from your contact's app.")
                .padding(.top)
        }
@@ -64,7 +64,7 @@ struct VerifyCodeView: View {
                        HStack {
                            NavigationLink {
                                ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
-                                    .navigationBarTitleDisplayMode(.inline)
+                                    .navigationBarTitleDisplayMode(.large)
                                    .navigationTitle("Scan code")
                            } label: {
                                Label("Scan code", systemImage: "qrcode")
@@ -222,9 +222,15 @@ struct ChatListNavLink: View {
        ContactRequestView(contactRequest: contactRequest, chat: chat)
        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
            Button {
-                Task { await acceptContactRequest(contactRequest) }
-            } label: { Label("Accept", systemImage: chatModel.incognito ? "theatermasks" : "checkmark") }
-                .tint(chatModel.incognito ? .indigo : .accentColor)
+                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
+            } label: { Label("Accept", systemImage: "checkmark") }
+                .tint(.accentColor)
+            Button {
+                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
+            } label: {
+                Label("Accept incognito", systemImage: "theatermasks")
+            }
+            .tint(.indigo)
            Button {
                AlertManager.shared.showAlert(rejectContactRequestAlert(contactRequest))
            } label: {
@@ -234,9 +240,10 @@ struct ChatListNavLink: View {
        }
        .frame(height: rowHeights[dynamicTypeSize])
        .onTapGesture { showContactRequestDialog = true }
-        .confirmationDialog("Connection request", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
-            Button(chatModel.incognito ? "Accept incognito" : "Accept contact") { Task { await acceptContactRequest(contactRequest) } }
-            Button("Reject contact (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
+        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
+            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
+            Button("Accept incognito") { Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) } }
+            Button("Reject (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
        }
    }

@@ -263,6 +270,7 @@ struct ChatListNavLink: View {
        .sheet(isPresented: $showContactConnectionInfo) {
            if case let .contactConnection(contactConnection) = chat.chatInfo {
                ContactConnectionInfo(contactConnection: contactConnection)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
        }
        .onTapGesture {
@@ -379,6 +387,7 @@ struct ChatListNavLink: View {
            .onTapGesture { showInvalidJSON = true }
            .sheet(isPresented: $showInvalidJSON) {
                invalidJSONView(json)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
    }
 }
@@ -60,8 +60,6 @@ struct ChatListView: View {
                chatList
            }
        }
-        .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
-        .onAppear() { connectViaUrl() }
        .onDisappear() { withAnimation { userPickerVisible = false } }
        .refreshable {
            AlertManager.shared.showAlert(Alert(
@@ -108,11 +106,6 @@ struct ChatListView: View {
            }
            ToolbarItem(placement: .principal) {
                HStack(spacing: 4) {
-                    if (chatModel.incognito) {
-                        Image(systemName: "theatermasks")
-                            .foregroundColor(.indigo)
-                            .padding(.trailing, 8)
-                    }
                    Text("Chats")
                        .font(.headline)
                    if chatModel.chats.count > 0 {
@@ -15,6 +15,8 @@ struct ChatPreviewView: View {
    @Environment(\.colorScheme) var colorScheme
    var darkGreen = Color(red: 0, green: 0.5, blue: 0)

+    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
+
    var body: some View {
        let cItem = chat.chatItems.last
        return HStack(spacing: 8) {
@@ -41,11 +43,9 @@ struct ChatPreviewView: View {

                ZStack(alignment: .topTrailing) {
                    chatMessagePreview(cItem)
-                    if case .direct = chat.chatInfo {
-                        chatStatusImage()
-                            .padding(.top, 24)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    }
+                    chatStatusImage()
+                        .padding(.top, 26)
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                }
                .padding(.trailing, 8)
                
@@ -59,12 +59,9 @@ struct ChatPreviewView: View {
    @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
        if case let .group(groupInfo) = chat.chatInfo {
            switch (groupInfo.membership.memberStatus) {
-            case .memLeft:
-                groupInactiveIcon()
-            case .memRemoved:
-                groupInactiveIcon()
-            case .memGroupDeleted:
-                groupInactiveIcon()
+            case .memLeft: groupInactiveIcon()
+            case .memRemoved: groupInactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
            default: EmptyView()
            }
        } else {
@@ -74,7 +71,7 @@ struct ChatPreviewView: View {

    @ViewBuilder private func groupInactiveIcon() -> some View {
        Image(systemName: "multiply.circle.fill")
-            .foregroundColor(.secondary)
+            .foregroundColor(.secondary.opacity(0.65))
            .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
    }

@@ -106,7 +103,7 @@ struct ChatPreviewView: View {
            .kerning(-2)
    }

-    private func chatPreviewLayout(_ text: Text) -> some View {
+    private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
        ZStack(alignment: .topTrailing) {
            text
                .lineLimit(2)
@@ -114,6 +111,8 @@ struct ChatPreviewView: View {
                .frame(maxWidth: .infinity, alignment: .topLeading)
                .padding(.leading, 8)
                .padding(.trailing, 36)
+                .privacySensitive(!showChatPreviews && !draft)
+                .redacted(reason: .privacy)
            let s = chat.chatStats
            if s.unreadCount > 0 || s.unreadChat {
                unreadCountText(s.unreadCount)
@@ -175,7 +174,7 @@ struct ChatPreviewView: View {

    @ViewBuilder private func chatMessagePreview(_ cItem: ChatItem?) -> some View {
        if chatModel.draftChatId == chat.id, let draft = chatModel.draft {
-            chatPreviewLayout(messageDraft(draft))
+            chatPreviewLayout(messageDraft(draft), draft: true)
        } else if let cItem = cItem {
            chatPreviewLayout(itemStatusMark(cItem) + chatItemPreview(cItem))
        } else {
@@ -198,10 +197,7 @@ struct ChatPreviewView: View {
    @ViewBuilder private func groupInvitationPreviewText(_ groupInfo: GroupInfo) -> some View {
        groupInfo.membership.memberIncognito
        ? chatPreviewInfoText("join as \(groupInfo.membership.memberProfile.displayName)")
-        : (chatModel.incognito
-           ? chatPreviewInfoText("join as \(chatModel.currentUser?.profile.displayName ?? "yourself")")
-           : chatPreviewInfoText("you are invited to group")
-        )
+        : chatPreviewInfoText("you are invited to group")
    }

    @ViewBuilder private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
@@ -229,7 +225,7 @@ struct ChatPreviewView: View {
        switch chat.chatInfo {
        case let .direct(contact):
            switch (chatModel.contactNetworkStatus(contact)) {
-            case .connected: EmptyView()
+            case .connected: incognitoIcon(chat.chatInfo.incognito)
            case .error:
                Image(systemName: "exclamationmark.circle")
                    .resizable()
@@ -240,11 +236,23 @@ struct ChatPreviewView: View {
                ProgressView()
            }
        default:
-            EmptyView()
+            incognitoIcon(chat.chatInfo.incognito)
        }
    }
 }

+@ViewBuilder func incognitoIcon(_ incognito: Bool) -> some View {
+    if incognito {
+        Image(systemName: "theatermasks")
+            .resizable()
+            .scaledToFit()
+            .frame(width: 22, height: 22)
+            .foregroundColor(.secondary)
+    } else {
+        EmptyView()
+    }
+}
+
 func unreadCountText(_ n: Int) -> Text {
    Text(n > 999 ? "\(n / 1000)k" : n > 0 ? "\(n)" : "")
 }
@@ -258,20 +266,20 @@ struct ChatPreviewView_Previews: PreviewProvider {
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now))]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
            ))
            ChatPreviewView(chat: Chat(
@@ -15,6 +15,7 @@ struct ContactConnectionInfo: View {
    @State var contactConnection: PendingContactConnection
    @State private var alert: CCInfoAlert?
    @State private var localAlias = ""
+    @State private var showIncognitoSheet = false
    @FocusState private var aliasTextFieldFocused: Bool

    enum CCInfoAlert: Identifiable {
@@ -31,19 +32,14 @@ struct ContactConnectionInfo: View {

    var body: some View {
        NavigationView {
-            List {
+            let v = List {
                Group {
-                    Text(contactConnection.initiated ? "You invited your contact" : "You accepted connection")
+                    Text(contactConnection.initiated ? "You invited a contact" : "You accepted connection")
                        .font(.largeTitle)
                        .bold()
-                        .padding(.bottom, 16)
+                        .padding(.bottom)

                    Text(contactConnectionText(contactConnection))
-                        .padding(.bottom, 16)
-
-                    if let connReqInv = contactConnection.connReqInv {
-                        OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInv)
-                    }
                }
                .listRowBackground(Color.clear)
                .listRowSeparator(.hidden)
@@ -65,10 +61,16 @@ struct ContactConnectionInfo: View {

                    if contactConnection.initiated,
                       let connReqInv = contactConnection.connReqInv {
-                        oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInv)
+                        QRCode(uri: connReqInv)
+                        incognitoEnabled()
+                        shareLinkButton(connReqInv)
+                        oneTimeLinkLearnMoreButton()
                    } else {
+                        incognitoEnabled()
                        oneTimeLinkLearnMoreButton()
                    }
+                } footer: {
+                    sharedProfileInfo(contactConnection.incognito)
                }

                Section {
@@ -80,6 +82,14 @@ struct ContactConnectionInfo: View {
                    }
                }
            }
+            if #available(iOS 16, *) {
+                v
+            } else {
+                // navigationBarHidden is added conditionally,
+                // because the view jumps in iOS 17 if this is added,
+                // and on iOS 16+ it is hidden without it.
+                v.navigationBarHidden(true)
+            }
        }
        .alert(item: $alert) { _alert in
            switch _alert {
@@ -128,6 +138,30 @@ struct ContactConnectionInfo: View {
        )
        : "You will be connected when your contact's device is online, please wait or check later!"
    }
+
+    @ViewBuilder private func incognitoEnabled() -> some View {
+        if contactConnection.incognito {
+            ZStack(alignment: .leading) {
+                Image(systemName: "theatermasks.fill")
+                    .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                    .foregroundColor(Color.indigo)
+                    .font(.system(size: 14))
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+                .padding(.leading, 36)
+            }
+            .sheet(isPresented: $showIncognitoSheet) {
+                IncognitoHelp()
+            }
+        }
+    }
 }

 struct ContactConnectionInfo_Previews: PreviewProvider {
@@ -58,10 +58,14 @@ struct ContactConnectionView: View {
                }
                .padding(.bottom, 2)

-                Text(contactConnection.description)
-                    .frame(alignment: .topLeading)
-                    .padding(.horizontal, 8)
-                    .padding(.bottom, 2)
+                ZStack(alignment: .topTrailing) {
+                    Text(contactConnection.description)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    incognitoIcon(contactConnection.incognito)
+                        .padding(.top, 26)
+                        .frame(maxWidth: .infinity, alignment: .trailing)
+                }
+                .padding(.horizontal, 8)

                Spacer()
            }
@@ -24,7 +24,7 @@ struct ContactRequestView: View {
                    Text(contactRequest.chatViewName)
                        .font(.title3)
                        .fontWeight(.bold)
-                        .foregroundColor(chatModel.incognito ? .indigo : .accentColor)
+                        .foregroundColor(.accentColor)
                        .padding(.leading, 8)
                        .frame(alignment: .topLeading)
                    Spacer()
@@ -133,7 +133,7 @@ struct LibraryMediaListPicker: UIViewControllerRepresentable {
        config.filter = .any(of: [.images, .videos])
        config.selectionLimit = selectionLimit
        config.selection = .ordered
-        //config.preferredAssetRepresentationMode = .current
+        config.preferredAssetRepresentationMode = .current
        let controller = PHPickerViewController(configuration: config)
        controller.delegate = context.coordinator
        return controller
@@ -37,7 +37,7 @@ struct LocalAuthRequest {
 }

 func authenticate(title: LocalizedStringKey? = nil, reason: String, selfDestruct: Bool = false, completed: @escaping (LAResult) -> Void) {
-    logger.debug("authenticate")
+    logger.debug("DEBUGGING: authenticate")
    switch privacyLocalAuthModeDefault.get() {
    case .system: systemAuthenticate(reason, completed)
    case .passcode:
@@ -58,21 +58,24 @@ func authenticate(title: LocalizedStringKey? = nil, reason: String, selfDestruct
 }

 func systemAuthenticate(_ reason: String, _ completed: @escaping (LAResult) -> Void) {
+    logger.debug("DEBUGGING: systemAuthenticate")
    let laContext = LAContext()
    var authAvailabilityError: NSError?
    if laContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: &authAvailabilityError) {
+        logger.debug("DEBUGGING: systemAuthenticate: canEvaluatePolicy callback")
        laContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { success, authError in
+            logger.debug("DEBUGGING: systemAuthenticate evaluatePolicy callback")
            DispatchQueue.main.async {
                if success {
                    completed(LAResult.success)
                } else {
-                    logger.error("authentication error: \(authError.debugDescription)")
+                    logger.error("DEBUGGING: systemAuthenticate authentication error: \(authError.debugDescription)")
                    completed(LAResult.failed(authError: authError?.localizedDescription))
                }
            }
        }
    } else {
-        logger.error("authentication availability error: \(authAvailabilityError.debugDescription)")
+        logger.error("DEBUGGING: authentication availability error: \(authAvailabilityError.debugDescription)")
        completed(LAResult.unavailable(authError: authAvailabilityError?.localizedDescription))
    }
 }
@@ -8,11 +8,15 @@

 import SwiftUI

-func showShareSheet(items: [Any]) {
+func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
    let keyWindowScene = UIApplication.shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
    if let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first,
       let presentedViewController = keyWindow.rootViewController?.presentedViewController ?? keyWindow.rootViewController {
        let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
+        if let completed = completed {
+            let handler: UIActivityViewController.CompletionWithItemsHandler = { _,_,_,_ in completed() }
+            activityViewController.completionWithItemsHandler = handler
+        }
        presentedViewController.present(activityViewController, animated: true)
    }
 }
@@ -12,38 +12,92 @@ import SimpleXChat

 struct AddContactView: View {
    @EnvironmentObject private var chatModel: ChatModel
-    var contactConnection: PendingContactConnection? = nil
+    @Binding var contactConnection: PendingContactConnection?
    var connReqInvitation: String
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false

    var body: some View {
-        List {
-            OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
-                .listRowBackground(Color.clear)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
-            Section("1-time link") {
-                oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
+        VStack {
+            List {
+                Section {
+                    if connReqInvitation != "" {
+                        QRCode(uri: connReqInvitation)
+                    } else {
+                        ProgressView()
+                            .progressViewStyle(.circular)
+                            .scaleEffect(2)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical)
+                    }
+                    IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                        .disabled(contactConnection == nil)
+                    shareLinkButton(connReqInvitation)
+                    oneTimeLinkLearnMoreButton()
+                } header: {
+                    Text("1-time link")
+                } footer: {
+                    sharedProfileInfo(incognitoDefault)
+                }
            }
        }
        .onAppear { chatModel.connReqInv = connReqInvitation }
+        .onChange(of: incognitoDefault) { incognito in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            ChatModel.shared.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
+        }
    }
 }

-@ViewBuilder func oneTimeLinkSection(contactConnection: PendingContactConnection? = nil, connReqInvitation: String) -> some View {
-    if connReqInvitation != "" {
-        QRCode(uri: connReqInvitation)
-    } else {
-        ProgressView()
-            .progressViewStyle(.circular)
-            .scaleEffect(2)
-            .frame(maxWidth: .infinity)
-            .padding(.vertical)
+struct IncognitoToggle: View {
+    @Binding var incognitoEnabled: Bool
+    @State private var showIncognitoSheet = false
+
+    var body: some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
+                .font(.system(size: 14))
+            Toggle(isOn: $incognitoEnabled) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+            }
+            .padding(.leading, 36)
+        }
+        .sheet(isPresented: $showIncognitoSheet) {
+            IncognitoHelp()
+        }
    }
-    shareLinkButton(connReqInvitation)
-    oneTimeLinkLearnMoreButton()
 }

-private func shareLinkButton(_ connReqInvitation: String) -> some View {
+func sharedProfileInfo(_ incognito: Bool) -> Text {
+    let name = ChatModel.shared.currentUser?.displayName ?? ""
+    return Text(
+        incognito
+        ? "A new random profile will be shared."
+        : "Your profile **\(name)** will be shared."
+    )
+}
+
+func shareLinkButton(_ connReqInvitation: String) -> some View {
    Button {
        showShareSheet(items: [connReqInvitation])
    } label: {
@@ -65,26 +119,11 @@ func oneTimeLinkLearnMoreButton() -> some View {
    }
 }

-struct OneTimeLinkProfileText: View {
-    @EnvironmentObject private var chatModel: ChatModel
-    var contactConnection: PendingContactConnection? = nil
-    var connReqInvitation: String
-
-    var body: some View {
-        HStack {
-            if (contactConnection?.incognito ?? chatModel.incognito) {
-                Image(systemName: "theatermasks").foregroundColor(.indigo)
-                Text("A random profile will be sent to your contact")
-            } else {
-                Image(systemName: "info.circle").foregroundColor(.secondary)
-                Text("Your chat profile will be sent to your contact")
-            }
-        }
-    }
-}
-
 struct AddContactView_Previews: PreviewProvider {
    static var previews: some View {
-        AddContactView(connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D")
+        AddContactView(
+            contactConnection: Binding.constant(PendingContactConnection.getSampleData()),
+            connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D"
+        )
    }
 }
@@ -47,21 +47,13 @@ struct AddGroupView: View {
                .padding(.vertical, 4)
            Text("The group is fully decentralized – it is visible only to the members.")
                .padding(.bottom, 4)
-            if (m.incognito) {
-                HStack {
-                    Image(systemName: "info.circle").foregroundColor(.orange).font(.footnote)
-                    Spacer().frame(width: 8)
-                    Text("Incognito mode is not supported here - your main profile will be sent to group members").font(.footnote)
-                }
-                .padding(.bottom)
-            } else {
-                HStack {
-                    Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                    Spacer().frame(width: 8)
-                    Text("Your chat profile will be sent to group members").font(.footnote)
-                }
-                .padding(.bottom)
+
+            HStack {
+                Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                Spacer().frame(width: 8)
+                Text("Your chat profile will be sent to group members").font(.footnote)
            }
+            .padding(.bottom)

            ZStack(alignment: .center) {
                ZStack(alignment: .topTrailing) {
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import SimpleXChat

 enum CreateLinkTab {
    case oneTime
@@ -24,6 +25,7 @@ struct CreateLinkView: View {
    @EnvironmentObject var m: ChatModel
    @State var selection: CreateLinkTab
    @State var connReqInvitation: String = ""
+    @State var contactConnection: PendingContactConnection? = nil
    @State private var creatingConnReq = false
    var viaNavLink = false

@@ -39,7 +41,7 @@ struct CreateLinkView: View {

    private func createLinkView() -> some View {
        TabView(selection: $selection) {
-            AddContactView(connReqInvitation: connReqInvitation)
+            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
                .tabItem {
                    Label(
                        connReqInvitation == ""
@@ -56,7 +58,7 @@ struct CreateLinkView: View {
                .tag(CreateLinkTab.longTerm)
        }
        .onChange(of: selection) { _ in
-            if case .oneTime = selection, connReqInvitation == "" && !creatingConnReq {
+            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
                createInvitation()
            }
        }
@@ -69,12 +71,14 @@ struct CreateLinkView: View {
    private func createInvitation() {
        creatingConnReq = true
        Task {
-            let connReq = await apiAddContact()
-            await MainActor.run {
-                if let connReq = connReq {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
                    connReqInvitation = connReq
+                    contactConnection = pcc
                    m.connReqInv = connReq
-                } else {
+                }
+            } else {
+                await MainActor.run {
                    creatingConnReq = false
                }
            }
@@ -10,13 +10,13 @@ import SwiftUI
 import SimpleXChat

 enum NewChatAction: Identifiable {
-    case createLink(link: String)
+    case createLink(link: String, connection: PendingContactConnection)
    case connectViaLink
    case createGroup

    var id: String {
        switch self {
-        case let .createLink(link): return "createLink \(link)"
+        case let .createLink(link, _): return "createLink \(link)"
        case .connectViaLink: return "connectViaLink"
        case .createGroup: return "createGroup"
        }
@@ -41,8 +41,8 @@ struct NewChatButton: View {
        }
        .sheet(item: $actionSheet) { sheet in
            switch sheet {
-            case let .createLink(link):
-                CreateLinkView(selection: .oneTime, connReqInvitation: link)
+            case let .createLink(link, pcc):
+                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
            case .connectViaLink: ConnectViaLinkView()
            case .createGroup: AddGroupView()
            }
@@ -51,8 +51,8 @@ struct NewChatButton: View {

    func addContactAction() {
        Task {
-            if let connReq = await apiAddContact() {
-                actionSheet = .createLink(link: connReq)
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                actionSheet = .createLink(link: connReq, connection: pcc)
            }
        }
    }
@@ -63,9 +63,9 @@ enum ConnReqType: Equatable {
    case invitation
 }

-func connectViaLink(_ connectionLink: String, _ dismiss: DismissAction? = nil) {
+func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
    Task {
-        if let connReqType = await apiConnect(connReq: connectionLink) {
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
            DispatchQueue.main.async {
                dismiss?()
                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
@@ -100,12 +100,12 @@ func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
    return crData.type == "group" && crData.groupLinkId != nil
 }

-func groupLinkAlert(_ connectionLink: String) -> Alert {
+func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
    return Alert(
        title: Text("Connect via group link?"),
        message: Text("You will join a group this link refers to and connect to its group members."),
-        primaryButton: .default(Text("Connect")) {
-            connectViaLink(connectionLink)
+        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
+            connectViaLink(connectionLink, incognito: incognito)
        },
        secondaryButton: .cancel()
    )
@@ -7,76 +7,77 @@
 //

 import SwiftUI
+import SimpleXChat

 struct PasteToConnectView: View {
-    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
    @State private var connectionLink: String = ""
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @FocusState private var linkEditorFocused: Bool

    var body: some View {
-        ScrollView {
-            VStack(alignment: .leading) {
-                Text("Connect via link")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.vertical)
-                Text("Paste the link you received into the box below to connect with your contact.")
-                    .padding(.bottom, 4)
-                if (chatModel.incognito) {
-                    HStack {
-                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("A random profile will be sent to the contact that you received this link from").font(.footnote)
+        List {
+            Text("Connect via link")
+                .font(.largeTitle)
+                .bold()
+                .fixedSize(horizontal: false, vertical: true)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .onTapGesture { linkEditorFocused = false }
+
+            Section {
+                linkEditor()
+
+                Button {
+                    if connectionLink == "" {
+                        connectionLink = UIPasteboard.general.string ?? ""
+                    } else {
+                        connectionLink = ""
                    }
-                    .padding(.bottom)
-                } else {
-                    HStack {
-                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("Your profile will be sent to the contact that you received this link from").font(.footnote)
+                } label: {
+                    if connectionLink == "" {
+                        settingsRow("doc.plaintext") { Text("Paste") }
+                    } else {
+                        settingsRow("multiply") { Text("Clear") }
                    }
-                    .padding(.bottom)
+                }
+                
+                Button {
+                    connect()
+                } label: {
+                    settingsRow("link") { Text("Connect") }
+                }
+                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
+                
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                sharedProfileInfo(incognitoDefault)
+                + Text(String("\n\n"))
+                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+            }
+        }
+    }
+
+    private func linkEditor() -> some View {
+        ZStack {
+            Group {
+                if connectionLink.isEmpty {
+                    TextEditor(text: Binding.constant(NSLocalizedString("Paste the link you received to connect with your contact.", comment: "placeholder")))
+                        .foregroundColor(.secondary)
+                        .disabled(true)
                }
                TextEditor(text: $connectionLink)
                    .onSubmit(connect)
                    .textInputAutocapitalization(.never)
                    .disableAutocorrection(true)
-                    .allowsTightening(false)
-                    .frame(height: 180)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 10)
-                            .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                    )
-
-                HStack(spacing: 20) {
-                    if connectionLink == "" {
-                        Button {
-                            connectionLink = UIPasteboard.general.string ?? ""
-                        } label: {
-                            Label("Paste", systemImage: "doc.plaintext")
-                        }
-                    } else {
-                        Button {
-                            connectionLink = ""
-                        } label: {
-                            Label("Clear", systemImage: "multiply")
-                        }
-
-                    }
-                    Spacer()
-                    Button(action: connect, label: {
-                        Label("Connect", systemImage: "link")
-                    })
-                    .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
-                }
-                .frame(height: 48)
-                .padding(.bottom)
-
-                Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+                    .focused($linkEditorFocused)
            }
-            .padding()
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+            .allowsTightening(false)
+            .padding(.horizontal, -5)
+            .padding(.top, -8)
+            .frame(height: 180, alignment: .topLeading)
+            .frame(maxWidth: .infinity, alignment: .leading)
        }
    }

@@ -85,9 +86,9 @@ struct PasteToConnectView: View {
        if let crData = parseLinkQueryData(link),
           checkCRDataGroup(crData) {
            dismiss()
-            AlertManager.shared.showAlert(groupLinkAlert(link))
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
        } else {
-            connectViaLink(link, dismiss)
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
        }
    }
 }
@@ -7,11 +7,12 @@
 //

 import SwiftUI
+import SimpleXChat
 import CodeScanner

 struct ScanToConnectView: View {
-    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false

    var body: some View {
        ScrollView {
@@ -19,34 +20,35 @@ struct ScanToConnectView: View {
                Text("Scan QR code")
                    .font(.largeTitle)
                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
                    .padding(.vertical)
-                if (chatModel.incognito) {
-                    HStack {
-                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("A random profile will be sent to your contact").font(.footnote)
-                    }
-                    .padding(.bottom)
-                } else {
-                    HStack {
-                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("Your chat profile will be sent to your contact").font(.footnote)
-                    }
-                    .padding(.bottom)
+
+                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                    .aspectRatio(1, contentMode: .fit)
+                    .cornerRadius(12)
+
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                    .padding(.horizontal)
+                    .padding(.vertical, 6)
+                    .background(
+                        RoundedRectangle(cornerRadius: 12, style: .continuous)
+                            .fill(Color(uiColor: .systemBackground))
+                    )
+                    .padding(.top)
+
+                Group {
+                    sharedProfileInfo(incognitoDefault)
+                    + Text(String("\n\n"))
+                    + Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
                }
-                ZStack {
-                    CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                        .aspectRatio(1, contentMode: .fit)
-                        .border(.gray)
-                }
-                .padding(.bottom)
-                Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
-                    .padding(.bottom)
+                .font(.footnote)
+                .foregroundColor(.secondary)
+                .padding(.horizontal)
            }
            .padding()
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
        }
+        .background(Color(.systemGroupedBackground))
    }

    func processQRCode(_ resp: Result<ScanResult, ScanError>) {
@@ -55,9 +57,9 @@ struct ScanToConnectView: View {
            if let crData = parseLinkQueryData(r.string),
               checkCRDataGroup(crData) {
                dismiss()
-                AlertManager.shared.showAlert(groupLinkAlert(r.string))
+                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
            } else {
-                Task { connectViaLink(r.string, dismiss) }
+                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
            }
        case let .failure(e):
            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
@@ -22,10 +22,28 @@ struct TerminalView: View {
    @State var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
    @State private var terminalItem: TerminalItem?
    @State private var scrolled = false
+    @State private var showing = false

    var body: some View {
        if authorized {
            terminalView()
+                .onAppear {
+                    if showing { return }
+                    showing = true
+                    Task {
+                        let items = await TerminalItems.shared.items()
+                        await MainActor.run {
+                            chatModel.terminalItems = items
+                            chatModel.showingTerminal = true
+                        }
+                    }
+                }
+                .onDisappear {
+                    if terminalItem == nil {
+                        chatModel.showingTerminal = false
+                        chatModel.terminalItems = []
+                    }
+                }
        } else {
            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
            .onAppear(perform: runAuth)
@@ -118,9 +136,8 @@ struct TerminalView: View {
        let cmd = ChatCommand.string(composeState.message)
        if composeState.message.starts(with: "/sql") && (!prefPerformLA || !developerTools) {
            let resp = ChatResponse.chatCmdError(user_: nil, chatError: ChatError.error(errorType: ChatErrorType.commandError(message: "Failed reading: empty")))
-            DispatchQueue.main.async {
-                ChatModel.shared.addTerminalItem(.cmd(.now, cmd))
-                ChatModel.shared.addTerminalItem(.resp(.now, resp))
+            Task {
+                await TerminalItems.shared.addCommand(.now, cmd, resp)
            }
        } else {
            DispatchQueue.global().async {
@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [2_500000, 5_000000, 7_500000, 10_000000, 15_000000, 20_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [1_500000, 3_000000, 5_000000, 7_000000, 10_000000, 15_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [5_000, 10_000, 20_000, 40_000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [10_000, 20_000, 40_000, 75_000, 100_000], label: secondsLabel)
                    timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                    intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                    Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)
@@ -153,7 +153,9 @@ struct AdvancedNetworkSettings: View {

    private func timeoutSettingPicker(_ title: LocalizedStringKey, selection: Binding<Int>, values: [Int], label: String) -> some View {
        Picker(title, selection: selection) {
-            ForEach(values, id: \.self) { value in
+            let v = selection.wrappedValue
+            let vs = values.contains(v) ? values : values + [v]
+            ForEach(vs, id: \.self) { value in
                Text("\(String(format: "%g", (Double(value) / 1000000))) \(secondsLabel)")
            }
        }
@@ -18,10 +18,9 @@ struct IncognitoHelp: View {
            ScrollView {
                VStack(alignment: .leading) {
                    Group {
-                    Text("Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.")
+                    Text("Incognito mode protects your privacy by using a new random profile for each contact.")
                    Text("It allows having many anonymous connections without any shared data between them in a single chat profile.")
                    Text("When you share an incognito profile with somebody, this profile will be used for the groups they invite you to.")
-                    Text("To find the profile used for an incognito connection, tap the contact or group name on top of the chat.")
                    }
                    .padding(.bottom)
                }
@@ -11,9 +11,12 @@ import SimpleXChat

 struct NotificationsView: View {
    @EnvironmentObject var m: ChatModel
-    @State private var notificationMode: NotificationsMode?
+    @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
    @State private var showAlert: NotificationAlert?
    @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
+//    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_LOCAL, store: groupDefaults) private var ntfEnableLocal = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_PERIODIC, store: groupDefaults) private var ntfEnablePeriodic = false

    var body: some View {
        List {
@@ -26,9 +29,7 @@ struct NotificationsView: View {
                            }
                        } footer: {
                            VStack(alignment: .leading) {
-                                if let mode = notificationMode {
-                                    Text(ntfModeDescription(mode))
-                                }
+                                Text(ntfModeDescription(notificationMode))
                            }
                            .font(.callout)
                            .padding(.top, 1)
@@ -43,7 +44,6 @@ struct NotificationsView: View {
                            return  Alert(title: Text("No device token!"))
                        }
                    }
-                    .onAppear { notificationMode = m.notificationMode }
                } label: {
                    HStack {
                        Text("Send notifications")
@@ -76,7 +76,7 @@ struct NotificationsView: View {
                    HStack {
                        Text("Show preview")
                        Spacer()
-                        Text(m.notificationPreview?.label ?? "")
+                        Text(m.notificationPreview.label)
                    }
                }
            } header: {
@@ -88,8 +88,15 @@ struct NotificationsView: View {
                        .padding(.top, 1)
                }
            }
-            .disabled(legacyDatabase)
+
+//            if developerTools {
+//                Section(String("Experimental")) {
+//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
+//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
+//                }
+//            }
        }
+        .disabled(legacyDatabase)
    }

    private func notificationAlert(_ alert: NotificationAlert, _ token: DeviceToken) -> Alert {
@@ -166,7 +173,7 @@ func ntfModeDescription(_ mode: NotificationsMode) -> LocalizedStringKey {

 struct SelectionListView<Item: SelectableItem>: View {
    var list: [Item]
-    @Binding var selection: Item?
+    @Binding var selection: Item
    var onSelection: ((Item) -> Void)?
    @State private var tapped: Item? = nil

@@ -71,9 +71,10 @@ struct PreferencesView: View {
            do {
                var p = fromLocalProfile(profile)
                p.preferences = fullPreferencesToPreferences(preferences)
-                if let newProfile = try await apiUpdateProfile(profile: p) {
+                if let (newProfile, updatedContacts) = try await apiUpdateProfile(profile: p) {
                    await MainActor.run {
                        chatModel.updateCurrentUser(newProfile, preferences)
+                        updatedContacts.forEach(chatModel.updateContact)
                        currentPreferences = preferences
                    }
                }
@@ -13,6 +13,9 @@ struct PrivacySettings: View {
    @EnvironmentObject var m: ChatModel
    @AppStorage(DEFAULT_PRIVACY_ACCEPT_IMAGES) private var autoAcceptImages = true
    @AppStorage(DEFAULT_PRIVACY_LINK_PREVIEWS) private var useLinkPreviews = true
+    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
    @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -21,6 +24,10 @@ struct PrivacySettings: View {
    @State private var contactReceiptsReset = false
    @State private var contactReceiptsOverrides = 0
    @State private var contactReceiptsDialogue = false
+    @State private var groupReceipts = false
+    @State private var groupReceiptsReset = false
+    @State private var groupReceiptsOverrides = 0
+    @State private var groupReceiptsDialogue = false
    @State private var alert: PrivacySettingsViewAlert?

    enum PrivacySettingsViewAlert: Identifiable {
@@ -57,6 +64,9 @@ struct PrivacySettings: View {
                }

                Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                    }
                    settingsRow("photo") {
                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
                            .onChange(of: autoAcceptImages) {
@@ -66,6 +76,18 @@ struct PrivacySettings: View {
                    settingsRow("network") {
                        Toggle("Send link previews", isOn: $useLinkPreviews)
                    }
+                    settingsRow("message") {
+                        Toggle("Show last messages", isOn: $showChatPreviews)
+                    }
+                    settingsRow("rectangle.and.pencil.and.ellipsis") {
+                        Toggle("Message draft", isOn: $saveLastDraft)
+                    }
+                    .onChange(of: saveLastDraft) { saveDraft in
+                        if !saveDraft {
+                            m.draft = nil
+                            m.draftChatId = nil
+                        }
+                    }
                    settingsRow("link") {
                        Picker("SimpleX links", selection: $simplexLinkMode) {
                            ForEach(SimpleXLinkMode.values) { mode in
@@ -89,15 +111,15 @@ struct PrivacySettings: View {
                    settingsRow("person") {
                        Toggle("Contacts", isOn: $contactReceipts)
                    }
-//                    settingsRow("person.2") {
-//                        Toggle("Small groups (max 20)", isOn: Binding.constant(false))
-//                    }
+                    settingsRow("person.2") {
+                        Toggle("Small groups (max 20)", isOn: $groupReceipts)
+                    }
                } header: {
                    Text("Send delivery receipts to")
                } footer: {
                    VStack(alignment: .leading) {
                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
-                        Text("They can be overridden in contact settings")
+                        Text("They can be overridden in contact and group settings.")
                    }
                    .frame(maxWidth: .infinity, alignment: .leading)
                }
@@ -113,19 +135,44 @@ struct PrivacySettings: View {
                        contactReceipts.toggle()
                    }
                }
+                .confirmationDialog(groupReceiptsDialogTitle, isPresented: $groupReceiptsDialogue, titleVisibility: .visible) {
+                    Button(groupReceipts ? "Enable (keep overrides)" : "Disable (keep overrides)") {
+                        setSendReceiptsGroups(groupReceipts, clearOverrides: false)
+                    }
+                    Button(groupReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
+                        setSendReceiptsGroups(groupReceipts, clearOverrides: true)
+                    }
+                    Button("Cancel", role: .cancel) {
+                        groupReceiptsReset = true
+                        groupReceipts.toggle()
+                    }
+                }
            }
        }
-        .onChange(of: contactReceipts) { _ in // sometimes there is race with onAppear
+        .onChange(of: contactReceipts) { _ in
            if contactReceiptsReset {
                contactReceiptsReset = false
            } else {
                setOrAskSendReceiptsContacts(contactReceipts)
            }
        }
+        .onChange(of: groupReceipts) { _ in
+            if groupReceiptsReset {
+                groupReceiptsReset = false
+            } else {
+                setOrAskSendReceiptsGroups(groupReceipts)
+            }
+        }
        .onAppear {
-            if let u = m.currentUser, contactReceipts != u.sendRcptsContacts {
-                contactReceiptsReset = true
-                contactReceipts = u.sendRcptsContacts
+            if let u = m.currentUser {
+                if contactReceipts != u.sendRcptsContacts {
+                    contactReceiptsReset = true
+                    contactReceipts = u.sendRcptsContacts
+                }
+                if groupReceipts != u.sendRcptsSmallGroups {
+                    groupReceiptsReset = true
+                    groupReceipts = u.sendRcptsSmallGroups
+                }
            }
        }
        .alert(item: $alert) { alert in
@@ -184,6 +231,54 @@ struct PrivacySettings: View {
        }
    }

+    private func setOrAskSendReceiptsGroups(_ enable: Bool) {
+        groupReceiptsOverrides = m.chats.reduce(0) { count, chat in
+            let sendRcpts = chat.chatInfo.groupInfo?.chatSettings.sendRcpts
+            return count + (sendRcpts == nil || sendRcpts == enable ? 0 : 1)
+        }
+        if groupReceiptsOverrides == 0 {
+            setSendReceiptsGroups(enable, clearOverrides: false)
+        } else {
+            groupReceiptsDialogue = true
+        }
+    }
+
+    private var groupReceiptsDialogTitle: LocalizedStringKey {
+        groupReceipts
+        ? "Sending receipts is disabled for \(groupReceiptsOverrides) groups"
+        : "Sending receipts is enabled for \(groupReceiptsOverrides) groups"
+    }
+
+    private func setSendReceiptsGroups(_ enable: Bool, clearOverrides: Bool) {
+        Task {
+            do {
+                if let currentUser = m.currentUser {
+                    let userMsgReceiptSettings = UserMsgReceiptSettings(enable: enable, clearOverrides: clearOverrides)
+                    try await apiSetUserGroupReceipts(currentUser.userId, userMsgReceiptSettings: userMsgReceiptSettings)
+                    privacyDeliveryReceiptsSet.set(true)
+                    await MainActor.run {
+                        var updatedUser = currentUser
+                        updatedUser.sendRcptsSmallGroups = enable
+                        m.updateUser(updatedUser)
+                        if clearOverrides {
+                            m.chats.forEach { chat in
+                                if var groupInfo = chat.chatInfo.groupInfo {
+                                    let sendRcpts = groupInfo.chatSettings.sendRcpts
+                                    if sendRcpts != nil && sendRcpts != enable {
+                                        groupInfo.chatSettings.sendRcpts = nil
+                                        m.updateGroup(groupInfo)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch let error {
+                alert = .error(title: "Error setting delivery receipts!", error: "Error: \(responseError(error))")
+            }
+        }
+    }
+
    private func simplexLockRow(_ value: LocalizedStringKey) -> some View {
        HStack {
            Text("SimpleX Lock")
@@ -21,11 +21,10 @@ struct ScanProtocolServer: View {
                .font(.largeTitle)
                .bold()
                .padding(.vertical)
-            ZStack {
-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .border(.gray)
-            }
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                .aspectRatio(1, contentMode: .fit)
+                .cornerRadius(12)
+                .padding(.top)
        }
        .padding()
        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -30,6 +30,8 @@ let DEFAULT_CALL_KIT_CALLS_IN_RECENTS = "callKitCallsInRecents"
 let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
+let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
+let DEFAULT_PRIVACY_SAVE_LAST_DRAFT = "privacySaveLastDraft"
 let DEFAULT_PRIVACY_PROTECT_SCREEN = "privacyProtectScreen"
 let DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET = "privacyDeliveryReceiptsSet"
 let DEFAULT_EXPERIMENTAL_CALLS = "experimentalCalls"
@@ -65,6 +67,8 @@ let appDefaults: [String: Any] = [
    DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
    DEFAULT_PRIVACY_LINK_PREVIEWS: true,
    DEFAULT_PRIVACY_SIMPLEX_LINK_MODE: SimpleXLinkMode.description.rawValue,
+    DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS: true,
+    DEFAULT_PRIVACY_SAVE_LAST_DRAFT: true,
    DEFAULT_PRIVACY_PROTECT_SCREEN: false,
    DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET: false,
    DEFAULT_EXPERIMENTAL_CALLS: false,
@@ -131,7 +135,6 @@ struct SettingsView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var sceneDelegate: SceneDelegate
    @Binding var showSettings: Bool
-    @State private var settingsSheet: SettingsSheet?

    var body: some View {
        ZStack {
@@ -161,8 +164,6 @@ struct SettingsView: View {
                        settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
                    }

-                    incognitoRow()
-
                    NavigationLink {
                        UserAddressView(shareViaProfile: chatModel.currentUser!.addressShared)
                            .navigationTitle("SimpleX address")
@@ -298,38 +299,9 @@ struct SettingsView: View {
            }
            .navigationTitle("Your settings")
        }
-        .sheet(item: $settingsSheet) { sheet in
-            switch sheet {
-            case .incognitoInfo: IncognitoHelp()
-            }
-        }
-    }
-
-    @ViewBuilder private func incognitoRow() -> some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: chatModel.incognito ? "theatermasks.fill" : "theatermasks")
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .foregroundColor(chatModel.incognito ? Color.indigo : .secondary)
-            Toggle(isOn: $chatModel.incognito) {
-                HStack(spacing: 6) {
-                    Text("Incognito")
-                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
-                        .font(.system(size: 14))
-                }
-                .onTapGesture {
-                    settingsSheet = .incognitoInfo
-                }
-            }
-            .onChange(of: chatModel.incognito) { incognito in
-                incognitoGroupDefault.set(incognito)
-                do {
-                    try apiSetIncognito(incognito: incognito)
-                } catch {
-                    logger.error("apiSetIncognito: cannot set incognito \(responseError(error))")
-                }
-            }
-            .padding(.leading, indent)
+        .onDisappear {
+            chatModel.showingTerminal = false
+            chatModel.terminalItems = []
        }
    }
    
@@ -351,12 +323,6 @@ struct SettingsView: View {
        }
    }

-    private enum SettingsSheet: Identifiable {
-        case incognitoInfo
-
-        var id: SettingsSheet { get { self } }
-    }
-
    private enum NotificationAlert {
        case enable
        case error(LocalizedStringKey, String)
@@ -190,7 +190,7 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            QRCode(uri: userAddress.connReqContact)
+            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
@@ -144,7 +144,7 @@ struct UserProfile: View {
    func saveProfile() {
        Task {
            do {
-                if let newProfile = try await apiUpdateProfile(profile: profile) {
+                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                    DispatchQueue.main.async {
                        chatModel.updateCurrentUser(newProfile)
                        profile = newProfile
@@ -3630,6 +3630,51 @@ SimpleX servers cannot see your profile.</source>
        <source>\~strike~</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
+        <source>%@ servers</source>
+        <target state="translated">%@ الخوادم</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
+        <source>%@ (current)</source>
+        <target state="translated">%@ (الحالي)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ (current):" xml:space="preserve" approved="no">
+        <source>%@ (current):</source>
+        <target state="translated">%@ (الحالي):</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@:" xml:space="preserve" approved="no">
+        <source>%@:</source>
+        <target state="needs-translation">%@:</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ في %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="needs-translation"># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## السجل</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## ردًا على</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ و %@ متصل</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ar" datatype="plaintext">
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="cs" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 barevný!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## Historie</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## Odpovídáno</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#tajný#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ a %@ připojen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ na %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ se chce připojit!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ a %lld ostatní členové připojeni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- více stabilní doručování zpráv.
+- o trochu lepší skupiny.
+- a více!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Ještě pár věcí</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Nový kontakt</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Náhodný profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Vašemu kontaktu bude zaslán náhodný profil</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Nový náhodný profil bude sdílen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -416,14 +441,17 @@
      </trans-unit>
      <trans-unit id="Abort" xml:space="preserve">
        <source>Abort</source>
+        <target>Přerušit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address" xml:space="preserve">
        <source>Abort changing address</source>
+        <target>Přerušit změnu adresy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address?" xml:space="preserve">
        <source>Abort changing address?</source>
+        <target>Přerušit změnu adresy?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="About SimpleX" xml:space="preserve">
@@ -452,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Přijmout kontakt</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Přijmout kontakt?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -465,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Přijmout inkognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -509,6 +537,7 @@
      </trans-unit>
      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve">
        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target>Změna adresy bude přerušena. Budou použity staré přijímací adresy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -603,6 +632,7 @@
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
        <source>Allow to send files and media.</source>
+        <target>Povolit odesílání souborů a médii.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send voice messages." xml:space="preserve">
@@ -1036,9 +1066,19 @@
        <target>Připojit</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Připojit se přes kontaktní odkaz?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Připojit přímo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Spojit se inkognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Připojit se přes odkaz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1056,9 +1096,9 @@
        <target>Připojit se prostřednictvím odkazu / QR kódu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Připojit se jednorázovým odkazem?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Připojit se jednorázovým odkazem</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1086,11 +1126,6 @@
        <target>Chyba spojení (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Žádost o připojení</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Požadavek na připojení byl odeslán!</target>
@@ -1143,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Kontakty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1538,12 +1574,19 @@
        <target>Smazáno v: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Doručenka</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Potvrzení o doručení jsou vypnuté!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Potvrzení o doručení!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1593,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Vypnout (zachovat přepsání)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1602,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Vypnout pro všechny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1666,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Nepovolovat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1710,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Povolit (zachovat přepsání)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1729,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Povolit pro všechny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1848,6 +1896,7 @@
      </trans-unit>
      <trans-unit id="Error aborting address change" xml:space="preserve">
        <source>Error aborting address change</source>
+        <target>Chyba přerušení změny adresy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -1942,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Chyba povolení potvrzení o doručení!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2026,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Chyba nastavování potvrzení o doručení!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2045,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Chyba synchronizace připojení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2089,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>I při vypnutí v konverzaci.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2111,13 +2164,9 @@
        <target>Exportovaný archiv databáze.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Exportuji archiv databáze...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Exportuji archiv databáze…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2132,6 +2181,7 @@
      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
+        <target>Oblíbené</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File will be deleted from servers." xml:space="preserve">
@@ -2161,18 +2211,22 @@
      </trans-unit>
      <trans-unit id="Files and media" xml:space="preserve">
        <source>Files and media</source>
+        <target>Soubory a média</target>
        <note>chat feature</note>
      </trans-unit>
      <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>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
        <source>Files and media prohibited!</source>
+        <target>Soubory a média jsou zakázány!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Filtrovat nepřečtené a oblíbené chaty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2182,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Najděte chaty rychleji</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Opravit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Opravit připojení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Opravit připojení?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Opravit šifrování po obnovení zálohy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Opravit nepodporované kontaktem</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Opravit nepodporované členem skupiny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2225,7 +2286,7 @@
      </trans-unit>
      <trans-unit id="Full name (optional)" xml:space="preserve">
        <source>Full name (optional)</source>
-        <target>Celé jméno (volitelné)</target>
+        <target>Celé jméno (volitelně)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Full name:" xml:space="preserve">
@@ -2315,6 +2376,7 @@
      </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">
@@ -2405,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>Historie</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2514,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>V odpovědi na</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2526,14 +2589,9 @@
        <target>Režim inkognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Zde není podporován režim inkognito - členům skupiny bude zaslán váš hlavní profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Režim inkognito chrání soukromí vašeho hlavního profilového jména a obrázku - pro každý nový kontakt je vytvořen nový náhodný profil.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Režim inkognito chrání vaše soukromí používáním nového náhodného profilu pro každý kontakt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2608,6 +2666,11 @@
        <target>Neplatná adresa serveru!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Neplatný status</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Platnost pozvánky vypršela!</target>
@@ -2691,16 +2754,17 @@
      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
-        <target>Připojte se inkognito</target>
+        <target>Připojit se inkognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
-        <target>Připojení ke skupině</target>
+        <target>Připojování ke skupině</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Zachovat vaše připojení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2795,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Nechat jednu zprávu zmizet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2865,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Chyba doručení zprávy</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Potvrzení o doručení zprávy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2906,13 +2972,9 @@
        <target>Zprávy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Přenášení archivu databáze...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Přenášení archivu databáze…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2955,6 +3017,11 @@
        <target>Další vylepšení se chystají již brzy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Pravděpodobně je toto spojení smazáno.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Tento kontakt s největší pravděpodobností smazal spojení s vámi.</target>
@@ -3060,6 +3127,10 @@
        <target>Žádné kontakty k přidání</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Žádný token zařízení!</target>
@@ -3067,6 +3138,7 @@
      </trans-unit>
      <trans-unit id="No filtered chats" xml:space="preserve">
        <source>No filtered chats</source>
+        <target>Žádné filtrované chaty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No group!" xml:space="preserve">
@@ -3076,6 +3148,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Žádná historie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3164,6 +3237,7 @@
      </trans-unit>
      <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
        <source>Only group owners can enable files and media.</source>
+        <target>Pouze majitelé skupiny mohou povolit soubory a média.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
@@ -3311,10 +3385,10 @@
        <target>Vložení přijatého odkazu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Vložte odkaz, který jste obdrželi, do pole níže a spojte se se svým kontaktem.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3488,6 +3562,7 @@
      </trans-unit>
      <trans-unit id="Prohibit sending files and media." xml:space="preserve">
        <source>Prohibit sending files and media.</source>
+        <target>Zakázat odesílání souborů a médií.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
@@ -3512,6 +3587,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Časový limit protokolu na KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3526,6 +3602,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Reagovat…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3558,6 +3635,10 @@
        <target>Přečtěte si více v našem [GitHub repozitáři](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Přijato v</target>
@@ -3580,6 +3661,7 @@
      </trans-unit>
      <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
        <source>Receiving address will be changed to a different server. Address change will complete after sender comes online.</source>
+        <target>Přijímací adresa bude změněna na jiný server. Změna adresy bude dokončena po připojení odesílatele.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3599,10 +3681,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Znovu připojte všechny připojené servery a vynuťte doručení zprávy. Využívá další provoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Znovu připojit servery?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3625,8 +3709,8 @@
        <target>Odmítnout</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Odmítnout kontakt (odesílatel NEBUDE upozorněn)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3667,14 +3751,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Znovu vyjednat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Znovu vyjednat šifrování</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Znovu vyjednat šifrování?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3934,6 +4021,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Potvrzení o doručení zasílat na</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3973,6 +4061,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Odeslat potvrzení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -3992,10 +4081,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>Odesílání potvrzení o doručení bude povoleno pro všechny kontakty ve všech viditelných chat profilech.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>Odesílání potvrzení o doručení bude povoleno pro všechny kontakty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4005,10 +4096,20 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>Odesílání potvrzení o doručení je vypnuto pro %lld kontakty</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>Odesílání potvrzení o doručení je povoleno pro %lld kontakty</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4151,6 +4252,10 @@
        <target>Zobrazit možnosti vývojáře</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Zobrazení náhledu</target>
@@ -4231,6 +4336,10 @@
        <target>Přeskočené zprávy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.</target>
@@ -4450,6 +4559,7 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>Šifrování funguje a nové povolení šifrování není vyžadováno. To může vyvolat chybu v připojení!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4489,6 +4599,7 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>Druhé zaškrtnutí jsme přehlédli! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4518,10 +4629,12 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Toto nastavení je pro váš aktuální profil **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Mohou být přepsány v nastavení kontaktů.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4539,6 +4652,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Tuto akci nelze vzít zpět - váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Tato skupina již neexistuje.</target>
@@ -4559,11 +4676,6 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Pro připojení může váš kontakt naskenovat QR kód, nebo použít odkaz v aplikaci.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Chcete-li najít profil použitý pro inkognito připojení, klepněte na název kontaktu nebo skupiny v horní části chatu.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Vytvoření nového připojení</target>
@@ -4644,7 +4756,7 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Neočekávaná chyba: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4653,6 +4765,7 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
      </trans-unit>
      <trans-unit id="Unfav." xml:space="preserve">
        <source>Unfav.</source>
+        <target>Odobl.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unhide" xml:space="preserve">
@@ -4782,6 +4895,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Použijte chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Použít pro nová připojení</target>
@@ -4792,6 +4909,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Použít rozhraní volání iOS</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Použít server</target>
@@ -5004,10 +5125,12 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>Můžete povolit později v Nastavení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>Můžete je povolit později v nastavení Soukromí &amp; Bezpečnosti aplikace</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5080,8 +5203,8 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Musíte zadat přístupovou frázi při každém spuštění aplikace - není uložena v zařízení.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>Pozvali jste svůj kontakt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5210,11 +5333,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Váš chat profil bude zaslán členům skupiny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Váš chat profil bude odeslán vašemu kontaktu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Vaše chat profily</target>
@@ -5269,6 +5387,10 @@ Můžete ji změnit v Nastavení.</target>
        <target>Vaše soukromí</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5276,11 +5398,6 @@ SimpleX servers cannot see your profile.</source>
 Servery SimpleX nevidí váš profil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Váš profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.</target>
@@ -5348,10 +5465,12 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>povoluji šifrování pro %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>povoluji šifrování…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5416,10 +5535,12 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>změna adresy pro %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>změna adresy…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5524,10 +5645,12 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>výchozí (ne)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>výchozí (ano)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5550,6 +5673,10 @@ Servery SimpleX nevidí váš profil.</target>
        <target>přímo</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>duplicitní zpráva</target>
@@ -5577,34 +5704,42 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>šifrování povoleno</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>šifrování povoleno pro %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>šifrování ok</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>šifrování ok pro %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>opětovné vyjednávání šifrování povoleno</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>opětovné vyjednávání šifrování povoleno pro %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>vyžadováno opětovné vyjednávání šifrování</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>vyžadováno opětovné vyjednávání šifrování pro %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5622,6 +5757,10 @@ Servery SimpleX nevidí váš profil.</target>
        <target>chyba</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>skupina smazána</target>
@@ -5880,6 +6019,7 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>bezpečnostní kód změněn</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6026,7 +6166,7 @@ Servery SimpleX nevidí váš profil.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6058,7 +6198,7 @@ Servery SimpleX nevidí váš profil.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "cs",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "de",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 colored!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## History</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## In reply to</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#secret#</target>
@@ -72,6 +87,11 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ and %@ connected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
        <target>%1$@ at %2$@:</target>
@@ -102,6 +122,11 @@
        <target>%@ wants to connect!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ and %lld other members connected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -397,14 +422,9 @@
        <target>A new contact</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>A random profile will be sent to the contact that you received this link from</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>A random profile will be sent to your contact</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>A new random profile will be shared.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -460,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Accept contact</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Accept connection request?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -473,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Accept incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -1046,9 +1066,19 @@
        <target>Connect</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Connect via contact link?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Connect directly</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Connect incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Connect via contact link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1066,9 +1096,9 @@
        <target>Connect via link / QR code</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Connect via one-time link?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Connect via one-time link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1096,11 +1126,6 @@
        <target>Connection error (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Connection request</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Connection request sent!</target>
@@ -1549,6 +1574,11 @@
        <target>Deleted at: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Delivery</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
        <target>Delivery receipts are disabled!</target>
@@ -2134,11 +2164,6 @@
        <target>Exported database archive.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Exporting database archive...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
        <target>Exporting database archive…</target>
@@ -2442,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>History</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2552,7 +2577,7 @@
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
        <target>In reply to</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2564,14 +2589,9 @@
        <target>Incognito mode</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Incognito mode is not supported here - your main profile will be sent to group members</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Incognito mode protects your privacy by using a new random profile for each contact.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2646,6 +2666,11 @@
        <target>Invalid server address!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Invalid status</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Invitation expired!</target>
@@ -2905,7 +2930,7 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Message delivery error</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
@@ -2947,11 +2972,6 @@
        <target>Messages &amp; files</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Migrating database archive...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Migrating database archive…</target>
@@ -2997,6 +3017,11 @@
        <target>More improvements are coming soon!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Most likely this connection is deleted.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Most likely this contact has deleted the connection with you.</target>
@@ -3102,6 +3127,11 @@
        <target>No contacts to add</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>No delivery information</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>No device token!</target>
@@ -3356,10 +3386,10 @@
        <target>Paste received link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
-        <target>Paste the link you received into the box below to connect with your contact.</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
+        <target>Paste the link you received to connect with your contact.</target>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3606,6 +3636,11 @@
        <target>Read more in our [GitHub repository](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Receipts are disabled</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Received at</target>
@@ -3676,9 +3711,9 @@
        <target>Reject</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
-        <target>Reject contact (sender NOT notified)</target>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
+        <target>Reject (sender NOT notified)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reject contact request" xml:space="preserve">
@@ -4066,11 +4101,21 @@
        <target>Sending receipts is disabled for %lld contacts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>Sending receipts is disabled for %lld groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
        <target>Sending receipts is enabled for %lld contacts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>Sending receipts is enabled for %lld groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
        <source>Sending via</source>
        <target>Sending via</target>
@@ -4211,6 +4256,11 @@
        <target>Show developer options</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Show last messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Show preview</target>
@@ -4291,6 +4341,11 @@
        <target>Skipped messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Small groups (max 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Some non-fatal errors occurred during import - you may see Chat console for more details.</target>
@@ -4583,9 +4638,9 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>These settings are for your current profile **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
-        <target>They can be overridden in contact settings</target>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>They can be overridden in contact and group settings.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4603,6 +4658,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>This group has over %lld members, delivery receipts are not sent.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>This group no longer exists.</target>
@@ -4623,11 +4683,6 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>To connect, your contact can scan QR code or use the link in the app.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>To make a new connection</target>
@@ -4708,7 +4763,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Unexpected error: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4847,6 +4902,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Use current profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Use for new connections</target>
@@ -4857,6 +4917,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use iOS call interface</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Use new incognito profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Use server</target>
@@ -5147,9 +5212,9 @@ To connect, please ask your contact to create another connection link and check
        <target>You have to enter passphrase every time the app starts - it is not stored on the device.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
-        <target>You invited your contact</target>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
+        <target>You invited a contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You joined this group" xml:space="preserve">
@@ -5277,11 +5342,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Your chat profile will be sent to group members</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Your chat profile will be sent to your contact</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Your chat profiles</target>
@@ -5336,6 +5396,11 @@ You can change it in Settings.</target>
        <target>Your privacy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Your profile **%@** will be shared.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5343,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 SimpleX servers cannot see your profile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Your profile will be sent to the contact that you received this link from</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Your profile, contacts and delivered messages are stored on your device.</target>
@@ -5623,6 +5683,11 @@ SimpleX servers cannot see your profile.</target>
        <target>direct</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>disabled</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>duplicate message</target>
@@ -5703,6 +5768,11 @@ SimpleX servers cannot see your profile.</target>
        <target>error</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>event happened</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>group deleted</target>
@@ -6108,7 +6178,7 @@ SimpleX servers cannot see your profile.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6140,7 +6210,7 @@ SimpleX servers cannot see your profile.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "en",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "es",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="fr" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 coloré!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## Historique</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## En réponse à</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#secret#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ et %@ sont connecté.es</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ à %2$@ :</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ veut se connecter !</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ et %lld autres membres sont connectés</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@ :</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- une diffusion plus stable des messages.
+- des groupes un peu plus performants.
+- et bien d'autres choses encore !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Encore quelques points</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Un nouveau contact</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Un profil aléatoire sera envoyé au contact qui vous a envoyé ce lien</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Un profil aléatoire sera envoyé à votre contact</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Un nouveau profil aléatoire sera partagé.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -455,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Accepter le contact</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Accepter la demande de connexion ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -468,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Accepter en incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -727,7 +752,7 @@
      </trans-unit>
      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
        <source>Audio/video calls are prohibited.</source>
-        <target>Interdire les appels audio/vidéo.</target>
+        <target>Les appels audio/vidéo sont interdits.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Authentication cancelled" xml:space="preserve">
@@ -752,7 +777,7 @@
      </trans-unit>
      <trans-unit id="Auto-accept" xml:space="preserve">
        <source>Auto-accept</source>
-        <target>Auto-acceptation</target>
+        <target>Auto-accepter</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Auto-accept contact requests" xml:space="preserve">
@@ -1041,9 +1066,19 @@
        <target>Se connecter</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Se connecter via le lien du contact ?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Se connecter directement</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Se connecter incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Se connecter via un lien de contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1061,9 +1096,9 @@
        <target>Se connecter via un lien / code QR</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Se connecter via un lien unique ?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Se connecter via un lien unique</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1091,11 +1126,6 @@
        <target>Erreur de connexion (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Demande de connexion</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Demande de connexion envoyée !</target>
@@ -1148,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Contacts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1262,7 +1293,7 @@
      </trans-unit>
      <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve">
        <source>Database IDs and Transport isolation option.</source>
-        <target>IDs de base de données et option d'isolation du transport.</target>
+        <target>IDs de base de données et option d'isolement du transport.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database downgrade" xml:space="preserve">
@@ -1543,12 +1574,19 @@
        <target>Supprimé à : %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Distribution</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Les accusés de réception sont désactivés !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Justificatifs de réception!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1583,7 +1621,7 @@
      </trans-unit>
      <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
        <source>Different names, avatars and transport isolation.</source>
-        <target>Différents noms, avatars et mode d'isolation de transport.</target>
+        <target>Différents noms, avatars et modes d'isolement de transport.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Direct messages" xml:space="preserve">
@@ -1598,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Désactiver (conserver les remplacements)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1607,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Désactiver pour tous</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1671,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Ne pas activer</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1715,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Activer (conserver les remplacements)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1734,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Activer pour tous</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1948,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Erreur lors de l'activation des accusés de réception !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2032,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Erreur lors de la configuration des accusés de réception !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2051,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Erreur de synchronisation de connexion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2095,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>Même s'il est désactivé dans la conversation.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2117,13 +2164,9 @@
        <target>Archive de la base de données exportée.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Exportation de l'archive de la base de données...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Exportation de l'archive de la base de données…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2183,6 +2226,7 @@
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Filtrer les messages non lus et favoris.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2192,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Trouver des messages plus rapidement</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Réparer</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Réparer la connexion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Réparer la connexion?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Réparer le chiffrement après la restauration des sauvegardes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Correction non prise en charge par le contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Correction non prise en charge par un membre du groupe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2416,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>Historique</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2525,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>En réponse à</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2537,14 +2589,9 @@
        <target>Mode Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Le mode Incognito n'est pas supporté ici - votre profil principal sera envoyé aux membres du groupe</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Le mode Incognito protège la confidentialité de votre profil principal — pour chaque nouveau contact un nouveau profil aléatoire est créé.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Le mode incognito protège votre vie privée en utilisant un nouveau profil aléatoire pour chaque contact.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2619,6 +2666,11 @@
        <target>Adresse de serveur invalide !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Statut invalide</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Invitation expirée !</target>
@@ -2712,6 +2764,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Conserver vos connexions</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2806,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Rendre un message éphémère</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2876,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Erreur de distribution du message</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Accusés de réception des messages !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2917,13 +2972,9 @@
        <target>Messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Migration de l'archive de la base de données...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Migration de l'archive de la base de données…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2966,6 +3017,11 @@
        <target>Plus d'améliorations à venir !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Connexion probablement supprimée.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Il est fort probable que ce contact ait supprimé la connexion avec vous.</target>
@@ -3071,6 +3127,11 @@
        <target>Aucun contact à ajouter</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>Pas d'information sur la distribution</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Pas de token d'appareil !</target>
@@ -3088,6 +3149,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Aucun historique</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3324,10 +3386,10 @@
        <target>Coller le lien reçu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Collez le lien que vous avez reçu dans le cadre ci-dessous pour vous connecter avec votre contact.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3526,6 +3588,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Délai d'attente du protocole par KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3540,6 +3603,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Réagissez…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3572,9 +3636,14 @@
        <target>Pour en savoir plus, consultez notre [dépôt GitHub](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Les accusés de réception sont désactivés</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
-        <target>Reçu le</target>
+        <target>Reçu à</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Received at: %@" xml:space="preserve">
@@ -3609,15 +3678,17 @@
      </trans-unit>
      <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
        <source>Recipients see updates as you type them.</source>
-        <target>Les destinataires voient les mises à jour au fur et à mesure que vous les tapez.</target>
+        <target>Les destinataires voient les mises à jour au fur et à mesure que vous leur écrivez.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Reconnecter tous les serveurs connectés pour forcer la livraison des messages. Cette méthode utilise du trafic supplémentaire.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Reconnecter les serveurs?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3640,8 +3711,8 @@
        <target>Rejeter</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Rejeter le contact (l'expéditeur N'en est PAS informé)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3682,14 +3753,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Renégocier</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Renégocier le chiffrement</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Renégocier le chiffrement?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3894,7 +3968,7 @@
      </trans-unit>
      <trans-unit id="Search" xml:space="preserve">
        <source>Search</source>
-        <target>Chercher</target>
+        <target>Recherche</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
@@ -3949,6 +4023,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Envoyer les accusés de réception à</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3988,6 +4063,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Envoyer les justificatifs</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4007,10 +4083,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>L'envoi d'accusés de réception sera activé pour tous les contacts dans tous les profils de chat visibles.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>L'envoi d'accusés de réception sera activé pour tous les contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4020,10 +4098,22 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>L'envoi d'accusés de réception est désactivé pour %lld contacts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>L'envoi de reçus est désactivé pour les groupes %lld</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>L'envoi d'accusés de réception est activé pour %lld contacts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>L'envoi de reçus est activé pour les groupes %lld</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4166,6 +4256,11 @@
        <target>Afficher les options pour les développeurs</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Voir les derniers messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Montrer l'aperçu</target>
@@ -4246,6 +4341,11 @@
        <target>Messages manqués</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Petits groupes (max 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.</target>
@@ -4373,7 +4473,7 @@
      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
-        <target>Appuyez pour activer le profil.</target>
+        <target>Appuyez pour activer un profil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Tap to join" xml:space="preserve">
@@ -4465,6 +4565,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>Le chiffrement fonctionne et le nouvel accord de chiffrement n'est pas nécessaire. Cela peut provoquer des erreurs de connexion !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4504,6 +4605,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>Le deuxième coche que nous avons manqué ! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4533,10 +4635,12 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Ces paramètres s'appliquent à votre profil actuel **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Ils peuvent être modifiés dans les paramètres des contacts et des groupes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4554,6 +4658,11 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
        <target>Cette action ne peut être annulée - votre profil, vos contacts, vos messages et vos fichiers seront irréversiblement perdus.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>Ce groupe compte plus de %lld membres, les accusés de réception ne sont pas envoyés.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Ce groupe n'existe plus.</target>
@@ -4574,11 +4683,6 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
        <target>Pour se connecter, votre contact peut scanner le code QR ou utiliser le lien dans l'application.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Pour trouver le profil utilisé lors d'une connexion incognito, appuyez sur le nom du contact ou du groupe en haut du chat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Pour établir une nouvelle connexion</target>
@@ -4623,7 +4727,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
      </trans-unit>
      <trans-unit id="Transport isolation" xml:space="preserve">
        <source>Transport isolation</source>
-        <target>Isolement du transport</target>
+        <target>Transport isolé</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
@@ -4659,7 +4763,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Erreur inattendue : %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4760,7 +4864,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Update transport isolation mode?" xml:space="preserve">
        <source>Update transport isolation mode?</source>
-        <target>Mettre à jour le mode d'isolation du transport ?</target>
+        <target>Mettre à jour le mode d'isolement du transport ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -4798,6 +4902,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Utiliser le chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Utiliser le profil actuel</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Utiliser pour les nouvelles connexions</target>
@@ -4808,6 +4917,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Utiliser l'interface d'appel d'iOS</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Utiliser un nouveau profil incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Utiliser ce serveur</target>
@@ -5020,10 +5134,12 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>Vous pouvez l'activer ultérieurement via Paramètres</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>Vous pouvez les activer ultérieurement via les paramètres de Confidentialité et Sécurité de l'application.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5096,8 +5212,8 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Vous devez saisir la phrase secrète à chaque fois que l'application démarre - elle n'est pas stockée sur l'appareil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>Vous avez invité votre contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5226,11 +5342,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Votre profil de chat sera envoyé aux membres du groupe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Votre profil de chat sera envoyé à votre contact</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Vos profils de chat</target>
@@ -5285,6 +5396,11 @@ Vous pouvez modifier ce choix dans les Paramètres.</target>
        <target>Votre vie privée</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Votre profil **%@** sera partagé.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5292,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Votre profil sera envoyé au contact qui vous a envoyé ce lien</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.</target>
@@ -5364,10 +5475,12 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>accord sur le chiffrement pour %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>accord sur le chiffrement…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5432,10 +5545,12 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>changement d'adresse pour %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>changement d'adresse…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5540,10 +5655,12 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>par défaut (non)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>par défaut (oui)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5566,6 +5683,11 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
        <target>direct</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>désactivé</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>message dupliqué</target>
@@ -5593,34 +5715,42 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>chiffrement accepté</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>chiffrement accepté pour %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>chiffrement OK</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>chiffrement ok pour %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>renégociation de chiffrement autorisée</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>renégociation de chiffrement autorisée pour %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>renégociation de chiffrement requise</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>renégociation de chiffrement requise pour %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5638,6 +5768,11 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
        <target>erreur</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>event happened</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>groupe supprimé</target>
@@ -5896,6 +6031,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>code de sécurité modifié</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6042,7 +6178,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6074,7 +6210,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "fr",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -8,7 +8,7 @@
      <trans-unit id="&#10;" xml:space="preserve" approved="no">
        <source>
 </source>
-        <target state="needs-translation">
+        <target state="translated">
 </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -19,22 +19,22 @@ Available in v5.1</source>
      </trans-unit>
      <trans-unit id=" " xml:space="preserve" approved="no">
        <source> </source>
-        <target state="needs-translation"> </target>
+        <target state="translated"> </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="  " xml:space="preserve" approved="no">
        <source>  </source>
-        <target state="needs-translation">  </target>
+        <target state="translated">  </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="   " xml:space="preserve" approved="no">
        <source>   </source>
-        <target state="needs-translation">   </target>
+        <target state="translated">   </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id=" (" xml:space="preserve" approved="no">
        <source> (</source>
-        <target state="needs-translation"> (</target>
+        <target state="translated"> (</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id=" (can be copied)" xml:space="preserve" approved="no">
@@ -279,12 +279,12 @@ Available in v5.1</source>
      </trans-unit>
      <trans-unit id=", " xml:space="preserve" approved="no">
        <source>, </source>
-        <target state="needs-translation">, </target>
+        <target state="translated">, </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="." xml:space="preserve" approved="no">
        <source>.</source>
-        <target state="needs-translation">.</target>
+        <target state="translated">.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="1 day" xml:space="preserve" approved="no">
@@ -1971,8 +1971,9 @@ Available in v5.1</source>
        <target state="translated">חברי הקבוצה יכולים לשלוח הודעות קוליות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group message:" xml:space="preserve">
+      <trans-unit id="Group message:" xml:space="preserve" approved="no">
        <source>Group message:</source>
+        <target state="translated">הודעה קבוצתית:</target>
        <note>notification</note>
      </trans-unit>
      <trans-unit id="Group moderation" xml:space="preserve" approved="no">
@@ -2377,262 +2378,327 @@ Available in v5.1</source>
        <target state="translated">נתוני פרופיל מקומיים בלבד</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Lock after" xml:space="preserve">
+      <trans-unit id="Lock after" xml:space="preserve" approved="no">
        <source>Lock after</source>
+        <target state="translated">נעל אחרי</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Lock mode" xml:space="preserve">
+      <trans-unit id="Lock mode" xml:space="preserve" approved="no">
        <source>Lock mode</source>
+        <target state="translated">מצב נעילה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Make a private connection" xml:space="preserve">
+      <trans-unit id="Make a private connection" xml:space="preserve" approved="no">
        <source>Make a private connection</source>
+        <target state="translated">צור חיבור פרטי</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Make profile private!" xml:space="preserve">
+      <trans-unit id="Make profile private!" xml:space="preserve" approved="no">
        <source>Make profile private!</source>
+        <target state="translated">הפוך את הפרופיל לפרטי!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." xml:space="preserve">
+      <trans-unit id="Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." xml:space="preserve" approved="no">
        <source>Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@).</source>
+        <target state="translated">ודא שכתובות השרת %@ הן בפורמט הנכון, מופרדות בשורה ואינן משוכפלות (%@).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve">
+      <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve" approved="no">
        <source>Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated.</source>
+        <target state="translated">ודאו שכתובות שרתי ה־WebRTC ICE הן בפורמט הנכון, מופרדות בשורה ולא משוכפלות.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve">
+      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve" approved="no">
        <source>Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*</source>
+        <target state="translated">אנשים רבים שאלו: *אם ל-SimpleX אין מזהי משתמש, איך הוא יכול לשלוח הודעות?*</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Mark deleted for everyone" xml:space="preserve">
+      <trans-unit id="Mark deleted for everyone" xml:space="preserve" approved="no">
        <source>Mark deleted for everyone</source>
+        <target state="translated">לסמן נמחק לכולם</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Mark read" xml:space="preserve">
+      <trans-unit id="Mark read" xml:space="preserve" approved="no">
        <source>Mark read</source>
+        <target state="translated">סמן כנקרא</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Mark verified" xml:space="preserve">
+      <trans-unit id="Mark verified" xml:space="preserve" approved="no">
        <source>Mark verified</source>
+        <target state="translated">סמן מאומת</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Markdown in messages" xml:space="preserve">
+      <trans-unit id="Markdown in messages" xml:space="preserve" approved="no">
        <source>Markdown in messages</source>
+        <target state="translated">מרקדאון בהודעות</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve">
+      <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve" approved="no">
        <source>Max 30 seconds, received instantly.</source>
+        <target state="translated">מקסימום 30 שניות, התקבל באופן מיידי.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member" xml:space="preserve">
+      <trans-unit id="Member" xml:space="preserve" approved="no">
        <source>Member</source>
+        <target state="translated">חבר קבוצה</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">
+      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve" approved="no">
        <source>Member role will be changed to "%@". All group members will be notified.</source>
+        <target state="translated">תפקיד חבר הקבוצה ישתנה ל-"%@". כל חברי הקבוצה יקבלו הודעה.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve">
+      <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve" approved="no">
        <source>Member role will be changed to "%@". The member will receive a new invitation.</source>
+        <target state="translated">תפקיד חבר הקבוצה ישתנה ל-"%@". חבר הקבוצה יקבל הזמנה חדשה.</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">
+      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve" approved="no">
        <source>Member will be removed from group - this cannot be undone!</source>
+        <target state="translated">חבר הקבוצה יוסר מהקבוצה – לא ניתן לבטל זאת!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message delivery error" xml:space="preserve">
+      <trans-unit id="Message delivery error" xml:space="preserve" approved="no">
        <source>Message delivery error</source>
+        <target state="translated">שגיאת מסירת הודעה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message draft" xml:space="preserve">
+      <trans-unit id="Message draft" xml:space="preserve" approved="no">
        <source>Message draft</source>
+        <target state="translated">טיוטת הודעה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message text" xml:space="preserve">
+      <trans-unit id="Message text" xml:space="preserve" approved="no">
        <source>Message text</source>
+        <target state="translated">טקסט הודעה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages" xml:space="preserve">
+      <trans-unit id="Messages" xml:space="preserve" approved="no">
        <source>Messages</source>
+        <target state="translated">הודעות</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages &amp; files" xml:space="preserve">
+      <trans-unit id="Messages &amp; files" xml:space="preserve" approved="no">
        <source>Messages &amp; files</source>
+        <target state="translated">הודעות וקבצים</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migrating database archive..." xml:space="preserve">
        <source>Migrating database archive...</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migration error:" xml:space="preserve">
+      <trans-unit id="Migration error:" xml:space="preserve" approved="no">
        <source>Migration error:</source>
+        <target state="translated">שגיאת העברה:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." xml:space="preserve">
+      <trans-unit id="Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." xml:space="preserve" approved="no">
        <source>Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat).</source>
+        <target state="translated">ההעברה נכשלה. הקש על **דלג** למטה כדי להמשיך להשתמש במסד הנתונים הנוכחי. אנא דווח על הבעיה למפתחי האפליקציה באמצעות צ'אט או דוא"ל [chat@simplex.chat](mailto:chat@simplex.chat).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migration is completed" xml:space="preserve">
+      <trans-unit id="Migration is completed" xml:space="preserve" approved="no">
        <source>Migration is completed</source>
+        <target state="translated">ההעברה הושלמה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrations: %@" xml:space="preserve">
+      <trans-unit id="Migrations: %@" xml:space="preserve" approved="no">
        <source>Migrations: %@</source>
+        <target state="translated">העברות: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Moderate" xml:space="preserve">
+      <trans-unit id="Moderate" xml:space="preserve" approved="no">
        <source>Moderate</source>
+        <target state="translated">חסימת הודעה</target>
        <note>chat item action</note>
      </trans-unit>
-      <trans-unit id="More improvements are coming soon!" xml:space="preserve">
+      <trans-unit id="More improvements are coming soon!" xml:space="preserve" approved="no">
        <source>More improvements are coming soon!</source>
+        <target state="translated">שיפורים נוספים יגיעו בקרוב!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
+      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve" approved="no">
        <source>Most likely this contact has deleted the connection with you.</source>
+        <target state="translated">ככל הנראה איש קשר זה מחק את החיבור איתך.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Multiple chat profiles" xml:space="preserve">
+      <trans-unit id="Multiple chat profiles" xml:space="preserve" approved="no">
        <source>Multiple chat profiles</source>
+        <target state="translated">פרופילי צ׳אט מרובים</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Mute" xml:space="preserve">
+      <trans-unit id="Mute" xml:space="preserve" approved="no">
        <source>Mute</source>
+        <target state="translated">השתק</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Muted when inactive!" xml:space="preserve">
+      <trans-unit id="Muted when inactive!" xml:space="preserve" approved="no">
        <source>Muted when inactive!</source>
+        <target state="translated">מושתק כאשר אין פעילות!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Name" xml:space="preserve">
+      <trans-unit id="Name" xml:space="preserve" approved="no">
        <source>Name</source>
+        <target state="translated">שם</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Network &amp; servers" xml:space="preserve">
+      <trans-unit id="Network &amp; servers" xml:space="preserve" approved="no">
        <source>Network &amp; servers</source>
+        <target state="translated">רשת ושרתים</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Network settings" xml:space="preserve">
+      <trans-unit id="Network settings" xml:space="preserve" approved="no">
        <source>Network settings</source>
+        <target state="translated">הגדרות רשת</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Network status" xml:space="preserve">
+      <trans-unit id="Network status" xml:space="preserve" approved="no">
        <source>Network status</source>
+        <target state="translated">מצב רשת</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="New Passcode" xml:space="preserve">
+      <trans-unit id="New Passcode" xml:space="preserve" approved="no">
        <source>New Passcode</source>
+        <target state="translated">קוד גישה חדש</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="New contact request" xml:space="preserve">
+      <trans-unit id="New contact request" xml:space="preserve" approved="no">
        <source>New contact request</source>
+        <target state="translated">בקשה חדשה ליצירת קשר</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="New contact:" xml:space="preserve">
+      <trans-unit id="New contact:" xml:space="preserve" approved="no">
        <source>New contact:</source>
+        <target state="translated">איש קשר חדש:</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="New database archive" xml:space="preserve">
+      <trans-unit id="New database archive" xml:space="preserve" approved="no">
        <source>New database archive</source>
+        <target state="translated">ארכיון מסד נתונים חדש</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="New in %@" xml:space="preserve">
+      <trans-unit id="New in %@" xml:space="preserve" approved="no">
        <source>New in %@</source>
+        <target state="translated">חדש ב %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="New member role" xml:space="preserve">
+      <trans-unit id="New member role" xml:space="preserve" approved="no">
        <source>New member role</source>
+        <target state="translated">תפקיד חבר קבוצה חדש</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="New message" xml:space="preserve">
+      <trans-unit id="New message" xml:space="preserve" approved="no">
        <source>New message</source>
+        <target state="translated">הודעה חדשה</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="New passphrase…" xml:space="preserve">
+      <trans-unit id="New passphrase…" xml:space="preserve" approved="no">
        <source>New passphrase…</source>
+        <target state="translated">סיסמה חדשה…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No" xml:space="preserve">
+      <trans-unit id="No" xml:space="preserve" approved="no">
        <source>No</source>
+        <target state="translated">לא</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No app password" xml:space="preserve">
+      <trans-unit id="No app password" xml:space="preserve" approved="no">
        <source>No app password</source>
+        <target state="translated">אין סיסמה לאפליקציה</target>
        <note>Authentication unavailable</note>
      </trans-unit>
-      <trans-unit id="No contacts selected" xml:space="preserve">
+      <trans-unit id="No contacts selected" xml:space="preserve" approved="no">
        <source>No contacts selected</source>
+        <target state="translated">לא נבחרו אנשי קשר</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No contacts to add" xml:space="preserve">
+      <trans-unit id="No contacts to add" xml:space="preserve" approved="no">
        <source>No contacts to add</source>
+        <target state="translated">אין אנשי קשר להוסיף</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No device token!" xml:space="preserve">
+      <trans-unit id="No device token!" xml:space="preserve" approved="no">
        <source>No device token!</source>
+        <target state="translated">אין אסימון מכשיר!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No group!" xml:space="preserve">
+      <trans-unit id="No group!" xml:space="preserve" approved="no">
        <source>Group not found!</source>
+        <target state="translated">קבוצה לא נמצאה!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No permission to record voice message" xml:space="preserve">
+      <trans-unit id="No permission to record voice message" xml:space="preserve" approved="no">
        <source>No permission to record voice message</source>
+        <target state="translated">אין הרשאה להקליט הודעה קולית</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No received or sent files" xml:space="preserve">
+      <trans-unit id="No received or sent files" xml:space="preserve" approved="no">
        <source>No received or sent files</source>
+        <target state="translated">לא התקבלו או נשלחו קבצים</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Notifications" xml:space="preserve">
+      <trans-unit id="Notifications" xml:space="preserve" approved="no">
        <source>Notifications</source>
+        <target state="translated">התראות</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Notifications are disabled!" xml:space="preserve">
+      <trans-unit id="Notifications are disabled!" xml:space="preserve" approved="no">
        <source>Notifications are disabled!</source>
+        <target state="translated">ההתראות מושבתות!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
+      <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve" approved="no">
        <source>Now admins can:
 - delete members' messages.
 - disable members ("observer" role)</source>
+        <target state="translated">כעת מנהלים יכולים:
+- למחוק הודעות של חברי קבוצה.
+- להשבית חברי קבוצה (תפקיד ”צופה”)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off" xml:space="preserve">
+      <trans-unit id="Off" xml:space="preserve" approved="no">
        <source>Off</source>
+        <target state="translated">כבוי</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
+      <trans-unit id="Off (Local)" xml:space="preserve" approved="no">
        <source>Off (Local)</source>
+        <target state="translated">כבוי (מקומי)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Ok" xml:space="preserve">
+      <trans-unit id="Ok" xml:space="preserve" approved="no">
        <source>Ok</source>
+        <target state="translated">אישור</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Old database" xml:space="preserve">
+      <trans-unit id="Old database" xml:space="preserve" approved="no">
        <source>Old database</source>
+        <target state="translated">מסד נתונים ישן</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Old database archive" xml:space="preserve">
+      <trans-unit id="Old database archive" xml:space="preserve" approved="no">
        <source>Old database archive</source>
+        <target state="translated">ארכיון מסד נתונים ישן</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="One-time invitation link" xml:space="preserve">
+      <trans-unit id="One-time invitation link" xml:space="preserve" approved="no">
        <source>One-time invitation link</source>
+        <target state="translated">קישור הזמנה חד־פעמי</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve">
+      <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve" approved="no">
        <source>Onion hosts will be required for connection. Requires enabling VPN.</source>
+        <target state="translated">לחיבור יידרשו מארחי Onion. דורש הפעלת VPN.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
+      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve" approved="no">
        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
+        <target state="translated">מארחי Onion ישומשו כאשר יהיו זמינים. דורש הפעלת VPN.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Onion hosts will not be used." xml:space="preserve">
+      <trans-unit id="Onion hosts will not be used." xml:space="preserve" approved="no">
        <source>Onion hosts will not be used.</source>
+        <target state="translated">לא ייעשה שימוש במארחי Onion.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." xml:space="preserve">
@@ -4976,6 +5042,275 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">אם תזינו קוד גישה זה בעת פתיחת האפליקציה, כל נתוני האפליקציה יימחקו באופן בלתי הפיך!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ בזמן %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="translated"># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## היסטוריה</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## בתגובה ל</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- שליחת הודעות יציבה יותר.
+- קבוצות קצת יותר טובות.
+- ועוד!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">עוד כמה דברים</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
+        <source>A new random profile will be shared.</source>
+        <target state="translated">ישותף פרופיל אקראי חדש.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">לאשר בקשת חיבור?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect directly" xml:space="preserve" approved="no">
+        <source>Connect directly</source>
+        <target state="translated">התחבר ישירות</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve" approved="no">
+        <source>Connect incognito</source>
+        <target state="translated">התחבר בזהות נסתרת</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via one-time link" xml:space="preserve" approved="no">
+        <source>Connect via one-time link</source>
+        <target state="translated">התחבר באמצעות קישור חד־פעמי</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Contacts" xml:space="preserve" approved="no">
+        <source>Contacts</source>
+        <target state="translated">אנשי קשר</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve" approved="no">
+        <source>Delivery</source>
+        <target state="translated">מסירה</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error synchronizing connection" xml:space="preserve" approved="no">
+        <source>Error synchronizing connection</source>
+        <target state="translated">שגיאה בסנכרון החיבור</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve" approved="no">
+        <source>Fix encryption after restoring backups.</source>
+        <target state="translated">תקן הצפנה לאחר שחזור גיבויים.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix not supported by group member" xml:space="preserve" approved="no">
+        <source>Fix not supported by group member</source>
+        <target state="translated">תיקון אינו נתמך על ידי חבר הקבוצה</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve" approved="no">
+        <source>Invalid status</source>
+        <target state="translated">סטטוס לא חוקי</target>
+        <note>item status text</note>
+      </trans-unit>
+      <trans-unit id="Migrating database archive…" xml:space="preserve" approved="no">
+        <source>Migrating database archive…</source>
+        <target state="translated">מעביר את ארכיון מסד הנתונים…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Moderated at: %@" xml:space="preserve" approved="no">
+        <source>Moderated at: %@</source>
+        <target state="translated">נחסם ב: %@</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve" approved="no">
+        <source>Most likely this connection is deleted.</source>
+        <target state="translated">סביר להניח שהחיבור הזה נמחק.</target>
+        <note>item status description</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ ו-%@ מחוברים</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve" approved="no">
+        <source>Connect via contact link</source>
+        <target state="translated">התחבר באמצעות קישור איש קשר</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delivery receipts!" xml:space="preserve" approved="no">
+        <source>Delivery receipts!</source>
+        <target state="translated">קבלות על המשלוח!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Disable for all" xml:space="preserve" approved="no">
+        <source>Disable for all</source>
+        <target state="translated">השבת לכולם</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve" approved="no">
+        <source>Error enabling delivery receipts!</source>
+        <target state="translated">שגיאה בהפעלת קבלות משלוח!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Even when disabled in the conversation." xml:space="preserve" approved="no">
+        <source>Even when disabled in the conversation.</source>
+        <target state="translated">גם אם הוא מושבת בשיחה.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix" xml:space="preserve" approved="no">
+        <source>Fix</source>
+        <target state="translated">תקן</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix connection" xml:space="preserve" approved="no">
+        <source>Fix connection</source>
+        <target state="translated">תקן את החיבור</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Find chats faster" xml:space="preserve" approved="no">
+        <source>Find chats faster</source>
+        <target state="translated">מצא צ'אטים מהר יותר</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix connection?" xml:space="preserve" approved="no">
+        <source>Fix connection?</source>
+        <target state="translated">לתקן את החיבור?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Make one message disappear" xml:space="preserve" approved="no">
+        <source>Make one message disappear</source>
+        <target state="translated">העלם הודעה אחת</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix not supported by contact" xml:space="preserve" approved="no">
+        <source>Fix not supported by contact</source>
+        <target state="translated">תיקון לא נתמך על ידי איש קשר</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve" approved="no">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target state="translated">מצב זהות נסתרת מגן על הפרטיות שלך על ידי שימוש בפרופיל אקראי חדש עבור כל איש קשר.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="In reply to" xml:space="preserve" approved="no">
+        <source>In reply to</source>
+        <target state="translated">בתגובה ל</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Keep your connections" xml:space="preserve" approved="no">
+        <source>Keep your connections</source>
+        <target state="translated">שימרו על הקשרים שלכם</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message delivery receipts!" xml:space="preserve" approved="no">
+        <source>Message delivery receipts!</source>
+        <target state="translated">קבלות על הודעות!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message reactions are prohibited in this chat." xml:space="preserve" approved="no">
+        <source>Message reactions are prohibited in this chat.</source>
+        <target state="translated">תגובות אמוג׳י להודעות אסורות בצ׳אט זה.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <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>
+      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve" approved="no">
+        <source>Delivery receipts are disabled!</source>
+        <target state="translated">קבלות על משלוח מושבתות!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Disable (keep overrides)" xml:space="preserve" approved="no">
+        <source>Disable (keep overrides)</source>
+        <target state="translated">השבת (שמור עקיפות)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Don't enable" xml:space="preserve" approved="no">
+        <source>Don't enable</source>
+        <target state="translated">אל תפעיל</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Enable (keep overrides)" xml:space="preserve" approved="no">
+        <source>Enable (keep overrides)</source>
+        <target state="translated">הפעל (שמור עקיפות)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Enable for all" xml:space="preserve" approved="no">
+        <source>Enable for all</source>
+        <target state="translated">הפעל עבור כולם</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error setting delivery receipts!" xml:space="preserve" approved="no">
+        <source>Error setting delivery receipts!</source>
+        <target state="translated">שגיאה בהגדרת קבלות משלוח!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Filter unread and favorite chats." xml:space="preserve" approved="no">
+        <source>Filter unread and favorite chats.</source>
+        <target state="translated">סנן צ'אטים שלא נקראו וצ'אטים מועדפים.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Moderated at" xml:space="preserve" approved="no">
+        <source>Moderated at</source>
+        <target state="translated">נחסם</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Message reactions" xml:space="preserve" approved="no">
+        <source>Message reactions</source>
+        <target state="translated">תגובות אמוג׳י להודעות</target>
+        <note>chat feature</note>
+      </trans-unit>
+      <trans-unit id="Exporting database archive…" xml:space="preserve" approved="no">
+        <source>Exporting database archive…</source>
+        <target state="translated">מייצא את ארכיון מסד הנתונים…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ ו-%lld חברים אחרים מחוברים</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New display name" xml:space="preserve" approved="no">
+        <source>New display name</source>
+        <target state="translated">שם תצוגה חדש</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve" approved="no">
+        <source>No delivery information</source>
+        <target state="translated">אין מידע על מסירה</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No filtered chats" xml:space="preserve" approved="no">
+        <source>No filtered chats</source>
+        <target state="translated">אין צ'אטים מסוננים</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No history" xml:space="preserve" approved="no">
+        <source>No history</source>
+        <target state="translated">ללא היסטוריה</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="he" datatype="plaintext">
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="it" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 colorato!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## Cronologia</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## In risposta a</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#segreto#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ e %@ sono connessi/e</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ alle %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ si vuole connettere!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ e altri %lld membri sono connessi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- recapito dei messaggi più stabile.
+- gruppi un po' migliorati.
+- e altro ancora!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Qualche altra cosa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Un contatto nuovo</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Verrà inviato un profilo casuale al contatto da cui hai ricevuto questo link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Verrà inviato un profilo casuale al tuo contatto</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Verrà condiviso un nuovo profilo casuale.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -455,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Accetta il contatto</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Accettare la richiesta di connessione?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -468,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Accetta in incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -1041,9 +1066,19 @@
        <target>Connetti</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Connettere via link del contatto?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Connetti direttamente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Connetti in incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Connetti via link del contatto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1061,9 +1096,9 @@
        <target>Connetti via link / codice QR</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Connettere via link una tantum?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Connetti via link una tantum</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1091,11 +1126,6 @@
        <target>Errore di connessione (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Richiesta di connessione</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Richiesta di connessione inviata!</target>
@@ -1148,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Contatti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1543,12 +1574,19 @@
        <target>Eliminato il: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Consegna</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Le ricevute di consegna sono disattivate!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Ricevute di consegna!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1598,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Disattiva (mantieni sostituzioni)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1607,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Disattiva per tutti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1671,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Non attivare</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1715,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Attiva (mantieni sostituzioni)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1734,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Attiva per tutti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1948,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Errore nell'attivazione delle ricevute di consegna!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2032,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Errore nell'impostazione delle ricevute di consegna!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2051,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Errore nella sincronizzazione della connessione</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2095,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>Anche quando disattivato nella conversazione.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2117,13 +2164,9 @@
        <target>Archivio database esportato.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Esportazione archivio database...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Esportazione archivio database…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2183,6 +2226,7 @@
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Filtra le chat non lette e preferite.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2192,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Trova le chat più velocemente</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Correggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Correggi connessione</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Correggere la connessione?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Correggi la crittografia dopo il ripristino dei backup.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Correzione non supportata dal contatto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Correzione non supportata dal membro del gruppo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2416,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>Cronologia</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2525,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>In risposta a</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2537,14 +2589,9 @@
        <target>Modalità incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>La modalità in incognito non è supportata qui: il tuo profilo principale verrà inviato ai membri del gruppo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>La modalità in incognito protegge la privacy del nome e dell'immagine del tuo profilo principale: per ogni nuovo contatto viene creato un nuovo profilo casuale.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>La modalità in incognito protegge la tua privacy usando un nuovo profilo casuale per ogni contatto.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2619,6 +2666,11 @@
        <target>Indirizzo del server non valido!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Stato non valido</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Invito scaduto!</target>
@@ -2712,6 +2764,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Mantieni le tue connessioni</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2806,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Fai sparire un messaggio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2876,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Errore di recapito del messaggio</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Ricevute di consegna dei messaggi!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2917,13 +2972,9 @@
        <target>Messaggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Migrazione archivio del database...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Migrazione archivio del database…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2966,6 +3017,11 @@
        <target>Altri miglioramenti sono in arrivo!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Probabilmente questa connessione è stata eliminata.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Probabilmente questo contatto ha eliminato la connessione con te.</target>
@@ -3071,6 +3127,11 @@
        <target>Nessun contatto da aggiungere</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>Nessuna informazione sulla consegna</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Nessun token del dispositivo!</target>
@@ -3088,6 +3149,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Nessuna cronologia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3324,10 +3386,10 @@
        <target>Incolla il link ricevuto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Incolla il link che hai ricevuto nella casella sottostante per connetterti con il tuo contatto.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3526,6 +3588,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Scadenza del protocollo per KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3540,6 +3603,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Reagisci…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3572,6 +3636,11 @@
        <target>Maggiori informazioni nel nostro [repository GitHub](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Le ricevute sono disattivate</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Ricevuto il</target>
@@ -3614,10 +3683,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Riconnetti tutti i server connessi per imporre il recapito dei messaggi. Utilizza traffico aggiuntivo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Riconnettere i server?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3640,8 +3711,8 @@
        <target>Rifiuta</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Rifiuta contatto (mittente NON avvisato)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3682,14 +3753,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Rinegoziare</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Rinegoziare crittografia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Rinegoziare la crittografia?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3949,6 +4023,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Invia ricevute di consegna a</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3988,6 +4063,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Invia ricevute</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4007,10 +4083,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>L'invio delle ricevute di consegna sarà attivo per tutti i contatti in tutti i profili di chat visibili.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>L'invio delle ricevute di consegna sarà attivo per tutti i contatti.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4020,10 +4098,22 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>L'invio di ricevute è disattivato per %lld contatti</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>L'invio di ricevute è disattivato per %lld gruppi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>L'invio di ricevute è attivo per %lld contatti</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>L'invio di ricevute è attivo per %lld gruppi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4166,6 +4256,11 @@
        <target>Mostra opzioni sviluppatore</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Mostra ultimi messaggi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Mostra anteprima</target>
@@ -4246,6 +4341,11 @@
        <target>Messaggi saltati</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Piccoli gruppi (max 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Si sono verificati alcuni errori non gravi durante l'importazione: vedi la console della chat per i dettagli.</target>
@@ -4465,6 +4565,7 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>La crittografia funziona e il nuovo accordo sulla crittografia non è richiesto. Potrebbero verificarsi errori di connessione!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4504,6 +4605,7 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>Il secondo segno di spunta che ci mancava! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4533,10 +4635,12 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Queste impostazioni sono per il tuo profilo attuale **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Possono essere sovrascritte nelle impostazioni dei contatti e dei gruppi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4554,6 +4658,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
        <target>Questa azione non può essere annullata: il tuo profilo, i contatti, i messaggi e i file andranno persi in modo irreversibile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>Questo gruppo ha più di %lld membri, le ricevute di consegna non vengono inviate.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Questo gruppo non esiste più.</target>
@@ -4574,11 +4683,6 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
        <target>Per connettervi, il tuo contatto può scansionare il codice QR o usare il link nell'app.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Per trovare il profilo usato per una connessione in incognito, tocca il nome del contatto o del gruppo in cima alla chat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Per creare una nuova connessione</target>
@@ -4659,7 +4763,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Errore imprevisto: % @</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4798,6 +4902,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Usa la chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Usa il profilo attuale</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Usa per connessioni nuove</target>
@@ -4808,6 +4917,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Usa interfaccia di chiamata iOS</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Usa nuovo profilo in incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Usa il server</target>
@@ -5020,10 +5134,12 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>Puoi attivarle più tardi nelle impostazioni</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>Puoi attivarle più tardi nelle impostazioni di privacy e sicurezza dell'app.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5096,8 +5212,8 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Devi inserire la password ogni volta che si avvia l'app: non viene memorizzata sul dispositivo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>Hai invitato il contatto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5226,11 +5342,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Il tuo profilo di chat verrà inviato ai membri del gruppo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Il tuo profilo di chat verrà inviato al tuo contatto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>I tuoi profili di chat</target>
@@ -5285,6 +5396,11 @@ Puoi modificarlo nelle impostazioni.</target>
        <target>La tua privacy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Il tuo profilo **%@** verrà condiviso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5292,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 I server di SimpleX non possono vedere il tuo profilo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Il tuo profilo verrà inviato al contatto da cui hai ricevuto questo link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Il tuo profilo, i contatti e i messaggi recapitati sono memorizzati sul tuo dispositivo.</target>
@@ -5364,10 +5475,12 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>concordando la crittografia per %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>concordando la crittografia…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5432,10 +5545,12 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>cambio indirizzo per %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>cambio indirizzo…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5540,10 +5655,12 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>predefinito (no)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>predefinito (sì)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5566,6 +5683,11 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
        <target>diretta</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>disattivato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>messaggio duplicato</target>
@@ -5593,34 +5715,42 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>crittografia concordata</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>crittografia concordata per %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>crittografia ok</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>crittografia ok per %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>rinegoziazione della crittografia consentita</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>rinegoziazione della crittografia consentita per %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>richiesta rinegoziazione della crittografia</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>richiesta rinegoziazione della crittografia per %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5638,6 +5768,11 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
        <target>errore</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>evento accaduto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>gruppo eliminato</target>
@@ -5750,7 +5885,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="member connected" xml:space="preserve">
        <source>connected</source>
-        <target>connesso/a</target>
+        <target>è connesso/a</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="message received" xml:space="preserve">
@@ -5896,6 +6031,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>codice di sicurezza modificato</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6042,7 +6178,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6074,7 +6210,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "it",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="ja" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 色付き!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## 履歴</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## 返信先</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>シークレット</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ と %@ は接続中</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ at %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ が接続を希望しています!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ および %lld 人のメンバーが接続中</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- より安定したメッセージ配信。
+- 改良されたグループ。
+- などなど！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>その他</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>新しい連絡先</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>このリンクの送信元にランダムなプロフィール(ダミー)が送られます</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>連絡先にランダムなプロフィール(ダミー)が送られます</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>新しいランダムなプロファイルが共有されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -416,14 +441,17 @@
      </trans-unit>
      <trans-unit id="Abort" xml:space="preserve">
        <source>Abort</source>
+        <target>中止</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address" xml:space="preserve">
        <source>Abort changing address</source>
+        <target>アドレス変更の中止</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address?" xml:space="preserve">
        <source>Abort changing address?</source>
+        <target>アドレス変更を中止しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="About SimpleX" xml:space="preserve">
@@ -452,8 +480,8 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
        <target>連絡を受け入れる</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -465,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>シークレットモードで承諾</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -509,6 +537,7 @@
      </trans-unit>
      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve">
        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target>アドレス変更は中止されます。古い受信アドレスが使用されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -603,6 +632,7 @@
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
        <source>Allow to send files and media.</source>
+        <target>ファイルやメディアの送信を許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send voice messages." xml:space="preserve">
@@ -777,6 +807,7 @@
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
+        <target>より良いメッセージ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -1035,8 +1066,18 @@
        <target>接続</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>直接接続する</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>シークレットモードで接続</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
        <target>連絡先リンク経由で接続しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1055,8 +1096,8 @@
        <target>リンク・QRコード経由で接続</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
        <target>使い捨てリンク経由で接続しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1085,11 +1126,6 @@
        <target>接続エラー (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>接続のリクエスト</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>接続リクエストを送信しました！</target>
@@ -1142,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>連絡先</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1537,8 +1574,14 @@
        <target>削除完了: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Delivery</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Delivery receipts are disabled!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
@@ -1592,6 +1635,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>無効にする（設定の優先を維持）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1601,6 +1645,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>すべて無効</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1665,6 +1710,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>有効にしない</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1709,6 +1755,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>有効にする（設定の優先を維持）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1728,6 +1775,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>すべて有効</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1847,6 +1895,7 @@
      </trans-unit>
      <trans-unit id="Error aborting address change" xml:space="preserve">
        <source>Error aborting address change</source>
+        <target>アドレス変更中止エラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -2044,6 +2093,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>接続の同期エラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2088,6 +2138,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>会話中に無効になっている場合でも。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2110,13 +2161,9 @@
        <target>データベースのアーカイブをエクスポートします。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>データベース アーカイブをエクスポートしています...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>データベース アーカイブをエクスポートしています…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2131,6 +2178,7 @@
      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
+        <target>お気に入り</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File will be deleted from servers." xml:space="preserve">
@@ -2160,50 +2208,62 @@
      </trans-unit>
      <trans-unit id="Files and media" xml:space="preserve">
        <source>Files and media</source>
+        <target>ファイルとメディア</target>
        <note>chat feature</note>
      </trans-unit>
      <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>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
        <source>Files and media prohibited!</source>
+        <target>ファイルとメディアは禁止されています!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>未読とお気に入りをフィルターします。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
        <source>Finally, we have them! 🚀</source>
+        <target>ついに、私たちはそれらを手に入れました! 🚀</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>チャットを素早く検索</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>修正</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>接続を修正</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>接続を修正しますか?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>バックアップの復元後に暗号化を修正します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>連絡先による修正はサポートされていません</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>グループメンバーによる修正はサポートされていません</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2313,6 +2373,7 @@
      </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">
@@ -2403,7 +2464,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>履歴</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2512,7 +2573,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>返信先</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2524,14 +2586,9 @@
        <target>シークレットモード</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>ここではシークレットモードが無効です。メインのプロフィールがグループのメンバーに送られます</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>シークレットモードとは、メインのプロフィールとプロフィール画像を守るために、新しい連絡先を追加する時に、その連絡先に対してランダムなプロフィールが作成されます。</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>シークレットモードとは、メインのプロフィールとプロフィール画像を守るために、新しい連絡先を追加する時に、その連絡先に対してランダムなプロフィールが作成されるという対策です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2606,6 +2663,11 @@
        <target>無効なサーバアドレス！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>無効なステータス</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>招待が期限切れました！</target>
@@ -2699,6 +2761,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>接続を維持</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2793,6 +2856,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>メッセージを1つ消す</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2863,7 +2927,7 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>メッセージ送信エラー</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
@@ -2904,13 +2968,9 @@
        <target>メッセージ &amp; ファイル</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>データベースのアーカイブを移行しています...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>データベースのアーカイブを移行しています…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2953,6 +3013,11 @@
        <target>まだまだ改善してまいります！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>おそらく、この接続は削除されています。</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>恐らくこの連絡先があなたとの接続を削除しました。</target>
@@ -3058,6 +3123,11 @@
        <target>追加できる連絡先がありません</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>送信情報なし</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>デバイストークンがありません!</target>
@@ -3065,6 +3135,7 @@
      </trans-unit>
      <trans-unit id="No filtered chats" xml:space="preserve">
        <source>No filtered chats</source>
+        <target>フィルタされたチャットはありません</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No group!" xml:space="preserve">
@@ -3074,6 +3145,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>履歴はありません</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3162,6 +3234,7 @@
      </trans-unit>
      <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
        <source>Only group owners can enable files and media.</source>
+        <target>ファイルやメディアを有効にできるのは、グループオーナーだけです。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
@@ -3309,10 +3382,10 @@
        <target>頂いたリンクを貼り付ける</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>連絡相手から頂いたリンクを以下の入力欄に貼り付けて繋がります。</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3486,6 +3559,7 @@
      </trans-unit>
      <trans-unit id="Prohibit sending files and media." xml:space="preserve">
        <source>Prohibit sending files and media.</source>
+        <target>ファイルやメディアの送信を禁止します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
@@ -3510,6 +3584,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>KB あたりのプロトコル タイムアウト</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3524,6 +3599,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>反応する…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3556,6 +3632,10 @@
        <target>詳しくは[GitHubリポジトリ](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address)をご覧ください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>受信</target>
@@ -3578,6 +3658,7 @@
      </trans-unit>
      <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
        <source>Receiving address will be changed to a different server. Address change will complete after sender comes online.</source>
+        <target>開発中の機能です！相手のクライアントが4.2でなければ機能しません。アドレス変更が完了すると、会話にメッセージが出ます。連絡相手 (またはグループのメンバー) からメッセージを受信できないかをご確認ください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3597,10 +3678,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>接続されているすべてのサーバーを再接続して、メッセージを強制的に配信します。 追加のトラフィックを使用します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>サーバーに再接続しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3623,8 +3706,8 @@
        <target>拒否</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>連絡を拒否（送信者には通知されません）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3665,14 +3748,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>再ネゴシエート</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>暗号化の再ネゴシエート</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>暗号化を再ネゴシエートしますか?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -4005,10 +4091,18 @@
        <source>Sending receipts is disabled for %lld contacts</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
        <source>Sending via</source>
        <target>経由で送信</target>
@@ -4149,6 +4243,11 @@
        <target>開発者向けオプションを表示</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>最新のメッセージを表示</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>プレビューを表示</target>
@@ -4229,8 +4328,14 @@
        <target>飛ばしたメッセージ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>小グループ（最大20名）</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
+        <target>インポート中に致命的でないエラーが発生しました - 詳細はチャットコンソールを参照してください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Somebody" xml:space="preserve">
@@ -4447,6 +4552,7 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>暗号化は機能しており、新しい暗号化への同意は必要ありません。接続エラーが発生する可能性があります！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4486,6 +4592,7 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>長らくお待たせしました！ ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4515,10 +4622,12 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>これらの設定は現在のプロファイル **%@** 用です。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>これらは連絡先の設定が優先します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4536,6 +4645,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>あなたのプロフィール、連絡先、メッセージ、ファイルが完全削除されます (※元に戻せません※)。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>このグループはもう存在しません。</target>
@@ -4556,11 +4669,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>接続するにはQRコードを読み込むか、アプリ内のリンクを使用する必要があります。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>シークレットモード接続のプロフィールを確認するには、チャットの上部の連絡先、またはグループ名をタップします。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>新規に接続する場合</target>
@@ -4641,7 +4749,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>予期しないエラー: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4650,6 +4758,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      </trans-unit>
      <trans-unit id="Unfav." xml:space="preserve">
        <source>Unfav.</source>
+        <target>お気に入りを取り消す。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unhide" xml:space="preserve">
@@ -4779,6 +4888,11 @@ To connect, please ask your contact to create another connection link and check
        <target>チャット</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>現在のプロファイルを使用する</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>新しい接続に使う</target>
@@ -4789,6 +4903,11 @@ To connect, please ask your contact to create another connection link and check
        <target>iOS通話インターフェースを使用する</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>新しいシークレットプロファイルを使用する</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>サーバを使う</target>
@@ -5001,10 +5120,12 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>あとで設定から有効にできます</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>あとでアプリのプライバシーとセキュリティの設定から有効にすることができます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5077,8 +5198,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="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>連絡先に招待を送りました</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5207,11 +5328,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="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>あなたのチャットプロフィールが連絡相手に送られます</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>あなたのチャットプロフィール</target>
@@ -5266,6 +5382,11 @@ You can change it in Settings.</source>
        <target>あなたのプライバシー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>あなたのプロファイル **%@** が共有されます。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5273,11 +5394,6 @@ SimpleX servers cannot see your profile.</source>
 SimpleX サーバーはあなたのプロファイルを参照できません。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>あなたのプロフィールは、このリンクを受け取った連絡先に送信されます</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>あなたのプロフィール、連絡先、送信したメッセージがご自分の端末に保存されます。</target>
@@ -5345,10 +5461,12 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>%@の暗号化に同意しています…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>暗号化に同意しています…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5413,10 +5531,12 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>%@ のアドレスを変更しています…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>アドレスを変更しています…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5521,10 +5641,12 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>デフォルト（いいえ）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>デフォルト（はい）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5547,6 +5669,11 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
        <target>直接</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>無効</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>重複メッセージ</target>
@@ -5574,34 +5701,42 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>暗号化に同意しました</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>%@ の暗号化に同意しました</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>暗号化OK</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>%@ の暗号化OK</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>暗号化の再ネゴシエーションを許可</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>%@ の暗号化の再ネゴシエーションを許可</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>暗号化の再ネゴシエーションが必要</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>%@ の暗号化の再ネゴシエーションが必要</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5619,6 +5754,11 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
        <target>エラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>イベント発生</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>グループ削除済み</target>
@@ -5786,6 +5926,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="no text" xml:space="preserve">
        <source>no text</source>
+        <target>テキストなし</target>
        <note>copied message info in history</note>
      </trans-unit>
      <trans-unit id="observer" xml:space="preserve">
@@ -5876,6 +6017,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>セキュリティコードが変更されました</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6022,7 +6164,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ja" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6054,7 +6196,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="ja" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "ja",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="nl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 gekleurd!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## Geschiedenis</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## Als antwoord op</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#geheim#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ en %@ verbonden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ bij %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ wil verbinding maken!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ en %lld andere leden hebben verbinding gemaakt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -218,7 +244,7 @@
      </trans-unit>
      <trans-unit id="%u messages failed to decrypt." xml:space="preserve">
        <source>%u messages failed to decrypt.</source>
-        <target>%u-berichten kunnen niet worden gedecodeerd.</target>
+        <target>%u berichten kunnen niet worden ontsleuteld.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%u messages skipped." xml:space="preserve">
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- stabielere berichtbezorging.
+- een beetje betere groepen.
+- en meer!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Nog een paar dingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Een nieuw contact</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Er wordt een willekeurig profiel verzonden naar het contact van wie je deze link hebt ontvangen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Er wordt een willekeurig profiel naar uw contactpersoon verzonden</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Een nieuw willekeurig profiel wordt gedeeld.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -455,8 +480,8 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
        <target>Accepteer contactpersoon</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -468,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Accepteer incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -772,7 +797,7 @@
      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
-        <target>Onjuiste bericht ID</target>
+        <target>Onjuiste bericht-ID</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Bad message hash" xml:space="preserve">
@@ -1041,8 +1066,18 @@
        <target>Verbind</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Verbind direct</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Verbind incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
        <target>Verbinden via contact link?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1061,8 +1096,8 @@
        <target>Maak verbinding via link / QR-code</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
        <target>Verbinden via een eenmalige link?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -1091,11 +1126,6 @@
        <target>Verbindingsfout (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Verbindingsverzoek</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Verbindingsverzoek verzonden!</target>
@@ -1148,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Contacten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1252,17 +1283,17 @@
      </trans-unit>
      <trans-unit id="Database ID" xml:space="preserve">
        <source>Database ID</source>
-        <target>Database ID</target>
+        <target>Database-ID</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database ID: %d" xml:space="preserve">
        <source>Database ID: %d</source>
-        <target>Database ID: %d</target>
+        <target>Database-ID: %d</target>
        <note>copied message info</note>
      </trans-unit>
      <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve">
        <source>Database IDs and Transport isolation option.</source>
-        <target>Database ID's en Transport isolatie optie.</target>
+        <target>Database-ID's en Transport isolatie optie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database downgrade" xml:space="preserve">
@@ -1543,12 +1574,19 @@
        <target>Verwijderd om: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Bezorging</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Ontvangstbewijzen zijn uitgeschakeld!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Ontvangstbewijzen!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1598,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Uitschakelen (overschrijvingen behouden)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1607,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Uitschakelen voor iedereen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1631,12 +1671,12 @@
      </trans-unit>
      <trans-unit id="Disappears at" xml:space="preserve">
        <source>Disappears at</source>
-        <target>Verdwijnt om</target>
+        <target>Verdwijnt op</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappears at: %@" xml:space="preserve">
        <source>Disappears at: %@</source>
-        <target>Verdwijnt om: %@</target>
+        <target>Verdwijnt op: %@</target>
        <note>copied message info</note>
      </trans-unit>
      <trans-unit id="Disconnect" xml:space="preserve">
@@ -1671,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Niet inschakelen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1715,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Inschakelen (overschrijvingen behouden)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1734,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Inschakelen voor iedereen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1948,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Fout bij het inschakelen van ontvangst bevestiging!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2032,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Fout bij het instellen van ontvangst bevestiging!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2051,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Fout bij het synchroniseren van de verbinding</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2095,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>Zelfs wanneer uitgeschakeld in het gesprek.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2117,13 +2164,9 @@
        <target>Geëxporteerd database archief.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Database archief exporteren...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Database archief exporteren…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2148,7 +2191,7 @@
      </trans-unit>
      <trans-unit id="File will be received when your contact completes uploading it." xml:space="preserve">
        <source>File will be received when your contact completes uploading it.</source>
-        <target>Het bestand wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</target>
+        <target>Het bestand wordt gedownload wanneer uw contactpersoon het uploaden heeft voltooid.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File will be received when your contact is online, please wait or check later!" xml:space="preserve">
@@ -2183,6 +2226,7 @@
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Filter ongelezen en favoriete chats.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2192,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Vind gesprekken sneller</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Herstel</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Verbinding herstellen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Verbinding herstellen?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Repareer versleuteling na het herstellen van back-ups.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Herstel wordt niet ondersteund door contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Herstel wordt niet ondersteund door groepslid</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2416,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>Geschiedenis</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2480,7 +2531,7 @@
      </trans-unit>
      <trans-unit id="Image will be received when your contact completes uploading it." xml:space="preserve">
        <source>Image will be received when your contact completes uploading it.</source>
-        <target>De afbeelding wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</target>
+        <target>De afbeelding wordt gedownload wanneer uw contactpersoon het uploaden heeft voltooid.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Image will be received when your contact is online, please wait or check later!" xml:space="preserve">
@@ -2525,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>In antwoord op</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2537,14 +2589,9 @@
        <target>Incognito modus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Incognito modus wordt hier niet ondersteund, uw hoofdprofiel wordt naar groepsleden verzonden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>De incognito modus beschermt de privacy van uw hoofdprofielnaam en afbeelding, voor elk nieuw contact wordt een nieuw willekeurig profiel gemaakt.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Incognito -modus beschermt uw privacy met behulp van een nieuw willekeurig profiel voor elk contact.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2619,6 +2666,11 @@
        <target>Ongeldig server adres!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Ongeldige status</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Uitnodiging verlopen!</target>
@@ -2661,7 +2713,7 @@
      </trans-unit>
      <trans-unit id="It can happen when you or your connection used the old database backup." xml:space="preserve">
        <source>It can happen when you or your connection used the old database backup.</source>
-        <target>Het kan gebeuren wanneer u of uw verbinding de oude databaseback-up gebruikte.</target>
+        <target>Het kan gebeuren wanneer u of de ander een oude databaseback-up gebruikt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It can happen when:&#10;1. The messages expired in the sending client after 2 days or on the server after 30 days.&#10;2. Message decryption failed, because you or your contact used old database backup.&#10;3. The connection was compromised." xml:space="preserve">
@@ -2712,6 +2764,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Behoud uw verbindingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2806,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Eén bericht laten verdwijnen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2825,7 +2879,7 @@
      </trans-unit>
      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve">
        <source>Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*</source>
-        <target>Veel mensen vroegen: *als SimpleX geen gebruikers ID's heeft, hoe kan het dan berichten bezorgen?*</target>
+        <target>Veel mensen vroegen: *als SimpleX geen gebruikers-ID's heeft, hoe kan het dan berichten bezorgen?*</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Mark deleted for everyone" xml:space="preserve">
@@ -2876,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Fout bij bezorging van bericht</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Ontvangst bevestiging voor berichten!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2917,13 +2972,9 @@
        <target>Berichten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Database archief migreren...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Database archief migreren…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2966,6 +3017,11 @@
        <target>Meer verbeteringen volgen snel!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Hoogstwaarschijnlijk is deze verbinding verwijderd.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Hoogstwaarschijnlijk heeft dit contact de verbinding met jou verwijderd.</target>
@@ -3071,6 +3127,11 @@
        <target>Geen contacten om toe te voegen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>Geen bezorging informatie</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Geen apparaattoken!</target>
@@ -3088,6 +3149,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Geen geschiedenis</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3324,10 +3386,10 @@
        <target>Plak de ontvangen link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Plak de link die je hebt ontvangen in het vak hieronder om verbinding te maken met je contactpersoon.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3526,6 +3588,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Protocol timeout per KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3540,6 +3603,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Reageer…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3572,6 +3636,11 @@
        <target>Lees meer in onze [GitHub-repository](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Bevestigingen zijn uitgeschakeld</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Ontvangen op</target>
@@ -3614,10 +3683,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Verbind alle verbonden servers opnieuw om de bezorging van berichten af te dwingen. Het maakt gebruik van extra data.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Servers opnieuw verbinden?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3640,8 +3711,8 @@
        <target>Afwijzen</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Contact afwijzen (afzender NIET op de hoogte)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3682,14 +3753,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Opnieuw onderhandelen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Heronderhandel over versleuteling</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Heronderhandelen over versleuteling?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3949,6 +4023,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Stuur ontvangstbewijzen naar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3988,6 +4063,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Ontvangstbewijzen verzenden</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4007,10 +4083,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>Het verzenden van ontvangst bevestiging wordt ingeschakeld voor alle contacten in alle zichtbare chatprofielen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>Het verzenden van ontvangst bevestiging wordt ingeschakeld voor alle contactpersonen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4020,10 +4098,22 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>Het verzenden van ontvangst bevestiging is uitgeschakeld voor %lld-contactpersonen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>Het verzenden van bevestigingen is uitgeschakeld voor %LLD -groepen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>Het verzenden van ontvangst bevestiging is ingeschakeld voor %lld-contactpersonen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>Het verzenden van bevestigingen is ingeschakeld voor %LLD -groepen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4166,6 +4256,11 @@
        <target>Ontwikkelaars opties tonen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Laat laatste berichten zien</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Toon voorbeeld</target>
@@ -4246,6 +4341,11 @@
        <target>Overgeslagen berichten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Kleine groepen (max 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Er zijn enkele niet-fatale fouten opgetreden tijdens het importeren - u kunt de Chat console raadplegen voor meer details.</target>
@@ -4428,7 +4528,7 @@
      </trans-unit>
      <trans-unit id="The 1st platform without any user identifiers – private by design." xml:space="preserve">
        <source>The 1st platform without any user identifiers – private by design.</source>
-        <target>Het eerste platform zonder gebruikers ID's, privé door ontwerp.</target>
+        <target>Het eerste platform zonder gebruikers-ID's, privé door ontwerp.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The ID of the next message is incorrect (less or equal to the previous).&#10;It can happen because of some bug or when the connection is compromised." xml:space="preserve">
@@ -4455,7 +4555,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
      </trans-unit>
      <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve">
        <source>The contact you shared this link with will NOT be able to connect!</source>
-        <target>Het contact met wie je deze link hebt gedeeld, kan GEEN verbinding maken!</target>
+        <target>Het contact met wie je deze link hebt gedeeld kan GEEN verbinding maken!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The created archive is available via app Settings / Database / Old database archive." xml:space="preserve">
@@ -4465,6 +4565,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>De versleuteling werkt en de nieuwe versleutelingsovereenkomst is niet vereist. Dit kan leiden tot verbindingsfouten!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4504,6 +4605,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>De tweede vink die we gemist hebben! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4533,10 +4635,12 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Deze instellingen zijn voor uw huidige profiel **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Ze kunnen worden overschreven in contactinstellingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4554,6 +4658,11 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
        <target>Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>Deze groep heeft meer dan %lld -leden, ontvangstbevestigingen worden niet verzonden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Deze groep bestaat niet meer.</target>
@@ -4574,11 +4683,6 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
        <target>Om verbinding te maken, kan uw contact persoon de QR-code scannen of de link in de app gebruiken.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Om het profiel te vinden dat wordt gebruikt voor een incognito verbinding, tikt u op de naam van het contact of de groep bovenaan de chat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Om een nieuwe verbinding te maken</target>
@@ -4586,7 +4690,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
      </trans-unit>
      <trans-unit id="To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." xml:space="preserve">
        <source>To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts.</source>
-        <target>Om de privacy te beschermen, heeft SimpleX in plaats van gebruikers ID's die door alle andere platforms worden gebruikt, ID's voor berichten wachtrijen, afzonderlijk voor elk van uw contacten.</target>
+        <target>Om de privacy te beschermen, heeft SimpleX in plaats van gebruikers-ID's die door alle andere platforms worden gebruikt, ID's voor berichten wachtrijen, afzonderlijk voor elk van uw contacten.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="To protect timezone, image/voice files use UTC." xml:space="preserve">
@@ -4659,7 +4763,7 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Onverwachte fout: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4798,6 +4902,11 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
        <target>Gebruik chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Gebruik het huidige profiel</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Gebruik voor nieuwe verbindingen</target>
@@ -4808,6 +4917,11 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
        <target>De iOS-oproepinterface gebruiken</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Gebruik een nieuw incognitoprofiel</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Gebruik server</target>
@@ -4850,7 +4964,7 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
      </trans-unit>
      <trans-unit id="Video will be received when your contact completes uploading it." xml:space="preserve">
        <source>Video will be received when your contact completes uploading it.</source>
-        <target>De video wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</target>
+        <target>De video wordt gedownload wanneer uw contactpersoon het uploaden heeft voltooid.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Video will be received when your contact is online, please wait or check later!" xml:space="preserve">
@@ -5020,10 +5134,12 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>U kunt later inschakelen via Instellingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>U kunt ze later inschakelen via de privacy- en beveiligingsinstellingen van de app.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5096,8 +5212,8 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
        <target>U moet elke keer dat de app start het wachtwoord invoeren, deze wordt niet op het apparaat opgeslagen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>Je hebt je contactpersoon uitgenodigd</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5113,7 +5229,7 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
      </trans-unit>
      <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
        <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
-        <target>U mag de meest recente versie van uw chat database ALLEEN op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</target>
+        <target>U mag ALLEEN de meest recente versie van uw chat database op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -5173,7 +5289,7 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
      </trans-unit>
      <trans-unit id="You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile" xml:space="preserve">
        <source>You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile</source>
-        <target>Je probeert een contact met wie je een incognito profiel hebt gedeeld, uit te nodigen voor de groep waarin je je hoofdprofiel gebruikt</target>
+        <target>Je probeert een contact met wie je een incognito profiel hebt gedeeld uit te nodigen voor de groep waarin je je hoofdprofiel gebruikt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You're using an incognito profile for this group - to prevent sharing your main profile inviting contacts is not allowed" xml:space="preserve">
@@ -5226,11 +5342,6 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
        <target>Uw chat profiel wordt verzonden naar de groepsleden</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Uw chat profiel wordt naar uw contactpersoon verzonden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Uw chat profielen</target>
@@ -5256,7 +5367,8 @@ U kunt deze verbinding verbreken en het contact verwijderen (en later proberen m
      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
        <source>Your contacts in SimpleX will see it.
 You can change it in Settings.</source>
-        <target>Uw contacten in SimpleX zullen het zien. U kunt dit wijzigen in Instellingen.</target>
+        <target>Uw contacten in SimpleX kunnen het zien. 
+U kunt dit wijzigen in Instellingen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
@@ -5284,6 +5396,11 @@ You can change it in Settings.</source>
        <target>Uw privacy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Uw profiel **%@** wordt gedeeld.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5291,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 SimpleX servers kunnen uw profiel niet zien.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Je profiel wordt verzonden naar het contact van wie je deze link hebt ontvangen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.</target>
@@ -5363,10 +5475,12 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>versleuteling overeenkomen voor %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>versleuteling overeenkomen…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5381,7 +5495,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
-        <target>Onjuiste bericht ID</target>
+        <target>Onjuiste bericht-ID</target>
        <note>integrity error chat item</note>
      </trans-unit>
      <trans-unit id="bad message hash" xml:space="preserve">
@@ -5431,10 +5545,12 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>adres wijzigen voor %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>adres wijzigen…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5539,10 +5655,12 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>standaard (nee)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>standaard (ja)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5565,6 +5683,11 @@ SimpleX servers kunnen uw profiel niet zien.</target>
        <target>direct</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>uitgeschakeld</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>dubbel bericht</target>
@@ -5592,34 +5715,42 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>versleuteling overeengekomen</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>versleuteling overeengekomen voor % @</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>versleuteling ok</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>versleuteling ok voor % @</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>versleuteling heronderhandeling toegestaan</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>versleuteling heronderhandeling toegestaan voor % @</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>heronderhandeling van versleuteling vereist</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>heronderhandeling van versleuteling vereist voor % @</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5637,6 +5768,11 @@ SimpleX servers kunnen uw profiel niet zien.</target>
        <target>fout</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>gebeurtenis gebeurd</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>groep verwijderd</target>
@@ -5895,6 +6031,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>beveiligingscode gewijzigd</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6041,7 +6178,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6056,7 +6193,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
      </trans-unit>
      <trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
        <source>SimpleX uses Face ID for local authentication</source>
-        <target>SimpleX gebruikt Face ID voor lokale authenticatie</target>
+        <target>SimpleX gebruikt Face-ID voor lokale authenticatie</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
@@ -6073,7 +6210,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "nl",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="pl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 kolorowy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## Historia</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## W odpowiedzi na</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#sekret#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ i %@ połączeni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ o %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ chce się połączyć!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ i %lld innych członków połączeni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- bardziej stabilne dostarczanie wiadomości.
+- nieco lepsze grupy.
+- i więcej!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Jeszcze kilka rzeczy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Nowy kontakt</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Losowy profil zostanie wysłany do kontaktu, od którego otrzymałeś ten link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Losowy profil zostanie wysłany do Twojego kontaktu</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Nowy losowy profil zostanie udostępniony.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -455,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Akceptuj kontakt</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Zaakceptować prośbę o połączenie?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -468,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Akceptuj incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -1041,9 +1066,19 @@
        <target>Połącz</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Połączyć się przez link kontaktowy?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Połącz bezpośrednio</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Połącz incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Połącz przez link kontaktowy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1061,9 +1096,9 @@
        <target>Połącz się przez link / kod QR</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Połączyć się przez jednorazowy link?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Połącz przez jednorazowy link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1091,11 +1126,6 @@
        <target>Błąd połączenia (UWIERZYTELNIANIE)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Prośba o połączenie</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Prośba o połączenie wysłana!</target>
@@ -1148,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Kontakty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1543,12 +1574,19 @@
        <target>Usunięto o: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Dostarczenie</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Potwierdzenia dostawy są wyłączone!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Potwierdzenia dostawy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1598,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Wyłącz (zachowaj nadpisania)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1607,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Wyłącz dla wszystkich</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1671,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Nie włączaj</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1715,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Włącz (zachowaj nadpisania)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1734,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Włącz dla wszystkich</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1948,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Błąd włączania potwierdzeń dostawy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2032,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Błąd ustawiania potwierdzeń dostawy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2051,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Błąd synchronizacji połączenia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2095,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>Nawet po wyłączeniu w rozmowie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2117,13 +2164,9 @@
        <target>Wyeksportowane archiwum bazy danych.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Eksportowanie archiwum bazy danych...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Eksportowanie archiwum bazy danych…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2183,6 +2226,7 @@
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Filtruj nieprzeczytane i ulubione czaty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2192,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Szybciej znajduj czaty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Napraw</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Napraw połączenie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Naprawić połączenie?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Napraw szyfrowanie po przywróceniu kopii zapasowych.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Naprawa nie jest obsługiwana przez kontakt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Naprawa nie jest obsługiwana przez członka grupy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2416,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>Historia</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2525,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>W odpowiedzi na</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2537,14 +2589,9 @@
        <target>Tryb incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Tryb Incognito nie jest tutaj obsługiwany - główny profil zostanie wysłany do członków grupy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Tryb incognito chroni prywatność nazwy i obrazu głównego profilu — dla każdego nowego kontaktu tworzony jest nowy losowy profil.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Tryb incognito chroni Twoją prywatność używając nowego losowego profilu dla każdego kontaktu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2619,6 +2666,11 @@
        <target>Nieprawidłowy adres serwera!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Nieprawidłowy status</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Zaproszenie wygasło!</target>
@@ -2712,6 +2764,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Zachowaj swoje połączenia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2806,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Spraw, aby jedna wiadomość zniknęła</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2876,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Błąd dostarczenia wiadomości</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Potwierdzenia dostarczenia wiadomości!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2917,13 +2972,9 @@
        <target>Wiadomości i pliki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Migrowanie archiwum bazy danych...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Migrowanie archiwum bazy danych…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2966,6 +3017,11 @@
        <target>Więcej ulepszeń już wkrótce!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Najprawdopodobniej to połączenie jest usunięte.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Najprawdopodobniej ten kontakt usunął połączenie z Tobą.</target>
@@ -3071,6 +3127,11 @@
        <target>Brak kontaktów do dodania</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>Brak informacji dostawy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Brak tokenu urządzenia!</target>
@@ -3088,6 +3149,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Brak historii</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3324,10 +3386,10 @@
        <target>Wklej otrzymany link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Wklej otrzymany link w pole poniżej, aby połączyć się z kontaktem.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3341,7 +3403,7 @@
      </trans-unit>
      <trans-unit id="Permanent decryption error" xml:space="preserve">
        <source>Permanent decryption error</source>
-        <target>Błąd odszyfrowania</target>
+        <target>Stały błąd odszyfrowania</target>
        <note>message decrypt error item</note>
      </trans-unit>
      <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -3526,6 +3588,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Limit czasu protokołu na KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3540,6 +3603,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Reaguj…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3572,6 +3636,11 @@
        <target>Przeczytaj więcej na naszym [repozytorium GitHub](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Potwierdzenia są wyłączone</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Otrzymane o</target>
@@ -3614,10 +3683,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Połącz ponownie wszystkie połączone serwery, aby wymusić dostarczanie wiadomości. Wykorzystuje dodatkowy ruch.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Ponownie połączyć serwery?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3640,8 +3711,8 @@
        <target>Odrzuć</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Odrzuć kontakt (nadawca NIE został powiadomiony)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3682,14 +3753,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Renegocjuj</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Renegocjuj szyfrowanie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Renegocjować szyfrowanie?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3949,6 +4023,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Wyślij potwierdzenia dostawy do</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3988,6 +4063,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Wyślij potwierdzenia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4007,10 +4083,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>Wysyłanie potwierdzeń dostawy zostanie włączone dla wszystkich kontaktów we wszystkich widocznych profilach czatu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>Wysyłanie potwierdzeń dostawy zostanie włączone dla wszystkich kontaktów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4020,10 +4098,22 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>Wysyłanie potwierdzeń jest wyłączone dla %lld kontaktów</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>Wysyłanie potwierdzeń jest wyłączone dla %lld grup</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>Wysyłanie potwierdzeń jest włączone dla %lld kontaktów</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>Wysyłanie potwierdzeń jest włączone dla %lld grup</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4166,6 +4256,11 @@
        <target>Pokaż opcje dewelopera</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Pokaż ostatnie wiadomości</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Pokaż podgląd</target>
@@ -4246,6 +4341,11 @@
        <target>Pominięte wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Małe grupy (maks. 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.</target>
@@ -4465,6 +4565,7 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>Szyfrowanie działa, a nowe uzgodnienie szyfrowania nie jest wymagane. Może to spowodować błędy w połączeniu!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4504,6 +4605,7 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>Drugi tik, który przegapiliśmy! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4533,10 +4635,12 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Te ustawienia dotyczą Twojego bieżącego profilu **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Można je nadpisać w ustawieniach kontaktu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4554,6 +4658,11 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
        <target>Tego działania nie można cofnąć - Twój profil, kontakty, wiadomości i pliki zostaną nieodwracalnie utracone.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>Ta grupa ma ponad %lld członków, potwierdzenia dostawy nie są wysyłane.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Ta grupa już nie istnieje.</target>
@@ -4574,11 +4683,6 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
        <target>Aby się połączyć, Twój kontakt może zeskanować kod QR lub skorzystać z linku w aplikacji.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Aby znaleźć profil używany do połączenia incognito, dotknij nazwę kontaktu lub grupy w górnej części czatu.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Aby nawiązać nowe połączenie</target>
@@ -4659,7 +4763,7 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Nieoczekiwany błąd: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4798,6 +4902,11 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Użyj czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Użyj obecnego profilu</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Użyj dla nowych połączeń</target>
@@ -4808,6 +4917,11 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Użyj interfejsu połączeń iOS</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Użyj nowego profilu incognito</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Użyj serwera</target>
@@ -5020,10 +5134,12 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>Możesz włączyć później w Ustawieniach</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>Możesz je włączyć później w ustawieniach Prywatności i Bezpieczeństwa aplikacji.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5096,8 +5212,8 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Musisz wprowadzić hasło przy każdym uruchomieniu aplikacji - nie jest one przechowywane na urządzeniu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
        <target>Zaprosiłeś swój kontakt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -5226,11 +5342,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Twój profil czatu zostanie wysłany do członków grupy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Twój profil czatu zostanie wysłany do Twojego kontaktu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Twoje profile czatu</target>
@@ -5285,6 +5396,11 @@ Możesz to zmienić w Ustawieniach.</target>
        <target>Twoja prywatność</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Twój profil **%@** zostanie udostępniony.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5292,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Twój profil zostanie wysłany do kontaktu, od którego otrzymałeś ten link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Twój profil, kontakty i dostarczone wiadomości są przechowywane na Twoim urządzeniu.</target>
@@ -5364,10 +5475,12 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>uzgadnianie szyfrowania dla %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>uzgadnianie szyfrowania…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5432,10 +5545,12 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>zmienienie adresu dla %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>zmiana adresu…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5540,10 +5655,12 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>domyślnie (nie)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>domyślnie (tak)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5566,6 +5683,11 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
        <target>bezpośredni</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>wyłączony</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>zduplikowana wiadomość</target>
@@ -5593,34 +5715,42 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>uzgodniono szyfrowanie</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>uzgodniono szyfrowanie dla %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>szyfrowanie ok</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>szyfrowanie ok dla %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>renegocjacja szyfrowania dozwolona</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>renegocjacja szyfrowania dozwolona dla %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>renegocjacja szyfrowania wymagana</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>renegocjacja szyfrowania wymagana dla %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5638,6 +5768,11 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
        <target>błąd</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>nowe wydarzenie</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>grupa usunięta</target>
@@ -5896,6 +6031,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>kod bezpieczeństwa zmieniony</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6042,7 +6178,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6074,7 +6210,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="pl" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "pl",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="ru" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 цвет!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## История</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## В ответ на</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#секрет#</target>
@@ -72,8 +87,14 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ и %@ соединены</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
+        <target>%1$@ в %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -101,6 +122,11 @@
        <target>%@ хочет соединиться!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ и %lld других членов соединены</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -305,6 +331,9 @@
        <source>- more stable message delivery.
 - a bit better groups.
 - and more!</source>
+        <target>- более стабильная доставка сообщений.
+- немного улучшенные группы.
+- и прочее!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -385,6 +414,7 @@
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
        <source>A few more things</source>
+        <target>Еще несколько изменений</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
@@ -392,14 +422,9 @@
        <target>Новый контакт</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>Контакту, от которого Вы получили эту ссылку, будет отправлен случайный профиль</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>Вашему контакту будет отправлен случайный профиль</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>Будет отправлен новый случайный профиль.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -416,14 +441,17 @@
      </trans-unit>
      <trans-unit id="Abort" xml:space="preserve">
        <source>Abort</source>
+        <target>Прекратить</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address" xml:space="preserve">
        <source>Abort changing address</source>
+        <target>Прекратить изменение адреса</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address?" xml:space="preserve">
        <source>Abort changing address?</source>
+        <target>Прекратить изменение адреса?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="About SimpleX" xml:space="preserve">
@@ -452,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Принять запрос</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Принять запрос?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -465,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Принять инкогнито</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -509,6 +537,7 @@
      </trans-unit>
      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve">
        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target>Изменение адреса будет прекращено. Будет использоваться старый адрес.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -603,6 +632,7 @@
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
        <source>Allow to send files and media.</source>
+        <target>Разрешить посылать файлы и медиа.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send voice messages." xml:space="preserve">
@@ -1036,9 +1066,19 @@
        <target>Соединиться</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Соединиться через ссылку-контакт?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Соединиться напрямую</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Соединиться Инкогнито</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Соединиться через ссылку-контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1056,9 +1096,9 @@
        <target>Соединиться через ссылку / QR код</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Соединиться через одноразовую ссылку?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Соединиться через одноразовую ссылку</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1086,11 +1126,6 @@
        <target>Ошибка соединения (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Запрос на соединение</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Запрос на соединение отправлен!</target>
@@ -1143,6 +1178,7 @@
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
        <source>Contacts</source>
+        <target>Контакты</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
@@ -1538,12 +1574,19 @@
        <target>Удалено: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Доставка</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
+        <target>Отчёты о доставке выключены!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
+        <target>Отчёты о доставке!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -1593,6 +1636,7 @@
      </trans-unit>
      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
        <source>Disable (keep overrides)</source>
+        <target>Выключить (кроме исключений)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1602,6 +1646,7 @@
      </trans-unit>
      <trans-unit id="Disable for all" xml:space="preserve">
        <source>Disable for all</source>
+        <target>Выключить для всех</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -1666,6 +1711,7 @@
      </trans-unit>
      <trans-unit id="Don't enable" xml:space="preserve">
        <source>Don't enable</source>
+        <target>Не включать</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
@@ -1710,6 +1756,7 @@
      </trans-unit>
      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
        <source>Enable (keep overrides)</source>
+        <target>Включить (кроме исключений)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -1729,6 +1776,7 @@
      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
+        <target>Включить для всех</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -1848,6 +1896,7 @@
      </trans-unit>
      <trans-unit id="Error aborting address change" xml:space="preserve">
        <source>Error aborting address change</source>
+        <target>Ошибка при прекращении изменения адреса</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -1942,6 +1991,7 @@
      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
+        <target>Ошибка при включении отчётов о доставке!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2026,6 +2076,7 @@
      </trans-unit>
      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
        <source>Error setting delivery receipts!</source>
+        <target>Ошибка настроек отчётов о доставке!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2045,6 +2096,7 @@
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
+        <target>Ошибка синхронизации соединения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -2089,6 +2141,7 @@
      </trans-unit>
      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
        <source>Even when disabled in the conversation.</source>
+        <target>Даже когда они выключены в разговоре.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
@@ -2111,13 +2164,9 @@
        <target>Архив чата экспортирован.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Архив чата экспортируется...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
+        <target>Архив чата экспортируется…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2132,6 +2181,7 @@
      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
+        <target>Избранный</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File will be deleted from servers." xml:space="preserve">
@@ -2161,18 +2211,22 @@
      </trans-unit>
      <trans-unit id="Files and media" xml:space="preserve">
        <source>Files and media</source>
+        <target>Файлы и медиа</target>
        <note>chat feature</note>
      </trans-unit>
      <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>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
        <source>Files and media prohibited!</source>
+        <target>Файлы и медиа запрещены!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
        <source>Filter unread and favorite chats.</source>
+        <target>Фильтровать непрочитанные и избранные чаты.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2182,30 +2236,37 @@
      </trans-unit>
      <trans-unit id="Find chats faster" xml:space="preserve">
        <source>Find chats faster</source>
+        <target>Быстро найти чаты</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix" xml:space="preserve">
        <source>Fix</source>
+        <target>Починить</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection" xml:space="preserve">
        <source>Fix connection</source>
+        <target>Починить соединение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix connection?" xml:space="preserve">
        <source>Fix connection?</source>
+        <target>Починить соединение?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
        <source>Fix encryption after restoring backups.</source>
+        <target>Починить шифрование после восстановления из бэкапа.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by contact" xml:space="preserve">
        <source>Fix not supported by contact</source>
+        <target>Починка не поддерживается контактом</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fix not supported by group member" xml:space="preserve">
        <source>Fix not supported by group member</source>
+        <target>Починка не поддерживается членом группы</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
@@ -2315,6 +2376,7 @@
      </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">
@@ -2405,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>История</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2514,7 +2576,8 @@
      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
-        <note>copied message info</note>
+        <target>В ответ на</target>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
@@ -2526,14 +2589,9 @@
        <target>Режим Инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Режим Инкогнито здесь не поддерживается - Ваш основной профиль будет отправлен членам группы</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Режим Инкогнито защищает конфиденциальность имени и изображения Вашего основного профиля — для каждого нового контакта создается новый случайный профиль.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Режим Инкогнито защищает Вашу конфиденциальность — для каждого контакта создается новый случайный профиль.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2608,6 +2666,11 @@
        <target>Ошибка в адресе сервера!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Неверный статус</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Приглашение истекло!</target>
@@ -2701,6 +2764,7 @@
      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
+        <target>Сохраните Ваши соединения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2795,6 +2859,7 @@
      </trans-unit>
      <trans-unit id="Make one message disappear" xml:space="preserve">
        <source>Make one message disappear</source>
+        <target>Одно исчезающее сообщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
@@ -2865,10 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Ошибка доставки сообщения</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status text</note>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
+        <target>Отчеты о доставке сообщений!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2906,13 +2972,9 @@
        <target>Сообщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Данные чата перемещаются...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
+        <target>Данные чата перемещаются…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2955,6 +3017,11 @@
        <target>Дополнительные улучшения скоро!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Скорее всего, соединение удалено.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Скорее всего, этот контакт удалил соединение с Вами.</target>
@@ -3060,6 +3127,11 @@
        <target>Нет контактов для добавления</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>Нет информации от доставке</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>Отсутствует токен устройства!</target>
@@ -3067,6 +3139,7 @@
      </trans-unit>
      <trans-unit id="No filtered chats" xml:space="preserve">
        <source>No filtered chats</source>
+        <target>Нет отфильтрованных разговоров</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No group!" xml:space="preserve">
@@ -3076,6 +3149,7 @@
      </trans-unit>
      <trans-unit id="No history" xml:space="preserve">
        <source>No history</source>
+        <target>Нет истории</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -3164,6 +3238,7 @@
      </trans-unit>
      <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
        <source>Only group owners can enable files and media.</source>
+        <target>Только владельцы группы могут разрешить файлы и медиа.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
@@ -3311,10 +3386,10 @@
        <target>Вставить полученную ссылку</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
        <target>Чтобы соединиться, вставьте ссылку, полученную от Вашего контакта.</target>
-        <note>No comment provided by engineer.</note>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3488,6 +3563,7 @@
      </trans-unit>
      <trans-unit id="Prohibit sending files and media." xml:space="preserve">
        <source>Prohibit sending files and media.</source>
+        <target>Запретить слать файлы и медиа.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
@@ -3512,6 +3588,7 @@
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
+        <target>Таймаут протокола на KB</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
@@ -3526,6 +3603,7 @@
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
        <source>React…</source>
+        <target>Реакция…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3558,6 +3636,11 @@
        <target>Узнайте больше из нашего [GitHub репозитория](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Отчёты о доставке выключены</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Получено</target>
@@ -3580,6 +3663,7 @@
      </trans-unit>
      <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
        <source>Receiving address will be changed to a different server. Address change will complete after sender comes online.</source>
+        <target>Адрес получения сообщений будет перемещён на другой сервер. Изменение адреса завершится после того как отправитель будет онлайн.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3599,10 +3683,12 @@
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Повторно подключите все серверы, чтобы принудительно доставить сообщения. Используется дополнительный трафик.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
+        <target>Переподключить серверы?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -3625,8 +3711,8 @@
        <target>Отклонить</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
        <target>Отклонить (не уведомляя отправителя)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3667,14 +3753,17 @@
      </trans-unit>
      <trans-unit id="Renegotiate" xml:space="preserve">
        <source>Renegotiate</source>
+        <target>Пересогласовать</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption" xml:space="preserve">
        <source>Renegotiate encryption</source>
+        <target>Пересогласовать шифрование</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
        <source>Renegotiate encryption?</source>
+        <target>Пересогласовать шифрование?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
@@ -3934,6 +4023,7 @@
      </trans-unit>
      <trans-unit id="Send delivery receipts to" xml:space="preserve">
        <source>Send delivery receipts to</source>
+        <target>Отправка отчётов о доставке</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
@@ -3973,6 +4063,7 @@
      </trans-unit>
      <trans-unit id="Send receipts" xml:space="preserve">
        <source>Send receipts</source>
+        <target>Отправлять отчёты о доставке</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -3992,10 +4083,12 @@
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>Отправка отчётов о доставке будет включена для всех контактов во всех видимых профилях чата.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>Отправка отчётов о доставке будет включена для всех контактов.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -4005,10 +4098,22 @@
      </trans-unit>
      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>Отправка отчётов о доставке выключена для %lld контактов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>Отчёты о доставке выключены для %lld групп</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>Отправка отчётов о доставке включена для %lld контактов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>Отчёты о доставке включены для %lld групп</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
@@ -4151,6 +4256,11 @@
        <target>Показать опции для девелоперов</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Показывать последние сообщения</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Показывать уведомления</target>
@@ -4231,8 +4341,14 @@
        <target>Пропущенные сообщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Маленькие группы (до 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
+        <target>Во время импорта произошли некоторые ошибки - для получения более подробной информации вы можете обратиться к консоли.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Somebody" xml:space="preserve">
@@ -4449,6 +4565,7 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>Шифрование работает, и новое соглашение не требуется. Это может привести к ошибкам соединения!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
@@ -4488,6 +4605,7 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
        <source>The second tick we missed! ✅</source>
+        <target>Вторая галочка - знать, что доставлено! ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4517,10 +4635,12 @@ It can happen because of some bug or when the connection is compromised.</source
      </trans-unit>
      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
        <source>These settings are for your current profile **%@**.</source>
+        <target>Установки для Вашего активного профиля **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
-        <source>They can be overridden in contact settings</source>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>Они могут быть переопределены в настройках контактов и групп.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4538,6 +4658,11 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Это действие нельзя отменить — Ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
+        <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>В группе более %lld членов, отчёты о доставке выключены.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
        <source>This group no longer exists.</source>
        <target>Эта группа больше не существует.</target>
@@ -4558,11 +4683,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Чтобы соединиться с Вами, Ваш контакт может отсканировать QR-код или использовать ссылку в приложении.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>Чтобы найти инкогнито профиль, используемый в разговоре, нажмите на имя контакта или группы в верхней части чата.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Чтобы соединиться</target>
@@ -4643,7 +4763,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Неожиданная ошибка: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4652,6 +4772,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      </trans-unit>
      <trans-unit id="Unfav." xml:space="preserve">
        <source>Unfav.</source>
+        <target>Не избр.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unhide" xml:space="preserve">
@@ -4781,6 +4902,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Использовать чат</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Использовать активный профиль</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Использовать для новых соединений</target>
@@ -4791,6 +4917,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Использовать интерфейс iOS для звонков</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Использовать новый Инкогнито профиль</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Использовать сервер</target>
@@ -5003,10 +5134,12 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="You can enable later via Settings" xml:space="preserve">
        <source>You can enable later via Settings</source>
+        <target>Вы можете включить их позже в Настройках</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>Вы можете включить их позже в настройках Конфиденциальности.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -5079,9 +5212,9 @@ 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 invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
-        <target>Вы пригласили Ваш контакт</target>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
+        <target>Вы пригласили контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You joined this group" xml:space="preserve">
@@ -5209,11 +5342,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="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Ваш профиль будет отправлен Вашему контакту</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Ваши профили чата</target>
@@ -5268,6 +5396,11 @@ You can change it in Settings.</source>
        <target>Конфиденциальность</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
+        <source>Your profile **%@** will be shared.</source>
+        <target>Будет отправлен Ваш профиль **%@**.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5275,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 SimpleX серверы не могут получить доступ к Вашему профилю.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Ваш профиль будет отправлен Вашему контакту.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Ваш профиль, контакты и доставленные сообщения хранятся на Вашем устройстве.</target>
@@ -5347,10 +5475,12 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
+        <target>шифрование согласовывается для %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="agreeing encryption…" xml:space="preserve">
        <source>agreeing encryption…</source>
+        <target>шифрование согласовывается…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -5415,10 +5545,12 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
        <source>changing address for %@…</source>
+        <target>смена адреса для %@…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="changing address…" xml:space="preserve">
        <source>changing address…</source>
+        <target>смена адреса…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5523,10 +5655,12 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="default (no)" xml:space="preserve">
        <source>default (no)</source>
+        <target>по умолчанию (нет)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="default (yes)" xml:space="preserve">
        <source>default (yes)</source>
+        <target>по умолчанию (да)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
@@ -5549,6 +5683,11 @@ SimpleX серверы не могут получить доступ к Ваше
        <target>прямое</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>выключено</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>повторное сообщение</target>
@@ -5576,34 +5715,42 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="encryption agreed" xml:space="preserve">
        <source>encryption agreed</source>
+        <target>шифрование согласовано</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption agreed for %@" xml:space="preserve">
        <source>encryption agreed for %@</source>
+        <target>шифрование согласовано для %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok" xml:space="preserve">
        <source>encryption ok</source>
+        <target>шифрование работает</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption ok for %@" xml:space="preserve">
        <source>encryption ok for %@</source>
+        <target>шифрование работает для %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
        <source>encryption re-negotiation allowed</source>
+        <target>новое соглашение о шифровании разрешено</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
        <source>encryption re-negotiation allowed for %@</source>
+        <target>новое соглашение о шифровании разрешено для %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
        <source>encryption re-negotiation required</source>
+        <target>требуется новое соглашение о шифровании</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
        <source>encryption re-negotiation required for %@</source>
+        <target>требуется новое соглашение о шифровании для %@</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
@@ -5621,6 +5768,11 @@ SimpleX серверы не могут получить доступ к Ваше
        <target>ошибка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>событие произошло</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>группа удалена</target>
@@ -5753,7 +5905,7 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="moderated" xml:space="preserve">
        <source>moderated</source>
-        <target>удалено</target>
+        <target>модерировано</target>
        <note>moderated chat item</note>
      </trans-unit>
      <trans-unit id="moderated by %@" xml:space="preserve">
@@ -5788,6 +5940,7 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="no text" xml:space="preserve">
        <source>no text</source>
+        <target>нет текста</target>
        <note>copied message info in history</note>
      </trans-unit>
      <trans-unit id="observer" xml:space="preserve">
@@ -5878,6 +6031,7 @@ SimpleX серверы не могут получить доступ к Ваше
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
+        <target>код безопасности изменился</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6024,7 +6178,7 @@ SimpleX серверы не могут получить доступ к Ваше
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ru" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6056,7 +6210,7 @@ SimpleX серверы не могут получить доступ к Ваше
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="ru" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -1 +0,0 @@
-
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "ru",
  "toolInfo" : {
-    "toolBuildNumber" : "14E300c",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.3.1"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Show More
+++ b/Show More