Merge branch 'master' into av/rtl-animation

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

.github/workflows/build.yml

@@ -166,10 +166,12 @@ jobs:
         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-lib-mac.sh
-          cd apps/multiplatform
-          ./gradlew packageDmg
+          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

PRIVACY.md

@@ -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

README.md

@@ -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)
@@ -255,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.
 
@@ -274,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
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -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 {

apps/ios/Shared/Model/ChatModel.swift

@@ -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
@@ -462,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
         }
     }
@@ -483,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)
@@ -579,13 +625,6 @@ 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 {

apps/ios/Shared/Model/ImageUtils.swift

@@ -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
     }
-}
+}

apps/ios/Shared/Model/NtfManager.swift

@@ -211,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))

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -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
 }
@@ -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) {
@@ -686,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
     }
 }
@@ -701,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
     }
 }
@@ -802,14 +807,14 @@ 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, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, auto: auto) {
-        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, auto: Bool = false) 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 {
@@ -842,7 +847,7 @@ func apiReceiveFile(fileId: Int64, inline: Bool? = nil, auto: Bool = false) asyn
 
 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)
     }
 }
@@ -1244,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 {
@@ -1285,255 +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, auto: true)
-                }
+        }
+        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 {
-                let added = active(user) ? m.upsertChatItem(cInfo, cItem) : true
-                if added && cItem.showNotification {
-                    NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-                }
+        }
+        if let endTask = m.messageDelivery[cItem.id] {
+            switch cItem.meta.itemStatus {
+            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
+        }
     }
 }
 
@@ -1572,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")
@@ -1584,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
-    }
-}

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

@@ -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"))
     }
 }

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

@@ -16,8 +16,8 @@ struct CIFileView: View {
 
     var body: some View {
         let metaReserve = edited
-        ? "                         "
-        : "                     "
+        ? "                           "
+        : "                       "
         Button(action: fileAction) {
             HStack(alignment: .bottom, spacing: 6) {
                 fileIndicator()
@@ -84,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 {
@@ -109,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
             }
@@ -193,6 +193,30 @@ 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(

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

@@ -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 {
@@ -110,7 +110,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
             .padding(padding)
     }
 

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

@@ -21,27 +21,28 @@ struct CIMetaView: View {
         } else {
             let meta = chatItem.meta
             let ttl = chat.chatInfo.timedMessagesTTL
+            let encrypted = chatItem.encryptedFile
             switch meta.itemStatus {
             case let .sndSent(sndProgress):
                 switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .sent)
-                case .partial: ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .sent)
+                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, color: metaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
+                        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, color: paleMetaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd2)
+                        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)
             }
         }
     }
@@ -53,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)
@@ -80,7 +81,11 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparen
     } 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 {

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

@@ -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)

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

@@ -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()
@@ -247,10 +253,11 @@ struct CIVideoView: View {
         .padding([.trailing, .top], 11)
     }
 
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) 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, false)
+                await receiveFile(user, file.fileId, encrypted, false)
             }
         }
     }
@@ -258,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: {
@@ -282,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 {

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

@@ -159,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)
@@ -174,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")
@@ -219,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: {
@@ -251,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: {
@@ -260,7 +261,7 @@ struct VoiceMessagePlayer: View {
                 playbackTime = TimeInterval(0)
             }
         )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -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))
     }

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

@@ -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)
         }
     }
 

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

@@ -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()

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

@@ -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 {

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

@@ -80,7 +80,7 @@ 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)
     }
 }
 

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

@@ -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 {

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

@@ -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 {
@@ -737,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)
             }
         }
         

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

@@ -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
     }

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

@@ -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
     }
 }

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

@@ -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 {

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

@@ -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)
     }

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

@@ -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)")
             }
         }
     }

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

@@ -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) {
@@ -101,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)
@@ -109,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)
@@ -170,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 {

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

@@ -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

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

@@ -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)
     }
 }

apps/ios/Shared/Views/TerminalView.swift

@@ -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 {

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

@@ -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
                     }
                 }

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

@@ -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
@@ -61,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) {
@@ -70,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
@@ -121,7 +139,7 @@ struct PrivacySettings: View {
                     Button(groupReceipts ? "Enable (keep overrides)" : "Disable (keep overrides)") {
                         setSendReceiptsGroups(groupReceipts, clearOverrides: false)
                     }
-                    Button(contactReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
+                    Button(groupReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
                         setSendReceiptsGroups(groupReceipts, clearOverrides: true)
                     }
                     Button("Cancel", role: .cancel) {

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

@@ -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,
@@ -295,6 +299,10 @@ struct SettingsView: View {
             }
             .navigationTitle("Your settings")
         }
+        .onDisappear {
+            chatModel.showingTerminal = false
+            chatModel.terminalItems = []
+        }
     }
     
     private func chatDatabaseRow() -> some View {

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

@@ -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)

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

@@ -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

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

@@ -3655,6 +3655,26 @@ SimpleX servers cannot see your profile.</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">

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ 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>
@@ -114,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>
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Přijmout kontakt</target>
+        <target>Přijmout kontakt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <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 kontaktní odkaz?</target>
+        <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">
@@ -1082,7 +1098,7 @@
       </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>
+        <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">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -2735,12 +2754,12 @@
       </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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -4232,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>
@@ -4610,7 +4634,7 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
       </trans-unit>
       <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>
+        <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">
@@ -5733,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>

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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>## Vergangenheit</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve">
         <source>## In reply to</source>
+        <target>## Als Antwort auf</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
@@ -84,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>%@ und %@ wurden verbunden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ an %2$@:</target>
@@ -114,6 +122,11 @@
         <target>%@ will sich mit Ihnen verbinden!</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>%@, %@ und %lld weitere Mitglieder wurden verbunden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -411,6 +424,7 @@
       </trans-unit>
       <trans-unit id="A new random profile will be shared." xml:space="preserve">
         <source>A new random profile will be shared.</source>
+        <target>Es wird ein neues Zufallsprofil geteilt.</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">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Kontakt annehmen</target>
+        <target>Kontaktanfrage annehmen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -688,7 +702,7 @@
       </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
-        <target>App Icon</target>
+        <target>App-Icon</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App passcode" xml:space="preserve">
@@ -733,12 +747,12 @@
       </trans-unit>
       <trans-unit id="Audio/video calls" xml:space="preserve">
         <source>Audio/video calls</source>
-        <target>Audio/Video Anrufe</target>
+        <target>Audio-/Video-Anrufe</target>
         <note>chat feature</note>
       </trans-unit>
       <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
         <source>Audio/video calls are prohibited.</source>
-        <target>Audio/Video Anrufe sind nicht erlaubt.</target>
+        <target>Audio-/Video-Anrufe sind nicht erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Authentication cancelled" xml:space="preserve">
@@ -954,7 +968,7 @@
       </trans-unit>
       <trans-unit id="Chat preferences" xml:space="preserve">
         <source>Chat preferences</source>
-        <target>Chat Präferenzen</target>
+        <target>Chat-Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Direkt verbinden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Inkognito verbinden</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>Über den Kontakt-Link verbinden?</target>
+        <target>Über den Kontakt-Link verbinden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1082,7 +1098,7 @@
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>Über einen Einmal-Link verbinden?</target>
+        <target>Über einen Einmal-Link verbinden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1157,7 +1173,7 @@
       </trans-unit>
       <trans-unit id="Contact preferences" xml:space="preserve">
         <source>Contact preferences</source>
-        <target>Kontakt Präferenzen</target>
+        <target>Kontakt-Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
@@ -1217,7 +1233,7 @@
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
         <source>Create one-time invitation link</source>
-        <target>Erstellen Sie einen einmaligen Einladungslink</target>
+        <target>Einmal-Einladungslink erstellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -1560,6 +1576,7 @@
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
         <source>Delivery</source>
+        <target>Zustellung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
@@ -1594,12 +1611,12 @@
       </trans-unit>
       <trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
         <source>Device authentication is disabled. Turning off SimpleX Lock.</source>
-        <target>Die Geräteauthentifizierung ist deaktiviert. SimpleX Sperre ist abgeschaltet.</target>
+        <target>Die Geräteauthentifizierung ist deaktiviert. SimpleX-Sperre ist abgeschaltet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
         <source>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</source>
-        <target>Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</target>
+        <target>Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX-Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
@@ -1624,7 +1641,7 @@
       </trans-unit>
       <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
         <source>Disable SimpleX Lock</source>
-        <target>SimpleX Sperre deaktivieren</target>
+        <target>SimpleX-Sperre deaktivieren</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
@@ -1744,7 +1761,7 @@
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
         <source>Enable SimpleX Lock</source>
-        <target>SimpleX Sperre aktivieren</target>
+        <target>SimpleX-Sperre aktivieren</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Enable TCP keep-alive" xml:space="preserve">
@@ -1974,7 +1991,7 @@
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
         <source>Error enabling delivery receipts!</source>
-        <target>Fehler beim Aktivieren der Empfangsbestätigungen!</target>
+        <target>Fehler beim Aktivieren von Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2059,7 +2076,7 @@
       </trans-unit>
       <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
         <source>Error setting delivery receipts!</source>
-        <target>Fehler beim Setzen der Empfangsbestätigungen!</target>
+        <target>Fehler beim Setzen von Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2324,7 +2341,7 @@
       </trans-unit>
       <trans-unit id="Group invitation is no longer valid, it was removed by sender." xml:space="preserve">
         <source>Group invitation is no longer valid, it was removed by sender.</source>
-        <target>Die Gruppeneinladung ist nicht mehr gültig, sie wurde vom Absender entfernt.</target>
+        <target>Die Gruppeneinladung ist nicht mehr gültig, da sie vom Absender entfernt wurde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group link" xml:space="preserve">
@@ -2379,7 +2396,7 @@
       </trans-unit>
       <trans-unit id="Group preferences" xml:space="preserve">
         <source>Group preferences</source>
-        <target>Gruppenpräferenzen</target>
+        <target>Gruppen-Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group profile" xml:space="preserve">
@@ -2569,11 +2586,12 @@
       </trans-unit>
       <trans-unit id="Incognito mode" xml:space="preserve">
         <source>Incognito mode</source>
-        <target>Inkognito Modus</target>
+        <target>Inkognito-Modus</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">
         <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Der Inkognito-Modus schützt Ihre Privatsphäre, indem für jeden Kontakt ein neues Zufallsprofil erstellt wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2650,6 +2668,7 @@
       </trans-unit>
       <trans-unit id="Invalid status" xml:space="preserve">
         <source>Invalid status</source>
+        <target>Ungültiger Status</target>
         <note>item status text</note>
       </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
@@ -3000,6 +3019,7 @@
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
         <source>Most likely this connection is deleted.</source>
+        <target>Wahrscheinlich ist diese Verbindung gelöscht worden.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
@@ -3109,6 +3129,7 @@
       </trans-unit>
       <trans-unit id="No delivery information" xml:space="preserve">
         <source>No delivery information</source>
+        <target>Keine Information über die Zustellung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
@@ -3212,7 +3233,7 @@
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
         <source>Only group owners can change group preferences.</source>
-        <target>Gruppenpräferenzen können nur von Gruppen-Eigentümern geändert werden.</target>
+        <target>Gruppen-Präferenzen können nur von Gruppen-Eigentümern geändert werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
@@ -3312,7 +3333,7 @@
       </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
-        <target>PING Zähler</target>
+        <target>PING-Zähler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="PING interval" xml:space="preserve">
@@ -3512,7 +3533,7 @@
       </trans-unit>
       <trans-unit id="Prohibit audio/video calls." xml:space="preserve">
         <source>Prohibit audio/video calls.</source>
-        <target>Audio/Video Anrufe nicht erlauben.</target>
+        <target>Audio-/Video-Anrufe nicht erlauben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit irreversible message deletion." xml:space="preserve">
@@ -3617,6 +3638,7 @@
       </trans-unit>
       <trans-unit id="Receipts are disabled" xml:space="preserve">
         <source>Receipts are disabled</source>
+        <target>Bestätigungen sind deaktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
@@ -4041,7 +4063,7 @@
       </trans-unit>
       <trans-unit id="Send receipts" xml:space="preserve">
         <source>Send receipts</source>
-        <target>Quittierungen versenden</target>
+        <target>Bestätigungen senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4076,20 +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>Das Senden von Empfangsbestätigungen an %lld Kontakte ist deaktiviert</target>
+        <target>Sendebestätigungen sind für %lld Kontakte deaktiviert</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>Sendebestätigungen sind für %lld Gruppen deaktiviert</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>Das Senden von Empfangsbestätigungen an %lld Kontakte ist aktiviert</target>
+        <target>Sendebestätigungen sind für %lld Kontakte aktiviert</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>Sendebestätigungen sind für %lld Gruppen aktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
@@ -4154,7 +4178,7 @@
       </trans-unit>
       <trans-unit id="Set group preferences" xml:space="preserve">
         <source>Set group preferences</source>
-        <target>Gruppenpräferenzen einstellen</target>
+        <target>Gruppen-Präferenzen einstellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set it instead of system authentication." xml:space="preserve">
@@ -4232,6 +4256,11 @@
         <target>Entwickleroptionen anzeigen</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>Letzte Nachrichten anzeigen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Vorschau anzeigen</target>
@@ -4254,7 +4283,7 @@
       </trans-unit>
       <trans-unit id="SimpleX Lock" xml:space="preserve">
         <source>SimpleX Lock</source>
-        <target>SimpleX Sperre</target>
+        <target>SimpleX-Sperre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Lock mode" xml:space="preserve">
@@ -4264,12 +4293,12 @@
       </trans-unit>
       <trans-unit id="SimpleX Lock not enabled!" xml:space="preserve">
         <source>SimpleX Lock not enabled!</source>
-        <target>SimpleX Sperre ist nicht aktiviert!</target>
+        <target>SimpleX-Sperre ist nicht aktiviert!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Lock turned on" xml:space="preserve">
         <source>SimpleX Lock turned on</source>
-        <target>SimpleX Sperre aktiviert</target>
+        <target>SimpleX-Sperre aktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address" xml:space="preserve">
@@ -4279,7 +4308,7 @@
       </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
-        <target>SimpleX Kontaktadressen-Link</target>
+        <target>SimpleX-Kontaktadressen-Link</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve">
@@ -4299,7 +4328,7 @@
       </trans-unit>
       <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
         <source>SimpleX one-time invitation</source>
-        <target>SimpleX Einmal-Link</target>
+        <target>SimpleX-Einmal-Einladung</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -4314,6 +4343,7 @@
       </trans-unit>
       <trans-unit id="Small groups (max 20)" xml:space="preserve">
         <source>Small groups (max 20)</source>
+        <target>Kleine Gruppen (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">
@@ -4630,6 +4660,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </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>Es werden keine Empfangsbestätigungen gesendet, da diese Gruppe über %lld Mitglieder hat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -4670,7 +4701,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       <trans-unit id="To protect your information, turn on SimpleX Lock.&#10;You will be prompted to complete authentication before this feature is enabled." xml:space="preserve">
         <source>To protect your information, turn on SimpleX Lock.
 You will be prompted to complete authentication before this feature is enabled.</source>
-        <target>Um Ihre Informationen zu schützen, schalten Sie die SimpleX Sperre ein.
+        <target>Um Ihre Informationen zu schützen, schalten Sie die SimpleX-Sperre ein.
 Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4863,7 +4894,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
-        <target>Verwenden Sie SimpleX Chat Server?</target>
+        <target>Verwenden Sie SimpleX-Chat-Server?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
@@ -4873,6 +4904,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Use current profile" xml:space="preserve">
         <source>Use current profile</source>
+        <target>Nutzen Sie das aktuelle Profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
@@ -4887,6 +4919,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Use new incognito profile" xml:space="preserve">
         <source>Use new incognito profile</source>
+        <target>Nutzen Sie das neue Inkognito-Profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
@@ -4906,7 +4939,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
-        <target>Verwende SimpleX Chat Server.</target>
+        <target>Verwendung von SimpleX-Chat-Servern.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
@@ -5146,7 +5179,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
         <source>You can turn on SimpleX Lock via Settings.</source>
-        <target>Sie können die SimpleX Sperre über die Einstellungen aktivieren.</target>
+        <target>Sie können die SimpleX-Sperre über die Einstellungen aktivieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can use markdown to format messages:" xml:space="preserve">
@@ -5365,6 +5398,7 @@ Sie können es in den Einstellungen ändern.</target>
       </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
+        <target>Ihr Profil **%@** wird geteilt.</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">
@@ -5531,7 +5565,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </trans-unit>
       <trans-unit id="connect to SimpleX Chat developers." xml:space="preserve">
         <source>connect to SimpleX Chat developers.</source>
-        <target>Mit den SimpleX Chat Entwicklern verbinden.</target>
+        <target>Mit den SimpleX Chat-Entwicklern verbinden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connected" xml:space="preserve">
@@ -5561,7 +5595,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </trans-unit>
       <trans-unit id="connecting (introduction invitation)" xml:space="preserve">
         <source>connecting (introduction invitation)</source>
-        <target>Verbindung (eingeladen)</target>
+        <target>Verbinde (nach einer Einladung)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting call" xml:space="preserve">
@@ -5651,6 +5685,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </trans-unit>
       <trans-unit id="disabled" xml:space="preserve">
         <source>disabled</source>
+        <target>deaktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
@@ -5733,6 +5768,11 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Fehler</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>Gruppe gelöscht</target>

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -87,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>
@@ -117,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>
@@ -4246,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>
@@ -5753,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>

apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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>## Historial</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve">
         <source>## In reply to</source>
+        <target>## En respuesta a</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
@@ -84,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>%@ y %@ conectados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ a las %2$@:</target>
@@ -114,6 +122,11 @@
         <target>¡ %@ quiere contactar!</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>%@, %@ y %lld miembros más conectados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -411,6 +424,7 @@
       </trans-unit>
       <trans-unit id="A new random profile will be shared." xml:space="preserve">
         <source>A new random profile will be shared.</source>
+        <target>Se compartirá un perfil nuevo aleatorio.</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">
@@ -452,7 +466,7 @@
       </trans-unit>
       <trans-unit id="About SimpleX address" xml:space="preserve">
         <source>About SimpleX address</source>
-        <target>Acerca de dirección SimpleX</target>
+        <target>Acerca de la dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent color" xml:space="preserve">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Aceptar contacto</target>
+        <target>¿Aceptar solicitud de conexión?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -668,12 +682,12 @@
       </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
-        <target>Siempre usar relay</target>
+        <target>Usar siempre retransmisor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve">
         <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
-        <target>Se creará un perfil de chat vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</target>
+        <target>Se creará un perfil vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
@@ -823,7 +837,7 @@
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
-        <target>Mediante perfil de Chat (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
+        <target>Mediante perfil (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Conectar directamente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Conectar incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
         <source>Connect via contact link</source>
-        <target>¿Conectar mediante enlace de contacto?</target>
+        <target>Conectar mediante enlace de contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1082,7 +1098,7 @@
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>¿Conectar mediante enlace de un uso?</target>
+        <target>Conectar mediante enlace de un sólo uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1192,12 +1208,12 @@
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
         <source>Create SimpleX address</source>
-        <target>Crear dirección SimpleX</target>
+        <target>Crear tu dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
         <source>Create an address to let people connect with you.</source>
-        <target>Crear una dirección para que otras personas se puedan conectar contigo.</target>
+        <target>Crea una dirección para que otras personas puedan conectar contigo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create file" xml:space="preserve">
@@ -1232,7 +1248,7 @@
       </trans-unit>
       <trans-unit id="Create your profile" xml:space="preserve">
         <source>Create your profile</source>
-        <target>Crear tu perfil</target>
+        <target>Crea tu perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created on %@" xml:space="preserve">
@@ -1365,7 +1381,7 @@
       </trans-unit>
       <trans-unit id="Decentralized" xml:space="preserve">
         <source>Decentralized</source>
-        <target>Descentralizado</target>
+        <target>Descentralizada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Decryption error" xml:space="preserve">
@@ -1415,12 +1431,12 @@
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
-        <target>Eliminar perfil de chat</target>
+        <target>Eliminar perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile?" xml:space="preserve">
         <source>Delete chat profile?</source>
-        <target>¿Eliminar el perfil de chat?</target>
+        <target>¿Eliminar el perfil?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -1455,7 +1471,7 @@
       </trans-unit>
       <trans-unit id="Delete files for all chat profiles" xml:space="preserve">
         <source>Delete files for all chat profiles</source>
-        <target>Eliminar los archivos de todos los perfiles</target>
+        <target>Eliminar archivos de todos los perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete for everyone" xml:space="preserve">
@@ -1560,6 +1576,7 @@
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
         <source>Delivery</source>
+        <target>Entrega</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
@@ -1619,7 +1636,7 @@
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
         <source>Disable (keep overrides)</source>
-        <target>Desactivar (mantener anulaciones)</target>
+        <target>Desactivar (conservar anulaciones)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1689,7 +1706,7 @@
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
-        <target>No crear dirección</target>
+        <target>No crear dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't enable" xml:space="preserve">
@@ -2419,7 +2436,7 @@
       </trans-unit>
       <trans-unit id="Hidden chat profiles" xml:space="preserve">
         <source>Hidden chat profiles</source>
-        <target>Perfiles Chat ocultos</target>
+        <target>Perfiles ocultos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Hidden profile password" xml:space="preserve">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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>El modo incógnito protege tu privacidad creando un perfil aleatorio por cada contacto.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2650,6 +2668,7 @@
       </trans-unit>
       <trans-unit id="Invalid status" xml:space="preserve">
         <source>Invalid status</source>
+        <target>Estado no válido</target>
         <note>item status text</note>
       </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
@@ -2745,7 +2764,7 @@
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
-        <target>Mantén tus conexiones</target>
+        <target>Conserva tus conexiones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2845,7 +2864,7 @@
       </trans-unit>
       <trans-unit id="Make profile private!" xml:space="preserve">
         <source>Make profile private!</source>
-        <target>¡Hacer un perfil privado!</target>
+        <target>¡Hacer perfil privado!</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">
@@ -2880,7 +2899,7 @@
       </trans-unit>
       <trans-unit id="Markdown in messages" xml:space="preserve">
         <source>Markdown in messages</source>
-        <target>Sintaxis markdown en los mensajes</target>
+        <target>Sintaxis Markdown</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve">
@@ -3000,6 +3019,7 @@
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
         <source>Most likely this connection is deleted.</source>
+        <target>Probablemente la conexión ha sido eliminada.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
@@ -3009,7 +3029,7 @@
       </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
-        <target>Múltiples perfiles de chat</target>
+        <target>Múltiples perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mute" xml:space="preserve">
@@ -3109,6 +3129,7 @@
       </trans-unit>
       <trans-unit id="No delivery information" xml:space="preserve">
         <source>No delivery information</source>
+        <target>Sin información de entrega</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
@@ -3217,12 +3238,12 @@
       </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>Sólo los propietarios pueden activar archivos y multimedia.</target>
+        <target>Sólo los propietarios del grupo pueden activar los archivos y multimedia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
         <source>Only group owners can enable voice messages.</source>
-        <target>Sólo los propietarios pueden activar los mensajes de voz.</target>
+        <target>Sólo los propietarios del grupo pueden activar los mensajes de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
@@ -3617,6 +3638,7 @@
       </trans-unit>
       <trans-unit id="Receipts are disabled" xml:space="preserve">
         <source>Receipts are disabled</source>
+        <target>Las confirmaciones están desactivadas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
@@ -3641,7 +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>La dirección de recepción se cambiará. El cambio se completará cuando el remitente esté en línea.</target>
+        <target>La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3701,12 +3723,12 @@
       </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
-        <target>El servidor de retransmisión sólo se usará en caso necesario. Un tercero podría ver tu dirección IP.</target>
+        <target>El retransmisor sólo se usa en caso de necesidad. Un tercero podría ver tu IP.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Relay server protects your IP address, but it can observe the duration of the call." xml:space="preserve">
         <source>Relay server protects your IP address, but it can observe the duration of the call.</source>
-        <target>El servidor de retransmisión protege tu dirección IP, pero puede observar la duración de la llamada.</target>
+        <target>El servidor de retransmisión protege tu IP pero puede ver la duración de la llamada.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove" xml:space="preserve">
@@ -4081,6 +4103,7 @@
       </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>El envío de confirmaciones está desactivado para %lld grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
@@ -4090,6 +4113,7 @@
       </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>El envío de confirmaciones está activado para %lld grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
@@ -4232,6 +4256,11 @@
         <target>Mostrar opciones de desarrollador</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>Mostrar último mensaje</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Mostrar vista previa</target>
@@ -4314,6 +4343,7 @@
       </trans-unit>
       <trans-unit id="Small groups (max 20)" xml:space="preserve">
         <source>Small groups (max 20)</source>
+        <target>Grupos pequeños (máx. 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">
@@ -4353,7 +4383,7 @@
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
         <source>Stop chat to enable database actions</source>
-        <target>Para habilitar las acciones sobre la base de datos, previamente debes detener Chat</target>
+        <target>Detén SimpleX para habilitar las acciones sobre la base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." xml:space="preserve">
@@ -4560,7 +4590,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The next generation of private messaging" xml:space="preserve">
         <source>The next generation of private messaging</source>
-        <target>La próxima generación de mensajería privada</target>
+        <target>La nueva generación de mensajería privada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The old database was not removed during the migration, it can be deleted." xml:space="preserve">
@@ -4595,12 +4625,12 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="There should be at least one user profile." xml:space="preserve">
         <source>There should be at least one user profile.</source>
-        <target>Debe haber al menos un perfil de usuario.</target>
+        <target>Debe haber al menos un perfil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="There should be at least one visible user profile." xml:space="preserve">
         <source>There should be at least one visible user profile.</source>
-        <target>Debe haber al menos un perfil de usuario visible.</target>
+        <target>Debe haber al menos un perfil visible.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
@@ -4610,7 +4640,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <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>Se pueden anular en la configuración de contactos</target>
+        <target>Se pueden anular en la configuración de contactos.</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">
@@ -4630,6 +4660,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
+        <target>Este grupo tiene más de %lld miembros, no se enviarán confirmaciones de entrega.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -4681,7 +4712,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." xml:space="preserve">
         <source>To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page.</source>
-        <target>Para hacer visible tu perfil oculto, introduce la contraseña completa en el campo de búsqueda de la página **Mis perfiles**.</target>
+        <target>Para hacer visible tu perfil oculto, introduce la contraseña en el campo de búsqueda del menú **Mis perfiles**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
@@ -4751,7 +4782,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="Unhide chat profile" xml:space="preserve">
         <source>Unhide chat profile</source>
-        <target>Mostrar perfil de chat</target>
+        <target>Mostrar perfil oculto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unhide profile" xml:space="preserve">
@@ -4874,6 +4905,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Use current profile" xml:space="preserve">
         <source>Use current profile</source>
+        <target>Usar perfil actual</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
@@ -4888,6 +4920,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Use new incognito profile" xml:space="preserve">
         <source>Use new incognito profile</source>
+        <target>Usar nuevo perfil incógnito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
@@ -5067,7 +5100,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You already have a chat profile with the same display name. Please choose another name." xml:space="preserve">
         <source>You already have a chat profile with the same display name. Please choose another name.</source>
-        <target>Tienes un perfil de chat con el mismo nombre mostrado. Debes elegir otro nombre.</target>
+        <target>Ya tienes un perfil con este nombre mostrado. Por favor, elige otro nombre.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connected to %@." xml:space="preserve">
@@ -5097,7 +5130,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
         <source>You can create it later</source>
-        <target>Puedes crearlo más tarde</target>
+        <target>Puedes crearla más tarde</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can enable later via Settings" xml:space="preserve">
@@ -5112,7 +5145,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
         <source>You can hide or mute a user profile - swipe it to the right.</source>
-        <target>Puedes ocultar o silenciar un perfil de usuario: deslízalo hacia la derecha.</target>
+        <target>Puedes ocultar o silenciar un perfil deslizándolo a la derecha.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can now send messages to %@" xml:space="preserve">
@@ -5222,7 +5255,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
-        <target>Te conectarás cuando se acepte tu solicitud de conexión, por favor espere o compruébalo más tarde.</target>
+        <target>Te conectarás cuando tu solicitud se acepte, por favor espera o compruébalo más tarde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will be connected when your contact's device is online, please wait or check later!" xml:space="preserve">
@@ -5297,7 +5330,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Your chat database" xml:space="preserve">
         <source>Your chat database</source>
-        <target>Base de datos Chat</target>
+        <target>Base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat database is not encrypted - set passphrase to encrypt it." xml:space="preserve">
@@ -5307,7 +5340,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
         <source>Your chat profile will be sent to group members</source>
-        <target>Tu perfil Chat será enviado a los miembros del grupo</target>
+        <target>Tu perfil será enviado a los miembros del grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -5366,6 +5399,7 @@ Puedes cambiarlo en Configuración.</target>
       </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
+        <target>Tu perfil **%@** será compartido.</target>
         <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">
@@ -5377,7 +5411,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </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>Tu perfil, contactos y mensajes entregados se almacenan en tu dispositivo.</target>
+        <target>Tu perfil, contactos y mensajes se almacenan en tu dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
@@ -5412,7 +5446,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" xml:space="preserve">
         <source>[Star on GitHub](https://github.com/simplex-chat/simplex-chat)</source>
-        <target>[Estrella en GitHub] (https://github.com/simplex-chat/simplex-chat)</target>
+        <target>[Estrella en GitHub](https://github.com/simplex-chat/simplex-chat)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="_italic_" xml:space="preserve">
@@ -5652,6 +5686,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="disabled" xml:space="preserve">
         <source>disabled</source>
+        <target>desactivado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
@@ -5701,12 +5736,12 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
         <source>encryption re-negotiation allowed</source>
-        <target>renegociación de cifrado permitida</target>
+        <target>renegociar el cifrado permitido</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>renegociación de cifrado permitida para %@</target>
+        <target>renegociar el cifrado permitido para %@</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation required" xml:space="preserve">
@@ -5734,6 +5769,10 @@ Los servidores de SimpleX no pueden ver tu perfil.</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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>grupo eliminado</target>
@@ -5801,7 +5840,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="invited" xml:space="preserve">
         <source>invited</source>
-        <target>ha invitado a</target>
+        <target>ha sido invitado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="invited %@" xml:space="preserve">
@@ -6042,7 +6081,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="via relay" xml:space="preserve">
         <source>via relay</source>
-        <target>mediante servidor relay</target>
+        <target>mediante retransmisor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ 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>
@@ -114,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>
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Accepter le contact</target>
+        <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">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Se connecter directement</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Se connecter incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
         <source>Connect via contact link</source>
-        <target>Se connecter via le lien du contact ?</target>
+        <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">
@@ -1082,7 +1098,7 @@
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>Se connecter via le lien du contact ?</target>
+        <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">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -3109,6 +3129,7 @@
       </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">
@@ -3617,6 +3638,7 @@
       </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">
@@ -4081,6 +4103,7 @@
       </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">
@@ -4090,6 +4113,7 @@
       </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">
@@ -4232,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>
@@ -4314,6 +4343,7 @@
       </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">
@@ -4610,7 +4640,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <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 remplacés dans les paramètres des contacts</target>
+        <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">
@@ -4630,6 +4660,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </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">
@@ -4873,6 +4904,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </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">
@@ -4887,6 +4919,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </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">
@@ -5365,6 +5398,7 @@ Vous pouvez modifier ce choix dans les Paramètres.</target>
       </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">
@@ -5441,7 +5475,7 @@ 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>acceptant le chiffrement pour %@…</target>
+        <target>accord sur le chiffrement pour %@…</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="agreeing encryption…" xml:space="preserve">
@@ -5651,6 +5685,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </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">
@@ -5690,7 +5725,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="encryption ok" xml:space="preserve">
         <source>encryption ok</source>
-        <target>chiffrement ok</target>
+        <target>chiffrement OK</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption ok for %@" xml:space="preserve">
@@ -5733,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>

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -284,7 +284,7 @@ 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="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">
@@ -4981,6 +5047,270 @@ SimpleX servers cannot see your profile.</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">

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ 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>
@@ -114,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>
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Accetta il contatto</target>
+        <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">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Connetti direttamente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Connetti in incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
         <source>Connect via contact link</source>
-        <target>Connettere via link del contatto?</target>
+        <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">
@@ -1082,7 +1098,7 @@
       </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>
+        <target>Connetti via link una tantum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -3109,6 +3129,7 @@
       </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">
@@ -3617,6 +3638,7 @@
       </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">
@@ -4081,6 +4103,7 @@
       </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">
@@ -4090,6 +4113,7 @@
       </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">
@@ -4232,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>
@@ -4314,6 +4343,7 @@
       </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">
@@ -4610,7 +4640,7 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
       </trans-unit>
       <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</target>
+        <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">
@@ -4630,6 +4660,7 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
       </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">
@@ -4873,6 +4904,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
       </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">
@@ -4887,6 +4919,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
       </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">
@@ -5365,6 +5398,7 @@ Puoi modificarlo nelle impostazioni.</target>
       </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">
@@ -5651,6 +5685,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </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">
@@ -5733,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>
@@ -5845,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">

apps/ios/SimpleX Localizations/it.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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">
@@ -113,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>
@@ -317,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">
@@ -397,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">
@@ -406,6 +424,7 @@
       </trans-unit>
       <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">
@@ -422,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">
@@ -515,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">
@@ -609,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">
@@ -783,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">
@@ -1043,10 +1068,12 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>直接接続する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>シークレットモードで接続</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
@@ -1151,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">
@@ -1548,10 +1576,12 @@
       </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">
@@ -1605,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">
@@ -1614,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">
@@ -1678,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">
@@ -1722,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">
@@ -1741,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">
@@ -1860,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">
@@ -2057,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">
@@ -2101,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">
@@ -2140,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">
@@ -2169,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">
@@ -2322,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">
@@ -2521,6 +2573,7 @@
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
+        <target>返信先</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
@@ -2535,6 +2588,7 @@
       </trans-unit>
       <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">
@@ -2611,6 +2665,7 @@
       </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">
@@ -2706,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">
@@ -2800,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">
@@ -2958,6 +3015,7 @@
       </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">
@@ -3067,6 +3125,7 @@
       </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">
@@ -3076,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">
@@ -3085,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">
@@ -3173,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">
@@ -3497,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">
@@ -3521,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">
@@ -3535,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">
@@ -3593,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">
@@ -3612,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">
@@ -3680,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">
@@ -4172,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>
@@ -4254,10 +4330,12 @@
       </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">
@@ -4474,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">
@@ -4513,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">
@@ -4542,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 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">
@@ -4676,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">
@@ -4807,6 +4890,7 @@ To connect, please ask your contact to create another connection link and check
       </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">
@@ -4821,6 +4905,7 @@ To connect, please ask your contact to create another connection link and check
       </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">
@@ -5035,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">
@@ -5297,6 +5384,7 @@ You can change it in Settings.</source>
       </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">
@@ -5373,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">
@@ -5441,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">
@@ -5549,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">
@@ -5577,6 +5671,7 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
       </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">
@@ -5606,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">
@@ -5651,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>
@@ -5818,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">
@@ -5908,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">

apps/ios/SimpleX Localizations/ja.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ 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>
@@ -114,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>
@@ -231,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">
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -783,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">
@@ -1054,10 +1068,12 @@
       </trans-unit>
       <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">
@@ -1267,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">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -2694,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">
@@ -2860,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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -3109,6 +3129,7 @@
       </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">
@@ -3617,6 +3638,7 @@
       </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">
@@ -4081,6 +4103,7 @@
       </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">
@@ -4090,6 +4113,7 @@
       </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">
@@ -4232,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>
@@ -4314,6 +4343,7 @@
       </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">
@@ -4498,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">
@@ -4525,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">
@@ -4630,6 +4660,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
       </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">
@@ -4659,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">
@@ -4873,6 +4904,7 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
       </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">
@@ -4887,6 +4919,7 @@ Om verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link
       </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">
@@ -5256,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">
@@ -5334,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">
@@ -5364,6 +5398,7 @@ You can change it in Settings.</source>
       </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">
@@ -5460,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">
@@ -5650,6 +5685,7 @@ SimpleX servers kunnen uw profiel niet zien.</target>
       </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">
@@ -5732,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>
@@ -6152,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">

apps/ios/SimpleX Localizations/nl.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ 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>
@@ -114,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>
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -468,7 +482,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Akceptuj kontakt</target>
+        <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">
@@ -1054,15 +1068,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Połącz bezpośrednio</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Połącz incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
         <source>Connect via contact link</source>
-        <target>Połączyć się przez link kontaktowy?</target>
+        <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">
@@ -1082,7 +1098,7 @@
       </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>
+        <target>Połącz przez jednorazowy link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -3109,6 +3129,7 @@
       </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">
@@ -3382,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">
@@ -3617,6 +3638,7 @@
       </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">
@@ -4081,6 +4103,7 @@
       </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">
@@ -4090,6 +4113,7 @@
       </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">
@@ -4232,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>
@@ -4314,6 +4343,7 @@
       </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">
@@ -4610,7 +4640,7 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
       </trans-unit>
       <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>
+        <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">
@@ -4630,6 +4660,7 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
       </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">
@@ -4873,6 +4904,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       </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">
@@ -4887,6 +4919,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       </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">
@@ -5365,6 +5398,7 @@ Możesz to zmienić w Ustawieniach.</target>
       </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">
@@ -5651,6 +5685,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </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">
@@ -5733,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>

apps/ios/SimpleX Localizations/pl.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%@ и %@ соединены</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>
@@ -114,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>
@@ -411,6 +424,7 @@
       </trans-unit>
       <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">
@@ -1054,10 +1068,12 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Соединиться напрямую</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Соединиться Инкогнито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact link" xml:space="preserve">
@@ -1082,7 +1098,7 @@
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>Соединиться через одноразовую ссылку?</target>
+        <target>Соединиться через одноразовую ссылку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1560,6 +1576,7 @@
       </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">
@@ -2574,6 +2591,7 @@
       </trans-unit>
       <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">
@@ -2650,6 +2668,7 @@
       </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">
@@ -3000,6 +3019,7 @@
       </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">
@@ -3109,6 +3129,7 @@
       </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">
@@ -3617,6 +3638,7 @@
       </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">
@@ -4081,6 +4103,7 @@
       </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">
@@ -4090,6 +4113,7 @@
       </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">
@@ -4232,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>
@@ -4314,6 +4343,7 @@
       </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">
@@ -4630,6 +4660,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </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">
@@ -4873,6 +4904,7 @@ To connect, please ask your contact to create another connection link and check
       </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">
@@ -4887,6 +4919,7 @@ To connect, please ask your contact to create another connection link and check
       </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">
@@ -5365,6 +5398,7 @@ You can change it in Settings.</source>
       </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">
@@ -5651,6 +5685,7 @@ SimpleX серверы не могут получить доступ к Ваше
       </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">
@@ -5733,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>
@@ -5865,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">

apps/ios/SimpleX Localizations/ru.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "locale" : "th"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/Shared/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/SimpleX Localizations/th.xcloc/Source Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.533"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

apps/ios/SimpleX Localizations/th.xcloc/Source Contents/Shared/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -0,0 +1,6 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX NSE";
+/* Bundle name */
+"CFBundleName" = "SimpleX NSE";
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";

apps/ios/SimpleX Localizations/th.xcloc/Source Contents/en.lproj/Localizable.strings

@@ -0,0 +1,30 @@
+/* No comment provided by engineer. */
+"_italic_" = "\\_italic_";
+
+/* No comment provided by engineer. */
+"**Add new contact**: to create your one-time QR Code for your contact." = "**Add new contact**: to create your one-time QR Code or link for your contact.";
+
+/* No comment provided by engineer. */
+"*bold*" = "\\*bold*";
+
+/* No comment provided by engineer. */
+"`a + b`" = "\\`a + b`";
+
+/* No comment provided by engineer. */
+"~strike~" = "\\~strike~";
+
+/* call status */
+"connecting call" = "connecting call…";
+
+/* No comment provided by engineer. */
+"Connecting server…" = "Connecting to server…";
+
+/* No comment provided by engineer. */
+"Connecting server… (error: %@)" = "Connecting to server… (error: %@)";
+
+/* rcv group event chat item */
+"member connected" = "connected";
+
+/* No comment provided by engineer. */
+"No group!" = "Group not found!";
+

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

@@ -0,0 +1,10 @@
+/* Bundle name */
+"CFBundleName" = "SimpleX";
+/* Privacy - Camera Usage Description */
+"NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Microphone Usage Description */
+"NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "SimpleX needs access to Photo Library for saving captured and received media";

apps/ios/SimpleX Localizations/th.xcloc/contents.json

@@ -0,0 +1,12 @@
+{
+  "developmentRegion" : "en",
+  "project" : "SimpleX.xcodeproj",
+  "targetLocale" : "th",
+  "toolInfo" : {
+    "toolBuildNumber" : "15A5219j",
+    "toolID" : "com.apple.dt.xcode",
+    "toolName" : "Xcode",
+    "toolVersion" : "15.0"
+  },
+  "version" : "1.0"
+}

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

@@ -44,14 +44,17 @@
       </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">
@@ -84,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>%2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -113,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>
@@ -317,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">
@@ -397,6 +414,7 @@
       </trans-unit>
       <trans-unit id="A few more things" xml:space="preserve">
         <source>A few more things</source>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A new contact" xml:space="preserve">
@@ -406,6 +424,7 @@
       </trans-unit>
       <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">
@@ -4189,6 +4208,10 @@
         <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>显示预览</target>
@@ -5670,6 +5693,10 @@ SimpleX 服务器无法看到您的资料。</target>
         <target>错误</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>群组已删除</target>

apps/ios/SimpleX Localizations/zh-Hans.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/NotificationService.swift

@@ -127,7 +127,7 @@ class NotificationService: UNNotificationServiceExtension {
                 logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfMsgInfo), privacy: .public)")
                 if let connEntity = ntfMsgInfo.connEntity {
                     setBestAttemptNtf(
-                        ntfMsgInfo.user.showNotifications
+                        ntfMsgInfo.ntfsEnabled
                         ? .nse(notification: createConnectionEventNtf(ntfMsgInfo.user, connEntity))
                         : .empty
                     )
@@ -271,7 +271,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
             ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
         }
         if let file = cItem.autoReceiveFile() {
-            cItem = autoReceiveFile(file) ?? cItem
+            cItem = autoReceiveFile(file, encrypted: cItem.encryptLocalFile) ?? cItem
         }
         let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
         return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
@@ -367,25 +367,25 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
     return nil
 }
 
-func apiReceiveFile(fileId: Int64, inline: Bool? = nil) -> AChatItem? {
-    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, inline: inline))
+func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
+    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     logger.error("receiveFile error: \(responseError(r))")
     return nil
 }
 
-func apiSetFileToReceive(fileId: Int64) {
-    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId))
+func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
+    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, encrypted: encrypted))
     if case .cmdOk = r { return }
     logger.error("setFileToReceive error: \(responseError(r))")
 }
 
-func autoReceiveFile(_ file: CIFile) -> ChatItem? {
+func autoReceiveFile(_ file: CIFile, encrypted: Bool) -> ChatItem? {
     switch file.fileProtocol {
     case .smp:
-        return apiReceiveFile(fileId: file.fileId)?.chatItem
+        return apiReceiveFile(fileId: file.fileId, encrypted: false)?.chatItem
     case .xftp:
-        apiSetFileToReceive(fileId: file.fileId)
+        apiSetFileToReceive(fileId: file.fileId, encrypted: encrypted)
         return nil
     }
 }
@@ -401,4 +401,8 @@ struct NtfMessages {
     var connEntity: ConnectionEntity?
     var msgTs: Date?
     var ntfMessages: [NtfMsgInfo]
+
+    var ntfsEnabled: Bool {
+        user.showNotifications && (connEntity?.ntfsEnabled ?? false)
+    }
 }

apps/ios/SimpleX NSE/cs.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/de.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/en.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/es.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/fr.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/it.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/ja.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/nl.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/pl.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/ru.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX NSE/th.lproj/InfoPlist.strings

@@ -0,0 +1,9 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX NSE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX NSE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "ลิขสิทธิ์ © 2022 SimpleX Chat สงวนลิขสิทธิ์";
+

apps/ios/SimpleX NSE/zh-Hans.lproj/Localizable.strings

@@ -1 +0,0 @@
-

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -24,11 +24,6 @@
 		5C00168128C4FE760094D739 /* KeyChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C00168028C4FE760094D739 /* KeyChain.swift */; };
 		5C029EA82837DBB3004A9677 /* CICallItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C029EA72837DBB3004A9677 /* CICallItemView.swift */; };
 		5C029EAA283942EA004A9677 /* CallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C029EA9283942EA004A9677 /* CallController.swift */; };
-		5C0403922A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C04038D2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a */; };
-		5C0403932A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C04038E2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a */; };
-		5C0403942A7EAA41006ACFE8 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C04038F2A7EAA41006ACFE8 /* libffi.a */; };
-		5C0403952A7EAA41006ACFE8 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0403902A7EAA41006ACFE8 /* libgmp.a */; };
-		5C0403962A7EAA41006ACFE8 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0403912A7EAA41006ACFE8 /* libgmpxx.a */; };
 		5C05DF532840AA1D00C683F9 /* CallSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C05DF522840AA1D00C683F9 /* CallSettings.swift */; };
 		5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C063D2627A4564100AEC577 /* ChatPreviewView.swift */; };
 		5C10D88828EED12E00E58BF0 /* ContactConnectionInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */; };
@@ -82,6 +77,12 @@
 		5C9CC7A928C532AB00BEF955 /* DatabaseErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9CC7A828C532AB00BEF955 /* DatabaseErrorView.swift */; };
 		5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */; };
 		5C9D13A3282187BB00AB8B43 /* WebRTC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D13A2282187BB00AB8B43 /* WebRTC.swift */; };
+		5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */; };
+		5C9F83F42A9A7D98009AD0AA /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83EF2A9A7D98009AD0AA /* libffi.a */; };
+		5C9F83F52A9A7D98009AD0AA /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F02A9A7D98009AD0AA /* libgmp.a */; };
+		5C9F83F62A9A7D98009AD0AA /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F12A9A7D98009AD0AA /* libgmpxx.a */; };
+		5C9F83F72A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F22A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a */; };
+		5C9F83F82A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F32A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a */; };
 		5C9FD96E27A5D6ED0075386C /* SendMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */; };
 		5CA059DC279559F40002BEB4 /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CA059DB279559F40002BEB4 /* Tests_iOS.swift */; };
 		5CA059DE279559F40002BEB4 /* Tests_iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CA059DD279559F40002BEB4 /* Tests_iOSLaunchTests.swift */; };
@@ -92,7 +93,6 @@
 		5CADE79A29211BB900072E13 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CADE79929211BB900072E13 /* PreferencesView.swift */; };
 		5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CADE79B292131E900072E13 /* ContactPreferencesView.swift */; };
 		5CB0BA882826CB3A00B3292C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CB0BA862826CB3A00B3292C /* InfoPlist.strings */; };
-		5CB0BA8B2826CB3A00B3292C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CB0BA892826CB3A00B3292C /* Localizable.strings */; };
 		5CB0BA8E2827126500B3292C /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA8D2827126500B3292C /* OnboardingView.swift */; };
 		5CB0BA90282713D900B3292C /* SimpleXInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA8F282713D900B3292C /* SimpleXInfo.swift */; };
 		5CB0BA92282713FD00B3292C /* CreateProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA91282713FD00B3292C /* CreateProfile.swift */; };
@@ -263,11 +263,6 @@
 		5C00168028C4FE760094D739 /* KeyChain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyChain.swift; sourceTree = "<group>"; };
 		5C029EA72837DBB3004A9677 /* CICallItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CICallItemView.swift; sourceTree = "<group>"; };
 		5C029EA9283942EA004A9677 /* CallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallController.swift; sourceTree = "<group>"; };
-		5C04038D2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5C04038E2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a"; sourceTree = "<group>"; };
-		5C04038F2A7EAA41006ACFE8 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5C0403902A7EAA41006ACFE8 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C0403912A7EAA41006ACFE8 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 		5C05DF522840AA1D00C683F9 /* CallSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallSettings.swift; sourceTree = "<group>"; };
 		5C063D2627A4564100AEC577 /* ChatPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatPreviewView.swift; sourceTree = "<group>"; };
 		5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactConnectionInfo.swift; sourceTree = "<group>"; };
@@ -302,11 +297,9 @@
 		5C5F2B6C27EBC3FE006A9D5F /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileImage.swift; sourceTree = "<group>"; };
 		5C65DAE429C77136003CEE45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		5C65DAE529C77136003CEE45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		5C65DAE629C771B9003CEE45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C65DAE729C771B9003CEE45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		5C65DAEA29CB8867003CEE45 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5C65DAEB29CB8867003CEE45 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C65DAEC29CB8908003CEE45 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = "es.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C65DAED29CB8908003CEE45 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5C65DAF829D0CC20003CEE45 /* DeveloperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperView.swift; sourceTree = "<group>"; };
@@ -321,11 +314,9 @@
 		5C7505A727B6D34800BE3227 /* ChatInfoToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoToolbar.swift; sourceTree = "<group>"; };
 		5C764E88279CBCB3000C6508 /* ChatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatModel.swift; sourceTree = "<group>"; };
 		5C84FE9129A216C800D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5C84FE9229A216C800D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C84FE9329A2179C00D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = "nl.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C84FE9429A2179C00D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5C8B41C929AF41BC00888272 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5C8B41CA29AF41BC00888272 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C8B41CB29AF44CF00888272 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = "cs.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C8B41CC29AF44CF00888272 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5C93292E29239A170090FFF9 /* ProtocolServersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProtocolServersView.swift; sourceTree = "<group>"; };
@@ -340,8 +331,13 @@
 		5C9C2DA82899DA6F00CC63B1 /* NetworkAndServers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkAndServers.swift; sourceTree = "<group>"; };
 		5C9CC7A828C532AB00BEF955 /* DatabaseErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseErrorView.swift; sourceTree = "<group>"; };
 		5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseEncryptionView.swift; sourceTree = "<group>"; };
-		5C9CC7B128D1F8F400BEF955 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C9D13A2282187BB00AB8B43 /* WebRTC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebRTC.swift; sourceTree = "<group>"; };
+		5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoFile.swift; sourceTree = "<group>"; };
+		5C9F83EF2A9A7D98009AD0AA /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C9F83F02A9A7D98009AD0AA /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C9F83F12A9A7D98009AD0AA /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C9F83F22A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5C9F83F32A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a"; sourceTree = "<group>"; };
 		5C9FD96A27A56D4D0075386C /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
 		5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMessageView.swift; sourceTree = "<group>"; };
 		5CA059C3279559F40002BEB4 /* SimpleXApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXApp.swift; sourceTree = "<group>"; };
@@ -351,21 +347,20 @@
 		5CA059D7279559F40002BEB4 /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CA059DB279559F40002BEB4 /* Tests_iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_iOS.swift; sourceTree = "<group>"; };
 		5CA059DD279559F40002BEB4 /* Tests_iOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_iOSLaunchTests.swift; sourceTree = "<group>"; };
+		5CA3ED4D2A942170005D71E2 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Localizable.strings; sourceTree = "<group>"; };
+		5CA3ED4F2A9422D1005D71E2 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = "th.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
+		5CA3ED502A9422D1005D71E2 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5CA7DFC229302AF000F7FDDE /* AppSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSheet.swift; sourceTree = "<group>"; };
 		5CA85D0A297218AA0095AF72 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5CA85D0B297218AA0095AF72 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CA85D0C297219EF0095AF72 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = "it.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CA85D0D297219EF0095AF72 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5CAB912529E93F9400F34A95 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5CAB912629E93F9400F34A95 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CAC41182A192D8400C331A2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5CAC41192A192D8400C331A2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CAC411A2A192DE800C331A2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = "ja.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CAC411B2A192DE800C331A2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5CADE79929211BB900072E13 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
 		5CADE79B292131E900072E13 /* ContactPreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactPreferencesView.swift; sourceTree = "<group>"; };
 		5CB0BA872826CB3A00B3292C /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		5CB0BA8A2826CB3A00B3292C /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CB0BA8D2827126500B3292C /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
 		5CB0BA8F282713D900B3292C /* SimpleXInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXInfo.swift; sourceTree = "<group>"; };
 		5CB0BA91282713FD00B3292C /* CreateProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateProfile.swift; sourceTree = "<group>"; };
@@ -374,7 +369,6 @@
 		5CB2085028DB64CA00D024EC /* CreateLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateLinkView.swift; sourceTree = "<group>"; };
 		5CB2085228DB7CAF00D024EC /* ConnectViaLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectViaLinkView.swift; sourceTree = "<group>"; };
 		5CB2085428DE647400D024EC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5CB2085528DE647400D024EC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CB346E42868AA7F001FD2EF /* SuspendChat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuspendChat.swift; sourceTree = "<group>"; };
 		5CB346E62868D76D001FD2EF /* NotificationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsView.swift; sourceTree = "<group>"; };
 		5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushEnvironment.swift; sourceTree = "<group>"; };
@@ -386,7 +380,6 @@
 		5CB924E027A867BA00ACCCDD /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
 		5CB9250C27A9432000ACCCDD /* ChatListNavLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListNavLink.swift; sourceTree = "<group>"; };
 		5CBD285529565CAE00EC2CF4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5CBD285629565CAE00EC2CF4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CBD285729565D2600EC2CF4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CBD285829565D2600EC2CF4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5CBD2859295711D700EC2CF4 /* ImageUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageUtils.swift; sourceTree = "<group>"; };
@@ -501,13 +494,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C0403932A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a in Frameworks */,
-				5C0403922A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a in Frameworks */,
+				5C9F83F82A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C0403942A7EAA41006ACFE8 /* libffi.a in Frameworks */,
-				5C0403952A7EAA41006ACFE8 /* libgmp.a in Frameworks */,
+				5C9F83F72A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a in Frameworks */,
+				5C9F83F62A9A7D98009AD0AA /* libgmpxx.a in Frameworks */,
+				5C9F83F42A9A7D98009AD0AA /* libffi.a in Frameworks */,
+				5C9F83F52A9A7D98009AD0AA /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C0403962A7EAA41006ACFE8 /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,11 +561,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C04038F2A7EAA41006ACFE8 /* libffi.a */,
-				5C0403902A7EAA41006ACFE8 /* libgmp.a */,
-				5C0403912A7EAA41006ACFE8 /* libgmpxx.a */,
-				5C04038D2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5-ghc8.10.7.a */,
-				5C04038E2A7EAA41006ACFE8 /* libHSsimplex-chat-5.3.0.2-57EsBXX08D1H5qwhz1zMA5.a */,
+				5C9F83EF2A9A7D98009AD0AA /* libffi.a */,
+				5C9F83F02A9A7D98009AD0AA /* libgmp.a */,
+				5C9F83F12A9A7D98009AD0AA /* libgmpxx.a */,
+				5C9F83F22A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h-ghc8.10.7.a */,
+				5C9F83F32A9A7D98009AD0AA /* libHSsimplex-chat-5.3.0.6-5utBXdHr6QFBiN3wb3H70h.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -732,10 +725,10 @@
 				5CADE79929211BB900072E13 /* PreferencesView.swift */,
 				5C5DB70D289ABDD200730FFF /* AppearanceSettings.swift */,
 				5C05DF522840AA1D00C683F9 /* CallSettings.swift */,
-				5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */,
 				5CB924E027A867BA00ACCCDD /* UserProfile.swift */,
 				5CC036DF29C488D500C0EF20 /* HiddenProfileView.swift */,
 				5C577F7C27C83AA10006112D /* MarkdownHelp.swift */,
+				5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */,
 				5C93292E29239A170090FFF9 /* ProtocolServersView.swift */,
 				5C93293029239BED0090FFF9 /* ProtocolServerView.swift */,
 				5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */,
@@ -772,7 +765,6 @@
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
-				5CB0BA892826CB3A00B3292C /* Localizable.strings */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
 			);
 			path = "SimpleX NSE";
@@ -789,6 +781,7 @@
 				5CDCAD7D2818941F00503DA2 /* API.swift */,
 				5CDCAD80281A7E2700503DA2 /* Notifications.swift */,
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
+				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
@@ -1012,6 +1005,7 @@
 				es,
 				pl,
 				ja,
+				th,
 			);
 			mainGroup = 5CA059BD279559F40002BEB4;
 			packageReferences = (
@@ -1057,7 +1051,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CB0BA882826CB3A00B3292C /* InfoPlist.strings in Resources */,
-				5CB0BA8B2826CB3A00B3292C /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1246,6 +1239,7 @@
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
 				5CE2BA8B284533A300EC33A6 /* ChatTypes.swift in Sources */,
 				5CE2BA8F284533A300EC33A6 /* APITypes.swift in Sources */,
+				5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */,
 				5CE2BA8C284533A300EC33A6 /* AppGroup.swift in Sources */,
 				5CE2BA8D284533A300EC33A6 /* CallTypes.swift in Sources */,
 				5CE2BA8E284533A300EC33A6 /* API.swift in Sources */,
@@ -1292,28 +1286,11 @@
 				5C65DAED29CB8908003CEE45 /* es */,
 				5C6D183329E93FBA00D430B3 /* pl */,
 				5CAC411B2A192DE800C331A2 /* ja */,
+				5CA3ED502A9422D1005D71E2 /* th */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		5CB0BA892826CB3A00B3292C /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				5CB0BA8A2826CB3A00B3292C /* ru */,
-				5C9CC7B128D1F8F400BEF955 /* en */,
-				5CB2085528DE647400D024EC /* de */,
-				5CBD285629565CAE00EC2CF4 /* fr */,
-				5CA85D0B297218AA0095AF72 /* it */,
-				5C84FE9229A216C800D95B1A /* nl */,
-				5C8B41CA29AF41BC00888272 /* cs */,
-				5C65DAE529C77136003CEE45 /* zh-Hans */,
-				5C65DAEB29CB8867003CEE45 /* es */,
-				5CAB912629E93F9400F34A95 /* pl */,
-				5CAC41192A192D8400C331A2 /* ja */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
 		5CC2C0FA2809BF11000C35E3 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -1328,6 +1305,7 @@
 				5C65DAEA29CB8867003CEE45 /* es */,
 				5CAB912529E93F9400F34A95 /* pl */,
 				5CAC41182A192D8400C331A2 /* ja */,
+				5CA3ED4D2A942170005D71E2 /* th */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1345,6 +1323,7 @@
 				5C65DAEC29CB8908003CEE45 /* es */,
 				5C6D183229E93FBA00D430B3 /* pl */,
 				5CAC411A2A192DE800C331A2 /* ja */,
+				5CA3ED4F2A9422D1005D71E2 /* th */,
 			);
 			name = "SimpleX--iOS--InfoPlist.strings";
 			sourceTree = "<group>";
@@ -1478,7 +1457,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1520,7 +1499,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1600,7 +1579,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1632,7 +1611,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1664,7 +1643,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1688,7 +1667,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.2.2;
+				MARKETING_VERSION = 5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1710,7 +1689,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 169;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1734,7 +1713,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.2.2;
+				MARKETING_VERSION = 5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -136,7 +136,7 @@ public func chatResponse(_ s: String) -> ChatResponse {
             type = jResp.allKeys[0] as? String
             if type == "apiChats" {
                 if let jApiChats = jResp["apiChats"] as? NSDictionary,
-                   let user: User = try? decodeObject(jApiChats["user"] as Any),
+                   let user: UserRef = try? decodeObject(jApiChats["user"] as Any),
                    let jChats = jApiChats["chats"] as? NSArray {
                     let chats = jChats.map { jChat in
                         if let chatData = try? parseChatData(jChat) {
@@ -148,16 +148,21 @@ public func chatResponse(_ s: String) -> ChatResponse {
                 }
             } else if type == "apiChat" {
                 if let jApiChat = jResp["apiChat"] as? NSDictionary,
-                   let user: User = try? decodeObject(jApiChat["user"] as Any),
+                   let user: UserRef = try? decodeObject(jApiChat["user"] as Any),
                    let jChat = jApiChat["chat"] as? NSDictionary,
                    let chat = try? parseChatData(jChat) {
                     return .apiChat(user: user, chat: chat)
                 }
             } else if type == "chatCmdError" {
                 if let jError = jResp["chatCmdError"] as? NSDictionary {
-                    let user: User? = try? decodeObject(jError["user_"] as Any)
+                    let user: UserRef? = try? decodeObject(jError["user_"] as Any)
                     return .chatCmdError(user_: user, chatError: .invalidJSON(json: prettyJSON(jError) ?? ""))
                 }
+            } else if type == "chatError" {
+                if let jError = jResp["chatError"] as? NSDictionary {
+                    let user: UserRef? = try? decodeObject(jError["user_"] as Any)
+                    return .chatError(user_: user, chatError: .invalidJSON(json: prettyJSON(jError) ?? ""))
+                }
             }
         }
         json = prettyJSON(j)

apps/ios/SimpleXChat/APITypes.swift

@@ -9,7 +9,7 @@
 import Foundation
 import SwiftUI
 
-let jsonDecoder = getJSONDecoder()
+public let jsonDecoder = getJSONDecoder()
 let jsonEncoder = getJSONEncoder()
 
 public enum ChatCommand {
@@ -39,7 +39,7 @@ public enum ChatCommand {
     case apiGetChats(userId: Int64)
     case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
     case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
-    case apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
+    case apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
     case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
     case apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode)
     case apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64)
@@ -110,8 +110,8 @@ public enum ChatCommand {
     case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
     case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
     case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, inline: Bool?)
-    case setFileToReceive(fileId: Int64)
+    case receiveFile(fileId: Int64, encrypted: Bool, inline: Bool?)
+    case setFileToReceive(fileId: Int64, encrypted: Bool)
     case cancelFile(fileId: Int64)
     case showVersion
     case string(String)
@@ -157,7 +157,7 @@ public enum ChatCommand {
                 (search == "" ? "" : " search=\(search)")
             case let .apiGetChatItemInfo(type, id, itemId): return "/_get item info \(ref(type, id)) \(itemId)"
             case let .apiSendMessage(type, id, file, quotedItemId, mc, live, ttl):
-                let msg = encodeJSON(ComposedMessage(filePath: file, quotedItemId: quotedItemId, msgContent: mc))
+                let msg = encodeJSON(ComposedMessage(fileSource: file, quotedItemId: quotedItemId, msgContent: mc))
                 let ttlStr = ttl != nil ? "\(ttl!)" : "default"
                 return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msg)"
             case let .apiUpdateChatItem(type, id, itemId, mc, live): return "/_update item \(ref(type, id)) \(itemId) live=\(onOff(live)) \(mc.cmdString)"
@@ -239,12 +239,13 @@ public enum ChatCommand {
             case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
             case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
             case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, inline):
+            case let .receiveFile(fileId, encrypted, inline):
+                let s = "/freceive \(fileId) encrypt=\(onOff(encrypted))"
                 if let inline = inline {
-                    return "/freceive \(fileId) inline=\(onOff(inline))"
+                    return s + " inline=\(onOff(inline))"
                 }
-                return "/freceive \(fileId)"
-            case let .setFileToReceive(fileId): return "/_set_file_to_receive \(fileId)"
+                return s
+            case let .setFileToReceive(fileId, encrypted): return "/_set_file_to_receive \(fileId) encrypt=\(onOff(encrypted))"
             case let .cancelFile(fileId): return "/fcancel \(fileId)"
             case .showVersion: return "/version"
             case let .string(str): return str
@@ -424,128 +425,128 @@ public enum ChatResponse: Decodable, Error {
     case chatRunning
     case chatStopped
     case chatSuspended
-    case apiChats(user: User, chats: [ChatData])
-    case apiChat(user: User, chat: ChatData)
-    case chatItemInfo(user: User, chatItem: AChatItem, chatItemInfo: ChatItemInfo)
-    case userProtoServers(user: User, servers: UserProtoServers)
-    case serverTestResult(user: User, testServer: String, testFailure: ProtocolTestFailure?)
-    case chatItemTTL(user: User, chatItemTTL: Int64?)
+    case apiChats(user: UserRef, chats: [ChatData])
+    case apiChat(user: UserRef, chat: ChatData)
+    case chatItemInfo(user: UserRef, chatItem: AChatItem, chatItemInfo: ChatItemInfo)
+    case userProtoServers(user: UserRef, servers: UserProtoServers)
+    case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
+    case chatItemTTL(user: UserRef, chatItemTTL: Int64?)
     case networkConfig(networkConfig: NetCfg)
-    case contactInfo(user: User, contact: Contact, connectionStats: ConnectionStats, customUserProfile: Profile?)
-    case groupMemberInfo(user: User, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
-    case contactSwitchStarted(user: User, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberSwitchStarted(user: User, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactSwitchAborted(user: User, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberSwitchAborted(user: User, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactSwitch(user: User, contact: Contact, switchProgress: SwitchProgress)
-    case groupMemberSwitch(user: User, groupInfo: GroupInfo, member: GroupMember, switchProgress: SwitchProgress)
-    case contactRatchetSyncStarted(user: User, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberRatchetSyncStarted(user: User, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactRatchetSync(user: User, contact: Contact, ratchetSyncProgress: RatchetSyncProgress)
-    case groupMemberRatchetSync(user: User, groupInfo: GroupInfo, member: GroupMember, ratchetSyncProgress: RatchetSyncProgress)
-    case contactVerificationReset(user: User, contact: Contact)
-    case groupMemberVerificationReset(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case contactCode(user: User, contact: Contact, connectionCode: String)
-    case groupMemberCode(user: User, groupInfo: GroupInfo, member: GroupMember, connectionCode: String)
-    case connectionVerified(user: User, verified: Bool, expectedCode: String)
-    case invitation(user: User, connReqInvitation: String, connection: PendingContactConnection)
-    case connectionIncognitoUpdated(user: User, toConnection: PendingContactConnection)
-    case sentConfirmation(user: User)
-    case sentInvitation(user: User)
-    case contactAlreadyExists(user: User, contact: Contact)
-    case contactRequestAlreadyAccepted(user: User, contact: Contact)
-    case contactDeleted(user: User, contact: Contact)
-    case chatCleared(user: User, chatInfo: ChatInfo)
+    case contactInfo(user: UserRef, contact: Contact, connectionStats: ConnectionStats, customUserProfile: Profile?)
+    case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
+    case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactSwitchAborted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberSwitchAborted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactSwitch(user: UserRef, contact: Contact, switchProgress: SwitchProgress)
+    case groupMemberSwitch(user: UserRef, groupInfo: GroupInfo, member: GroupMember, switchProgress: SwitchProgress)
+    case contactRatchetSyncStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberRatchetSyncStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactRatchetSync(user: UserRef, contact: Contact, ratchetSyncProgress: RatchetSyncProgress)
+    case groupMemberRatchetSync(user: UserRef, groupInfo: GroupInfo, member: GroupMember, ratchetSyncProgress: RatchetSyncProgress)
+    case contactVerificationReset(user: UserRef, contact: Contact)
+    case groupMemberVerificationReset(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case contactCode(user: UserRef, contact: Contact, connectionCode: String)
+    case groupMemberCode(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionCode: String)
+    case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
+    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
+    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
+    case sentConfirmation(user: UserRef)
+    case sentInvitation(user: UserRef)
+    case contactAlreadyExists(user: UserRef, contact: Contact)
+    case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
+    case contactDeleted(user: UserRef, contact: Contact)
+    case chatCleared(user: UserRef, chatInfo: ChatInfo)
     case userProfileNoChange(user: User)
-    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile)
+    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
     case userPrivacy(user: User, updatedUser: User)
-    case contactAliasUpdated(user: User, toContact: Contact)
-    case connectionAliasUpdated(user: User, toConnection: PendingContactConnection)
+    case contactAliasUpdated(user: UserRef, toContact: Contact)
+    case connectionAliasUpdated(user: UserRef, toConnection: PendingContactConnection)
     case contactPrefsUpdated(user: User, fromContact: Contact, toContact: Contact)
     case userContactLink(user: User, contactLink: UserContactLink)
     case userContactLinkUpdated(user: User, contactLink: UserContactLink)
     case userContactLinkCreated(user: User, connReqContact: String)
     case userContactLinkDeleted(user: User)
-    case contactConnected(user: User, contact: Contact, userCustomProfile: Profile?)
-    case contactConnecting(user: User, contact: Contact)
-    case receivedContactRequest(user: User, contactRequest: UserContactRequest)
-    case acceptingContactRequest(user: User, contact: Contact)
-    case contactRequestRejected(user: User)
-    case contactUpdated(user: User, toContact: Contact)
+    case contactConnected(user: UserRef, contact: Contact, userCustomProfile: Profile?)
+    case contactConnecting(user: UserRef, contact: Contact)
+    case receivedContactRequest(user: UserRef, contactRequest: UserContactRequest)
+    case acceptingContactRequest(user: UserRef, contact: Contact)
+    case contactRequestRejected(user: UserRef)
+    case contactUpdated(user: UserRef, toContact: Contact)
     case contactsSubscribed(server: String, contactRefs: [ContactRef])
     case contactsDisconnected(server: String, contactRefs: [ContactRef])
-    case contactSubError(user: User, contact: Contact, chatError: ChatError)
-    case contactSubSummary(user: User, contactSubscriptions: [ContactSubStatus])
-    case groupSubscribed(user: User, groupInfo: GroupInfo)
-    case memberSubErrors(user: User, memberSubErrors: [MemberSubError])
-    case groupEmpty(user: User, groupInfo: GroupInfo)
+    case contactSubError(user: UserRef, contact: Contact, chatError: ChatError)
+    case contactSubSummary(user: UserRef, contactSubscriptions: [ContactSubStatus])
+    case groupSubscribed(user: UserRef, groupInfo: GroupInfo)
+    case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
+    case groupEmpty(user: UserRef, groupInfo: GroupInfo)
     case userContactLinkSubscribed
-    case newChatItem(user: User, chatItem: AChatItem)
-    case chatItemStatusUpdated(user: User, chatItem: AChatItem)
-    case chatItemUpdated(user: User, chatItem: AChatItem)
-    case chatItemNotChanged(user: User, chatItem: AChatItem)
-    case chatItemReaction(user: User, added: Bool, reaction: ACIReaction)
-    case chatItemDeleted(user: User, deletedChatItem: AChatItem, toChatItem: AChatItem?, byUser: Bool)
-    case contactsList(user: User, contacts: [Contact])
+    case newChatItem(user: UserRef, chatItem: AChatItem)
+    case chatItemStatusUpdated(user: UserRef, chatItem: AChatItem)
+    case chatItemUpdated(user: UserRef, chatItem: AChatItem)
+    case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
+    case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
+    case chatItemDeleted(user: UserRef, deletedChatItem: AChatItem, toChatItem: AChatItem?, byUser: Bool)
+    case contactsList(user: UserRef, contacts: [Contact])
     // group events
-    case groupCreated(user: User, groupInfo: GroupInfo)
-    case sentGroupInvitation(user: User, groupInfo: GroupInfo, contact: Contact, member: GroupMember)
-    case userAcceptedGroupSent(user: User, groupInfo: GroupInfo, hostContact: Contact?)
-    case userDeletedMember(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case leftMemberUser(user: User, groupInfo: GroupInfo)
-    case groupMembers(user: User, group: Group)
-    case receivedGroupInvitation(user: User, groupInfo: GroupInfo, contact: Contact, memberRole: GroupMemberRole)
-    case groupDeletedUser(user: User, groupInfo: GroupInfo)
-    case joinedGroupMemberConnecting(user: User, groupInfo: GroupInfo, hostMember: GroupMember, member: GroupMember)
-    case memberRole(user: User, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
-    case memberRoleUser(user: User, groupInfo: GroupInfo, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
-    case deletedMemberUser(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case deletedMember(user: User, groupInfo: GroupInfo, byMember: GroupMember, deletedMember: GroupMember)
-    case leftMember(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case groupDeleted(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case contactsMerged(user: User, intoContact: Contact, mergedContact: Contact)
-    case groupInvitation(user: User, groupInfo: GroupInfo) // unused
-    case userJoinedGroup(user: User, groupInfo: GroupInfo)
-    case joinedGroupMember(user: User, groupInfo: GroupInfo, member: GroupMember)
-    case connectedToGroupMember(user: User, groupInfo: GroupInfo, member: GroupMember, memberContact: Contact?)
-    case groupRemoved(user: User, groupInfo: GroupInfo) // unused
-    case groupUpdated(user: User, toGroup: GroupInfo)
-    case groupLinkCreated(user: User, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
-    case groupLink(user: User, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
-    case groupLinkDeleted(user: User, groupInfo: GroupInfo)
+    case groupCreated(user: UserRef, groupInfo: GroupInfo)
+    case sentGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, member: GroupMember)
+    case userAcceptedGroupSent(user: UserRef, groupInfo: GroupInfo, hostContact: Contact?)
+    case userDeletedMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case leftMemberUser(user: UserRef, groupInfo: GroupInfo)
+    case groupMembers(user: UserRef, group: Group)
+    case receivedGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, memberRole: GroupMemberRole)
+    case groupDeletedUser(user: UserRef, groupInfo: GroupInfo)
+    case joinedGroupMemberConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, member: GroupMember)
+    case memberRole(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
+    case memberRoleUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
+    case deletedMemberUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case deletedMember(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, deletedMember: GroupMember)
+    case leftMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case groupDeleted(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case contactsMerged(user: UserRef, intoContact: Contact, mergedContact: Contact)
+    case groupInvitation(user: UserRef, groupInfo: GroupInfo) // unused
+    case userJoinedGroup(user: UserRef, groupInfo: GroupInfo)
+    case joinedGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case connectedToGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember, memberContact: Contact?)
+    case groupRemoved(user: UserRef, groupInfo: GroupInfo) // unused
+    case groupUpdated(user: UserRef, toGroup: GroupInfo)
+    case groupLinkCreated(user: UserRef, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
+    case groupLink(user: UserRef, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
+    case groupLinkDeleted(user: UserRef, groupInfo: GroupInfo)
     // receiving file events
-    case rcvFileAccepted(user: User, chatItem: AChatItem)
-    case rcvFileAcceptedSndCancelled(user: User, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileStart(user: User, chatItem: AChatItem)
-    case rcvFileProgressXFTP(user: User, chatItem: AChatItem, receivedSize: Int64, totalSize: Int64)
-    case rcvFileComplete(user: User, chatItem: AChatItem)
-    case rcvFileCancelled(user: User, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileSndCancelled(user: User, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileError(user: User, chatItem: AChatItem)
+    case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
+    case rcvFileAcceptedSndCancelled(user: UserRef, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileStart(user: UserRef, chatItem: AChatItem)
+    case rcvFileProgressXFTP(user: UserRef, chatItem: AChatItem, receivedSize: Int64, totalSize: Int64)
+    case rcvFileComplete(user: UserRef, chatItem: AChatItem)
+    case rcvFileCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileSndCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileError(user: UserRef, chatItem: AChatItem)
     // sending file events
-    case sndFileStart(user: User, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileComplete(user: User, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileCancelled(user: User, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
-    case sndFileRcvCancelled(user: User, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileProgressXFTP(user: User, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
-    case sndFileCompleteXFTP(user: User, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
-    case sndFileError(user: User, chatItem: AChatItem)
+    case sndFileStart(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileComplete(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileCancelled(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
+    case sndFileRcvCancelled(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileProgressXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
+    case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
+    case sndFileError(user: UserRef, chatItem: AChatItem)
     // call events
     case callInvitation(callInvitation: RcvCallInvitation)
-    case callOffer(user: User, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
-    case callAnswer(user: User, contact: Contact, answer: WebRTCSession)
-    case callExtraInfo(user: User, contact: Contact, extraInfo: WebRTCExtraInfo)
-    case callEnded(user: User, contact: Contact)
+    case callOffer(user: UserRef, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
+    case callAnswer(user: UserRef, contact: Contact, answer: WebRTCSession)
+    case callExtraInfo(user: UserRef, contact: Contact, extraInfo: WebRTCExtraInfo)
+    case callEnded(user: UserRef, contact: Contact)
     case callInvitations(callInvitations: [RcvCallInvitation])
     case ntfTokenStatus(status: NtfTknStatus)
     case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
     case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
-    case newContactConnection(user: User, connection: PendingContactConnection)
-    case contactConnectionDeleted(user: User, connection: PendingContactConnection)
+    case newContactConnection(user: UserRef, connection: PendingContactConnection)
+    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
     case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
-    case cmdOk(user: User?)
-    case chatCmdError(user_: User?, chatError: ChatError)
-    case chatError(user_: User?, chatError: ChatError)
+    case cmdOk(user: UserRef?)
+    case chatCmdError(user_: UserRef?, chatError: ChatError)
+    case chatError(user_: UserRef?, chatError: ChatError)
     case archiveImported(archiveErrors: [ArchiveError])
 
     public var responseType: String {
@@ -724,7 +725,7 @@ public enum ChatResponse: Decodable, Error {
             case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
             case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
             case .userProfileNoChange: return noDetails
-            case let .userProfileUpdated(u, _, toProfile): return withUser(u, String(describing: toProfile))
+            case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
             case let .userPrivacy(u, updatedUser): return withUser(u, String(describing: updatedUser))
             case let .contactAliasUpdated(u, toContact): return withUser(u, String(describing: toContact))
             case let .connectionAliasUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
@@ -816,7 +817,7 @@ public enum ChatResponse: Decodable, Error {
 
     private var noDetails: String { get { "\(responseType): no details" } }
 
-    private func withUser(_ u: User?, _ s: String) -> String {
+    private func withUser(_ u: (any UserLike)?, _ s: String) -> String {
         if let id = u?.userId {
             return "userId: \(id)\n\(s)"
         }
@@ -853,7 +854,7 @@ public enum ChatPagination {
 }
 
 struct ComposedMessage: Encodable {
-    var filePath: String?
+    var fileSource: CryptoFile?
     var quotedItemId: Int64?
     var msgContent: MsgContent
 }

apps/ios/SimpleXChat/AppGroup.swift

@@ -17,6 +17,7 @@ public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal"
 public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
+public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
@@ -59,6 +60,7 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE: false,
         GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
         GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false,
+        GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES: true,
         GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
         GROUP_DEFAULT_CALL_KIT_ENABLED: true,
     ])
@@ -113,7 +115,7 @@ public let ntfEnablePeriodicGroupDefault = BoolDefault(defaults: groupDefaults,
 
 public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES)
 
-public let privacyTransferImagesInlineGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE)
+public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)
 
 public let ntfBadgeCountGroupDefault = IntDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_BADGE_COUNT)
 

apps/ios/SimpleXChat/ChatTypes.swift

@@ -9,7 +9,7 @@
 import Foundation
 import SwiftUI
 
-public struct User: Decodable, NamedChat, Identifiable {
+public struct User: Identifiable, Decodable, UserLike, NamedChat {
     public var userId: Int64
     var userContactId: Int64
     var localDisplayName: ContactName
@@ -52,6 +52,17 @@ public struct User: Decodable, NamedChat, Identifiable {
     )
 }
 
+public struct UserRef: Identifiable, Decodable, UserLike {
+    public var userId: Int64
+    public var localDisplayName: ContactName
+
+    public var id: Int64 { userId }
+}
+
+public protocol UserLike: Identifiable {
+    var userId: Int64  { get }
+}
+
 public struct UserPwdHash: Decodable {
     public var hash: String
     public var salt: String
@@ -160,6 +171,13 @@ public func fromLocalProfile (_ profile: LocalProfile) -> Profile {
     Profile(displayName: profile.displayName, fullName: profile.fullName, image: profile.image, contactLink: profile.contactLink, preferences: profile.preferences)
 }
 
+public struct UserProfileUpdateSummary: Decodable {
+    public var notChanged: Int
+    public var updateSuccesses: Int
+    public var updateFailures: Int
+    public var changedContacts: [Contact]
+}
+
 public enum ChatType: String {
     case direct = "@"
     case group = "#"
@@ -1466,6 +1484,8 @@ public struct SecurityCode: Decodable, Equatable {
 
 public struct UserContact: Decodable {
     public var userContactLinkId: Int64
+//    public var connReqContact: String
+    public var groupId: Int64?
 
     public init(userContactLinkId: Int64) {
         self.userContactLinkId = userContactLinkId
@@ -1927,6 +1947,16 @@ public enum ConnectionEntity: Decodable {
             return nil
         }
     }
+
+    public var ntfsEnabled: Bool {
+        switch self {
+        case let .rcvDirectMsgConnection(contact): return contact?.chatSettings.enableNtfs ?? false
+        case let .rcvGroupMsgConnection(groupInfo, _): return groupInfo.chatSettings.enableNtfs
+        case .sndFileConnection: return false
+        case .rcvFileConnection: return false
+        case let .userContactConnection(userContact): return userContact.groupId == nil
+        }
+    }
 }
 
 public struct NtfMsgInfo: Decodable {
@@ -2009,6 +2039,17 @@ public struct ChatItem: Identifiable, Decodable {
         }
     }
 
+    public var memberConnected: GroupMember? {
+        switch chatDir {
+        case .groupRcv(let groupMember):
+            switch content {
+            case .rcvGroupEvent(rcvGroupEvent: .memberConnected): return groupMember
+            default: return nil
+            }
+        default: return nil
+        }
+    }
+
     private var showNtfDir: Bool {
         return !chatDir.sent
     }
@@ -2071,6 +2112,17 @@ public struct ChatItem: Identifiable, Decodable {
         return nil
     }
 
+    public var encryptedFile: Bool? {
+        guard let fileSource = file?.fileSource else { return nil }
+        return fileSource.cryptoArgs != nil
+    }
+
+    public var encryptLocalFile: Bool {
+        file?.fileProtocol == .xftp &&
+        content.msgContent?.isVideo == false &&
+        privacyEncryptLocalFilesGroupDefault.get()
+    }
+
     public var memberDisplayName: String? {
         get {
             if case let .groupRcv(groupMember) = chatDir {
@@ -2507,6 +2559,20 @@ public enum CIContent: Decodable, ItemContent {
             }
         }
     }
+
+    public var showMemberName: Bool {
+        switch self {
+        case .rcvMsgContent: return true
+        case .rcvDeleted: return true
+        case .rcvCall: return true
+        case .rcvIntegrityError: return true
+        case .rcvDecryptionError: return true
+        case .rcvGroupInvitation: return true
+        case .rcvModerated: return true
+        case .invalidJSON: return true
+        default: return false
+        }
+    }
 }
 
 public enum MsgDecryptError: String, Decodable {
@@ -2635,12 +2701,18 @@ public struct CIFile: Decodable {
     public var fileId: Int64
     public var fileName: String
     public var fileSize: Int64
-    public var filePath: String?
+    public var fileSource: CryptoFile?
     public var fileStatus: CIFileStatus
     public var fileProtocol: FileProtocol
 
     public static func getSample(fileId: Int64 = 1, fileName: String = "test.txt", fileSize: Int64 = 100, filePath: String? = "test.txt", fileStatus: CIFileStatus = .rcvComplete) -> CIFile {
-        CIFile(fileId: fileId, fileName: fileName, fileSize: fileSize, filePath: filePath, fileStatus: fileStatus, fileProtocol: .xftp)
+        let f: CryptoFile?
+        if let filePath = filePath {
+            f = CryptoFile.plain(filePath)
+        } else {
+            f = nil
+        }
+        return CIFile(fileId: fileId, fileName: fileName, fileSize: fileSize, fileSource: f, fileStatus: fileStatus, fileProtocol: .xftp)
     }
 
     public var loaded: Bool {
@@ -2687,6 +2759,25 @@ public struct CIFile: Decodable {
     }
 }
 
+public struct CryptoFile: Codable {
+    public var filePath: String // the name of the file, not a full path
+    public var cryptoArgs: CryptoFileArgs?
+
+    public init(filePath: String, cryptoArgs: CryptoFileArgs?) {
+        self.filePath = filePath
+        self.cryptoArgs = cryptoArgs
+    }
+
+    public static func plain(_ f: String) -> CryptoFile {
+        CryptoFile(filePath: f, cryptoArgs: nil)
+    }
+}
+
+public struct CryptoFileArgs: Codable {
+    public var fileKey: String
+    public var fileNonce: String
+}
+
 public struct CancelAction {
     public var uiAction: String
     public var alert: AlertInfo

apps/ios/SimpleXChat/CryptoFile.swift

@@ -0,0 +1,69 @@
+//
+//  CryptoFile.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 05/09/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+
+enum WriteFileResult: Decodable {
+    case result(cryptoArgs: CryptoFileArgs)
+    case error(writeError: String)
+}
+
+public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
+    let ptr: UnsafeMutableRawPointer = malloc(data.count)
+    memcpy(ptr, (data as NSData).bytes, data.count)
+    var cPath = path.cString(using: .utf8)!
+    let cjson = chat_write_file(&cPath, ptr, Int32(data.count))!
+    let d = fromCString(cjson).data(using: .utf8)!
+    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
+    case let .result(cfArgs): return cfArgs
+    case let .error(err): throw RuntimeError(err)
+    }
+}
+
+public func readCryptoFile(path: String, cryptoArgs: CryptoFileArgs) throws -> Data {
+    var cPath = path.cString(using: .utf8)!
+    var cKey = cryptoArgs.fileKey.cString(using: .utf8)!
+    var cNonce = cryptoArgs.fileNonce.cString(using: .utf8)!
+    let ptr = chat_read_file(&cPath, &cKey, &cNonce)!
+    let status = UInt8(ptr.pointee)
+    switch status {
+    case 0: // ok
+        let dLen = Data(bytes: ptr.advanced(by: 1), count: 4)
+        let len = dLen.withUnsafeBytes { $0.load(as: UInt32.self) }
+        let d = Data(bytes: ptr.advanced(by: 5), count: Int(len))
+        free(ptr)
+        return d
+    case 1: // error
+        let err = String.init(cString: ptr)
+        free(ptr)
+        throw RuntimeError(err)
+    default:
+        throw RuntimeError("unexpected chat_read_file status: \(status)")
+    }
+}
+
+public func encryptCryptoFile(fromPath: String, toPath: String) throws -> CryptoFileArgs {
+    var cFromPath = fromPath.cString(using: .utf8)!
+    var cToPath = toPath.cString(using: .utf8)!
+    let cjson = chat_encrypt_file(&cFromPath, &cToPath)!
+    let d = fromCString(cjson).data(using: .utf8)!
+    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
+    case let .result(cfArgs): return cfArgs
+    case let .error(err): throw RuntimeError(err)
+    }
+}
+
+public func decryptCryptoFile(fromPath: String, cryptoArgs: CryptoFileArgs, toPath: String) throws {
+    var cFromPath = fromPath.cString(using: .utf8)!
+    var cKey = cryptoArgs.fileKey.cString(using: .utf8)!
+    var cNonce = cryptoArgs.fileNonce.cString(using: .utf8)!
+    var cToPath = toPath.cString(using: .utf8)!
+    let cErr = chat_decrypt_file(&cFromPath, &cKey, &cNonce, &cToPath)!
+    let err = fromCString(cErr)
+    if err != "" { throw RuntimeError(err) }
+}

apps/ios/SimpleXChat/FileUtils.swift

@@ -173,11 +173,16 @@ public func getAppFilePath(_ fileName: String) -> URL {
     getAppFilesDirectory().appendingPathComponent(fileName)
 }
 
-public func saveFile(_ data: Data, _ fileName: String) -> String? {
+public func saveFile(_ data: Data, _ fileName: String, encrypted: Bool) -> CryptoFile? {
     let filePath = getAppFilePath(fileName)
     do {
-        try data.write(to: filePath)
-        return fileName
+        if encrypted {
+            let cfArgs = try writeCryptoFile(path: filePath.path, data: data)
+            return CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
+        } else {
+            try data.write(to: filePath)
+            return CryptoFile.plain(fileName)
+        }
     } catch {
         logger.error("FileUtils.saveFile error: \(error.localizedDescription)")
         return nil
@@ -210,7 +215,7 @@ public func cleanupFile(_ aChatItem: AChatItem) {
     let cItem = aChatItem.chatItem
     let mc = cItem.content.msgContent
     if case .file = mc,
-       let fileName = cItem.file?.filePath {
+       let fileName = cItem.file?.fileSource?.filePath {
         removeFile(fileName)
     }
 }
@@ -221,3 +226,15 @@ public func getMaxFileSize(_ fileProtocol: FileProtocol) -> Int64 {
     case .smp: return MAX_FILE_SIZE_SMP
     }
 }
+
+public struct RuntimeError: Error {
+    let message: String
+
+    public init(_ message: String) {
+        self.message = message
+    }
+
+    public var localizedDescription: String {
+        return message
+    }
+}

apps/ios/SimpleXChat/Notifications.swift

@@ -21,7 +21,7 @@ public let appNotificationId = "chat.simplex.app.notification"
 
 let contactHidden = NSLocalizedString("Contact hidden:", comment: "notification")
 
-public func createContactRequestNtf(_ user: User, _ contactRequest: UserContactRequest) -> UNMutableNotificationContent {
+public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: UserContactRequest) -> UNMutableNotificationContent {
     let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
     return createNotification(
         categoryIdentifier: ntfCategoryContactRequest,
@@ -38,7 +38,7 @@ public func createContactRequestNtf(_ user: User, _ contactRequest: UserContactR
     )
 }
 
-public func createContactConnectedNtf(_ user: User, _ contact: Contact) -> UNMutableNotificationContent {
+public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact) -> UNMutableNotificationContent {
     let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
     return createNotification(
         categoryIdentifier: ntfCategoryContactConnected,
@@ -56,7 +56,7 @@ public func createContactConnectedNtf(_ user: User, _ contact: Contact) -> UNMut
     )
 }
 
-public func createMessageReceivedNtf(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) -> UNMutableNotificationContent {
+public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) -> UNMutableNotificationContent {
     let previewMode = ntfPreviewModeGroupDefault.get()
     var title: String
     if case let .group(groupInfo) = cInfo, case let .groupRcv(groupMember) = cItem.chatDir {

apps/ios/SimpleXChat/SimpleX.h

@@ -25,3 +25,18 @@ extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_encrypt_media(char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
+
+// chat_write_file returns null-terminated string with JSON of WriteFileResult
+extern char *chat_write_file(char *path, char *data, int len);
+
+// chat_read_file returns a buffer with:
+// result status (1 byte), then if
+//   status == 0 (success): buffer length (uint32, 4 bytes), buffer of specified length.
+//   status == 1 (error): null-terminated error message string.
+extern char *chat_read_file(char *path, char *key, char *nonce);
+
+// chat_encrypt_file returns null-terminated string with JSON of WriteFileResult
+extern char *chat_encrypt_file(char *fromPath, char *toPath);
+
+// chat_decrypt_file returns null-terminated string with the error message
+extern char *chat_decrypt_file(char *fromPath, char *key, char *nonce, char *toPath);

apps/ios/cs.lproj/Localizable.strings

@@ -88,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*tučně*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## Historie";
+
+/* copied message info */
+"## In reply to" = "## Odpovídáno";
+
 /* No comment provided by engineer. */
 "#secret#" = "#tajný#";
 
@@ -106,6 +115,9 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ a %@ připojen";
+
 /* copied message info, <sender> at <time> */
 "%@ at %@:" = "%1$@ na %2$@:";
 
@@ -124,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ se chce připojit!";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ a %lld ostatní členové připojeni";
+
 /* copied message info */
 "%@:" = "%@:";
 
@@ -244,6 +259,9 @@
 /* notification title */
 "A new contact" = "Nový kontakt";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "Nový náhodný profil bude sdílen.";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Samostatné připojení TCP bude použito **pro každý chat profil, který máte v aplikaci**.";
 
@@ -279,7 +297,7 @@
 "Accept" = "Přijmout";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Přijmout kontakt";
+"Accept connection request?" = "Přijmout kontakt?";
 
 /* notification body */
 "Accept contact request from %@?" = "Přijmout žádost o kontakt od %@?";
@@ -690,11 +708,17 @@
 /* server test step */
 "Connect" = "Připojit";
 
+/* No comment provided by engineer. */
+"Connect directly" = "Připojit přímo";
+
+/* No comment provided by engineer. */
+"Connect incognito" = "Spojit se inkognito";
+
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "připojit se k vývojářům SimpleX Chat.";
 
 /* No comment provided by engineer. */
-"Connect via contact link" = "Připojit se přes kontaktní odkaz?";
+"Connect via contact link" = "Připojit se přes odkaz";
 
 /* No comment provided by engineer. */
 "Connect via group link?" = "Připojit se přes odkaz skupiny?";
@@ -706,7 +730,7 @@
 "Connect via link / QR code" = "Připojit se prostřednictvím odkazu / QR kódu";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "Připojit se jednorázovým odkazem?";
+"Connect via one-time link" = "Připojit se jednorázovým odkazem";
 
 /* No comment provided by engineer. */
 "connected" = "připojeno";
@@ -1050,6 +1074,9 @@
 /* rcv group event chat item */
 "deleted group" = "odstraněna skupina";
 
+/* No comment provided by engineer. */
+"Delivery" = "Doručenka";
+
 /* No comment provided by engineer. */
 "Delivery receipts are disabled!" = "Potvrzení o doručení jsou vypnuté!";
 
@@ -1719,6 +1746,9 @@
 /* No comment provided by engineer. */
 "Incognito mode" = "Režim inkognito";
 
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "Režim inkognito chrání vaše soukromí používáním nového náhodného profilu pro každý kontakt.";
+
 /* chat list item description */
 "incognito via contact address link" = "inkognito přes odkaz na kontaktní adresu";
 
@@ -1782,6 +1812,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "Neplatná adresa serveru!";
 
+/* item status text */
+"Invalid status" = "Neplatný status";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "Platnost pozvánky vypršela!";
 
@@ -1855,10 +1888,10 @@
 "Join group" = "Připojit ke skupině";
 
 /* No comment provided by engineer. */
-"Join incognito" = "Připojte se inkognito";
+"Join incognito" = "Připojit se inkognito";
 
 /* No comment provided by engineer. */
-"Joining group" = "Připojení ke skupině";
+"Joining group" = "Připojování ke skupině";
 
 /* No comment provided by engineer. */
 "Keep your connections" = "Zachovat vaše připojení";
@@ -2043,6 +2076,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Další vylepšení se chystají již brzy!";
 
+/* item status description */
+"Most likely this connection is deleted." = "Pravděpodobně je toto spojení smazáno.";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "Tento kontakt s největší pravděpodobností smazal spojení s vámi.";
 
@@ -3068,7 +3104,7 @@
 "These settings are for your current profile **%@**." = "Toto nastavení je pro váš aktuální profil **%@**.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Mohou být přepsány v nastavení kontaktů";
+"They can be overridden in contact and group settings." = "Mohou být přepsány v nastavení kontaktů.";
 
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Tuto akci nelze vrátit zpět - všechny přijaté a odeslané soubory a média budou smazány. Obrázky s nízkým rozlišením zůstanou zachovány.";

apps/ios/de.lproj/Localizable.strings

@@ -88,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*fett*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## Vergangenheit";
+
+/* copied message info */
+"## In reply to" = "## Als Antwort auf";
+
 /* No comment provided by engineer. */
 "#secret#" = "#geheim#";
 
@@ -106,6 +115,9 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ und %@ wurden verbunden";
+
 /* copied message info, <sender> at <time> */
 "%@ at %@:" = "%1$@ an %2$@:";
 
@@ -124,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ will sich mit Ihnen verbinden!";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ und %lld weitere Mitglieder wurden verbunden";
+
 /* copied message info */
 "%@:" = "%@:";
 
@@ -244,6 +259,9 @@
 /* notification title */
 "A new contact" = "Ein neuer Kontakt";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "Es wird ein neues Zufallsprofil geteilt.";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "**Für jedes von Ihnen in der App genutzte Chat-Profil** wird eine separate TCP-Verbindung genutzt.";
 
@@ -279,7 +297,7 @@
 "Accept" = "Annehmen";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Kontakt annehmen";
+"Accept connection request?" = "Kontaktanfrage annehmen?";
 
 /* notification body */
 "Accept contact request from %@?" = "Die Kontaktanfrage von %@ annehmen?";
@@ -426,7 +444,7 @@
 "App build: %@" = "App Build: %@";
 
 /* No comment provided by engineer. */
-"App icon" = "App Icon";
+"App icon" = "App-Icon";
 
 /* No comment provided by engineer. */
 "App passcode" = "App-Zugangscode";
@@ -456,10 +474,10 @@
 "audio call (not e2e encrypted)" = "Audioanruf (nicht E2E verschlüsselt)";
 
 /* chat feature */
-"Audio/video calls" = "Audio/Video Anrufe";
+"Audio/video calls" = "Audio-/Video-Anrufe";
 
 /* No comment provided by engineer. */
-"Audio/video calls are prohibited." = "Audio/Video Anrufe sind nicht erlaubt.";
+"Audio/video calls are prohibited." = "Audio-/Video-Anrufe sind nicht erlaubt.";
 
 /* PIN entry */
 "Authentication cancelled" = "Authentifizierung abgebrochen";
@@ -625,7 +643,7 @@
 "Chat is stopped" = "Der Chat ist beendet";
 
 /* No comment provided by engineer. */
-"Chat preferences" = "Chat Präferenzen";
+"Chat preferences" = "Chat-Präferenzen";
 
 /* No comment provided by engineer. */
 "Chats" = "Chats";
@@ -691,10 +709,16 @@
 "Connect" = "Verbinden";
 
 /* No comment provided by engineer. */
-"connect to SimpleX Chat developers." = "Mit den SimpleX Chat Entwicklern verbinden.";
+"Connect directly" = "Direkt verbinden";
 
 /* No comment provided by engineer. */
-"Connect via contact link" = "Über den Kontakt-Link verbinden?";
+"Connect incognito" = "Inkognito verbinden";
+
+/* No comment provided by engineer. */
+"connect to SimpleX Chat developers." = "Mit den SimpleX Chat-Entwicklern verbinden.";
+
+/* No comment provided by engineer. */
+"Connect via contact link" = "Über den Kontakt-Link verbinden";
 
 /* No comment provided by engineer. */
 "Connect via group link?" = "Über den Gruppen-Link verbinden?";
@@ -706,7 +730,7 @@
 "Connect via link / QR code" = "Über einen Link / QR-Code verbinden";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "Über einen Einmal-Link verbinden?";
+"Connect via one-time link" = "Über einen Einmal-Link verbinden";
 
 /* No comment provided by engineer. */
 "connected" = "Verbunden";
@@ -724,7 +748,7 @@
 "connecting (introduced)" = "Verbindung (erstellt)";
 
 /* No comment provided by engineer. */
-"connecting (introduction invitation)" = "Verbindung (eingeladen)";
+"connecting (introduction invitation)" = "Verbinde (nach einer Einladung)";
 
 /* call status */
 "connecting call" = "Anruf wird verbunden…";
@@ -787,7 +811,7 @@
 "Contact name" = "Kontaktname";
 
 /* No comment provided by engineer. */
-"Contact preferences" = "Kontakt Präferenzen";
+"Contact preferences" = "Kontakt-Präferenzen";
 
 /* No comment provided by engineer. */
 "Contacts" = "Kontakte";
@@ -820,7 +844,7 @@
 "Create link" = "Link erzeugen";
 
 /* No comment provided by engineer. */
-"Create one-time invitation link" = "Erstellen Sie einen einmaligen Einladungslink";
+"Create one-time invitation link" = "Einmal-Einladungslink erstellen";
 
 /* server test step */
 "Create queue" = "Erzeuge Warteschlange";
@@ -1050,6 +1074,9 @@
 /* rcv group event chat item */
 "deleted group" = "Gruppe gelöscht";
 
+/* No comment provided by engineer. */
+"Delivery" = "Zustellung";
+
 /* No comment provided by engineer. */
 "Delivery receipts are disabled!" = "Empfangsbestätigungen sind deaktiviert!";
 
@@ -1069,10 +1096,10 @@
 "Device" = "Gerät";
 
 /* No comment provided by engineer. */
-"Device authentication is disabled. Turning off SimpleX Lock." = "Die Geräteauthentifizierung ist deaktiviert. SimpleX Sperre ist abgeschaltet.";
+"Device authentication is disabled. Turning off SimpleX Lock." = "Die Geräteauthentifizierung ist deaktiviert. SimpleX-Sperre ist abgeschaltet.";
 
 /* No comment provided by engineer. */
-"Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.";
+"Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX-Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.";
 
 /* No comment provided by engineer. */
 "different migration in the app/database: %@ / %@" = "Unterschiedlicher Migrationsstand in der App/Datenbank: %@ / %@";
@@ -1096,7 +1123,10 @@
 "Disable for all" = "Für Alle deaktivieren";
 
 /* authentication reason */
-"Disable SimpleX Lock" = "SimpleX Sperre deaktivieren";
+"Disable SimpleX Lock" = "SimpleX-Sperre deaktivieren";
+
+/* No comment provided by engineer. */
+"disabled" = "deaktiviert";
 
 /* No comment provided by engineer. */
 "Disappearing message" = "Verschwindende Nachricht";
@@ -1195,7 +1225,7 @@
 "Enable self-destruct passcode" = "Selbstzerstörungs-Zugangscode aktivieren";
 
 /* authentication reason */
-"Enable SimpleX Lock" = "SimpleX Sperre aktivieren";
+"Enable SimpleX Lock" = "SimpleX-Sperre aktivieren";
 
 /* No comment provided by engineer. */
 "Enable TCP keep-alive" = "TCP-Keep-alive aktivieren";
@@ -1351,7 +1381,7 @@
 "Error deleting user profile" = "Fehler beim Löschen des Benutzerprofils";
 
 /* No comment provided by engineer. */
-"Error enabling delivery receipts!" = "Fehler beim Aktivieren der Empfangsbestätigungen!";
+"Error enabling delivery receipts!" = "Fehler beim Aktivieren von Empfangsbestätigungen!";
 
 /* No comment provided by engineer. */
 "Error enabling notifications" = "Fehler beim Aktivieren der Benachrichtigungen";
@@ -1402,7 +1432,7 @@
 "Error sending message" = "Fehler beim Senden der Nachricht";
 
 /* No comment provided by engineer. */
-"Error setting delivery receipts!" = "Fehler beim Setzen der Empfangsbestätigungen!";
+"Error setting delivery receipts!" = "Fehler beim Setzen von Empfangsbestätigungen!";
 
 /* No comment provided by engineer. */
 "Error starting chat" = "Fehler beim Starten des Chats";
@@ -1443,6 +1473,9 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Auch wenn sie im Chat deaktiviert sind.";
 
+/* No comment provided by engineer. */
+"event happened" = "event happened";
+
 /* No comment provided by engineer. */
 "Exit without saving" = "Beenden ohne Speichern";
 
@@ -1564,7 +1597,7 @@
 "Group invitation expired" = "Die Gruppeneinladung ist abgelaufen";
 
 /* No comment provided by engineer. */
-"Group invitation is no longer valid, it was removed by sender." = "Die Gruppeneinladung ist nicht mehr gültig, sie wurde vom Absender entfernt.";
+"Group invitation is no longer valid, it was removed by sender." = "Die Gruppeneinladung ist nicht mehr gültig, da sie vom Absender entfernt wurde.";
 
 /* No comment provided by engineer. */
 "Group link" = "Gruppen-Link";
@@ -1597,7 +1630,7 @@
 "Group moderation" = "Gruppenmoderation";
 
 /* No comment provided by engineer. */
-"Group preferences" = "Gruppenpräferenzen";
+"Group preferences" = "Gruppen-Präferenzen";
 
 /* No comment provided by engineer. */
 "Group profile" = "Gruppenprofil";
@@ -1717,7 +1750,10 @@
 "Incognito" = "Inkognito";
 
 /* No comment provided by engineer. */
-"Incognito mode" = "Inkognito Modus";
+"Incognito mode" = "Inkognito-Modus";
+
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "Der Inkognito-Modus schützt Ihre Privatsphäre, indem für jeden Kontakt ein neues Zufallsprofil erstellt wird.";
 
 /* chat list item description */
 "incognito via contact address link" = "Inkognito über einen Kontaktadressen-Link";
@@ -1782,6 +1818,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "Ungültige Serveradresse!";
 
+/* item status text */
+"Invalid status" = "Ungültiger Status";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "Einladung abgelaufen!";
 
@@ -2043,6 +2082,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Weitere Verbesserungen sind bald verfügbar!";
 
+/* item status description */
+"Most likely this connection is deleted." = "Wahrscheinlich ist diese Verbindung gelöscht worden.";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "Dieser Kontakt hat sehr wahrscheinlich die Verbindung mit Ihnen gelöscht.";
 
@@ -2115,6 +2157,9 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "Keine Kontakte zum Hinzufügen";
 
+/* No comment provided by engineer. */
+"No delivery information" = "Keine Information über die Zustellung";
+
 /* No comment provided by engineer. */
 "No device token!" = "Kein Geräte-Token!";
 
@@ -2195,7 +2240,7 @@
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Nur die Endgeräte speichern die Benutzerprofile, Kontakte, Gruppen und Nachrichten, welche über eine **2-Schichten Ende-zu-Ende-Verschlüsselung** gesendet werden.";
 
 /* No comment provided by engineer. */
-"Only group owners can change group preferences." = "Gruppenpräferenzen können nur von Gruppen-Eigentümern geändert werden.";
+"Only group owners can change group preferences." = "Gruppen-Präferenzen können nur von Gruppen-Eigentümern geändert werden.";
 
 /* No comment provided by engineer. */
 "Only group owners can enable files and media." = "Nur Gruppenbesitzer können Dateien und Medien aktivieren.";
@@ -2303,7 +2348,7 @@
 "Permanent decryption error" = "Entschlüsselungsfehler";
 
 /* No comment provided by engineer. */
-"PING count" = "PING Zähler";
+"PING count" = "PING-Zähler";
 
 /* No comment provided by engineer. */
 "PING interval" = "PING-Intervall";
@@ -2384,7 +2429,7 @@
 "Profile update will be sent to your contacts." = "Profil-Aktualisierung wird an Ihre Kontakte gesendet.";
 
 /* No comment provided by engineer. */
-"Prohibit audio/video calls." = "Audio/Video Anrufe nicht erlauben.";
+"Prohibit audio/video calls." = "Audio-/Video-Anrufe nicht erlauben.";
 
 /* No comment provided by engineer. */
 "Prohibit irreversible message deletion." = "Unwiederbringliches löschen von Nachrichten nicht erlauben.";
@@ -2446,6 +2491,9 @@
 /* No comment provided by engineer. */
 "Read more in our GitHub repository." = "Erfahren Sie in unserem GitHub-Repository mehr dazu.";
 
+/* No comment provided by engineer. */
+"Receipts are disabled" = "Bestätigungen sind deaktiviert";
+
 /* No comment provided by engineer. */
 "received answer…" = "Antwort erhalten…";
 
@@ -2726,7 +2774,7 @@
 "Send questions and ideas" = "Senden Sie Fragen und Ideen";
 
 /* No comment provided by engineer. */
-"Send receipts" = "Quittierungen versenden";
+"Send receipts" = "Bestätigungen senden";
 
 /* No comment provided by engineer. */
 "Send them from gallery or custom keyboards." = "Senden Sie diese aus dem Fotoalbum oder von individuellen Tastaturen.";
@@ -2747,10 +2795,16 @@
 "Sending file will be stopped." = "Das Senden der Datei wird beendet.";
 
 /* No comment provided by engineer. */
-"Sending receipts is disabled for %lld contacts" = "Das Senden von Empfangsbestätigungen an %lld Kontakte ist deaktiviert";
+"Sending receipts is disabled for %lld contacts" = "Sendebestätigungen sind für %lld Kontakte deaktiviert";
 
 /* No comment provided by engineer. */
-"Sending receipts is enabled for %lld contacts" = "Das Senden von Empfangsbestätigungen an %lld Kontakte ist aktiviert";
+"Sending receipts is disabled for %lld groups" = "Sendebestätigungen sind für %lld Gruppen deaktiviert";
+
+/* No comment provided by engineer. */
+"Sending receipts is enabled for %lld contacts" = "Sendebestätigungen sind für %lld Kontakte aktiviert";
+
+/* No comment provided by engineer. */
+"Sending receipts is enabled for %lld groups" = "Sendebestätigungen sind für %lld Gruppen aktiviert";
 
 /* No comment provided by engineer. */
 "Sending via" = "Senden über";
@@ -2789,7 +2843,7 @@
 "Set contact name…" = "Kontaktname festlegen…";
 
 /* No comment provided by engineer. */
-"Set group preferences" = "Gruppenpräferenzen einstellen";
+"Set group preferences" = "Gruppen-Präferenzen einstellen";
 
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Anstelle der System-Authentifizierung festlegen.";
@@ -2836,6 +2890,9 @@
 /* No comment provided by engineer. */
 "Show developer options" = "Entwickleroptionen anzeigen";
 
+/* No comment provided by engineer. */
+"Show last messages" = "Letzte Nachrichten anzeigen";
+
 /* No comment provided by engineer. */
 "Show preview" = "Vorschau anzeigen";
 
@@ -2852,7 +2909,7 @@
 "SimpleX Chat security was audited by Trail of Bits." = "Die Sicherheit von SimpleX Chat wurde von Trail of Bits überprüft.";
 
 /* simplex link type */
-"SimpleX contact address" = "SimpleX Kontaktadressen-Link";
+"SimpleX contact address" = "SimpleX-Kontaktadressen-Link";
 
 /* notification */
 "SimpleX encrypted message or connection event" = "SimpleX verschlüsselte Nachricht oder Verbindungs-Ereignis";
@@ -2864,19 +2921,19 @@
 "SimpleX links" = "SimpleX-Links";
 
 /* No comment provided by engineer. */
-"SimpleX Lock" = "SimpleX Sperre";
+"SimpleX Lock" = "SimpleX-Sperre";
 
 /* No comment provided by engineer. */
 "SimpleX Lock mode" = "SimpleX Sperr-Modus";
 
 /* No comment provided by engineer. */
-"SimpleX Lock not enabled!" = "SimpleX Sperre ist nicht aktiviert!";
+"SimpleX Lock not enabled!" = "SimpleX-Sperre ist nicht aktiviert!";
 
 /* No comment provided by engineer. */
-"SimpleX Lock turned on" = "SimpleX Sperre aktiviert";
+"SimpleX Lock turned on" = "SimpleX-Sperre aktiviert";
 
 /* simplex link type */
-"SimpleX one-time invitation" = "SimpleX Einmal-Link";
+"SimpleX one-time invitation" = "SimpleX-Einmal-Einladung";
 
 /* No comment provided by engineer. */
 "Skip" = "Überspringen";
@@ -2884,6 +2941,9 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "Übersprungene Nachrichten";
 
+/* No comment provided by engineer. */
+"Small groups (max 20)" = "Kleine Gruppen (max. 20)";
+
 /* No comment provided by engineer. */
 "SMP servers" = "SMP-Server";
 
@@ -3082,6 +3142,9 @@
 /* notification title */
 "this contact" = "Dieser Kontakt";
 
+/* No comment provided by engineer. */
+"This group has over %lld members, delivery receipts are not sent." = "Es werden keine Empfangsbestätigungen gesendet, da diese Gruppe über %lld Mitglieder hat.";
+
 /* No comment provided by engineer. */
 "This group no longer exists." = "Diese Gruppe existiert nicht mehr.";
 
@@ -3104,7 +3167,7 @@
 "To protect timezone, image/voice files use UTC." = "Bild- und Sprachdateinamen enthalten UTC, um Informationen zur Zeitzone zu schützen.";
 
 /* No comment provided by engineer. */
-"To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Um Ihre Informationen zu schützen, schalten Sie die SimpleX Sperre ein.\nSie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.";
+"To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled." = "Um Ihre Informationen zu schützen, schalten Sie die SimpleX-Sperre ein.\nSie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.";
 
 /* No comment provided by engineer. */
 "To record voice message please grant permission to use Microphone." = "Bitte erlauben Sie die Nutzung des Mikrofons, um Sprachnachrichten aufnehmen zu können.";
@@ -3226,17 +3289,23 @@
 /* No comment provided by engineer. */
 "Use chat" = "Verwenden Sie Chat";
 
+/* No comment provided by engineer. */
+"Use current profile" = "Nutzen Sie das aktuelle Profil";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "Für neue Verbindungen nutzen";
 
 /* No comment provided by engineer. */
 "Use iOS call interface" = "iOS Anrufschnittstelle nutzen";
 
+/* No comment provided by engineer. */
+"Use new incognito profile" = "Nutzen Sie das neue Inkognito-Profil";
+
 /* No comment provided by engineer. */
 "Use server" = "Server nutzen";
 
 /* No comment provided by engineer. */
-"Use SimpleX Chat servers?" = "Verwenden Sie SimpleX Chat Server?";
+"Use SimpleX Chat servers?" = "Verwenden Sie SimpleX-Chat-Server?";
 
 /* No comment provided by engineer. */
 "User profile" = "Benutzerprofil";
@@ -3245,7 +3314,7 @@
 "Using .onion hosts requires compatible VPN provider." = "Für die Nutzung von .onion-Hosts sind kompatible VPN-Anbieter erforderlich.";
 
 /* No comment provided by engineer. */
-"Using SimpleX Chat servers." = "Verwende SimpleX Chat Server.";
+"Using SimpleX Chat servers." = "Verwendung von SimpleX-Chat-Servern.";
 
 /* No comment provided by engineer. */
 "v%@ (%@)" = "v%@ (%@)";
@@ -3428,7 +3497,7 @@
 "You can start chat via app Settings / Database or by restarting the app" = "Sie können den Chat über die App-Einstellungen / Datenbank oder durch Neustart der App starten";
 
 /* No comment provided by engineer. */
-"You can turn on SimpleX Lock via Settings." = "Sie können die SimpleX Sperre über die Einstellungen aktivieren.";
+"You can turn on SimpleX Lock via Settings." = "Sie können die SimpleX-Sperre über die Einstellungen aktivieren.";
 
 /* No comment provided by engineer. */
 "You can use markdown to format messages:" = "Um Nachrichteninhalte zu formatieren, können Sie Markdowns verwenden:";
@@ -3574,6 +3643,9 @@
 /* No comment provided by engineer. */
 "Your privacy" = "Meine Privatsphäre";
 
+/* No comment provided by engineer. */
+"Your profile **%@** will be shared." = "Ihr Profil **%@** wird geteilt.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.\nSimpleX-Server können Ihr Profil nicht einsehen.";
 

apps/ios/es.lproj/Localizable.strings

@@ -50,7 +50,7 @@
 "[Send us email](mailto:chat@simplex.chat)" = "[Contacta vía email](mailto:chat@simplex.chat)";
 
 /* No comment provided by engineer. */
-"[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Estrella en GitHub] (https://github.com/simplex-chat/simplex-chat)";
+"[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Estrella en GitHub](https://github.com/simplex-chat/simplex-chat)";
 
 /* No comment provided by engineer. */
 "**Add new contact**: to create your one-time QR Code for your contact." = "**Añadir nuevo contacto**: para crear tu código QR o enlace de un uso para tu contacto.";
@@ -88,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*bold*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## Historial";
+
+/* copied message info */
+"## In reply to" = "## En respuesta a";
+
 /* No comment provided by engineer. */
 "#secret#" = "#secreto#";
 
@@ -106,6 +115,9 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ y %@ conectados";
+
 /* copied message info, <sender> at <time> */
 "%@ at %@:" = "%1$@ a las %2$@:";
 
@@ -124,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "¡ %@ quiere contactar!";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ y %lld miembros más conectados";
+
 /* copied message info */
 "%@:" = "%@:";
 
@@ -244,6 +259,9 @@
 /* notification title */
 "A new contact" = "Contacto nuevo";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "Se compartirá un perfil nuevo aleatorio.";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Se usará una conexión TCP independiente **por cada perfil que tengas en la aplicación**.";
 
@@ -263,7 +281,7 @@
 "About SimpleX" = "Acerca de SimpleX";
 
 /* No comment provided by engineer. */
-"About SimpleX address" = "Acerca de dirección SimpleX";
+"About SimpleX address" = "Acerca de la dirección SimpleX";
 
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "Sobre SimpleX Chat";
@@ -279,7 +297,7 @@
 "Accept" = "Aceptar";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Aceptar contacto";
+"Accept connection request?" = "¿Aceptar solicitud de conexión?";
 
 /* notification body */
 "Accept contact request from %@?" = "¿Aceptar solicitud de contacto de %@?";
@@ -414,10 +432,10 @@
 "always" = "siempre";
 
 /* No comment provided by engineer. */
-"Always use relay" = "Siempre usar relay";
+"Always use relay" = "Usar siempre retransmisor";
 
 /* No comment provided by engineer. */
-"An empty chat profile with the provided name is created, and the app opens as usual." = "Se creará un perfil de chat vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.";
+"An empty chat profile with the provided name is created, and the app opens as usual." = "Se creará un perfil vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.";
 
 /* No comment provided by engineer. */
 "Answer call" = "Responder llamada";
@@ -519,7 +537,7 @@
 "Both you and your contact can send voice messages." = "Tanto tú como tu contacto podéis enviar mensajes de voz.";
 
 /* No comment provided by engineer. */
-"By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Mediante perfil de Chat (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
+"By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Mediante perfil (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
 /* No comment provided by engineer. */
 "Call already ended!" = "¡La llamada ha terminado!";
@@ -690,11 +708,17 @@
 /* server test step */
 "Connect" = "Conectar";
 
+/* No comment provided by engineer. */
+"Connect directly" = "Conectar directamente";
+
+/* No comment provided by engineer. */
+"Connect incognito" = "Conectar incognito";
+
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "contacta con los desarrolladores de SimpleX Chat.";
 
 /* No comment provided by engineer. */
-"Connect via contact link" = "¿Conectar mediante enlace de contacto?";
+"Connect via contact link" = "Conectar mediante enlace de contacto";
 
 /* No comment provided by engineer. */
 "Connect via group link?" = "¿Conectar mediante enlace de grupo?";
@@ -706,7 +730,7 @@
 "Connect via link / QR code" = "Conecta vía enlace / Código QR";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "¿Conectar mediante enlace de un uso?";
+"Connect via one-time link" = "Conectar mediante enlace de un sólo uso";
 
 /* No comment provided by engineer. */
 "connected" = "conectado";
@@ -808,7 +832,7 @@
 "Create" = "Crear";
 
 /* No comment provided by engineer. */
-"Create an address to let people connect with you." = "Crear una dirección para que otras personas se puedan conectar contigo.";
+"Create an address to let people connect with you." = "Crea una dirección para que otras personas puedan conectar contigo.";
 
 /* server test step */
 "Create file" = "Crear archivo";
@@ -829,10 +853,10 @@
 "Create secret group" = "Crea grupo secreto";
 
 /* No comment provided by engineer. */
-"Create SimpleX address" = "Crear dirección SimpleX";
+"Create SimpleX address" = "Crear tu dirección SimpleX";
 
 /* No comment provided by engineer. */
-"Create your profile" = "Crear tu perfil";
+"Create your profile" = "Crea tu perfil";
 
 /* No comment provided by engineer. */
 "Created on %@" = "Creado en %@";
@@ -919,7 +943,7 @@
 "days" = "días";
 
 /* No comment provided by engineer. */
-"Decentralized" = "Descentralizado";
+"Decentralized" = "Descentralizada";
 
 /* message decrypt error item */
 "Decryption error" = "Error descifrado";
@@ -955,10 +979,10 @@
 "Delete chat archive?" = "¿Eliminar archivo del chat?";
 
 /* No comment provided by engineer. */
-"Delete chat profile" = "Eliminar perfil de chat";
+"Delete chat profile" = "Eliminar perfil";
 
 /* No comment provided by engineer. */
-"Delete chat profile?" = "¿Eliminar el perfil de chat?";
+"Delete chat profile?" = "¿Eliminar el perfil?";
 
 /* No comment provided by engineer. */
 "Delete connection" = "Eliminar conexión";
@@ -982,7 +1006,7 @@
 "Delete files and media?" = "Eliminar archivos y multimedia?";
 
 /* No comment provided by engineer. */
-"Delete files for all chat profiles" = "Eliminar los archivos de todos los perfiles";
+"Delete files for all chat profiles" = "Eliminar archivos de todos los perfiles";
 
 /* chat feature */
 "Delete for everyone" = "Eliminar para todos";
@@ -1050,6 +1074,9 @@
 /* rcv group event chat item */
 "deleted group" = "grupo eliminado";
 
+/* No comment provided by engineer. */
+"Delivery" = "Entrega";
+
 /* No comment provided by engineer. */
 "Delivery receipts are disabled!" = "¡Las confirmaciones de entrega están desactivadas!";
 
@@ -1090,7 +1117,7 @@
 "Direct messages between members are prohibited in this group." = "Los mensajes directos entre miembros del grupo no están permitidos.";
 
 /* No comment provided by engineer. */
-"Disable (keep overrides)" = "Desactivar (mantener anulaciones)";
+"Disable (keep overrides)" = "Desactivar (conservar anulaciones)";
 
 /* No comment provided by engineer. */
 "Disable for all" = "Desactivar para todos";
@@ -1098,6 +1125,9 @@
 /* authentication reason */
 "Disable SimpleX Lock" = "Desactivar Bloqueo SimpleX";
 
+/* No comment provided by engineer. */
+"disabled" = "desactivado";
+
 /* No comment provided by engineer. */
 "Disappearing message" = "Mensaje temporal";
 
@@ -1132,7 +1162,7 @@
 "Do NOT use SimpleX for emergency calls." = "NO uses SimpleX para llamadas de emergencia.";
 
 /* No comment provided by engineer. */
-"Don't create address" = "No crear dirección";
+"Don't create address" = "No crear dirección SimpleX";
 
 /* No comment provided by engineer. */
 "Don't enable" = "No activar";
@@ -1249,10 +1279,10 @@
 "encryption ok for %@" = "cifrado ok para %@";
 
 /* chat item text */
-"encryption re-negotiation allowed" = "renegociación de cifrado permitida";
+"encryption re-negotiation allowed" = "renegociar el cifrado permitido";
 
 /* chat item text */
-"encryption re-negotiation allowed for %@" = "renegociación de cifrado permitida para %@";
+"encryption re-negotiation allowed for %@" = "renegociar el cifrado permitido para %@";
 
 /* chat item text */
 "encryption re-negotiation required" = "se requiere renegociar el cifrado";
@@ -1624,7 +1654,7 @@
 "Hidden" = "Oculto";
 
 /* No comment provided by engineer. */
-"Hidden chat profiles" = "Perfiles Chat ocultos";
+"Hidden chat profiles" = "Perfiles ocultos";
 
 /* No comment provided by engineer. */
 "Hidden profile password" = "Contraseña del perfil oculto";
@@ -1719,6 +1749,9 @@
 /* No comment provided by engineer. */
 "Incognito mode" = "Modo incógnito";
 
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "El modo incógnito protege tu privacidad creando un perfil aleatorio por cada contacto.";
+
 /* chat list item description */
 "incognito via contact address link" = "en modo incógnito mediante enlace de dirección del contacto";
 
@@ -1782,6 +1815,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "¡Dirección de servidor no válida!";
 
+/* item status text */
+"Invalid status" = "Estado no válido";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "¡Invitación caducada!";
 
@@ -1798,7 +1834,7 @@
 "Invite to group" = "Invitar al grupo";
 
 /* No comment provided by engineer. */
-"invited" = "ha invitado a";
+"invited" = "ha sido invitado";
 
 /* rcv group event chat item */
 "invited %@" = "ha invitado a %@";
@@ -1861,7 +1897,7 @@
 "Joining group" = "Entrando al grupo";
 
 /* No comment provided by engineer. */
-"Keep your connections" = "Mantén tus conexiones";
+"Keep your connections" = "Conserva tus conexiones";
 
 /* No comment provided by engineer. */
 "Keychain error" = "Error Keychain";
@@ -1924,7 +1960,7 @@
 "Make one message disappear" = "Escribir un mensaje temporal";
 
 /* No comment provided by engineer. */
-"Make profile private!" = "¡Hacer un perfil privado!";
+"Make profile private!" = "¡Hacer perfil privado!";
 
 /* No comment provided by engineer. */
 "Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." = "Asegúrate de que las direcciones del servidor %@ tienen el formato correcto, están separadas por líneas y no duplicadas (%@).";
@@ -1945,7 +1981,7 @@
 "Mark verified" = "Marcar como verificado";
 
 /* No comment provided by engineer. */
-"Markdown in messages" = "Sintaxis markdown en los mensajes";
+"Markdown in messages" = "Sintaxis Markdown";
 
 /* marked deleted chat item preview text */
 "marked deleted" = "marcado eliminado";
@@ -2043,11 +2079,14 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "¡Pronto habrá más mejoras!";
 
+/* item status description */
+"Most likely this connection is deleted." = "Probablemente la conexión ha sido eliminada.";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "Lo más probable es que este contacto haya eliminado la conexión contigo.";
 
 /* No comment provided by engineer. */
-"Multiple chat profiles" = "Múltiples perfiles de chat";
+"Multiple chat profiles" = "Múltiples perfiles";
 
 /* No comment provided by engineer. */
 "Mute" = "Silenciar";
@@ -2115,6 +2154,9 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "Sin contactos que añadir";
 
+/* No comment provided by engineer. */
+"No delivery information" = "Sin información de entrega";
+
 /* No comment provided by engineer. */
 "No device token!" = "¡Sin dispositivo token!";
 
@@ -2198,10 +2240,10 @@
 "Only group owners can change group preferences." = "Sólo los propietarios pueden modificar las preferencias de grupo.";
 
 /* No comment provided by engineer. */
-"Only group owners can enable files and media." = "Sólo los propietarios pueden activar archivos y multimedia.";
+"Only group owners can enable files and media." = "Sólo los propietarios del grupo pueden activar los archivos y multimedia.";
 
 /* No comment provided by engineer. */
-"Only group owners can enable voice messages." = "Sólo los propietarios pueden activar los mensajes de voz.";
+"Only group owners can enable voice messages." = "Sólo los propietarios del grupo pueden activar los mensajes de voz.";
 
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Sólo tú puedes añadir reacciones a los mensajes.";
@@ -2446,6 +2488,9 @@
 /* No comment provided by engineer. */
 "Read more in our GitHub repository." = "Más información en nuestro repositorio GitHub.";
 
+/* No comment provided by engineer. */
+"Receipts are disabled" = "Las confirmaciones están desactivadas";
+
 /* No comment provided by engineer. */
 "received answer…" = "respuesta recibida…";
 
@@ -2465,7 +2510,7 @@
 "Received message" = "Mensaje entrante";
 
 /* No comment provided by engineer. */
-"Receiving address will be changed to a different server. Address change will complete after sender comes online." = "La dirección de recepción se cambiará. El cambio se completará cuando el remitente esté en línea.";
+"Receiving address will be changed to a different server. Address change will complete after sender comes online." = "La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.";
 
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Se detendrá la recepción del archivo.";
@@ -2504,10 +2549,10 @@
 "rejected call" = "llamada rechazada";
 
 /* No comment provided by engineer. */
-"Relay server is only used if necessary. Another party can observe your IP address." = "El servidor de retransmisión sólo se usará en caso necesario. Un tercero podría ver tu dirección IP.";
+"Relay server is only used if necessary. Another party can observe your IP address." = "El retransmisor sólo se usa en caso de necesidad. Un tercero podría ver tu IP.";
 
 /* No comment provided by engineer. */
-"Relay server protects your IP address, but it can observe the duration of the call." = "El servidor de retransmisión protege tu dirección IP, pero puede observar la duración de la llamada.";
+"Relay server protects your IP address, but it can observe the duration of the call." = "El servidor de retransmisión protege tu IP pero puede ver la duración de la llamada.";
 
 /* No comment provided by engineer. */
 "Remove" = "Eliminar";
@@ -2749,9 +2794,15 @@
 /* No comment provided by engineer. */
 "Sending receipts is disabled for %lld contacts" = "El envío de confirmaciones está desactivado para %lld contactos";
 
+/* No comment provided by engineer. */
+"Sending receipts is disabled for %lld groups" = "El envío de confirmaciones está desactivado para %lld grupos";
+
 /* No comment provided by engineer. */
 "Sending receipts is enabled for %lld contacts" = "El envío de confirmaciones está activado para %lld contactos";
 
+/* No comment provided by engineer. */
+"Sending receipts is enabled for %lld groups" = "El envío de confirmaciones está activado para %lld grupos";
+
 /* No comment provided by engineer. */
 "Sending via" = "Enviando vía";
 
@@ -2836,6 +2887,9 @@
 /* No comment provided by engineer. */
 "Show developer options" = "Mostrar opciones de desarrollador";
 
+/* No comment provided by engineer. */
+"Show last messages" = "Mostrar último mensaje";
+
 /* No comment provided by engineer. */
 "Show preview" = "Mostrar vista previa";
 
@@ -2884,6 +2938,9 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "Mensajes omitidos";
 
+/* No comment provided by engineer. */
+"Small groups (max 20)" = "Grupos pequeños (máx. 20)";
+
 /* No comment provided by engineer. */
 "SMP servers" = "Servidores SMP";
 
@@ -2909,7 +2966,7 @@
 "Stop" = "Detener";
 
 /* No comment provided by engineer. */
-"Stop chat to enable database actions" = "Para habilitar las acciones sobre la base de datos, previamente debes detener Chat";
+"Stop chat to enable database actions" = "Detén SimpleX para habilitar las acciones sobre la base de datos";
 
 /* No comment provided by engineer. */
 "Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "Para poder exportar, importar o eliminar la base de datos primero debes detener Chat. Durante el tiempo que esté detenido no podrás recibir ni enviar mensajes.";
@@ -3038,7 +3095,7 @@
 "The message will be marked as moderated for all members." = "El mensaje será marcado como moderado para todos los miembros.";
 
 /* No comment provided by engineer. */
-"The next generation of private messaging" = "La próxima generación de mensajería privada";
+"The next generation of private messaging" = "La nueva generación de mensajería privada";
 
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "La base de datos antigua no se eliminó durante la migración, puede eliminarse.";
@@ -3059,16 +3116,16 @@
 "Theme" = "Tema";
 
 /* No comment provided by engineer. */
-"There should be at least one user profile." = "Debe haber al menos un perfil de usuario.";
+"There should be at least one user profile." = "Debe haber al menos un perfil.";
 
 /* No comment provided by engineer. */
-"There should be at least one visible user profile." = "Debe haber al menos un perfil de usuario visible.";
+"There should be at least one visible user profile." = "Debe haber al menos un perfil visible.";
 
 /* No comment provided by engineer. */
 "These settings are for your current profile **%@**." = "Esta configuración afecta a tu perfil actual **%@**.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Se pueden anular en la configuración de contactos";
+"They can be overridden in contact and group settings." = "Se pueden anular en la configuración de contactos.";
 
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Esta acción no se puede deshacer. Se eliminarán todos los archivos y multimedia recibidos y enviados. Las imágenes de baja resolución permanecerán.";
@@ -3082,6 +3139,9 @@
 /* notification title */
 "this contact" = "este contacto";
 
+/* No comment provided by engineer. */
+"This group has over %lld members, delivery receipts are not sent." = "Este grupo tiene más de %lld miembros, no se enviarán confirmaciones de entrega.";
+
 /* No comment provided by engineer. */
 "This group no longer exists." = "Este grupo ya no existe.";
 
@@ -3110,7 +3170,7 @@
 "To record voice message please grant permission to use Microphone." = "Para grabar el mensaje de voz concede permiso para usar el micrófono.";
 
 /* No comment provided by engineer. */
-"To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Para hacer visible tu perfil oculto, introduce la contraseña completa en el campo de búsqueda de la página **Mis perfiles**.";
+"To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Para hacer visible tu perfil oculto, introduce la contraseña en el campo de búsqueda del menú **Mis perfiles**.";
 
 /* No comment provided by engineer. */
 "To support instant push notifications the chat database has to be migrated." = "Para permitir las notificaciones automáticas instantáneas, la base de datos se debe migrar.";
@@ -3152,7 +3212,7 @@
 "Unhide" = "Mostrar";
 
 /* No comment provided by engineer. */
-"Unhide chat profile" = "Mostrar perfil de chat";
+"Unhide chat profile" = "Mostrar perfil oculto";
 
 /* No comment provided by engineer. */
 "Unhide profile" = "Mostrar perfil";
@@ -3226,12 +3286,18 @@
 /* No comment provided by engineer. */
 "Use chat" = "Usar Chat";
 
+/* No comment provided by engineer. */
+"Use current profile" = "Usar perfil actual";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "Usar para conexiones nuevas";
 
 /* No comment provided by engineer. */
 "Use iOS call interface" = "Usar interfaz de llamada de iOS";
 
+/* No comment provided by engineer. */
+"Use new incognito profile" = "Usar nuevo perfil incógnito";
+
 /* No comment provided by engineer. */
 "Use server" = "Usar servidor";
 
@@ -3269,7 +3335,7 @@
 "via one-time link" = "mediante enlace de un uso";
 
 /* No comment provided by engineer. */
-"via relay" = "mediante servidor relay";
+"via relay" = "mediante retransmisor";
 
 /* No comment provided by engineer. */
 "Video call" = "Videollamada";
@@ -3374,7 +3440,7 @@
 "You allow" = "Permites";
 
 /* No comment provided by engineer. */
-"You already have a chat profile with the same display name. Please choose another name." = "Tienes un perfil de chat con el mismo nombre mostrado. Debes elegir otro nombre.";
+"You already have a chat profile with the same display name. Please choose another name." = "Ya tienes un perfil con este nombre mostrado. Por favor, elige otro nombre.";
 
 /* No comment provided by engineer. */
 "You are already connected to %@." = "Ya estás conectado a %@.";
@@ -3398,7 +3464,7 @@
 "You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." = "También puedes conectarte haciendo clic en el enlace. Si se abre en el navegador, haz clic en el botón **Abrir en aplicación móvil**.";
 
 /* No comment provided by engineer. */
-"You can create it later" = "Puedes crearlo más tarde";
+"You can create it later" = "Puedes crearla más tarde";
 
 /* No comment provided by engineer. */
 "You can enable later via Settings" = "Puedes activar más tarde en Configuración";
@@ -3407,7 +3473,7 @@
 "You can enable them later via app Privacy & Security settings." = "Puedes activarlos más tarde en la configuración de Privacidad y Seguridad.";
 
 /* No comment provided by engineer. */
-"You can hide or mute a user profile - swipe it to the right." = "Puedes ocultar o silenciar un perfil de usuario: deslízalo hacia la derecha.";
+"You can hide or mute a user profile - swipe it to the right." = "Puedes ocultar o silenciar un perfil deslizándolo a la derecha.";
 
 /* notification body */
 "You can now send messages to %@" = "Ya puedes enviar mensajes a %@";
@@ -3497,7 +3563,7 @@
 "You will be connected to group when the group host's device is online, please wait or check later!" = "Te conectarás al grupo cuando el dispositivo del anfitrión esté en línea, por favor espera o compruébalo más tarde.";
 
 /* No comment provided by engineer. */
-"You will be connected when your connection request is accepted, please wait or check later!" = "Te conectarás cuando se acepte tu solicitud de conexión, por favor espere o compruébalo más tarde.";
+"You will be connected when your connection request is accepted, please wait or check later!" = "Te conectarás cuando tu solicitud se acepte, por favor espera o compruébalo más tarde.";
 
 /* No comment provided by engineer. */
 "You will be connected when your contact's device is online, please wait or check later!" = "Te conectarás cuando el dispositivo de tu contacto esté en línea, por favor espera o compruébalo más tarde.";
@@ -3533,13 +3599,13 @@
 "Your calls" = "Llamadas";
 
 /* No comment provided by engineer. */
-"Your chat database" = "Base de datos Chat";
+"Your chat database" = "Base de datos";
 
 /* No comment provided by engineer. */
 "Your chat database is not encrypted - set passphrase to encrypt it." = "La base de datos no está cifrada - establece una contraseña para cifrarla.";
 
 /* No comment provided by engineer. */
-"Your chat profile will be sent to group members" = "Tu perfil Chat será enviado a los miembros del grupo";
+"Your chat profile will be sent to group members" = "Tu perfil será enviado a los miembros del grupo";
 
 /* No comment provided by engineer. */
 "Your chat profiles" = "Mis perfiles";
@@ -3574,11 +3640,14 @@
 /* No comment provided by engineer. */
 "Your privacy" = "Privacidad";
 
+/* No comment provided by engineer. */
+"Your profile **%@** will be shared." = "Tu perfil **%@** será compartido.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Tu perfil se almacena en tu dispositivo y sólo se comparte con tus contactos.\nLos servidores de SimpleX no pueden ver tu perfil.";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Tu perfil, contactos y mensajes entregados se almacenan en tu dispositivo.";
+"Your profile, contacts and delivered messages are stored on your device." = "Tu perfil, contactos y mensajes se almacenan en tu dispositivo.";
 
 /* No comment provided by engineer. */
 "Your random profile" = "Tu perfil aleatorio";

apps/ios/fr.lproj/Localizable.strings

@@ -88,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*gras*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## Historique";
+
+/* copied message info */
+"## In reply to" = "## En réponse à";
+
 /* No comment provided by engineer. */
 "#secret#" = "#secret#";
 
@@ -106,6 +115,9 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ et %@ sont connecté.es";
+
 /* copied message info, <sender> at <time> */
 "%@ at %@:" = "%1$@ à %2$@ :";
 
@@ -124,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ veut se connecter !";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ et %lld autres membres sont connectés";
+
 /* copied message info */
 "%@:" = "%@ :";
 
@@ -244,6 +259,9 @@
 /* notification title */
 "A new contact" = "Un nouveau contact";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "Un nouveau profil aléatoire sera partagé.";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Une connexion TCP distincte sera utilisée **pour chaque profil de chat que vous avez dans l'application**.";
 
@@ -279,7 +297,7 @@
 "Accept" = "Accepter";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Accepter le contact";
+"Accept connection request?" = "Accepter la demande de connexion ?";
 
 /* notification body */
 "Accept contact request from %@?" = "Accepter la demande de contact de %@ ?";
@@ -327,7 +345,7 @@
 "Advanced network settings" = "Paramètres réseau avancés";
 
 /* chat item text */
-"agreeing encryption for %@…" = "acceptant le chiffrement pour %@…";
+"agreeing encryption for %@…" = "accord sur le chiffrement pour %@…";
 
 /* chat item text */
 "agreeing encryption…" = "accord sur le chiffrement…";
@@ -690,11 +708,17 @@
 /* server test step */
 "Connect" = "Se connecter";
 
+/* No comment provided by engineer. */
+"Connect directly" = "Se connecter directement";
+
+/* No comment provided by engineer. */
+"Connect incognito" = "Se connecter incognito";
+
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "se connecter aux developpeurs de SimpleX Chat.";
 
 /* No comment provided by engineer. */
-"Connect via contact link" = "Se connecter via le lien du contact ?";
+"Connect via contact link" = "Se connecter via un lien de contact";
 
 /* No comment provided by engineer. */
 "Connect via group link?" = "Se connecter via le lien du groupe ?";
@@ -706,7 +730,7 @@
 "Connect via link / QR code" = "Se connecter via un lien / code QR";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "Se connecter via le lien du contact ?";
+"Connect via one-time link" = "Se connecter via un lien unique";
 
 /* No comment provided by engineer. */
 "connected" = "connecté";
@@ -1050,6 +1074,9 @@
 /* rcv group event chat item */
 "deleted group" = "groupe supprimé";
 
+/* No comment provided by engineer. */
+"Delivery" = "Distribution";
+
 /* No comment provided by engineer. */
 "Delivery receipts are disabled!" = "Les accusés de réception sont désactivés !";
 
@@ -1098,6 +1125,9 @@
 /* authentication reason */
 "Disable SimpleX Lock" = "Désactiver SimpleX Lock";
 
+/* No comment provided by engineer. */
+"disabled" = "désactivé";
+
 /* No comment provided by engineer. */
 "Disappearing message" = "Message éphémère";
 
@@ -1243,7 +1273,7 @@
 "encryption agreed for %@" = "chiffrement accepté pour %@";
 
 /* chat item text */
-"encryption ok" = "chiffrement ok";
+"encryption ok" = "chiffrement OK";
 
 /* chat item text */
 "encryption ok for %@" = "chiffrement ok pour %@";
@@ -1443,6 +1473,9 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Même s'il est désactivé dans la conversation.";
 
+/* No comment provided by engineer. */
+"event happened" = "event happened";
+
 /* No comment provided by engineer. */
 "Exit without saving" = "Quitter sans sauvegarder";
 
@@ -1719,6 +1752,9 @@
 /* No comment provided by engineer. */
 "Incognito mode" = "Mode Incognito";
 
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "Le mode incognito protège votre vie privée en utilisant un nouveau profil aléatoire pour chaque contact.";
+
 /* chat list item description */
 "incognito via contact address link" = "mode incognito via le lien d'adresse du contact";
 
@@ -1782,6 +1818,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "Adresse de serveur invalide !";
 
+/* item status text */
+"Invalid status" = "Statut invalide";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "Invitation expirée !";
 
@@ -2043,6 +2082,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Plus d'améliorations à venir !";
 
+/* item status description */
+"Most likely this connection is deleted." = "Connexion probablement supprimée.";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "Il est fort probable que ce contact ait supprimé la connexion avec vous.";
 
@@ -2115,6 +2157,9 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "Aucun contact à ajouter";
 
+/* No comment provided by engineer. */
+"No delivery information" = "Pas d'information sur la distribution";
+
 /* No comment provided by engineer. */
 "No device token!" = "Pas de token d'appareil !";
 
@@ -2446,6 +2491,9 @@
 /* No comment provided by engineer. */
 "Read more in our GitHub repository." = "Plus d'informations sur notre GitHub.";
 
+/* No comment provided by engineer. */
+"Receipts are disabled" = "Les accusés de réception sont désactivés";
+
 /* No comment provided by engineer. */
 "received answer…" = "réponse reçu…";
 
@@ -2749,9 +2797,15 @@
 /* No comment provided by engineer. */
 "Sending receipts is disabled for %lld contacts" = "L'envoi d'accusés de réception est désactivé pour %lld contacts";
 
+/* No comment provided by engineer. */
+"Sending receipts is disabled for %lld groups" = "L'envoi de reçus est désactivé pour les groupes %lld";
+
 /* No comment provided by engineer. */
 "Sending receipts is enabled for %lld contacts" = "L'envoi d'accusés de réception est activé pour %lld contacts";
 
+/* No comment provided by engineer. */
+"Sending receipts is enabled for %lld groups" = "L'envoi de reçus est activé pour les groupes %lld";
+
 /* No comment provided by engineer. */
 "Sending via" = "Envoi via";
 
@@ -2836,6 +2890,9 @@
 /* No comment provided by engineer. */
 "Show developer options" = "Afficher les options pour les développeurs";
 
+/* No comment provided by engineer. */
+"Show last messages" = "Voir les derniers messages";
+
 /* No comment provided by engineer. */
 "Show preview" = "Montrer l'aperçu";
 
@@ -2884,6 +2941,9 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "Messages manqués";
 
+/* No comment provided by engineer. */
+"Small groups (max 20)" = "Petits groupes (max 20)";
+
 /* No comment provided by engineer. */
 "SMP servers" = "Serveurs SMP";
 
@@ -3068,7 +3128,7 @@
 "These settings are for your current profile **%@**." = "Ces paramètres s'appliquent à votre profil actuel **%@**.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Ils peuvent être remplacés dans les paramètres des contacts";
+"They can be overridden in contact and group settings." = "Ils peuvent être modifiés dans les paramètres des contacts et des groupes.";
 
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Cette action ne peut être annulée - tous les fichiers et médias reçus et envoyés seront supprimés. Les photos à faible résolution seront conservées.";
@@ -3082,6 +3142,9 @@
 /* notification title */
 "this contact" = "ce contact";
 
+/* No comment provided by engineer. */
+"This group has over %lld members, delivery receipts are not sent." = "Ce groupe compte plus de %lld membres, les accusés de réception ne sont pas envoyés.";
+
 /* No comment provided by engineer. */
 "This group no longer exists." = "Ce groupe n'existe plus.";
 
@@ -3226,12 +3289,18 @@
 /* No comment provided by engineer. */
 "Use chat" = "Utiliser le chat";
 
+/* No comment provided by engineer. */
+"Use current profile" = "Utiliser le profil actuel";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "Utiliser pour les nouvelles connexions";
 
 /* No comment provided by engineer. */
 "Use iOS call interface" = "Utiliser l'interface d'appel d'iOS";
 
+/* No comment provided by engineer. */
+"Use new incognito profile" = "Utiliser un nouveau profil incognito";
+
 /* No comment provided by engineer. */
 "Use server" = "Utiliser ce serveur";
 
@@ -3574,6 +3643,9 @@
 /* No comment provided by engineer. */
 "Your privacy" = "Votre vie privée";
 
+/* No comment provided by engineer. */
+"Your profile **%@** will be shared." = "Votre profil **%@** sera partagé.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts.\nLes serveurs SimpleX ne peuvent pas voir votre profil.";
 

apps/ios/it.lproj/Localizable.strings

@@ -88,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*grassetto*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## Cronologia";
+
+/* copied message info */
+"## In reply to" = "## In risposta a";
+
 /* No comment provided by engineer. */
 "#secret#" = "#segreto#";
 
@@ -106,6 +115,9 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ e %@ sono connessi/e";
+
 /* copied message info, <sender> at <time> */
 "%@ at %@:" = "%1$@ alle %2$@:";
 
@@ -124,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ si vuole connettere!";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ e altri %lld membri sono connessi";
+
 /* copied message info */
 "%@:" = "%@:";
 
@@ -244,6 +259,9 @@
 /* notification title */
 "A new contact" = "Un contatto nuovo";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "Verrà condiviso un nuovo profilo casuale.";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Verrà usata una connessione TCP separata **per ogni profilo di chat presente nell'app**.";
 
@@ -279,7 +297,7 @@
 "Accept" = "Accetta";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Accetta il contatto";
+"Accept connection request?" = "Accettare la richiesta di connessione?";
 
 /* notification body */
 "Accept contact request from %@?" = "Accettare la richiesta di contatto da %@?";
@@ -690,11 +708,17 @@
 /* server test step */
 "Connect" = "Connetti";
 
+/* No comment provided by engineer. */
+"Connect directly" = "Connetti direttamente";
+
+/* No comment provided by engineer. */
+"Connect incognito" = "Connetti in incognito";
+
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "connettiti agli sviluppatori di SimpleX Chat.";
 
 /* No comment provided by engineer. */
-"Connect via contact link" = "Connettere via link del contatto?";
+"Connect via contact link" = "Connetti via link del contatto";
 
 /* No comment provided by engineer. */
 "Connect via group link?" = "Connettere via link del gruppo?";
@@ -706,7 +730,7 @@
 "Connect via link / QR code" = "Connetti via link / codice QR";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "Connettere via link una tantum?";
+"Connect via one-time link" = "Connetti via link una tantum";
 
 /* No comment provided by engineer. */
 "connected" = "connesso/a";
@@ -1050,6 +1074,9 @@
 /* rcv group event chat item */
 "deleted group" = "gruppo eliminato";
 
+/* No comment provided by engineer. */
+"Delivery" = "Consegna";
+
 /* No comment provided by engineer. */
 "Delivery receipts are disabled!" = "Le ricevute di consegna sono disattivate!";
 
@@ -1098,6 +1125,9 @@
 /* authentication reason */
 "Disable SimpleX Lock" = "Disattiva SimpleX Lock";
 
+/* No comment provided by engineer. */
+"disabled" = "disattivato";
+
 /* No comment provided by engineer. */
 "Disappearing message" = "Messaggio a tempo";
 
@@ -1443,6 +1473,9 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Anche quando disattivato nella conversazione.";
 
+/* No comment provided by engineer. */
+"event happened" = "evento accaduto";
+
 /* No comment provided by engineer. */
 "Exit without saving" = "Esci senza salvare";
 
@@ -1719,6 +1752,9 @@
 /* No comment provided by engineer. */
 "Incognito mode" = "Modalità incognito";
 
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "La modalità in incognito protegge la tua privacy usando un nuovo profilo casuale per ogni contatto.";
+
 /* chat list item description */
 "incognito via contact address link" = "incognito via link indirizzo del contatto";
 
@@ -1782,6 +1818,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "Indirizzo del server non valido!";
 
+/* item status text */
+"Invalid status" = "Stato non valido";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "Invito scaduto!";
 
@@ -1960,7 +1999,7 @@
 "Member" = "Membro";
 
 /* rcv group event chat item */
-"member connected" = "connesso/a";
+"member connected" = "è connesso/a";
 
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "Il ruolo del membro verrà cambiato in \"%@\". Tutti i membri del gruppo verranno avvisati.";
@@ -2043,6 +2082,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Altri miglioramenti sono in arrivo!";
 
+/* item status description */
+"Most likely this connection is deleted." = "Probabilmente questa connessione è stata eliminata.";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "Probabilmente questo contatto ha eliminato la connessione con te.";
 
@@ -2115,6 +2157,9 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "Nessun contatto da aggiungere";
 
+/* No comment provided by engineer. */
+"No delivery information" = "Nessuna informazione sulla consegna";
+
 /* No comment provided by engineer. */
 "No device token!" = "Nessun token del dispositivo!";
 
@@ -2446,6 +2491,9 @@
 /* No comment provided by engineer. */
 "Read more in our GitHub repository." = "Maggiori informazioni nel nostro repository GitHub.";
 
+/* No comment provided by engineer. */
+"Receipts are disabled" = "Le ricevute sono disattivate";
+
 /* No comment provided by engineer. */
 "received answer…" = "risposta ricevuta…";
 
@@ -2749,9 +2797,15 @@
 /* No comment provided by engineer. */
 "Sending receipts is disabled for %lld contacts" = "L'invio di ricevute è disattivato per %lld contatti";
 
+/* No comment provided by engineer. */
+"Sending receipts is disabled for %lld groups" = "L'invio di ricevute è disattivato per %lld gruppi";
+
 /* No comment provided by engineer. */
 "Sending receipts is enabled for %lld contacts" = "L'invio di ricevute è attivo per %lld contatti";
 
+/* No comment provided by engineer. */
+"Sending receipts is enabled for %lld groups" = "L'invio di ricevute è attivo per %lld gruppi";
+
 /* No comment provided by engineer. */
 "Sending via" = "Invio tramite";
 
@@ -2836,6 +2890,9 @@
 /* No comment provided by engineer. */
 "Show developer options" = "Mostra opzioni sviluppatore";
 
+/* No comment provided by engineer. */
+"Show last messages" = "Mostra ultimi messaggi";
+
 /* No comment provided by engineer. */
 "Show preview" = "Mostra anteprima";
 
@@ -2884,6 +2941,9 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "Messaggi saltati";
 
+/* No comment provided by engineer. */
+"Small groups (max 20)" = "Piccoli gruppi (max 20)";
+
 /* No comment provided by engineer. */
 "SMP servers" = "Server SMP";
 
@@ -3068,7 +3128,7 @@
 "These settings are for your current profile **%@**." = "Queste impostazioni sono per il tuo profilo attuale **%@**.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Possono essere sovrascritte nelle impostazioni dei contatti";
+"They can be overridden in contact and group settings." = "Possono essere sovrascritte nelle impostazioni dei contatti e dei gruppi.";
 
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Questa azione non può essere annullata: tutti i file e i media ricevuti e inviati verranno eliminati. Rimarranno le immagini a bassa risoluzione.";
@@ -3082,6 +3142,9 @@
 /* notification title */
 "this contact" = "questo contatto";
 
+/* No comment provided by engineer. */
+"This group has over %lld members, delivery receipts are not sent." = "Questo gruppo ha più di %lld membri, le ricevute di consegna non vengono inviate.";
+
 /* No comment provided by engineer. */
 "This group no longer exists." = "Questo gruppo non esiste più.";
 
@@ -3226,12 +3289,18 @@
 /* No comment provided by engineer. */
 "Use chat" = "Usa la chat";
 
+/* No comment provided by engineer. */
+"Use current profile" = "Usa il profilo attuale";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "Usa per connessioni nuove";
 
 /* No comment provided by engineer. */
 "Use iOS call interface" = "Usa interfaccia di chiamata iOS";
 
+/* No comment provided by engineer. */
+"Use new incognito profile" = "Usa nuovo profilo in incognito";
+
 /* No comment provided by engineer. */
 "Use server" = "Usa il server";
 
@@ -3574,6 +3643,9 @@
 /* No comment provided by engineer. */
 "Your privacy" = "La tua privacy";
 
+/* No comment provided by engineer. */
+"Your profile **%@** will be shared." = "Il tuo profilo **%@** verrà condiviso.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Il tuo profilo è memorizzato sul tuo dispositivo e condiviso solo con i tuoi contatti.\nI server di SimpleX non possono vedere il tuo profilo.";
 

apps/ios/ja.lproj/Localizable.strings

@@ -19,6 +19,9 @@
 /* No comment provided by engineer. */
 "_italic_" = "\\_斜体_";
 
+/* No comment provided by engineer. */
+"- more stable message delivery.\n- a bit better groups.\n- and more!" = "- より安定したメッセージ配信。\n- 改良されたグループ。\n- などなど！";
+
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 最長 5 分間の音声メッセージ。\n- 消えるまでのカスタム時間。\n- 編集履歴。";
 
@@ -85,6 +88,15 @@
 /* No comment provided by engineer. */
 "*bold*" = "\\*太文字*";
 
+/* copied message info title, # <title> */
+"# %@" = "# %@";
+
+/* copied message info */
+"## History" = "## 履歴";
+
+/* copied message info */
+"## In reply to" = "## 返信先";
+
 /* No comment provided by engineer. */
 "#secret#" = "シークレット";
 
@@ -103,6 +115,12 @@
 /* No comment provided by engineer. */
 "%@ %@" = "%@ %@";
 
+/* No comment provided by engineer. */
+"%@ and %@ connected" = "%@ と %@ は接続中";
+
+/* copied message info, <sender> at <time> */
+"%@ at %@:" = "%1$@ at %2$@:";
+
 /* notification title */
 "%@ is connected!" = "%@ 接続中!";
 
@@ -118,6 +136,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ が接続を希望しています!";
 
+/* No comment provided by engineer. */
+"%@, %@ and %lld other members connected" = "%@, %@ および %lld 人のメンバーが接続中";
+
 /* copied message info */
 "%@:" = "%@:";
 
@@ -232,15 +253,30 @@
 /* No comment provided by engineer. */
 "30 seconds" = "30秒";
 
+/* No comment provided by engineer. */
+"A few more things" = "その他";
+
 /* notification title */
 "A new contact" = "新しい連絡先";
 
+/* No comment provided by engineer. */
+"A new random profile will be shared." = "新しいランダムなプロファイルが共有されます。";
+
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "**アプリ内のチャット プロフィールごとに**、個別の TCP 接続が使用されます。";
 
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." = "**アプリ内のチャット プロファイルごとに**、個別の TCP 接続が使用されます。\n**注意**：多くの接続がある場合、バッテリーと通信量の消費が大幅に増加し、一部の接続に失敗することがあります。";
 
+/* No comment provided by engineer. */
+"Abort" = "中止";
+
+/* No comment provided by engineer. */
+"Abort changing address" = "アドレス変更の中止";
+
+/* No comment provided by engineer. */
+"Abort changing address?" = "アドレス変更を中止しますか？";
+
 /* No comment provided by engineer. */
 "About SimpleX" = "SimpleXについて";
 
@@ -296,6 +332,9 @@
 /* No comment provided by engineer. */
 "Address" = "アドレス";
 
+/* No comment provided by engineer. */
+"Address change will be aborted. Old receiving address will be used." = "アドレス変更は中止されます。古い受信アドレスが使用されます。";
+
 /* member role */
 "admin" = "管理者";
 
@@ -305,6 +344,12 @@
 /* No comment provided by engineer. */
 "Advanced network settings" = "ネットワーク詳細設定";
 
+/* chat item text */
+"agreeing encryption for %@…" = "%@の暗号化に同意しています…";
+
+/* chat item text */
+"agreeing encryption…" = "暗号化に同意しています…";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "すべてのアプリデータが削除されます。";
 
@@ -353,6 +398,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages." = "送信済みメッセージの永久削除を許可する。";
 
+/* No comment provided by engineer. */
+"Allow to send files and media." = "ファイルやメディアの送信を許可する。";
+
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "音声メッセージの送信を許可する。";
 
@@ -467,6 +515,9 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "メッセージ ID が正しくありません";
 
+/* No comment provided by engineer. */
+"Better messages" = "より良いメッセージ";
+
 /* No comment provided by engineer. */
 "bold" = "太文字";
 
@@ -564,6 +615,12 @@
 /* rcv group event chat item */
 "changed your role to %@" = "あなたの役割を %@ に変更しました";
 
+/* chat item text */
+"changing address for %@…" = "%@ のアドレスを変更しています…";
+
+/* chat item text */
+"changing address…" = "アドレスを変更しています…";
+
 /* No comment provided by engineer. */
 "Chat archive" = "チャットのアーカイブ";
 
@@ -651,6 +708,12 @@
 /* server test step */
 "Connect" = "接続";
 
+/* No comment provided by engineer. */
+"Connect directly" = "直接接続する";
+
+/* No comment provided by engineer. */
+"Connect incognito" = "シークレットモードで接続";
+
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "SimpleX Chat 開発者に接続します。";
 
@@ -750,6 +813,9 @@
 /* No comment provided by engineer. */
 "Contact preferences" = "連絡先の設定";
 
+/* No comment provided by engineer. */
+"Contacts" = "連絡先";
+
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "連絡先はメッセージを削除対象とすることができます。あなたには閲覧可能です。";
 
@@ -885,6 +951,12 @@
 /* pref value */
 "default (%@)" = "デフォルト (%@)";
 
+/* No comment provided by engineer. */
+"default (no)" = "デフォルト（いいえ）";
+
+/* No comment provided by engineer. */
+"default (yes)" = "デフォルト（はい）";
+
 /* chat item action */
 "Delete" = "削除";
 
@@ -1002,6 +1074,12 @@
 /* rcv group event chat item */
 "deleted group" = "削除されたグループ";
 
+/* No comment provided by engineer. */
+"Delivery" = "Delivery";
+
+/* No comment provided by engineer. */
+"Delivery receipts are disabled!" = "Delivery receipts are disabled!";
+
 /* No comment provided by engineer. */
 "Description" = "説明";
 
@@ -1035,9 +1113,18 @@
 /* No comment provided by engineer. */
 "Direct messages between members are prohibited in this group." = "このグループではメンバー間のダイレクトメッセージが使用禁止です。";
 
+/* No comment provided by engineer. */
+"Disable (keep overrides)" = "無効にする（設定の優先を維持）";
+
+/* No comment provided by engineer. */
+"Disable for all" = "すべて無効";
+
 /* authentication reason */
 "Disable SimpleX Lock" = "SimpleXロックを無効にする";
 
+/* No comment provided by engineer. */
+"disabled" = "無効";
+
 /* No comment provided by engineer. */
 "Disappearing message" = "消えるメッセージ";
 
@@ -1074,6 +1161,9 @@
 /* No comment provided by engineer. */
 "Don't create address" = "アドレスを作成しないでください";
 
+/* No comment provided by engineer. */
+"Don't enable" = "有効にしない";
+
 /* No comment provided by engineer. */
 "Don't show again" = "次から表示しない";
 
@@ -1104,9 +1194,15 @@
 /* No comment provided by engineer. */
 "Enable" = "有効";
 
+/* No comment provided by engineer. */
+"Enable (keep overrides)" = "有効にする（設定の優先を維持）";
+
 /* No comment provided by engineer. */
 "Enable automatic message deletion?" = "自動メッセージ削除を有効にしますか？";
 
+/* No comment provided by engineer. */
+"Enable for all" = "すべて有効";
+
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "即時通知を有効にしますか？";
 
@@ -1167,6 +1263,30 @@
 /* notification */
 "Encrypted message: unexpected error" = "暗号化されたメッセージ : 予期しないエラー";
 
+/* chat item text */
+"encryption agreed" = "暗号化に同意しました";
+
+/* chat item text */
+"encryption agreed for %@" = "%@ の暗号化に同意しました";
+
+/* chat item text */
+"encryption ok" = "暗号化OK";
+
+/* chat item text */
+"encryption ok for %@" = "%@ の暗号化OK";
+
+/* chat item text */
+"encryption re-negotiation allowed" = "暗号化の再ネゴシエーションを許可";
+
+/* chat item text */
+"encryption re-negotiation allowed for %@" = "%@ の暗号化の再ネゴシエーションを許可";
+
+/* chat item text */
+"encryption re-negotiation required" = "暗号化の再ネゴシエーションが必要";
+
+/* chat item text */
+"encryption re-negotiation required for %@" = "%@ の暗号化の再ネゴシエーションが必要";
+
 /* No comment provided by engineer. */
 "ended" = "終了";
 
@@ -1200,6 +1320,9 @@
 /* No comment provided by engineer. */
 "Error" = "エラー";
 
+/* No comment provided by engineer. */
+"Error aborting address change" = "アドレス変更中止エラー";
+
 /* No comment provided by engineer. */
 "Error accepting contact request" = "連絡先リクエストの承諾にエラー発生";
 
@@ -1311,6 +1434,9 @@
 /* No comment provided by engineer. */
 "Error switching profile!" = "プロフィール切り替えにエラー発生！";
 
+/* No comment provided by engineer. */
+"Error synchronizing connection" = "接続の同期エラー";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "グループのリンクのアップデートにエラー発生";
 
@@ -1335,6 +1461,12 @@
 /* No comment provided by engineer. */
 "Error: URL is invalid" = "エラー: 無効なURL";
 
+/* No comment provided by engineer. */
+"Even when disabled in the conversation." = "会話中に無効になっている場合でも。";
+
+/* No comment provided by engineer. */
+"event happened" = "イベント発生";
+
 /* No comment provided by engineer. */
 "Exit without saving" = "保存せずに閉じる";
 
@@ -1356,6 +1488,9 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "送信者がオンラインになるまでの待ち時間がなく、速い！";
 
+/* No comment provided by engineer. */
+"Favorite" = "お気に入り";
+
 /* No comment provided by engineer. */
 "File will be deleted from servers." = "ファイルはサーバーから削除されます。";
 
@@ -1371,6 +1506,42 @@
 /* No comment provided by engineer. */
 "Files & media" = "ファイルとメディア";
 
+/* chat feature */
+"Files and media" = "ファイルとメディア";
+
+/* No comment provided by engineer. */
+"Files and media are prohibited in this group." = "このグループでは、ファイルとメディアは禁止されています。";
+
+/* No comment provided by engineer. */
+"Files and media prohibited!" = "ファイルとメディアは禁止されています!";
+
+/* No comment provided by engineer. */
+"Filter unread and favorite chats." = "未読とお気に入りをフィルターします。";
+
+/* No comment provided by engineer. */
+"Finally, we have them! 🚀" = "ついに、私たちはそれらを手に入れました! 🚀";
+
+/* No comment provided by engineer. */
+"Find chats faster" = "チャットを素早く検索";
+
+/* No comment provided by engineer. */
+"Fix" = "修正";
+
+/* No comment provided by engineer. */
+"Fix connection" = "接続を修正";
+
+/* No comment provided by engineer. */
+"Fix connection?" = "接続を修正しますか?";
+
+/* No comment provided by engineer. */
+"Fix encryption after restoring backups." = "バックアップの復元後に暗号化を修正します。";
+
+/* No comment provided by engineer. */
+"Fix not supported by contact" = "連絡先による修正はサポートされていません";
+
+/* No comment provided by engineer. */
+"Fix not supported by group member" = "グループメンバーによる修正はサポートされていません";
+
 /* No comment provided by engineer. */
 "For console" = "コンソール";
 
@@ -1437,6 +1608,9 @@
 /* No comment provided by engineer. */
 "Group members can send disappearing messages." = "グループのメンバーが消えるメッセージを送信できます。";
 
+/* No comment provided by engineer. */
+"Group members can send files and media." = "グループメンバーはファイルやメディアを送信できます。";
+
 /* No comment provided by engineer. */
 "Group members can send voice messages." = "グループのメンバーが音声メッセージを送信できます。";
 
@@ -1560,12 +1734,18 @@
 /* No comment provided by engineer. */
 "Improved server configuration" = "サーバ設定の向上";
 
+/* No comment provided by engineer. */
+"In reply to" = "返信先";
+
 /* No comment provided by engineer. */
 "Incognito" = "シークレットモード";
 
 /* No comment provided by engineer. */
 "Incognito mode" = "シークレットモード";
 
+/* No comment provided by engineer. */
+"Incognito mode protects your privacy by using a new random profile for each contact." = "シークレットモードとは、メインのプロフィールとプロフィール画像を守るために、新しい連絡先を追加する時に、その連絡先に対してランダムなプロフィールが作成されるという対策です。";
+
 /* chat list item description */
 "incognito via contact address link" = "連絡先リンク経由でシークレットモード";
 
@@ -1629,6 +1809,9 @@
 /* No comment provided by engineer. */
 "Invalid server address!" = "無効なサーバアドレス！";
 
+/* item status text */
+"Invalid status" = "無効なステータス";
+
 /* No comment provided by engineer. */
 "Invitation expired!" = "招待が期限切れました！";
 
@@ -1707,6 +1890,9 @@
 /* No comment provided by engineer. */
 "Joining group" = "グループに参加";
 
+/* No comment provided by engineer. */
+"Keep your connections" = "接続を維持";
+
 /* No comment provided by engineer. */
 "Keychain error" = "キーチェーンのエラー";
 
@@ -1764,6 +1950,9 @@
 /* No comment provided by engineer. */
 "Make a private connection" = "プライベートな接続をする";
 
+/* No comment provided by engineer. */
+"Make one message disappear" = "メッセージを1つ消す";
+
 /* No comment provided by engineer. */
 "Make profile private!" = "プロフィールを非表示にできます！";
 
@@ -1881,6 +2070,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "まだまだ改善してまいります！";
 
+/* item status description */
+"Most likely this connection is deleted." = "おそらく、この接続は削除されています。";
+
 /* No comment provided by engineer. */
 "Most likely this contact has deleted the connection with you." = "恐らくこの連絡先があなたとの接続を削除しました。";
 
@@ -1953,21 +2145,33 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "追加できる連絡先がありません";
 
+/* No comment provided by engineer. */
+"No delivery information" = "送信情報なし";
+
 /* No comment provided by engineer. */
 "No device token!" = "デバイストークンがありません!";
 
 /* No comment provided by engineer. */
 "no e2e encryption" = "エンドツーエンド暗号化がありません";
 
+/* No comment provided by engineer. */
+"No filtered chats" = "フィルタされたチャットはありません";
+
 /* No comment provided by engineer. */
 "No group!" = "グループが見つかりません！";
 
+/* No comment provided by engineer. */
+"No history" = "履歴はありません";
+
 /* No comment provided by engineer. */
 "No permission to record voice message" = "音声メッセージを録音する権限がありません";
 
 /* No comment provided by engineer. */
 "No received or sent files" = "送受信済みのファイルがありません";
 
+/* copied message info in history */
+"no text" = "テキストなし";
+
 /* No comment provided by engineer. */
 "Notifications" = "通知";
 
@@ -2026,6 +2230,9 @@
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "グループ設定を変えられるのはグループのオーナーだけです。";
 
+/* No comment provided by engineer. */
+"Only group owners can enable files and media." = "ファイルやメディアを有効にできるのは、グループオーナーだけです。";
+
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "音声メッセージを利用可能に設定できるのはグループのオーナーだけです。";
 
@@ -2227,6 +2434,9 @@
 /* No comment provided by engineer. */
 "Prohibit sending disappearing messages." = "消えるメッセージを使用禁止にする。";
 
+/* No comment provided by engineer. */
+"Prohibit sending files and media." = "ファイルやメディアの送信を禁止します。";
+
 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "音声メッセージを使用禁止にする。";
 
@@ -2239,12 +2449,18 @@
 /* No comment provided by engineer. */
 "Protocol timeout" = "プロトコル・タイムアウト";
 
+/* No comment provided by engineer. */
+"Protocol timeout per KB" = "KB あたりのプロトコル タイムアウト";
+
 /* No comment provided by engineer. */
 "Push notifications" = "プッシュ通知";
 
 /* No comment provided by engineer. */
 "Rate the app" = "アプリを評価";
 
+/* chat item menu */
+"React…" = "反応する…";
+
 /* No comment provided by engineer. */
 "Read" = "読む";
 
@@ -2281,6 +2497,9 @@
 /* message info title */
 "Received message" = "受信したメッセージ";
 
+/* No comment provided by engineer. */
+"Receiving address will be changed to a different server. Address change will complete after sender comes online." = "開発中の機能です！相手のクライアントが4.2でなければ機能しません。アドレス変更が完了すると、会話にメッセージが出ます。連絡相手 (またはグループのメンバー) からメッセージを受信できないかをご確認ください。";
+
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "ファイルの受信を停止します。";
 
@@ -2290,6 +2509,12 @@
 /* No comment provided by engineer. */
 "Recipients see updates as you type them." = "受信者には、入力時に更新内容が表示されます。";
 
+/* No comment provided by engineer. */
+"Reconnect all connected servers to force message delivery. It uses additional traffic." = "接続されているすべてのサーバーを再接続して、メッセージを強制的に配信します。 追加のトラフィックを使用します。";
+
+/* No comment provided by engineer. */
+"Reconnect servers?" = "サーバーに再接続しますか？";
+
 /* No comment provided by engineer. */
 "Record updated at" = "レコード更新日時";
 
@@ -2338,6 +2563,15 @@
 /* rcv group event chat item */
 "removed you" = "あなたを除名しました";
 
+/* No comment provided by engineer. */
+"Renegotiate" = "再ネゴシエート";
+
+/* No comment provided by engineer. */
+"Renegotiate encryption" = "暗号化の再ネゴシエート";
+
+/* No comment provided by engineer. */
+"Renegotiate encryption?" = "暗号化を再ネゴシエートしますか?";
+
 /* chat item action */
 "Reply" = "返信";
 
@@ -2476,6 +2710,9 @@
 /* No comment provided by engineer. */
 "Security code" = "セキュリティコード";
 
+/* chat item text */
+"security code changed" = "セキュリティコードが変更されました";
+
 /* No comment provided by engineer. */
 "Select" = "選択";
 
@@ -2614,6 +2851,9 @@
 /* No comment provided by engineer. */
 "Show developer options" = "開発者向けオプションを表示";
 
+/* No comment provided by engineer. */
+"Show last messages" = "最新のメッセージを表示";
+
 /* No comment provided by engineer. */
 "Show preview" = "プレビューを表示";
 
@@ -2662,9 +2902,15 @@
 /* No comment provided by engineer. */
 "Skipped messages" = "飛ばしたメッセージ";
 
+/* No comment provided by engineer. */
+"Small groups (max 20)" = "小グループ（最大20名）";
+
 /* No comment provided by engineer. */
 "SMP servers" = "SMPサーバ";
 
+/* No comment provided by engineer. */
+"Some non-fatal errors occurred during import - you may see Chat console for more details." = "インポート中に致命的でないエラーが発生しました - 詳細はチャットコンソールを参照してください。";
+
 /* notification title */
 "Somebody" = "誰か";
 
@@ -2794,6 +3040,9 @@
 /* No comment provided by engineer. */
 "The created archive is available via app Settings / Database / Old database archive." = "作成されたアーカイブは、アプリの設定／データベース／過去のデータベースアーカイブから利用できます。";
 
+/* No comment provided by engineer. */
+"The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "暗号化は機能しており、新しい暗号化への同意は必要ありません。接続エラーが発生する可能性があります！";
+
 /* No comment provided by engineer. */
 "The group is fully decentralized – it is visible only to the members." = "グループは完全分散型で、メンバーしか内容を見れません。";
 
@@ -2818,6 +3067,9 @@
 /* No comment provided by engineer. */
 "The profile is only shared with your contacts." = "プロフィールは連絡先にしか共有されません。";
 
+/* No comment provided by engineer. */
+"The second tick we missed! ✅" = "長らくお待たせしました！ ✅";
+
 /* No comment provided by engineer. */
 "The sender will NOT be notified" = "送信者には通知されません";
 
@@ -2833,6 +3085,12 @@
 /* No comment provided by engineer. */
 "There should be at least one visible user profile." = "少なくとも1つのユーザープロフィールが表示されている必要があります。";
 
+/* No comment provided by engineer. */
+"These settings are for your current profile **%@**." = "これらの設定は現在のプロファイル **%@** 用です。";
+
+/* No comment provided by engineer. */
+"They can be overridden in contact and group settings." = "これらは連絡先の設定が優先します。";
+
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "ファイルとメディアが全て削除されます (※元に戻せません※)。低解像度の画像が残ります。";
 
@@ -2908,6 +3166,9 @@
 /* No comment provided by engineer. */
 "Unexpected migration state" = "予期しない移行状態";
 
+/* No comment provided by engineer. */
+"Unfav." = "お気に入りを取り消す。";
+
 /* No comment provided by engineer. */
 "Unhide" = "表示にする";
 
@@ -2986,12 +3247,18 @@
 /* No comment provided by engineer. */
 "Use chat" = "チャット";
 
+/* No comment provided by engineer. */
+"Use current profile" = "現在のプロファイルを使用する";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "新しい接続に使う";
 
 /* No comment provided by engineer. */
 "Use iOS call interface" = "iOS通話インターフェースを使用する";
 
+/* No comment provided by engineer. */
+"Use new incognito profile" = "新しいシークレットプロファイルを使用する";
+
 /* No comment provided by engineer. */
 "Use server" = "サーバを使う";
 
@@ -3160,6 +3427,12 @@
 /* No comment provided by engineer. */
 "You can create it later" = "後からでも作成できます";
 
+/* No comment provided by engineer. */
+"You can enable later via Settings" = "あとで設定から有効にできます";
+
+/* No comment provided by engineer. */
+"You can enable them later via app Privacy & Security settings." = "あとでアプリのプライバシーとセキュリティの設定から有効にすることができます。";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "ユーザープロファイルを右にスワイプすると、非表示またはミュートにすることができます。";
 
@@ -3328,6 +3601,9 @@
 /* No comment provided by engineer. */
 "Your privacy" = "あなたのプライバシー";
 
+/* No comment provided by engineer. */
+"Your profile **%@** will be shared." = "あなたのプロファイル **%@** が共有されます。";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "プロフィールはデバイスに保存され、連絡先とのみ共有されます。\nSimpleX サーバーはあなたのプロファイルを参照できません。";