fix

* ios: update servers API/UI

* fix UI

* fix

.github/workflows/build.yml

@@ -52,9 +52,9 @@ jobs:
           - os: ubuntu-20.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
-          - os: ubuntu-18.04
+          - os: ubuntu-22.04
             cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-18_04-x86-64
+            asset_name: simplex-chat-ubuntu-22_04-x86-64
           - os: macos-latest
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
@@ -96,7 +96,7 @@ jobs:
         run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
         shell: bash
         run: |
           echo "ignore-project: False"    >> cabal.project.local
@@ -112,8 +112,8 @@ jobs:
           echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
 
       - name: Unix test
-        if: matrix.os != 'windows-latest' && matrix.os != 'ubuntu-20.04'
-        timeout-minutes: 20
+        if: matrix.os != 'windows-latest'
+        timeout-minutes: 30
         shell: bash
         run: cabal test --test-show-details=direct
 

.gitignore

@@ -75,3 +75,4 @@ website/package-lock.json
 # Ignore test files
 website/.cache
 website/test/stubs-layout-cache/_includes/*.js
+apps/android/app/release

README.md

@@ -1,15 +1,29 @@
-| Updated 07.02.2023 | Languages: EN, [FR](/docs/lang/fr/README.md) |
-
-<img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
-
-# SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design!
-
 [![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
 [![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
 [![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 [![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
 
+| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
+
+<img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
+
+# SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design!
+
+[<img src="./images/trail-of-bits.jpg" height="100">](http://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html) &nbsp;&nbsp;&nbsp; [<img src="./images/privacy-guides.jpg" height="80">](https://www.privacyguides.org/en/real-time-communication/#simplex-chat) &nbsp;&nbsp;&nbsp; [<img src="./images/kuketz-blog.jpg" height="80">](https://www.kuketz-blog.de/simplex-eindruecke-vom-messenger-ohne-identifier/)
+
+## Welcome to SimpleX Chat!
+
+1. 📲 [Install the app](#install-the-app).
+2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
+3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
+4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
+5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
+
+[Learn more about SimpleX Chat](#contents).
+
+## Install the app
+
 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
 &nbsp;
 [![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
@@ -26,7 +40,90 @@
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
 - 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
 
-**NEW**: Security audit by [Trail of Bits](https://www.trailofbits.com/about), the [new website](https://simplex.chat) and v4.2 released! [See the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md)
+## Connect to the team via the app
+
+- to ask any questions
+- to suggest any improvements
+- to share anything relevant
+
+## Join user groups
+
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-2](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FQP8zaGjjmlXV-ix_Er4JgJ0lNPYGS1KX%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEApAgBkRZ3x12ayZ7sHrjHQWNMvqzZpWUgM_fFCUdLXwo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xWpPXEZZsQp_F7vwAcAYDw%3D%3D%22%7D)
+
+There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
+
+[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
+
+You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
+
+## 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.
+
+The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
+
+<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app1.png" alt="Make a private connection" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app2.png" alt="Conversation" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app3.png" alt="Video call" height="360">
+
+After you connect, you can [verify connection security code](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md#connection-security-verification).
+
+## User guide (NEW)
+
+Read about the app features and settings in the new [User guide](./docs/guide/README.md).
+
+## Help translating SimpleX Chat
+
+Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps, website and documents are translated to many other languages.
+
+Join our translators to help SimpleX grow!
+
+|locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
+|:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
+|🇬🇧 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/)||
+|🇨🇿 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/)||
+|🇳🇱 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/)||
+|🇷🇺 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/)|||
+|🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)|[![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/)|[![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, Hindi, Japanese, Spanish and [many 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!
+
+## Contribute
+
+We would love to have you join the development! You can help us with:
+
+- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
+- contributing to SimpleX Chat knowledge-base.
+- developing features - please connect to us via chat so we can help you get started.
+
+## Help us with donations
+
+Huge thank you to everybody who donated to SimpleX Chat!
+
+We are prioritizing users privacy and security - it would be impossible without your support.
+
+Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
+
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.
+
+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
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder
 
 ## Contents
 
@@ -38,16 +135,11 @@
   - [Users own SimpleX network](#users-own-simplex-network)
 - [Frequently asked questions](#frequently-asked-questions)
 - [News and updates](#news-and-updates)
-- [Make a private connection](#make-a-private-connection)
 - [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)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
-- [Join a user group](#join-a-user-group)
-- [Translate the apps](#translate-the-apps)
-- [Contribute](#contribute)
-- [Help us with donations](#help-us-with-donations)
 - [Disclaimers, Security contact, License](#disclaimers)
 
 ## Why privacy matters
@@ -88,26 +180,22 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent updates:
 
-[Feb 04, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
+[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
 
-[Jan 03, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
+[Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
 
-[Dec 06, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
+[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
 
-[Nov 08, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
+
+[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
+
+[Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
 
 [All updates](./blog)
 
-## Make a private connection
-
-You need to share a link or scan a QR code (in person or during a video call) to make a connection and start messaging.
-
-The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
-
-<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app1.png" alt="Make a private connection" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app2.png" alt="Conversation" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app3.png" alt="Video call" height="360">
-
 ## :zap: Quick installation of a terminal app
 
 ```sh
@@ -202,17 +290,21 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ Multiple user profiles in the same chat database.
 - ✅ Optionally avoid re-using the same TCP session for multiple connections.
 - ✅ Preserve message drafts.
-- 🏗 File server to optimize for efficient and private sending of large files.
-- 🏗 Improved audio & video calls.
+- ✅ File server to optimize for efficient and private sending of large files.
+- ✅ Improved audio & video calls.
+- ✅ Support older Android OS and 32-bit CPUs.
+- ✅ Hidden chat profiles.
+- 🏗 Sending and receiving large files via [XFTP protocol](./blog/20230301-simplex-file-transfer-protocol.md).
+- 🏗 Video messages.
 - 🏗 SMP queue redundancy and rotation (manual is supported).
 - 🏗 Reduced battery and traffic usage in large groups.
-- 🏗 Support older Android OS and 32-bit CPUs.
+- Include optional message into connection request sent via contact address.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
 - Access password/pin (with optional alternative access password).
 - Local app files encryption.
-- Video messages.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
 - Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
+- Privately share your location.
 - Feeds/broadcasts.
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
@@ -225,70 +317,6 @@ If you are considering developing with SimpleX platform please get in touch for
 - Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.
 
-## Join a user group
-
-You can join an English-speaking group if you want to ask any questions: [#SimpleX-Group-2](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FQP8zaGjjmlXV-ix_Er4JgJ0lNPYGS1KX%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEApAgBkRZ3x12ayZ7sHrjHQWNMvqzZpWUgM_fFCUdLXwo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xWpPXEZZsQp_F7vwAcAYDw%3D%3D%22%7D)
-
-There are also several groups in languages other than English, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users. We do not always answer questions there, so please ask them in one of the English-speaking groups.
-
-- [\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking).
-- [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking).
-- [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking).
-- [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
-
-You can join these groups either by opening these links in the app or by opening them in a desktop browser and scanning QR code.
-
-Join via the app to share what's going on and ask any questions!
-
-## Translate the apps
-
-Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps are translated to many other languages. Join our translators to help SimpleX grow faster!
-
-Current interface languages:
-
-- English (development language)
-- German: [@mlanp](https://github.com/mlanp)
-- French: [@ishi_sama](https://github.com/ishi-sama)
-- Italian: [@unbranched](https://github.com/unbranched)
-- Russian: project team
-
-Languages in progress: Chinese, Hindi, Czech, Japanese, Dutch and [many 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!
-
-## Contribute
-
-We would love to have you join the development! You can contribute to SimpleX Chat with:
-
-- translate website homepage - there is a lot of content we would like to share, it would help to bring the new users.
-- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
-- developing features - please connect to us via chat so we can help you get started.
-
-## Help us with donations
-
-Huge thank you to everybody who donated to SimpleX Chat!
-
-We are prioritizing users privacy and security - it would be impossible without your support.
-
-Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
-
-Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.
-
-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
-- please let us know, via GitHub issue or chat, if you want to create a donation in some other cryptocurrency - we will add the address to the list.
-
-Thank you,
-
-Evgeny
-
-SimpleX Chat founder
-
 ## Disclaimers
 
 [SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed, and had many breaking changes and improvements in v1.0.0.

apps/android/app/build.gradle

@@ -9,15 +9,12 @@ android {
 
     defaultConfig {
         applicationId "chat.simplex.app"
-        minSdk 29
+        minSdk 26
         targetSdk 32
-        versionCode 102
-        versionName "4.5.3"
+        versionCode 111
+        versionName "4.6.1-beta.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        ndk {
-            abiFilters 'arm64-v8a'
-        }
         vectorDrawables {
             useSupportLibrary true
         }
@@ -77,9 +74,26 @@ android {
         jniLibs.useLegacyPackaging = compression_level != "0"
     }
     def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-    if (isRelease) {
+    def isBundle = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("bundle") }) != null
+//    if (isRelease) {
         // Comma separated list of languages that will be included in the apk
-        android.defaultConfig.resConfigs("en", "ru", "de", "fr", "it", "nl", "cs")
+    android.defaultConfig.resConfigs("en", "cs", "de", "es", "fr", "it", "nl", "ru", "zh-rCN")
+//    }
+    if (isBundle) {
+        defaultConfig.ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
+    } else {
+        splits {
+            abi {
+                enable true
+                reset()
+                if (isRelease) {
+                    include 'arm64-v8a', 'armeabi-v7a'
+                } else {
+                    include 'arm64-v8a', 'armeabi-v7a'
+                    universalApk false
+                }
+            }
+        }
     }
 }
 
@@ -129,6 +143,9 @@ dependencies {
     implementation "io.coil-kt:coil-compose:2.1.0"
     implementation "io.coil-kt:coil-gif:2.1.0"
 
+    // Video support
+    implementation "com.google.android.exoplayer:exoplayer:2.17.1"
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -136,19 +153,12 @@ dependencies {
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 }
 
-def buildType = "unknown"
 // Don't do anything if no compression is needed
 if (compression_level != "0") {
     tasks.whenTaskAdded { task ->
         if (task.name == 'packageDebug') {
-            task.doLast {
-                buildType = "debug"
-            }
             task.finalizedBy compressApk
         } else if (task.name == 'packageRelease') {
-            task.doLast {
-                buildType = "release"
-            }
             task.finalizedBy compressApk
         }
     }
@@ -156,6 +166,13 @@ if (compression_level != "0") {
 
 tasks.register("compressApk") {
     doLast {
+        def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
+        def buildType
+        if (isRelease) {
+            buildType = "release"
+        } else {
+            buildType = "debug"
+        }
         def javaHome = System.properties['java.home'] ?: org.gradle.internal.jvm.Jvm.current().getJavaHome()
         def sdkDir = android.getSdkDirectory().getAbsolutePath()
         def keyAlias = ""
@@ -196,6 +213,8 @@ tasks.register("compressApk") {
 
         if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') {
             new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk"))
+            new File(outputDir, "app-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk"))
+            new File(outputDir, "app-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk"))
         }
 
         // View all gradle properties set

apps/android/app/src/main/AndroidManifest.xml

@@ -31,6 +31,7 @@
       android:extractNativeLibs="${extract_native_libs}"
       android:supportsRtl="true"
       android:theme="@style/Theme.SimpleX">
+    <!--      android:localeConfig="@xml/locales_config"-->
 
     <!-- Main activity -->
     <activity

apps/android/app/src/main/cpp/CMakeLists.txt

@@ -53,10 +53,6 @@ add_library( support SHARED IMPORTED )
 set_target_properties( support PROPERTIES IMPORTED_LOCATION
     ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libsupport.so)
 
-add_library( crypto SHARED IMPORTED )
-set_target_properties( crypto PROPERTIES IMPORTED_LOCATION
-    ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libcrypto.so)
-
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
@@ -64,7 +60,7 @@ set_target_properties( crypto PROPERTIES IMPORTED_LOCATION
 target_link_libraries( # Specifies the target library.
     app-lib
 
-    simplex support crypto
+    simplex support
 
     # Links the target library to the log library
     # included in the NDK.

apps/android/app/src/main/cpp/simplex-api.c

@@ -7,6 +7,17 @@ void hs_init(int * argc, char **argv[]);
 void setLineBuffering(void);
 int pipe_std_to_socket(const char * name);
 
+extern void __svfscanf(void){};
+extern void __vfwscanf(void){};
+extern void __memset_chk_fail(void){};
+extern void __strcpy_chk_generic(void){};
+extern void __strcat_chk_generic(void){};
+extern void __libc_globals(void){};
+extern void __rel_iplt_start(void){};
+
+// Android 9 only, not 13
+extern void reallocarray(void){};
+
 JNIEXPORT jint JNICALL
 Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
     const char *name = (*env)->GetStringUTFChars(env, socket_name, JNI_FALSE);
@@ -24,21 +35,24 @@ Java_chat_simplex_app_SimplexAppKt_initHS(__unused JNIEnv *env, __unused jclass
 // from simplex-chat
 typedef long* chat_ctrl;
 
-extern char *chat_migrate_init(const char *path, const char *key, chat_ctrl *ctrl);
+extern char *chat_migrate_init(const char *path, const char *key, const char *confirm, chat_ctrl *ctrl);
 extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
 extern char *chat_recv_msg(chat_ctrl ctrl); // deprecated
 extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
 extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
+extern char *chat_password_hash(const char *pwd, const char *salt);
 
 JNIEXPORT jobjectArray JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey) {
+Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey, jstring confirm) {
     const char *_dbPath = (*env)->GetStringUTFChars(env, dbPath, JNI_FALSE);
     const char *_dbKey = (*env)->GetStringUTFChars(env, dbKey, JNI_FALSE);
+    const char *_confirm = (*env)->GetStringUTFChars(env, confirm, JNI_FALSE);
     jlong _ctrl = (jlong) 0;
-    jstring res = (*env)->NewStringUTF(env, chat_migrate_init(_dbPath, _dbKey, &_ctrl));
+    jstring res = (*env)->NewStringUTF(env, chat_migrate_init(_dbPath, _dbKey, _confirm, &_ctrl));
     (*env)->ReleaseStringUTFChars(env, dbPath, _dbPath);
     (*env)->ReleaseStringUTFChars(env, dbKey, _dbKey);
+    (*env)->ReleaseStringUTFChars(env, dbKey, _confirm);
 
     // Creating array of Object's (boxed values can be passed, eg. Long instead of long)
     jobjectArray ret = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/Object"), NULL);
@@ -85,3 +99,13 @@ Java_chat_simplex_app_SimplexAppKt_chatParseServer(JNIEnv *env, __unused jclass
     (*env)->ReleaseStringUTFChars(env, str, _str);
     return res;
 }
+
+JNIEXPORT jstring JNICALL
+Java_chat_simplex_app_SimplexAppKt_chatPasswordHash(JNIEnv *env, __unused jclass clazz, jstring pwd, jstring salt) {
+    const char *_pwd = (*env)->GetStringUTFChars(env, pwd, JNI_FALSE);
+    const char *_salt = (*env)->GetStringUTFChars(env, salt, JNI_FALSE);
+    jstring res = (*env)->NewStringUTF(env, chat_password_hash(_pwd, _salt));
+    (*env)->ReleaseStringUTFChars(env, pwd, _pwd);
+    (*env)->ReleaseStringUTFChars(env, salt, _salt);
+    return res;
+}

apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt

@@ -3,9 +3,7 @@ package chat.simplex.app
 import android.app.Application
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Parcelable
+import android.os.*
 import android.os.SystemClock.elapsedRealtime
 import android.util.Log
 import android.view.WindowManager
@@ -41,9 +39,8 @@ import chat.simplex.app.views.database.DatabaseErrorView
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.onboarding.*
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch
 
 class MainActivity: FragmentActivity() {
   companion object {
@@ -68,6 +65,7 @@ class MainActivity: FragmentActivity() {
     super.onCreate(savedInstanceState)
     // testJson()
     val m = vm.chatModel
+    applyAppLocale(m.controller.appPrefs.appLanguage)
     // When call ended and orientation changes, it re-process old intent, it's unneeded.
     // Only needed to be processed on first creation of activity
     if (savedInstanceState == null) {
@@ -110,8 +108,8 @@ class MainActivity: FragmentActivity() {
     processExternalIntent(intent, vm.chatModel)
   }
 
-  override fun onStart() {
-    super.onStart()
+  override fun onResume() {
+    super.onResume()
     val enteredBackgroundVal = enteredBackground.value
     if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= 30_000) {
       runAuthenticate()
@@ -130,6 +128,7 @@ class MainActivity: FragmentActivity() {
 
   override fun onStop() {
     super.onStop()
+    VideoPlayer.stopAll()
     enteredBackground.value = elapsedRealtime()
   }
 
@@ -161,25 +160,31 @@ class MainActivity: FragmentActivity() {
     } else {
       userAuthorized.value = false
       ModalManager.shared.closeModals()
-      authenticate(
-        generalGetString(R.string.auth_unlock),
-        generalGetString(R.string.auth_log_in_using_credential),
-        this@MainActivity,
-        completed = { laResult ->
-          when (laResult) {
-            LAResult.Success ->
-              userAuthorized.value = true
-            is LAResult.Error, LAResult.Failed ->
-              laFailed.value = true
-            LAResult.Unavailable -> {
-              userAuthorized.value = true
-              m.performLA.value = false
-              m.controller.appPrefs.performLA.set(false)
-              laUnavailableTurningOffAlert()
+      // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
+      CoroutineScope(Dispatchers.Default).launch {
+        delay(50)
+        withContext(Dispatchers.Main) {
+          authenticate(
+            generalGetString(R.string.auth_unlock),
+            generalGetString(R.string.auth_log_in_using_credential),
+            this@MainActivity,
+            completed = { laResult ->
+              when (laResult) {
+                LAResult.Success ->
+                  userAuthorized.value = true
+                is LAResult.Error, LAResult.Failed ->
+                  laFailed.value = true
+                LAResult.Unavailable -> {
+                  userAuthorized.value = true
+                  m.performLA.value = false
+                  m.controller.appPrefs.performLA.set(false)
+                  laUnavailableTurningOffAlert()
+                }
+              }
             }
-          }
+          )
         }
-      )
+      }
     }
   }
 
@@ -262,14 +267,6 @@ fun MainPage(
   setPerformLA: (Boolean) -> Unit,
   showLANotice: () -> Unit
 ) {
-  // this with LaunchedEffect(userAuthorized.value) fixes bottom sheet visibly collapsing after authentication
-  var chatsAccessAuthorized by rememberSaveable { mutableStateOf(false) }
-  LaunchedEffect(userAuthorized.value) {
-    if (chatModel.controller.appPrefs.performLA.get()) {
-      delay(500L)
-    }
-    chatsAccessAuthorized = userAuthorized.value == true
-  }
   var showChatDatabaseError by rememberSaveable {
     mutableStateOf(chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null)
   }
@@ -328,7 +325,7 @@ fun MainPage(
         }
       }
       onboarding == null || userCreated == null -> SplashView()
-      !chatsAccessAuthorized -> {
+      userAuthorized.value != true -> {
         if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
           authView()
         } else {
@@ -405,8 +402,9 @@ fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
       Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
       if (chatId != null) {
         withBGApi {
-          if (userId != null && userId != chatModel.currentUser.value?.userId) {
-            chatModel.controller.changeActiveUser(userId)
+          awaitChatStartedIfNeeded(chatModel)
+          if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
+            chatModel.controller.changeActiveUser(userId, null)
           }
           val cInfo = chatModel.getChat(chatId)?.chatInfo
           chatModel.clearOverlays.value = true
@@ -417,8 +415,9 @@ fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
     NtfManager.ShowChatsAction -> {
       Log.d(TAG, "processNotificationIntent: ShowChatsAction")
       withBGApi {
-        if (userId != null && userId != chatModel.currentUser.value?.userId) {
-          chatModel.controller.changeActiveUser(userId)
+        awaitChatStartedIfNeeded(chatModel)
+        if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
+          chatModel.controller.changeActiveUser(userId, null)
         }
         chatModel.chatId.value = null
         chatModel.clearOverlays.value = true
@@ -508,6 +507,20 @@ fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
     }
   }
 }
+
+suspend fun awaitChatStartedIfNeeded(chatModel: ChatModel, timeout: Long = 30_000) {
+  // Still decrypting database
+  if (chatModel.chatRunning.value == null) {
+    val step = 50L
+    for (i in 0..(timeout / step)) {
+      if (chatModel.chatRunning.value == true || chatModel.onboardingStage.value == OnboardingStage.Step1_SimpleXInfo) {
+        break
+      }
+      delay(step)
+    }
+  }
+}
+
 //fun testJson() {
 //  val str: String = """
 //  """.trimIndent()

apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -26,22 +26,26 @@ external fun pipeStdOutToSocket(socketName: String) : Int
 
 // SimpleX API
 typealias ChatCtrl = Long
-external fun chatMigrateInit(dbPath: String, dbKey: String): Array<Any>
+external fun chatMigrateInit(dbPath: String, dbKey: String, confirm: String): Array<Any>
 external fun chatSendCmd(ctrl: ChatCtrl, msg: String): String
 external fun chatRecvMsg(ctrl: ChatCtrl): String
 external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
 external fun chatParseMarkdown(str: String): String
 external fun chatParseServer(str: String): String
+external fun chatPasswordHash(pwd: String, salt: String): String
 
 class SimplexApp: Application(), LifecycleEventObserver {
   lateinit var chatController: ChatController
 
   var isAppOnForeground: Boolean = false
 
-  fun initChatController(useKey: String? = null, startChat: Boolean = true) {
+  val defaultLocale: Locale = Locale.getDefault()
+
+  fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
     val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
     val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
-    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePathPrefix, dbKey)
+    val confirm = confirmMigrations ?: if (appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
+    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePathPrefix, dbKey, confirm.value)
     val res: DBMigrationResult = kotlin.runCatching {
       json.decodeFromString<DBMigrationResult>(migrated[0] as String)
     }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -94,6 +94,32 @@ class ChatModel(val controller: ChatController) {
   val filesToDelete = mutableSetOf<File>()
   val simplexLinkMode = mutableStateOf(controller.appPrefs.simplexLinkMode.get())
 
+  fun getUser(userId: Long): User? = if (currentUser.value?.userId == userId) {
+    currentUser.value
+  } else {
+    users.firstOrNull { it.user.userId == userId }?.user
+  }
+
+  private fun getUserIndex(user: User): Int =
+    users.indexOfFirst { it.user.userId == user.userId }
+
+  fun updateUser(user: User) {
+    val i = getUserIndex(user)
+    if (i != -1) {
+      users[i] = users[i].copy(user = user)
+    }
+    if (currentUser.value?.userId == user.userId) {
+      currentUser.value = user
+    }
+  }
+
+  fun removeUser(user: User) {
+    val i = getUserIndex(user)
+    if (i != -1 && users[i].user.userId != currentUser.value?.userId) {
+      users.removeAt(i)
+    }
+  }
+
   fun hasChat(id: String): Boolean = chats.firstOrNull { it.id == id } != null
   fun getChat(id: String): Chat? = chats.firstOrNull { it.id == id }
   fun getContactChat(contactId: Long): Chat? = chats.firstOrNull { it.chatInfo is ChatInfo.Direct && it.chatInfo.apiId == contactId }
@@ -166,10 +192,13 @@ class ChatModel(val controller: ChatController) {
     // add to current chat
     if (chatId.value == cInfo.id) {
       withContext(Dispatchers.Main) {
-        if (chatItems.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
-          chatItems.add(kotlin.math.max(0, chatItems.lastIndex), cItem)
-        } else {
-          chatItems.add(cItem)
+        // Prevent situation when chat item already in the list received from backend
+        if (chatItems.none { it.id == cItem.id }) {
+          if (chatItems.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+            chatItems.add(kotlin.math.max(0, chatItems.lastIndex), cItem)
+          } else {
+            chatItems.add(cItem)
+          }
         }
       }
     }
@@ -196,19 +225,19 @@ class ChatModel(val controller: ChatController) {
       res = true
     }
     // update current chat
-    if (chatId.value == cInfo.id) {
-      val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
-      if (itemIndex >= 0) {
-        chatItems[itemIndex] = cItem
-        return false
-      } else {
-        withContext(Dispatchers.Main) {
+    return if (chatId.value == cInfo.id) {
+      withContext(Dispatchers.Main) {
+        val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
+        if (itemIndex >= 0) {
+          chatItems[itemIndex] = cItem
+          false
+        } else {
           chatItems.add(cItem)
+          true
         }
-        return true
       }
     } else {
-      return res
+      res
     }
   }
 
@@ -422,13 +451,19 @@ data class User(
   val localDisplayName: String,
   val profile: LocalProfile,
   val fullPreferences: FullChatPreferences,
-  val activeUser: Boolean
+  val activeUser: Boolean,
+  val showNtfs: Boolean,
+  val viewPwdHash: UserPwdHash?
 ): NamedChat {
   override val displayName: String get() = profile.displayName
   override val fullName: String get() = profile.fullName
   override val image: String? get() = profile.image
   override val localAlias: String = ""
 
+  val hidden: Boolean = viewPwdHash != null
+
+  val showNotifications: Boolean = activeUser || showNtfs
+
   companion object {
     val sampleData = User(
       userId = 1,
@@ -436,11 +471,19 @@ data class User(
       localDisplayName = "alice",
       profile = LocalProfile.sampleData,
       fullPreferences = FullChatPreferences.sampleData,
-      activeUser = true
+      activeUser = true,
+      showNtfs = true,
+      viewPwdHash = null,
     )
   }
 }
 
+@Serializable
+data class UserPwdHash(
+  val hash: String,
+  val salt: String
+)
+
 @Serializable
 data class UserInfo(
   val user: User,
@@ -486,6 +529,24 @@ data class Chat (
   val chatItems: List<ChatItem>,
   val chatStats: ChatStats = ChatStats(),
 ) {
+  val userCanSend: Boolean
+    get() = when (chatInfo) {
+      is ChatInfo.Direct -> true
+      is ChatInfo.Group -> {
+        val m = chatInfo.groupInfo.membership
+        m.memberActive && m.memberRole >= GroupMemberRole.Member
+      }
+      else -> false
+    }
+
+  val userIsObserver: Boolean get() = when(chatInfo) {
+    is ChatInfo.Group -> {
+      val m = chatInfo.groupInfo.membership
+      m.memberActive && m.memberRole == GroupMemberRole.Observer
+    }
+    else -> false
+  }
+
   val id: String get() = chatInfo.id
 
   @Serializable
@@ -963,11 +1024,13 @@ class GroupMemberRef(
 
 @Serializable
 enum class GroupMemberRole(val memberRole: String) {
-  @SerialName("member") Member("member"), // order matters in comparisons
+  @SerialName("observer") Observer("observer"), // order matters in comparisons
+  @SerialName("member") Member("member"),
   @SerialName("admin") Admin("admin"),
   @SerialName("owner") Owner("owner");
 
   val text: String get() = when (this) {
+    Observer -> generalGetString(R.string.group_member_role_observer)
     Member -> generalGetString(R.string.group_member_role_member)
     Admin -> generalGetString(R.string.group_member_role_admin)
     Owner -> generalGetString(R.string.group_member_role_owner)
@@ -1218,9 +1281,24 @@ data class ChatItem (
     when (content) {
       is CIContent.SndDeleted -> true
       is CIContent.RcvDeleted -> true
+      is CIContent.SndModerated -> true
+      is CIContent.RcvModerated -> true
       else -> false
     }
 
+  fun memberToModerate(chatInfo: ChatInfo): Pair<GroupInfo, GroupMember>? {
+    return if (chatInfo is ChatInfo.Group && chatDir is CIDirection.GroupRcv) {
+      val m = chatInfo.groupInfo.membership
+      if (m.memberRole >= GroupMemberRole.Admin && m.memberRole >= chatDir.groupMember.memberRole && meta.itemDeleted == null) {
+        chatInfo.groupInfo to chatDir.groupMember
+      } else {
+      null
+      }
+    } else {
+      null
+    }
+  }
+
   private val showNtfDir: Boolean get() = !chatDir.sent
 
   val showNotification: Boolean get() =
@@ -1344,7 +1422,7 @@ data class ChatItem (
         file = null
       )
     }
-    
+
     private const val TEMP_DELETED_CHAT_ITEM_ID = -1L
     const val TEMP_LIVE_CHAT_ITEM_ID = -2L
 
@@ -1636,18 +1714,31 @@ class CIFile(
   val fileName: String,
   val fileSize: Long,
   val filePath: String? = null,
-  val fileStatus: CIFileStatus
+  val fileStatus: CIFileStatus,
+  val fileProtocol: FileProtocol
 ) {
   val loaded: Boolean = when (fileStatus) {
-    CIFileStatus.SndStored -> true
-    CIFileStatus.SndTransfer -> true
-    CIFileStatus.SndComplete -> true
-    CIFileStatus.SndCancelled -> true
-    CIFileStatus.RcvInvitation -> false
-    CIFileStatus.RcvAccepted -> false
-    CIFileStatus.RcvTransfer -> false
-    CIFileStatus.RcvCancelled -> false
-    CIFileStatus.RcvComplete -> true
+    is CIFileStatus.SndStored -> true
+    is CIFileStatus.SndTransfer -> true
+    is CIFileStatus.SndComplete -> true
+    is CIFileStatus.SndCancelled -> true
+    is CIFileStatus.RcvInvitation -> false
+    is CIFileStatus.RcvAccepted -> false
+    is CIFileStatus.RcvTransfer -> false
+    is CIFileStatus.RcvCancelled -> false
+    is CIFileStatus.RcvComplete -> true
+  }
+
+  val cancellable: Boolean = when (fileStatus) {
+    is CIFileStatus.SndStored -> fileProtocol != FileProtocol.XFTP // TODO true - enable when XFTP send supports cancel
+    is CIFileStatus.SndTransfer -> fileProtocol != FileProtocol.XFTP // TODO true
+    is CIFileStatus.SndComplete -> false
+    is CIFileStatus.SndCancelled -> false
+    is CIFileStatus.RcvInvitation -> false
+    is CIFileStatus.RcvAccepted -> true
+    is CIFileStatus.RcvTransfer -> true
+    is CIFileStatus.RcvCancelled -> false
+    is CIFileStatus.RcvComplete -> false
   }
 
   companion object {
@@ -1658,21 +1749,27 @@ class CIFile(
       filePath: String? = "test.txt",
       fileStatus: CIFileStatus = CIFileStatus.RcvComplete
     ): CIFile =
-      CIFile(fileId = fileId, fileName = fileName, fileSize = fileSize, filePath = filePath, fileStatus = fileStatus)
+      CIFile(fileId = fileId, fileName = fileName, fileSize = fileSize, filePath = filePath, fileStatus = fileStatus, fileProtocol = FileProtocol.XFTP)
   }
 }
 
 @Serializable
-enum class CIFileStatus {
-  @SerialName("snd_stored") SndStored,
-  @SerialName("snd_transfer") SndTransfer,
-  @SerialName("snd_complete") SndComplete,
-  @SerialName("snd_cancelled") SndCancelled,
-  @SerialName("rcv_invitation") RcvInvitation,
-  @SerialName("rcv_accepted") RcvAccepted,
-  @SerialName("rcv_transfer") RcvTransfer,
-  @SerialName("rcv_complete") RcvComplete,
-  @SerialName("rcv_cancelled") RcvCancelled;
+enum class FileProtocol {
+  @SerialName("smp") SMP,
+  @SerialName("xftp") XFTP;
+}
+
+@Serializable
+sealed class CIFileStatus {
+  @Serializable @SerialName("sndStored") object SndStored: CIFileStatus()
+  @Serializable @SerialName("sndTransfer") class SndTransfer(val sndProgress: Long, val sndTotal: Long): CIFileStatus()
+  @Serializable @SerialName("sndComplete") object SndComplete: CIFileStatus()
+  @Serializable @SerialName("sndCancelled") object SndCancelled: CIFileStatus()
+  @Serializable @SerialName("rcvInvitation") object RcvInvitation: CIFileStatus()
+  @Serializable @SerialName("rcvAccepted") object RcvAccepted: CIFileStatus()
+  @Serializable @SerialName("rcvTransfer") class RcvTransfer(val rcvProgress: Long, val rcvTotal: Long): CIFileStatus()
+  @Serializable @SerialName("rcvComplete") object RcvComplete: CIFileStatus()
+  @Serializable @SerialName("rcvCancelled") object RcvCancelled: CIFileStatus()
 }
 
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@@ -1683,6 +1780,7 @@ sealed class MsgContent {
   @Serializable(with = MsgContentSerializer::class) class MCText(override val text: String): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCLink(override val text: String, val preview: LinkPreview): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCImage(override val text: String, val image: String): MsgContent()
+  @Serializable(with = MsgContentSerializer::class) class MCVideo(override val text: String, val image: String, val duration: Int): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCVoice(override val text: String, val duration: Int): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCFile(override val text: String): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCUnknown(val type: String? = null, override val text: String, val json: JsonElement): MsgContent()
@@ -1736,6 +1834,11 @@ object MsgContentSerializer : KSerializer<MsgContent> {
       element<String>("text")
       element<String>("image")
     })
+    element("MCVideo", buildClassSerialDescriptor("MCVideo") {
+      element<String>("text")
+      element<String>("image")
+      element<Int>("duration")
+    })
     element("MCFile", buildClassSerialDescriptor("MCFile") {
       element<String>("text")
     })
@@ -1759,6 +1862,11 @@ object MsgContentSerializer : KSerializer<MsgContent> {
             val image = json["image"]?.jsonPrimitive?.content ?: "unknown message format"
             MsgContent.MCImage(text, image)
           }
+          "video" -> {
+            val image = json["image"]?.jsonPrimitive?.content ?: "unknown message format"
+            val duration = json["duration"]?.jsonPrimitive?.intOrNull ?: 0
+            MsgContent.MCVideo(text, image, duration)
+          }
           "voice" -> {
             val duration = json["duration"]?.jsonPrimitive?.intOrNull ?: 0
             MsgContent.MCVoice(text, duration)
@@ -1794,6 +1902,13 @@ object MsgContentSerializer : KSerializer<MsgContent> {
           put("text", value.text)
           put("image", value.image)
         }
+      is MsgContent.MCVideo ->
+        buildJsonObject {
+          put("type", "video")
+          put("text", value.text)
+          put("image", value.image)
+          put("duration", value.duration)
+        }
       is MsgContent.MCVoice ->
         buildJsonObject {
           put("type", "voice")

apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt

@@ -80,7 +80,7 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
   }
 
   fun notifyContactRequestReceived(user: User, cInfo: ChatInfo.ContactRequest) {
-    notifyMessageReceived(
+    displayNotification(
       user = user,
       chatId = cInfo.id,
       displayName = cInfo.displayName,
@@ -91,7 +91,7 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
   }
 
   fun notifyContactConnected(user: User, contact: Contact) {
-    notifyMessageReceived(
+    displayNotification(
       user = user,
       chatId = contact.id,
       displayName = contact.displayName,
@@ -101,11 +101,11 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
 
   fun notifyMessageReceived(user: User, cInfo: ChatInfo, cItem: ChatItem) {
     if (!cInfo.ntfsEnabled) return
-
-    notifyMessageReceived(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+    displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
   }
 
-  fun notifyMessageReceived(user: User, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
+  fun displayNotification(user: User, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
+    if (!user.showNotifications) return
     Log.d(TAG, "notifyMessageReceived $chatId")
     val now = Clock.System.now().toEpochMilliseconds()
     val recentNotification = (now - prevNtfTime.getOrDefault(chatId, 0) < msgNtfTimeoutMs)

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -133,18 +133,24 @@ class AppPreferences(val context: Context) {
   val incognito = mkBoolPreference(SHARED_PREFS_INCOGNITO, false)
   val connectViaLinkTab = mkStrPreference(SHARED_PREFS_CONNECT_VIA_LINK_TAB, ConnectViaLinkTab.SCAN.name)
   val liveMessageAlertShown = mkBoolPreference(SHARED_PREFS_LIVE_MESSAGE_ALERT_SHOWN, false)
+  val showHiddenProfilesNotice = mkBoolPreference(SHARED_PREFS_SHOW_HIDDEN_PROFILES_NOTICE, true)
+  val showMuteProfileAlert = mkBoolPreference(SHARED_PREFS_SHOW_MUTE_PROFILE_ALERT, true)
+  val appLanguage = mkStrPreference(SHARED_PREFS_APP_LANGUAGE, null)
 
   val storeDBPassphrase = mkBoolPreference(SHARED_PREFS_STORE_DB_PASSPHRASE, true)
   val initialRandomDBPassphrase = mkBoolPreference(SHARED_PREFS_INITIAL_RANDOM_DB_PASSPHRASE, false)
   val encryptedDBPassphrase = mkStrPreference(SHARED_PREFS_ENCRYPTED_DB_PASSPHRASE, null)
   val initializationVectorDBPassphrase = mkStrPreference(SHARED_PREFS_INITIALIZATION_VECTOR_DB_PASSPHRASE, null)
   val encryptionStartedAt = mkDatePreference(SHARED_PREFS_ENCRYPTION_STARTED_AT, null, true)
+  val confirmDBUpgrades = mkBoolPreference(SHARED_PREFS_CONFIRM_DB_UPGRADES, false)
 
   val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM.name)
   val primaryColor = mkIntPreference(SHARED_PREFS_PRIMARY_COLOR, LightColorPalette.primary.toArgb())
 
   val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null)
 
+  val xftpSendEnabled = mkBoolPreference(SHARED_PREFS_XFTP_SEND_ENABLED, false)
+
   private fun mkIntPreference(prefName: String, default: Int) =
     SharedPreference(
       get = fun() = sharedPreferences.getInt(prefName, default),
@@ -214,6 +220,7 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
     private const val SHARED_PREFS_CHAT_ARCHIVE_NAME = "ChatArchiveName"
     private const val SHARED_PREFS_CHAT_ARCHIVE_TIME = "ChatArchiveTime"
+    private const val SHARED_PREFS_APP_LANGUAGE = "AppLanguage"
     private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
     private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
     private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
@@ -231,14 +238,18 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_INCOGNITO = "Incognito"
     private const val SHARED_PREFS_CONNECT_VIA_LINK_TAB = "ConnectViaLinkTab"
     private const val SHARED_PREFS_LIVE_MESSAGE_ALERT_SHOWN = "LiveMessageAlertShown"
+    private const val SHARED_PREFS_SHOW_HIDDEN_PROFILES_NOTICE = "ShowHiddenProfilesNotice"
+    private const val SHARED_PREFS_SHOW_MUTE_PROFILE_ALERT = "ShowMuteProfileAlert"
     private const val SHARED_PREFS_STORE_DB_PASSPHRASE = "StoreDBPassphrase"
     private const val SHARED_PREFS_INITIAL_RANDOM_DB_PASSPHRASE = "InitialRandomDBPassphrase"
     private const val SHARED_PREFS_ENCRYPTED_DB_PASSPHRASE = "EncryptedDBPassphrase"
     private const val SHARED_PREFS_INITIALIZATION_VECTOR_DB_PASSPHRASE = "InitializationVectorDBPassphrase"
     private const val SHARED_PREFS_ENCRYPTION_STARTED_AT = "EncryptionStartedAt"
+    private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
     private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme"
     private const val SHARED_PREFS_PRIMARY_COLOR = "PrimaryColor"
     private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion"
+    private const val SHARED_PREFS_XFTP_SEND_ENABLED = "XFTPSendEnabled"
   }
 }
 
@@ -259,11 +270,24 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     chatModel.incognito.value = appPrefs.incognito.get()
   }
 
+  private fun currentUserId(funcName: String): Long {
+    val userId = chatModel.currentUser.value?.userId
+    if (userId == null) {
+      val error = "$funcName: no current user"
+      Log.e(TAG, error)
+      throw Exception(error)
+    }
+    return userId
+  }
+
   suspend fun startChat(user: User) {
     Log.d(TAG, "user: $user")
     try {
       if (chatModel.chatRunning.value == true) return
       apiSetNetworkConfig(getNetCfg())
+      apiSetTempFolder(getTempFilesDirectory(appContext))
+      apiSetFilesFolder(getAppFilesDirectory(appContext))
+      apiSetXFTPConfig(getXFTPCfg())
       val justStarted = apiStartChat()
       val users = listUsers()
       chatModel.users.clear()
@@ -271,7 +295,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
       if (justStarted) {
         chatModel.currentUser.value = user
         chatModel.userCreated.value = true
-        apiSetFilesFolder(getAppFilesDirectory(appContext))
         apiSetIncognito(chatModel.incognito.value)
         getUserChatData()
         chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
@@ -290,21 +313,26 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun changeActiveUser(toUserId: Long) {
+  suspend fun changeActiveUser(toUserId: Long, viewPwd: String?) {
     try {
-      changeActiveUser_(toUserId)
+      changeActiveUser_(toUserId, viewPwd)
     } catch (e: Exception) {
       Log.e(TAG, "Unable to set active user: ${e.stackTraceToString()}")
       AlertManager.shared.showAlertMsg(generalGetString(R.string.failed_to_active_user_title), e.stackTraceToString())
     }
   }
 
-  suspend fun changeActiveUser_(toUserId: Long) {
-    chatModel.currentUser.value = apiSetActiveUser(toUserId)
+  suspend fun changeActiveUser_(toUserId: Long, viewPwd: String?) {
+    val currentUser = apiSetActiveUser(toUserId, viewPwd)
+    chatModel.currentUser.value = currentUser
     val users = listUsers()
     chatModel.users.clear()
     chatModel.users.addAll(users)
     getUserChatData()
+    val invitation = chatModel.callInvitations.values.firstOrNull { inv -> inv.user.userId == toUserId }
+    if (invitation != null) {
+      chatModel.callManager.reportNewIncomingCall(invitation.copy(user = currentUser))
+    }
   }
 
   suspend fun getUserChatData() {
@@ -401,15 +429,33 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     throw Exception("failed to list users ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiSetActiveUser(userId: Long): User {
-    val r = sendCmd(CC.ApiSetActiveUser(userId))
+  suspend fun apiSetActiveUser(userId: Long, viewPwd: String?): User {
+    val r = sendCmd(CC.ApiSetActiveUser(userId, viewPwd))
     if (r is CR.ActiveUser) return r.user
     Log.d(TAG, "apiSetActiveUser: ${r.responseType} ${r.details}")
     throw Exception("failed to set the user as active ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiDeleteUser(userId: Long, delSMPQueues: Boolean) {
-    val r = sendCmd(CC.ApiDeleteUser(userId, delSMPQueues))
+  suspend fun apiHideUser(userId: Long, viewPwd: String): User =
+    setUserPrivacy(CC.ApiHideUser(userId, viewPwd))
+
+  suspend fun apiUnhideUser(userId: Long, viewPwd: String): User =
+    setUserPrivacy(CC.ApiUnhideUser(userId, viewPwd))
+
+  suspend fun apiMuteUser(userId: Long): User =
+    setUserPrivacy(CC.ApiMuteUser(userId))
+
+  suspend fun apiUnmuteUser(userId: Long): User =
+    setUserPrivacy(CC.ApiUnmuteUser(userId))
+
+  private suspend fun setUserPrivacy(cmd: CC): User {
+    val r = sendCmd(cmd)
+    if (r is CR.UserPrivacy) return r.updatedUser
+    else throw Exception("Failed to change user privacy: ${r.responseType} ${r.details}")
+  }
+
+  suspend fun apiDeleteUser(userId: Long, delSMPQueues: Boolean, viewPwd: String?) {
+    val r = sendCmd(CC.ApiDeleteUser(userId, delSMPQueues, viewPwd))
     if (r is CR.CmdOk) return
     Log.d(TAG, "apiDeleteUser: ${r.responseType} ${r.details}")
     throw Exception("failed to delete the user ${r.responseType} ${r.details}")
@@ -432,12 +478,24 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
+  private suspend fun apiSetTempFolder(tempFolder: String) {
+    val r = sendCmd(CC.SetTempFolder(tempFolder))
+    if (r is CR.CmdOk) return
+    throw Error("failed to set temp folder: ${r.responseType} ${r.details}")
+  }
+
   private suspend fun apiSetFilesFolder(filesFolder: String) {
     val r = sendCmd(CC.SetFilesFolder(filesFolder))
     if (r is CR.CmdOk) return
     throw Error("failed to set files folder: ${r.responseType} ${r.details}")
   }
 
+  suspend fun apiSetXFTPConfig(cfg: XFTPFileConfig?) {
+    val r = sendCmd(CC.ApiSetXFTPConfig(cfg))
+    if (r is CR.CmdOk) return
+    throw Error("apiSetXFTPConfig bad response: ${r.responseType} ${r.details}")
+  }
+
   suspend fun apiSetIncognito(incognito: Boolean) {
     val r = sendCmd(CC.SetIncognito(incognito))
     if (r is CR.CmdOk) return
@@ -470,10 +528,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun apiGetChats(): List<Chat> {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiGetChats: no current user")
-      return emptyList()
-    }
+    val userId = kotlin.runCatching { currentUserId("apiGetChats") }.getOrElse { return emptyList() }
     val r = sendCmd(CC.ApiGetChats(userId))
     if (r is CR.ApiChats) return r.chats
     Log.e(TAG, "failed getting the list of chats: ${r.responseType} ${r.details}")
@@ -517,11 +572,15 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     return null
   }
 
+  suspend fun apiDeleteMemberChatItem(groupId: Long, groupMemberId: Long, itemId: Long): Pair<ChatItem, ChatItem?>? {
+    val r = sendCmd(CC.ApiDeleteMemberChatItem(groupId, groupMemberId, itemId))
+    if (r is CR.ChatItemDeleted) return r.deletedChatItem.chatItem to r.toChatItem?.chatItem
+    Log.e(TAG, "apiDeleteMemberChatItem bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
   private suspend fun getUserSMPServers(): Pair<List<ServerCfg>, List<String>>? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "getUserSMPServers: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("getUserSMPServers") }.getOrElse { return null }
     val r = sendCmd(CC.APIGetUserSMPServers(userId))
     if (r is CR.UserSMPServers) return r.smpServers to r.presetSMPServers
     Log.e(TAG, "getUserSMPServers bad response: ${r.responseType} ${r.details}")
@@ -529,10 +588,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun setUserSMPServers(smpServers: List<ServerCfg>): Boolean {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "setUserSMPServers: no current user")
-      return false
-    }
+    val userId = kotlin.runCatching { currentUserId("setUserSMPServers") }.getOrElse { return false }
     val r = sendCmd(CC.APISetUserSMPServers(userId, smpServers))
     return when (r) {
       is CR.CmdOk -> true
@@ -548,8 +604,8 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun testSMPServer(smpServer: String): SMPTestFailure? {
-    val userId = chatModel.currentUser.value?.userId ?: run { throw Exception("testSMPServer: no current user") }
-    val r = sendCmd(CC.TestSMPServer(userId, smpServer))
+    val userId = currentUserId("testSMPServer")
+    val r = sendCmd(CC.APITestSMPServer(userId, smpServer))
     return when (r) {
       is CR.SmpTestResult -> r.smpTestFailure
       else -> {
@@ -560,14 +616,14 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun getChatItemTTL(): ChatItemTTL {
-    val userId = chatModel.currentUser.value?.userId ?: run { throw Exception("getChatItemTTL: no current user") }
+    val userId = currentUserId("getChatItemTTL")
     val r = sendCmd(CC.APIGetChatItemTTL(userId))
     if (r is CR.ChatItemTTL) return ChatItemTTL.fromSeconds(r.chatItemTTL)
     throw Exception("failed to get chat item TTL: ${r.responseType} ${r.details}")
   }
 
   suspend fun setChatItemTTL(chatItemTTL: ChatItemTTL) {
-    val userId = chatModel.currentUser.value?.userId ?: run { throw Exception("setChatItemTTL: no current user") }
+    val userId = currentUserId("setChatItemTTL")
     val r = sendCmd(CC.APISetChatItemTTL(userId, chatItemTTL.seconds))
     if (r is CR.CmdOk) return
     throw Exception("failed to set chat item TTL: ${r.responseType} ${r.details}")
@@ -751,10 +807,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun apiListContacts(): List<Contact>? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiListContacts: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("apiListContacts") }.getOrElse { return null }
     val r = sendCmd(CC.ApiListContacts(userId))
     if (r is CR.ContactsList) return r.contacts
     Log.e(TAG, "apiListContacts bad response: ${r.responseType} ${r.details}")
@@ -762,10 +815,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun apiUpdateProfile(profile: Profile): Profile? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiUpdateProfile: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("apiUpdateProfile") }.getOrElse { return null }
     val r = sendCmd(CC.ApiUpdateProfile(userId, profile))
     if (r is CR.UserProfileNoChange) return profile
     if (r is CR.UserProfileUpdated) return r.toProfile
@@ -795,10 +845,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun apiCreateUserAddress(): String? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiCreateUserAddress: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("apiCreateUserAddress") }.getOrElse { return null }
     val r = sendCmd(CC.ApiCreateMyAddress(userId))
     return when (r) {
       is CR.UserContactLinkCreated -> r.connReqContact
@@ -812,10 +859,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun apiDeleteUserAddress(): Boolean {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiDeleteUserAddress: no current user")
-      return false
-    }
+    val userId = kotlin.runCatching { currentUserId("apiDeleteUserAddress") }.getOrElse { return false }
     val r = sendCmd(CC.ApiDeleteMyAddress(userId))
     if (r is CR.UserContactLinkDeleted) return true
     Log.e(TAG, "apiDeleteUserAddress bad response: ${r.responseType} ${r.details}")
@@ -823,10 +867,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   private suspend fun apiGetUserAddress(): UserContactLinkRec? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiGetUserAddress: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("apiGetUserAddress") }.getOrElse { return null }
     val r = sendCmd(CC.ApiShowMyAddress(userId))
     if (r is CR.UserContactLink) return r.contactLink
     if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
@@ -838,10 +879,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
   }
 
   suspend fun userAddressAutoAccept(autoAccept: AutoAccept?): UserContactLinkRec? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "userAddressAutoAccept: no current user")
-      return null
-    }
+    val userId = kotlin.runCatching { currentUserId("userAddressAutoAccept") }.getOrElse { return null }
     val r = sendCmd(CC.ApiAddressAutoAccept(userId, autoAccept))
     if (r is CR.UserContactLinkUpdated) return r.contactLink
     if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
@@ -960,11 +998,27 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun apiNewGroup(p: GroupProfile): GroupInfo? {
-    val userId = chatModel.currentUser.value?.userId ?: run {
-      Log.e(TAG, "apiNewGroup: no current user")
-      return null
+  suspend fun cancelFile(user: User, fileId: Long) {
+    val chatItem = apiCancelFile(fileId)
+    if (chatItem != null) {
+      chatItemSimpleUpdate(user, chatItem)
     }
+  }
+
+  suspend fun apiCancelFile(fileId: Long): AChatItem? {
+    val r = sendCmd(CC.CancelFile(fileId))
+    return when (r) {
+      is CR.SndFileCancelled -> r.chatItem
+      is CR.RcvFileCancelled -> r.chatItem
+      else -> {
+        Log.d(TAG, "apiCancelFile bad response: ${r.responseType} ${r.details}")
+        null
+      }
+    }
+  }
+
+  suspend fun apiNewGroup(p: GroupProfile): GroupInfo? {
+    val userId = kotlin.runCatching { currentUserId("apiNewGroup") }.getOrElse { return null }
     val r = sendCmd(CC.ApiNewGroup(userId, p))
     if (r is CR.GroupCreated) return r.groupInfo
     Log.e(TAG, "apiNewGroup bad response: ${r.responseType} ${r.details}")
@@ -1060,9 +1114,9 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun apiCreateGroupLink(groupId: Long): String? {
-    return when (val r = sendCmd(CC.APICreateGroupLink(groupId))) {
-      is CR.GroupLinkCreated -> r.connReqContact
+  suspend fun apiCreateGroupLink(groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<String, GroupMemberRole>? {
+    return when (val r = sendCmd(CC.APICreateGroupLink(groupId, memberRole))) {
+      is CR.GroupLinkCreated -> r.connReqContact to r.memberRole
       else -> {
         if (!(networkErrorAlert(r))) {
           apiErrorAlert("apiCreateGroupLink", generalGetString(R.string.error_creating_link_for_group), r)
@@ -1072,6 +1126,18 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
+  suspend fun apiGroupLinkMemberRole(groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<String, GroupMemberRole>? {
+    return when (val r = sendCmd(CC.APIGroupLinkMemberRole(groupId, memberRole))) {
+      is CR.GroupLink -> r.connReqContact to r.memberRole
+      else -> {
+        if (!(networkErrorAlert(r))) {
+          apiErrorAlert("apiGroupLinkMemberRole", generalGetString(R.string.error_updating_link_for_group), r)
+        }
+        null
+      }
+    }
+  }
+
   suspend fun apiDeleteGroupLink(groupId: Long): Boolean {
     return when (val r = sendCmd(CC.APIDeleteGroupLink(groupId))) {
       is CR.GroupLinkDeleted -> true
@@ -1084,9 +1150,9 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun apiGetGroupLink(groupId: Long): String? {
+  suspend fun apiGetGroupLink(groupId: Long): Pair<String, GroupMemberRole>? {
     return when (val r = sendCmd(CC.APIGetGroupLink(groupId))) {
-      is CR.GroupLink -> r.connReqContact
+      is CR.GroupLink -> r.connReqContact to r.memberRole
       else -> {
         Log.e(TAG, "apiGetGroupLink bad response: ${r.responseType} ${r.details}")
         null
@@ -1185,7 +1251,11 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
         val contactRequest = r.contactRequest
         val cInfo = ChatInfo.ContactRequest(contactRequest)
         if (active(r.user)) {
-          chatModel.addChat(Chat(chatInfo = cInfo, chatItems = listOf()))
+          if (chatModel.hasChat(contactRequest.id)) {
+            chatModel.updateChatInfo(cInfo)
+          } else {
+            chatModel.addChat(Chat(chatInfo = cInfo, chatItems = listOf()))
+          }
         }
         ntfManager.notifyContactRequestReceived(r.user, cInfo)
       }
@@ -1271,7 +1341,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
         val isLastChatItem = chatModel.getChat(cInfo.id)?.chatItems?.lastOrNull()?.id == cItem.id
         if (isLastChatItem && ntfManager.hasNotificationsForChat(cInfo.id)) {
           ntfManager.cancelNotificationsForChat(cInfo.id)
-          ntfManager.notifyMessageReceived(
+          ntfManager.displayNotification(
             r.user,
             cInfo.id,
             cInfo.displayName,
@@ -1347,6 +1417,10 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
         chatItemSimpleUpdate(r.user, r.chatItem)
       is CR.RcvFileComplete ->
         chatItemSimpleUpdate(r.user, r.chatItem)
+      is CR.RcvFileSndCancelled ->
+        chatItemSimpleUpdate(r.user, r.chatItem)
+      is CR.RcvFileProgressXFTP ->
+        chatItemSimpleUpdate(r.user, r.chatItem)
       is CR.SndFileStart ->
         chatItemSimpleUpdate(r.user, r.chatItem)
       is CR.SndFileComplete -> {
@@ -1362,8 +1436,25 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
           removeFile(appContext, fileName)
         }
       }
-      is CR.CallInvitation ->
+      is CR.SndFileRcvCancelled ->
+        chatItemSimpleUpdate(r.user, r.chatItem)
+      is CR.SndFileProgressXFTP ->
+        chatItemSimpleUpdate(r.user, r.chatItem)
+      is CR.SndFileCompleteXFTP -> {
+        chatItemSimpleUpdate(r.user, r.chatItem)
+        val cItem = r.chatItem.chatItem
+        val mc = cItem.content.msgContent
+        val fileName = cItem.file?.fileName
+        if (
+          mc is MsgContent.MCFile
+          && fileName != null
+        ) {
+          removeFile(appContext, fileName)
+        }
+      }
+      is CR.CallInvitation -> {
         chatModel.callManager.reportNewIncomingCall(r.callInvitation)
+      }
       is CR.CallOffer -> {
         // TODO askConfirmation?
         // TODO check encryption is compatible
@@ -1658,6 +1749,11 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
+  fun getXFTPCfg(): XFTPFileConfig? {
+    val prefXFTPSendEnabled = appPrefs.xftpSendEnabled.get()
+    return if (prefXFTPSendEnabled) XFTPFileConfig(minFileSize = 0) else null
+  }
+
   fun getNetCfg(): NetCfg {
     val useSocksProxy = appPrefs.networkUseSocksProxy.get()
     val socksProxy = if (useSocksProxy) ":9050" else null
@@ -1729,11 +1825,17 @@ sealed class CC {
   class ShowActiveUser: CC()
   class CreateActiveUser(val profile: Profile): CC()
   class ListUsers: CC()
-  class ApiSetActiveUser(val userId: Long): CC()
-  class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean): CC()
+  class ApiSetActiveUser(val userId: Long, val viewPwd: String?): CC()
+  class ApiHideUser(val userId: Long, val viewPwd: String): CC()
+  class ApiUnhideUser(val userId: Long, val viewPwd: String): CC()
+  class ApiMuteUser(val userId: Long): CC()
+  class ApiUnmuteUser(val userId: Long): CC()
+  class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean, val viewPwd: String?): CC()
   class StartChat(val expire: Boolean): CC()
   class ApiStopChat: CC()
+  class SetTempFolder(val tempFolder: String): CC()
   class SetFilesFolder(val filesFolder: String): CC()
+  class ApiSetXFTPConfig(val config: XFTPFileConfig?): CC()
   class SetIncognito(val incognito: Boolean): CC()
   class ApiExportArchive(val config: ArchiveConfig): CC()
   class ApiImportArchive(val config: ArchiveConfig): CC()
@@ -1744,6 +1846,7 @@ sealed class CC {
   class ApiSendMessage(val type: ChatType, val id: Long, val file: String?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean): CC()
   class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent, val live: Boolean): CC()
   class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
+  class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
   class ApiNewGroup(val userId: Long, val groupProfile: GroupProfile): CC()
   class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
   class ApiJoinGroup(val groupId: Long): CC()
@@ -1752,12 +1855,13 @@ sealed class CC {
   class ApiLeaveGroup(val groupId: Long): CC()
   class ApiListMembers(val groupId: Long): CC()
   class ApiUpdateGroupProfile(val groupId: Long, val groupProfile: GroupProfile): CC()
-  class APICreateGroupLink(val groupId: Long): CC()
+  class APICreateGroupLink(val groupId: Long, val memberRole: GroupMemberRole): CC()
+  class APIGroupLinkMemberRole(val groupId: Long, val memberRole: GroupMemberRole): CC()
   class APIDeleteGroupLink(val groupId: Long): CC()
   class APIGetGroupLink(val groupId: Long): CC()
   class APIGetUserSMPServers(val userId: Long): CC()
   class APISetUserSMPServers(val userId: Long, val smpServers: List<ServerCfg>): CC()
-  class TestSMPServer(val userId: Long, val smpServer: String): CC()
+  class APITestSMPServer(val userId: Long, val smpServer: String): CC()
   class APISetChatItemTTL(val userId: Long, val seconds: Long?): CC()
   class APIGetChatItemTTL(val userId: Long): CC()
   class APISetNetworkConfig(val networkConfig: NetCfg): CC()
@@ -1797,6 +1901,7 @@ sealed class CC {
   class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
   class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
   class ReceiveFile(val fileId: Long, val inline: Boolean?): CC()
+  class CancelFile(val fileId: Long): CC()
   class ShowVersion(): CC()
 
   val cmdString: String get() = when (this) {
@@ -1804,11 +1909,17 @@ sealed class CC {
     is ShowActiveUser -> "/u"
     is CreateActiveUser -> "/create user ${profile.displayName} ${profile.fullName}"
     is ListUsers -> "/users"
-    is ApiSetActiveUser -> "/_user $userId"
-    is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}"
+    is ApiSetActiveUser -> "/_user $userId${maybePwd(viewPwd)}"
+    is ApiHideUser -> "/_hide user $userId ${json.encodeToString(viewPwd)}"
+    is ApiUnhideUser -> "/_unhide user $userId ${json.encodeToString(viewPwd)}"
+    is ApiMuteUser -> "/_mute user $userId"
+    is ApiUnmuteUser -> "/_unmute user $userId"
+    is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}${maybePwd(viewPwd)}"
     is StartChat -> "/_start subscribe=on expire=${onOff(expire)}"
     is ApiStopChat -> "/_stop"
+    is SetTempFolder -> "/_temp_folder $tempFolder"
     is SetFilesFolder -> "/_files_folder $filesFolder"
+    is ApiSetXFTPConfig -> if (config != null) "/_xftp on ${json.encodeToString(config)}" else "/_xftp off"
     is SetIncognito -> "/incognito ${onOff(incognito)}"
     is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
     is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
@@ -1819,6 +1930,7 @@ sealed class CC {
     is ApiSendMessage -> "/_send ${chatRef(type, id)} live=${onOff(live)} json ${json.encodeToString(ComposedMessage(file, quotedItemId, mc))}"
     is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId live=${onOff(live)} ${mc.cmdString}"
     is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
+    is ApiDeleteMemberChatItem -> "/_delete member item #$groupId $groupMemberId $itemId"
     is ApiNewGroup -> "/_group $userId ${json.encodeToString(groupProfile)}"
     is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
     is ApiJoinGroup -> "/_join #$groupId"
@@ -1827,12 +1939,13 @@ sealed class CC {
     is ApiLeaveGroup -> "/_leave #$groupId"
     is ApiListMembers -> "/_members #$groupId"
     is ApiUpdateGroupProfile -> "/_group_profile #$groupId ${json.encodeToString(groupProfile)}"
-    is APICreateGroupLink -> "/_create link #$groupId"
+    is APICreateGroupLink -> "/_create link #$groupId ${memberRole.name.lowercase()}"
+    is APIGroupLinkMemberRole -> "/_set link role #$groupId ${memberRole.name.lowercase()}"
     is APIDeleteGroupLink -> "/_delete link #$groupId"
     is APIGetGroupLink -> "/_get link #$groupId"
     is APIGetUserSMPServers -> "/_smp $userId"
     is APISetUserSMPServers -> "/_smp $userId ${smpServersStr(smpServers)}"
-    is TestSMPServer -> "/smp test $userId $smpServer"
+    is APITestSMPServer -> "/_smp test $userId $smpServer"
     is APISetChatItemTTL -> "/_ttl $userId ${chatItemTTLStr(seconds)}"
     is APIGetChatItemTTL -> "/_ttl $userId"
     is APISetNetworkConfig -> "/_network ${json.encodeToString(networkConfig)}"
@@ -1872,6 +1985,7 @@ sealed class CC {
     is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
     is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
     is ReceiveFile -> if (inline == null) "/freceive $fileId" else "/freceive $fileId inline=${onOff(inline)}"
+    is CancelFile -> "/fcancel $fileId"
     is ShowVersion -> "/version"
   }
 
@@ -1881,10 +1995,16 @@ sealed class CC {
     is CreateActiveUser -> "createActiveUser"
     is ListUsers -> "listUsers"
     is ApiSetActiveUser -> "apiSetActiveUser"
+    is ApiHideUser -> "apiHideUser"
+    is ApiUnhideUser -> "apiUnhideUser"
+    is ApiMuteUser -> "apiMuteUser"
+    is ApiUnmuteUser -> "apiUnmuteUser"
     is ApiDeleteUser -> "apiDeleteUser"
     is StartChat -> "startChat"
     is ApiStopChat -> "apiStopChat"
+    is SetTempFolder -> "setTempFolder"
     is SetFilesFolder -> "setFilesFolder"
+    is ApiSetXFTPConfig -> "apiSetXFTPConfig"
     is SetIncognito -> "setIncognito"
     is ApiExportArchive -> "apiExportArchive"
     is ApiImportArchive -> "apiImportArchive"
@@ -1895,6 +2015,7 @@ sealed class CC {
     is ApiSendMessage -> "apiSendMessage"
     is ApiUpdateChatItem -> "apiUpdateChatItem"
     is ApiDeleteChatItem -> "apiDeleteChatItem"
+    is ApiDeleteMemberChatItem -> "apiDeleteMemberChatItem"
     is ApiNewGroup -> "apiNewGroup"
     is ApiAddMember -> "apiAddMember"
     is ApiJoinGroup -> "apiJoinGroup"
@@ -1904,11 +2025,12 @@ sealed class CC {
     is ApiListMembers -> "apiListMembers"
     is ApiUpdateGroupProfile -> "apiUpdateGroupProfile"
     is APICreateGroupLink -> "apiCreateGroupLink"
+    is APIGroupLinkMemberRole -> "apiGroupLinkMemberRole"
     is APIDeleteGroupLink -> "apiDeleteGroupLink"
     is APIGetGroupLink -> "apiGetGroupLink"
     is APIGetUserSMPServers -> "apiGetUserSMPServers"
     is APISetUserSMPServers -> "apiSetUserSMPServers"
-    is TestSMPServer -> "testSMPServer"
+    is APITestSMPServer -> "testSMPServer"
     is APISetChatItemTTL -> "apiSetChatItemTTL"
     is APIGetChatItemTTL -> "apiGetChatItemTTL"
     is APISetNetworkConfig -> "/apiSetNetworkConfig"
@@ -1948,6 +2070,7 @@ sealed class CC {
     is ApiChatRead -> "apiChatRead"
     is ApiChatUnread -> "apiChatUnread"
     is ReceiveFile -> "receiveFile"
+    is CancelFile -> "cancelFile"
     is ShowVersion -> "showVersion"
   }
 
@@ -1961,13 +2084,26 @@ sealed class CC {
   val obfuscated: CC
     get() = when (this) {
       is ApiStorageEncryption -> ApiStorageEncryption(DBEncryptionConfig(obfuscate(config.currentKey), obfuscate(config.newKey)))
+      is ApiSetActiveUser -> ApiSetActiveUser(userId, obfuscateOrNull(viewPwd))
+      is ApiHideUser -> ApiHideUser(userId, obfuscate(viewPwd))
+      is ApiUnhideUser -> ApiUnhideUser(userId, obfuscate(viewPwd))
+      is ApiDeleteUser -> ApiDeleteUser(userId, delSMPQueues, obfuscateOrNull(viewPwd))
       else -> this
     }
 
   private fun obfuscate(s: String): String = if (s.isEmpty()) "" else "***"
 
+  private fun obfuscateOrNull(s: String?): String? =
+    if (s != null) {
+      obfuscate(s)
+    } else {
+      null
+    }
+
   private fun onOff(b: Boolean): String = if (b) "on" else "off"
 
+  private fun maybePwd(pwd: String?): String = if (pwd == "" || pwd == null) "" else " " + json.encodeToString(pwd)
+
   companion object {
     fun chatRef(chatType: ChatType, id: Long) = "${chatType.type}${id}"
 
@@ -1996,6 +2132,9 @@ sealed class ChatPagination {
 @Serializable
 class ComposedMessage(val filePath: String?, val quotedItemId: Long?, val msgContent: MsgContent)
 
+@Serializable
+class XFTPFileConfig(val minFileSize: Long)
+
 @Serializable
 class ArchiveConfig(val archivePath: String, val disableCompression: Boolean? = null, val parentTempDirectory: String? = null)
 
@@ -2820,6 +2959,13 @@ class APIResponse(val resp: CR, val corr: String? = null) {
                 resp = CR.ApiChat(user, chat),
                 corr = data["corr"]?.toString()
               )
+            } else if (type == "chatCmdError") {
+              val userObject = resp["user_"]?.jsonObject
+              val user = runCatching<User?> { json.decodeFromJsonElement(userObject!!) }.getOrNull()
+              return APIResponse(
+                resp = CR.ChatCmdError(user, ChatError.ChatErrorInvalidJSON(json.encodeToString(resp["chatError"]))),
+                corr = data["corr"]?.toString()
+              )
             }
           } catch (e: Exception) {
             Log.e(TAG, "Error while parsing chat(s): " + e.stackTraceToString())
@@ -2876,6 +3022,7 @@ sealed class CR {
   @Serializable @SerialName("chatCleared") class ChatCleared(val user: User, val chatInfo: ChatInfo): CR()
   @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange(val user: User): CR()
   @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val user: User, val fromProfile: Profile, val toProfile: Profile): CR()
+  @Serializable @SerialName("userPrivacy") class UserPrivacy(val user: User, val updatedUser: User): CR()
   @Serializable @SerialName("contactAliasUpdated") class ContactAliasUpdated(val user: User, val toContact: Contact): CR()
   @Serializable @SerialName("connectionAliasUpdated") class ConnectionAliasUpdated(val user: User, val toConnection: PendingContactConnection): CR()
   @Serializable @SerialName("contactPrefsUpdated") class ContactPrefsUpdated(val user: User, val fromContact: Contact, val toContact: Contact): CR()
@@ -2925,20 +3072,24 @@ sealed class CR {
   @Serializable @SerialName("connectedToGroupMember") class ConnectedToGroupMember(val user: User, val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("groupRemoved") class GroupRemoved(val user: User, val groupInfo: GroupInfo): CR() // unused
   @Serializable @SerialName("groupUpdated") class GroupUpdated(val user: User, val toGroup: GroupInfo): CR()
-  @Serializable @SerialName("groupLinkCreated") class GroupLinkCreated(val user: User, val groupInfo: GroupInfo, val connReqContact: String): CR()
-  @Serializable @SerialName("groupLink") class GroupLink(val user: User, val groupInfo: GroupInfo, val connReqContact: String): CR()
+  @Serializable @SerialName("groupLinkCreated") class GroupLinkCreated(val user: User, val groupInfo: GroupInfo, val connReqContact: String, val memberRole: GroupMemberRole): CR()
+  @Serializable @SerialName("groupLink") class GroupLink(val user: User, val groupInfo: GroupInfo, val connReqContact: String, val memberRole: GroupMemberRole): CR()
   @Serializable @SerialName("groupLinkDeleted") class GroupLinkDeleted(val user: User, val groupInfo: GroupInfo): CR()
   // receiving file events
   @Serializable @SerialName("rcvFileAccepted") class RcvFileAccepted(val user: User, val chatItem: AChatItem): CR()
   @Serializable @SerialName("rcvFileAcceptedSndCancelled") class RcvFileAcceptedSndCancelled(val user: User, val rcvFileTransfer: RcvFileTransfer): CR()
   @Serializable @SerialName("rcvFileStart") class RcvFileStart(val user: User, val chatItem: AChatItem): CR()
   @Serializable @SerialName("rcvFileComplete") class RcvFileComplete(val user: User, val chatItem: AChatItem): CR()
+  @Serializable @SerialName("rcvFileCancelled") class RcvFileCancelled(val user: User, val chatItem: AChatItem, val rcvFileTransfer: RcvFileTransfer): CR()
+  @Serializable @SerialName("rcvFileSndCancelled") class RcvFileSndCancelled(val user: User, val chatItem: AChatItem, val rcvFileTransfer: RcvFileTransfer): CR()
+  @Serializable @SerialName("rcvFileProgressXFTP") class RcvFileProgressXFTP(val user: User, val chatItem: AChatItem, val receivedSize: Long, val totalSize: Long): CR()
   // sending file events
   @Serializable @SerialName("sndFileStart") class SndFileStart(val user: User, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
   @Serializable @SerialName("sndFileComplete") class SndFileComplete(val user: User, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
-  @Serializable @SerialName("sndFileCancelled") class SndFileCancelled(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
+  @Serializable @SerialName("sndFileCancelled") class SndFileCancelled(val user: User, val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta, val sndFileTransfers: List<SndFileTransfer>): CR()
   @Serializable @SerialName("sndFileRcvCancelled") class SndFileRcvCancelled(val user: User, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
-  @Serializable @SerialName("sndGroupFileCancelled") class SndGroupFileCancelled(val user: User, val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta, val sndFileTransfers: List<SndFileTransfer>): CR()
+  @Serializable @SerialName("sndFileProgressXFTP") class SndFileProgressXFTP(val user: User, val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta, val sentSize: Long, val totalSize: Long): CR()
+  @Serializable @SerialName("sndFileCompleteXFTP") class SndFileCompleteXFTP(val user: User, val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta): CR()
   @Serializable @SerialName("callInvitation") class CallInvitation(val callInvitation: RcvCallInvitation): CR()
   @Serializable @SerialName("callOffer") class CallOffer(val user: User, val contact: Contact, val callType: CallType, val offer: WebRTCSession, val sharedKey: String? = null, val askConfirmation: Boolean): CR()
   @Serializable @SerialName("callAnswer") class CallAnswer(val user: User, val contact: Contact, val answer: WebRTCSession): CR()
@@ -2946,11 +3097,11 @@ sealed class CR {
   @Serializable @SerialName("callEnded") class CallEnded(val user: User, val contact: Contact): CR()
   @Serializable @SerialName("newContactConnection") class NewContactConnection(val user: User, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: User, val connection: PendingContactConnection): CR()
-  @Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo): CR()
+  @Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
   @Serializable @SerialName("apiParsedMarkdown") class ParsedMarkdown(val formattedText: List<FormattedText>? = null): CR()
   @Serializable @SerialName("cmdOk") class CmdOk(val user: User?): CR()
-  @Serializable @SerialName("chatCmdError") class ChatCmdError(val user: User?, val chatError: ChatError): CR()
-  @Serializable @SerialName("chatError") class ChatRespError(val user: User?, val chatError: ChatError): CR()
+  @Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: User?, val chatError: ChatError): CR()
+  @Serializable @SerialName("chatError") class ChatRespError(val user_: User?, val chatError: ChatError): CR()
   @Serializable class Response(val type: String, val json: String): CR()
   @Serializable class Invalid(val str: String): CR()
 
@@ -2979,6 +3130,7 @@ sealed class CR {
     is ChatCleared -> "chatCleared"
     is UserProfileNoChange -> "userProfileNoChange"
     is UserProfileUpdated -> "userProfileUpdated"
+    is UserPrivacy -> "userPrivacy"
     is ContactAliasUpdated -> "contactAliasUpdated"
     is ConnectionAliasUpdated -> "connectionAliasUpdated"
     is ContactPrefsUpdated -> "contactPrefsUpdated"
@@ -3034,11 +3186,15 @@ sealed class CR {
     is RcvFileAccepted -> "rcvFileAccepted"
     is RcvFileStart -> "rcvFileStart"
     is RcvFileComplete -> "rcvFileComplete"
+    is RcvFileCancelled -> "rcvFileCancelled"
+    is RcvFileSndCancelled -> "rcvFileSndCancelled"
+    is RcvFileProgressXFTP -> "rcvFileProgressXFTP"
     is SndFileCancelled -> "sndFileCancelled"
     is SndFileComplete -> "sndFileComplete"
     is SndFileRcvCancelled -> "sndFileRcvCancelled"
     is SndFileStart -> "sndFileStart"
-    is SndGroupFileCancelled -> "sndGroupFileCancelled"
+    is SndFileProgressXFTP -> "sndFileProgressXFTP"
+    is SndFileCompleteXFTP -> "sndFileCompleteXFTP"
     is CallInvitation -> "callInvitation"
     is CallOffer -> "callOffer"
     is CallAnswer -> "callAnswer"
@@ -3080,6 +3236,7 @@ sealed class CR {
     is ChatCleared -> withUser(user, json.encodeToString(chatInfo))
     is UserProfileNoChange -> withUser(user, noDetails())
     is UserProfileUpdated -> withUser(user, json.encodeToString(toProfile))
+    is UserPrivacy -> withUser(user, json.encodeToString(updatedUser))
     is ContactAliasUpdated -> withUser(user, json.encodeToString(toContact))
     is ConnectionAliasUpdated -> withUser(user, json.encodeToString(toConnection))
     is ContactPrefsUpdated -> withUser(user, "fromContact: $fromContact\ntoContact: \n${json.encodeToString(toContact)}")
@@ -3129,18 +3286,22 @@ sealed class CR {
     is ConnectedToGroupMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
     is GroupRemoved -> withUser(user, json.encodeToString(groupInfo))
     is GroupUpdated -> withUser(user, json.encodeToString(toGroup))
-    is GroupLinkCreated -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact")
-    is GroupLink -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact")
+    is GroupLinkCreated -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact\nmemberRole: $memberRole")
+    is GroupLink -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact\nmemberRole: $memberRole")
     is GroupLinkDeleted -> withUser(user, json.encodeToString(groupInfo))
     is RcvFileAcceptedSndCancelled -> withUser(user, noDetails())
     is RcvFileAccepted -> withUser(user, json.encodeToString(chatItem))
     is RcvFileStart -> withUser(user, json.encodeToString(chatItem))
     is RcvFileComplete -> withUser(user, json.encodeToString(chatItem))
+    is RcvFileCancelled -> withUser(user, json.encodeToString(chatItem))
+    is RcvFileSndCancelled -> withUser(user, json.encodeToString(chatItem))
+    is RcvFileProgressXFTP -> withUser(user, "chatItem: ${json.encodeToString(chatItem)}\nreceivedSize: $receivedSize\ntotalSize: $totalSize")
     is SndFileCancelled -> json.encodeToString(chatItem)
     is SndFileComplete -> withUser(user, json.encodeToString(chatItem))
     is SndFileRcvCancelled -> withUser(user, json.encodeToString(chatItem))
     is SndFileStart -> withUser(user, json.encodeToString(chatItem))
-    is SndGroupFileCancelled -> withUser(user, json.encodeToString(chatItem))
+    is SndFileProgressXFTP -> withUser(user, "chatItem: ${json.encodeToString(chatItem)}\nsentSize: $sentSize\ntotalSize: $totalSize")
+    is SndFileCompleteXFTP -> withUser(user, json.encodeToString(chatItem))
     is CallInvitation -> "contact: ${callInvitation.contact.id}\ncallType: $callInvitation.callType\nsharedKey: ${callInvitation.sharedKey ?: ""}"
     is CallOffer -> withUser(user, "contact: ${contact.id}\ncallType: $callType\nsharedKey: ${sharedKey ?: ""}\naskConfirmation: $askConfirmation\noffer: ${json.encodeToString(offer)}")
     is CallAnswer -> withUser(user, "contact: ${contact.id}\nanswer: ${json.encodeToString(answer)}")
@@ -3148,10 +3309,12 @@ sealed class CR {
     is CallEnded -> withUser(user, "contact: ${contact.id}")
     is NewContactConnection -> withUser(user, json.encodeToString(connection))
     is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
-    is VersionInfo -> json.encodeToString(versionInfo)
+    is VersionInfo -> "version ${json.encodeToString(versionInfo)}\n\n" +
+        "chat migrations: ${json.encodeToString(chatMigrations.map { it.upName })}\n\n" +
+        "agent migrations: ${json.encodeToString(agentMigrations.map { it.upName })}"
     is CmdOk -> withUser(user, noDetails())
-    is ChatCmdError -> withUser(user, chatError.string)
-    is ChatRespError -> withUser(user, chatError.string)
+    is ChatCmdError -> withUser(user_, chatError.string)
+    is ChatRespError -> withUser(user_, chatError.string)
     is Response -> json
     is Invalid -> str
   }
@@ -3223,11 +3386,13 @@ sealed class ChatError {
     is ChatErrorAgent -> "agent ${agentError.string}"
     is ChatErrorStore -> "store ${storeError.string}"
     is ChatErrorDatabase -> "database ${databaseError.string}"
+    is ChatErrorInvalidJSON -> "invalid json ${json}"
   }
   @Serializable @SerialName("error") class ChatErrorChat(val errorType: ChatErrorType): ChatError()
   @Serializable @SerialName("errorAgent") class ChatErrorAgent(val agentError: AgentErrorType): ChatError()
   @Serializable @SerialName("errorStore") class ChatErrorStore(val storeError: StoreError): ChatError()
   @Serializable @SerialName("errorDatabase") class ChatErrorDatabase(val databaseError: DatabaseError): ChatError()
+  @Serializable @SerialName("invalidJSON") class ChatErrorInvalidJSON(val json: String): ChatError()
 }
 
 @Serializable

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt

@@ -17,6 +17,7 @@ enum class DefaultTheme {
 val DEFAULT_PADDING = 16.dp
 val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
+val DEFAULT_BOTTOM_PADDING = 48.dp
 
 val DarkColorPalette = darkColors(
   primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files

apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt

@@ -83,6 +83,8 @@ fun TerminalLayout(
             liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
             needToAllowVoiceToContact = false,
             allowedVoiceByPrefs = false,
+            userIsObserver = false,
+            userCanSend = true,
             allowVoiceToContact = {},
             sendMessage = sendCommand,
             sendLiveMessage = null,

apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt

@@ -13,12 +13,14 @@ class CallManager(val chatModel: ChatModel) {
     Log.d(TAG, "CallManager.reportNewIncomingCall")
     with (chatModel) {
       callInvitations[invitation.contact.id] = invitation
-      if (Clock.System.now() - invitation.callTs <= 3.minutes) {
-        activeCallInvitation.value = invitation
-        controller.ntfManager.notifyCallInvitation(invitation)
-      } else {
-        val contact = invitation.contact
-        controller.ntfManager.notifyMessageReceived(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
+      if (invitation.user.showNotifications) {
+        if (Clock.System.now() - invitation.callTs <= 3.minutes) {
+          activeCallInvitation.value = invitation
+          controller.ntfManager.notifyCallInvitation(invitation)
+        } else {
+          val contact = invitation.contact
+          controller.ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
+        }
       }
     }
   }

apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt

@@ -3,11 +3,12 @@ package chat.simplex.app.views.call
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Context
+import android.content.*
 import android.content.pm.ActivityInfo
-import android.media.AudioDeviceInfo
-import android.media.AudioManager
+import android.media.*
 import android.os.Build
+import android.os.PowerManager
+import android.os.PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK
 import android.util.Log
 import android.view.ViewGroup
 import android.webkit.*
@@ -19,6 +20,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -37,7 +39,7 @@ import androidx.webkit.WebViewClientCompat
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ProfileImage
 import chat.simplex.app.views.helpers.withApi
 import chat.simplex.app.views.usersettings.NotificationsMode
@@ -53,6 +55,7 @@ fun ActiveCallView(chatModel: ChatModel) {
     val call = chatModel.activeCall.value
     if (call != null) withApi { chatModel.callManager.endCall(call) }
   })
+  val audioViaBluetooth = rememberSaveable { mutableStateOf(false) }
   val ntfModeService = remember { chatModel.controller.appPrefs.notificationsMode.get() == NotificationsMode.SERVICE.name }
   LaunchedEffect(Unit) {
     // Start service when call happening since it's not already started.
@@ -60,17 +63,48 @@ fun ActiveCallView(chatModel: ChatModel) {
     if (!ntfModeService) SimplexService.start(SimplexApp.context)
   }
   DisposableEffect(Unit) {
+    val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    var btDeviceCount = 0
+    val audioCallback = object: AudioDeviceCallback() {
+      override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
+        Log.d(TAG, "Added audio devices: ${addedDevices.map { it.type }}")
+        super.onAudioDevicesAdded(addedDevices)
+        val addedCount = addedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
+        btDeviceCount += addedCount
+        audioViaBluetooth.value = btDeviceCount > 0
+        if (addedCount > 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
+          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
+          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
+        }
+      }
+      override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
+        Log.d(TAG, "Removed audio devices: ${removedDevices.map { it.type }}")
+        super.onAudioDevicesRemoved(removedDevices)
+        val removedCount = removedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
+        btDeviceCount -= removedCount
+        audioViaBluetooth.value = btDeviceCount > 0
+        if (btDeviceCount == 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
+          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
+          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
+        }
+      }
+    }
+    am.registerAudioDeviceCallback(audioCallback, null)
+    val pm = (SimplexApp.context.getSystemService(Context.POWER_SERVICE) as PowerManager)
+    val proximityLock = if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, SimplexApp.context.packageName + ":proximityLock")
+    } else {
+      null
+    }
+    proximityLock?.acquire()
     onDispose {
       // Stop it when call ended
       if (!ntfModeService) SimplexService.safeStopService(SimplexApp.context)
-      // Clear selected communication device to default value after we changed it in call
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        am.clearCommunicationDevice()
-      }
+      dropAudioManagerOverrides()
+      am.unregisterAudioDeviceCallback(audioCallback)
+      proximityLock?.release()
     }
   }
-  val cxt = LocalContext.current
   val scope = rememberCoroutineScope()
   Box(Modifier.fillMaxSize()) {
     WebRTCView(chatModel.callCommand) { apiMsg ->
@@ -100,6 +134,7 @@ fun ActiveCallView(chatModel: ChatModel) {
               val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
               if (callStatus == WebRTCCallStatus.Connected) {
                 chatModel.activeCall.value = call.copy(callState = CallState.Connected)
+                setCallSound(call.soundSpeaker, audioViaBluetooth)
               }
               withApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
             } catch (e: Error) {
@@ -108,8 +143,7 @@ fun ActiveCallView(chatModel: ChatModel) {
           is WCallResponse.Connected -> {
             chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
             scope.launch {
-              delay(2000L)
-              setCallSound(cxt, call)
+              setCallSound(call.soundSpeaker, audioViaBluetooth)
             }
           }
           is WCallResponse.Ended -> {
@@ -143,15 +177,18 @@ fun ActiveCallView(chatModel: ChatModel) {
       }
     }
     val call = chatModel.activeCall.value
-    if (call != null)  ActiveCallOverlay(call, chatModel)
+    if (call != null)  ActiveCallOverlay(call, chatModel, audioViaBluetooth)
   }
 
   val context = LocalContext.current
   DisposableEffect(Unit) {
     val activity = context as? Activity ?: return@DisposableEffect onDispose {}
+    val prevVolumeControlStream = activity.volumeControlStream
+    activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
     // Lock orientation to portrait in order to have good experience with calls
     activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     onDispose {
+      activity.volumeControlStream = prevVolumeControlStream
       // Unlock orientation
       activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
     }
@@ -159,10 +196,10 @@ fun ActiveCallView(chatModel: ChatModel) {
 }
 
 @Composable
-private fun ActiveCallOverlay(call: Call, chatModel: ChatModel) {
-  var cxt = LocalContext.current
+private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetooth: MutableState<Boolean>) {
   ActiveCallOverlayLayout(
     call = call,
+    speakerCanBeEnabled = !audioViaBluetooth.value,
     dismiss = { withApi { chatModel.callManager.endCall(call) } },
     toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
     toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
@@ -171,38 +208,55 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel) {
       if (call != null) {
         call = call.copy(soundSpeaker = !call.soundSpeaker)
         chatModel.activeCall.value = call
-        setCallSound(cxt, call)
+        setCallSound(call.soundSpeaker, audioViaBluetooth)
       }
     },
     flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
   )
 }
 
-private fun setCallSound(cxt: Context, call: Call) {
-  Log.d(TAG, "setCallSound: set audio mode")
-  val am = cxt.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-  if (call.soundSpeaker) {
-    am.mode = AudioManager.MODE_NORMAL
-    am.isSpeakerphoneOn = true
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      am.availableCommunicationDevices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER }?.let {
+private fun setCallSound(speaker: Boolean, audioViaBluetooth: MutableState<Boolean>) {
+  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  Log.d(TAG, "setCallSound: set audio mode, speaker enabled: $speaker")
+  am.mode = AudioManager.MODE_IN_COMMUNICATION
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+    val btDevice = am.availableCommunicationDevices.lastOrNull { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
+    val preferredSecondaryDevice = if (speaker) AudioDeviceInfo.TYPE_BUILTIN_SPEAKER else AudioDeviceInfo.TYPE_BUILTIN_EARPIECE
+    if (btDevice != null) {
+      am.setCommunicationDevice(btDevice)
+    } else if (am.communicationDevice?.type != preferredSecondaryDevice) {
+      am.availableCommunicationDevices.firstOrNull { it.type == preferredSecondaryDevice }?.let {
         am.setCommunicationDevice(it)
       }
     }
   } else {
-    am.mode = AudioManager.MODE_IN_CALL
-    am.isSpeakerphoneOn = false
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      am.availableCommunicationDevices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE }?.let {
-        am.setCommunicationDevice(it)
-      }
+    if (audioViaBluetooth.value) {
+      am.isSpeakerphoneOn = false
+      am.startBluetoothSco()
+    } else {
+      am.stopBluetoothSco()
+      am.isSpeakerphoneOn = speaker
     }
+    am.isBluetoothScoOn = am.isBluetoothScoAvailableOffCall && audioViaBluetooth.value
+  }
+}
+
+private fun dropAudioManagerOverrides() {
+  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  am.mode = AudioManager.MODE_NORMAL
+  // Clear selected communication device to default value after we changed it in call
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+    am.clearCommunicationDevice()
+  } else {
+    am.isSpeakerphoneOn = false
+    am.stopBluetoothSco()
   }
 }
 
 @Composable
 private fun ActiveCallOverlayLayout(
   call: Call,
+  speakerCanBeEnabled: Boolean,
   dismiss: () -> Unit,
   toggleAudio: () -> Unit,
   toggleVideo: () -> Unit,
@@ -240,7 +294,7 @@ private fun ActiveCallOverlayLayout(
           CallInfoView(call, alignment = Alignment.CenterHorizontally)
         }
         Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(Modifier.fillMaxWidth().padding(bottom = 48.dp), contentAlignment = Alignment.CenterStart) {
+        Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
           Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
             IconButton(onClick = dismiss) {
               Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
@@ -251,7 +305,7 @@ private fun ActiveCallOverlayLayout(
           }
           Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
             Box(Modifier.padding(end = 32.dp)) {
-              ToggleSoundButton(call, toggleSound)
+              ToggleSoundButton(call, speakerCanBeEnabled, toggleSound)
             }
           }
         }
@@ -261,10 +315,10 @@ private fun ActiveCallOverlayLayout(
 }
 
 @Composable
-private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit) {
+private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit, enabled: Boolean = true) {
   if (call.hasMedia) {
-    IconButton(onClick = action) {
-      Icon(icon, stringResource(iconText), tint = Color(0xFFFFFFD8), modifier = Modifier.size(40.dp))
+    IconButton(onClick = action, enabled = enabled) {
+      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else HighOrLowlight, modifier = Modifier.size(40.dp))
     }
   } else {
     Spacer(Modifier.size(40.dp))
@@ -281,11 +335,11 @@ private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
 }
 
 @Composable
-private fun ToggleSoundButton(call: Call, toggleSound: () -> Unit) {
+private fun ToggleSoundButton(call: Call, enabled: Boolean, toggleSound: () -> Unit) {
   if (call.soundSpeaker) {
-    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound)
+    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound, enabled)
   } else {
-    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound)
+    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound, enabled)
   }
 }
 
@@ -485,6 +539,7 @@ fun PreviewActiveCallOverlayVideo() {
           RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null)
         )
       ),
+      speakerCanBeEnabled = true,
       dismiss = {},
       toggleAudio = {},
       toggleVideo = {},
@@ -509,6 +564,7 @@ fun PreviewActiveCallOverlayAudio() {
           RTCIceCandidate(RTCIceCandidateType.Host, "udp", null)
         )
       ),
+      speakerCanBeEnabled = true,
       dismiss = {},
       toggleAudio = {},
       toggleVideo = {},

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt

@@ -1,5 +1,6 @@
 package chat.simplex.app.views.chat
 
+import android.app.Activity
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.net.Uri
@@ -133,6 +134,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
       searchText,
       useLinkPreviews = useLinkPreviews,
       linkMode = chatModel.simplexLinkMode.value,
+      allowVideoAttachment = chatModel.controller.appPrefs.xftpSendEnabled.get(),
       chatModelIncognito = chatModel.incognito.value,
       back = {
         hideKeyboard(view)
@@ -152,9 +154,14 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
             }
           } else if (chat.chatInfo is ChatInfo.Group) {
             setGroupMembers(chat.chatInfo.groupInfo, chatModel)
-            var groupLink = chatModel.controller.apiGetGroupLink(chat.chatInfo.groupInfo.groupId)
+            val link = chatModel.controller.apiGetGroupLink(chat.chatInfo.groupInfo.groupId)
+            var groupLink = link?.first
+            var groupLinkMemberRole = link?.second
             ModalManager.shared.showModalCloseable(true) { close ->
-              GroupChatInfoView(chatModel, groupLink, { groupLink = it }, close)
+              GroupChatInfoView(chatModel, groupLink, groupLinkMemberRole, {
+                groupLink = it.first;
+                groupLinkMemberRole = it.second
+              }, close)
             }
           }
         }
@@ -193,27 +200,42 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
       deleteMessage = { itemId, mode ->
         withApi {
           val cInfo = chat.chatInfo
-          val r = chatModel.controller.apiDeleteChatItem(
-            type = cInfo.chatType,
-            id = cInfo.apiId,
-            itemId = itemId,
-            mode = mode
-          )
-          if (r != null) {
-            val toChatItem = r.toChatItem
-            if (toChatItem == null) {
-              chatModel.removeChatItem(cInfo, r.deletedChatItem.chatItem)
-            } else {
-              chatModel.upsertChatItem(cInfo, toChatItem.chatItem)
-            }
+          val toDeleteItem = chatModel.chatItems.firstOrNull { it.id == itemId }
+          val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
+          val groupInfo = toModerate?.first
+          val groupMember = toModerate?.second
+          val deletedChatItem: ChatItem?
+          val toChatItem: ChatItem?
+          if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
+            val r = chatModel.controller.apiDeleteMemberChatItem(
+              groupId = groupInfo.groupId,
+              groupMemberId = groupMember.groupMemberId,
+              itemId = itemId
+            )
+            deletedChatItem = r?.first
+            toChatItem = r?.second
+          } else {
+            val r = chatModel.controller.apiDeleteChatItem(
+              type = cInfo.chatType,
+              id = cInfo.apiId,
+              itemId = itemId,
+              mode = mode
+            )
+            deletedChatItem = r?.deletedChatItem?.chatItem
+            toChatItem = r?.toChatItem?.chatItem
+          }
+          if (toChatItem == null && deletedChatItem != null) {
+            chatModel.removeChatItem(cInfo, deletedChatItem)
+          } else if (toChatItem != null) {
+            chatModel.upsertChatItem(cInfo, toChatItem)
           }
         }
       },
       receiveFile = { fileId ->
-        val user = chatModel.currentUser.value
-        if (user != null) {
-          withApi { chatModel.controller.receiveFile(user, fileId) }
-        }
+        withApi { chatModel.controller.receiveFile(user, fileId) }
+      },
+      cancelFile = { fileId ->
+        withApi { chatModel.controller.cancelFile(user, fileId) }
       },
       joinGroup = { groupId ->
         withApi { chatModel.controller.apiJoinGroup(groupId) }
@@ -286,6 +308,7 @@ fun ChatLayout(
   searchValue: State<String>,
   useLinkPreviews: Boolean,
   linkMode: SimplexLinkMode,
+  allowVideoAttachment: Boolean,
   chatModelIncognito: Boolean,
   back: () -> Unit,
   info: () -> Unit,
@@ -293,6 +316,7 @@ fun ChatLayout(
   loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   receiveFile: (Long) -> Unit,
+  cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   startCall: (CallMediaType) -> Unit,
   acceptCall: (Contact) -> Unit,
@@ -316,6 +340,7 @@ fun ChatLayout(
         sheetContent = {
           ChooseAttachmentView(
             attachmentOption,
+            allowVideoAttachment,
             hide = { scope.launch { attachmentBottomSheetState.hide() } }
           )
         },
@@ -337,7 +362,7 @@ fun ChatLayout(
             ChatItemsList(
               chat, unreadCount, composeState, chatItems, searchValue,
               useLinkPreviews, linkMode, chatModelIncognito, showMemberInfo, loadPrevMessages, deleteMessage,
-              receiveFile, joinGroup, acceptCall, acceptFeature, markRead, setFloatingButton, onComposed,
+              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, markRead, setFloatingButton, onComposed,
             )
           }
         }
@@ -510,6 +535,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   receiveFile: (Long) -> Unit,
+  cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
@@ -556,6 +582,11 @@ fun BoxWithConstraintsScope.ChatItemsList(
           stopListening = true
       }
   }
+  DisposableEffectOnGone(
+    whenGone = {
+      VideoPlayer.releaseAll()
+    }
+  )
   LazyColumn(Modifier.align(Alignment.BottomCenter), state = listState, reverseLayout = true) {
     itemsIndexed(reversedChatItems, key = { _, item -> item.id}) { i, cItem ->
       CompositionLocalProvider(
@@ -575,10 +606,12 @@ fun BoxWithConstraintsScope.ChatItemsList(
         if (dismissState.isAnimationRunning && (swipedToStart || swipedToEnd)) {
           LaunchedEffect(Unit) {
             scope.launch {
-              if (composeState.value.editing) {
-                composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-              } else if (cItem.id != ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
-                composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+              if (cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) {
+                if (composeState.value.editing) {
+                  composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+                } else if (cItem.id != ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+                  composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+                }
               }
             }
           }
@@ -618,11 +651,11 @@ fun BoxWithConstraintsScope.ChatItemsList(
               } else {
                 Spacer(Modifier.size(42.dp))
               }
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
             }
           } else {
             Box(Modifier.padding(start = 104.dp, end = 12.dp).then(swipeableModifier)) {
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
             }
           }
         } else { // direct message
@@ -633,7 +666,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
               end = if (sent) 12.dp else 76.dp,
             ).then(swipeableModifier)
           ) {
-            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
           }
         }
 
@@ -913,21 +946,26 @@ private fun markUnreadChatAsRead(activeChat: MutableState<Chat?>, chatModel: Cha
   }
 }
 
+sealed class ProviderMedia {
+  data class Image(val uri: Uri, val image: Bitmap): ProviderMedia()
+  data class Video(val uri: Uri, val preview: String): ProviderMedia()
+}
+
 private fun providerForGallery(
   listStateIndex: Int,
   chatItems: List<ChatItem>,
   cItemId: Long,
   scrollTo: (Int) -> Unit
 ): ImageGalleryProvider {
-  fun canShowImage(item: ChatItem): Boolean =
-    item.content.msgContent is MsgContent.MCImage && item.file?.loaded == true && getLoadedFilePath(SimplexApp.context, item.file) != null
+  fun canShowMedia(item: ChatItem): Boolean =
+    (item.content.msgContent is MsgContent.MCImage || item.content.msgContent is MsgContent.MCVideo) && (item.file?.loaded == true && getLoadedFilePath(SimplexApp.context, item.file) != null)
 
   fun item(skipInternalIndex: Int, initialChatId: Long): Pair<Int, ChatItem>? {
     var processedInternalIndex = -skipInternalIndex.sign
     val indexOfFirst = chatItems.indexOfFirst { it.id == initialChatId }
     for (chatItemsIndex in if (skipInternalIndex >= 0) indexOfFirst downTo 0 else indexOfFirst..chatItems.lastIndex) {
       val item = chatItems[chatItemsIndex]
-      if (canShowImage(item)) {
+      if (canShowMedia(item)) {
         processedInternalIndex += skipInternalIndex.sign
       }
       if (processedInternalIndex == skipInternalIndex) {
@@ -941,16 +979,28 @@ private fun providerForGallery(
   var initialChatId = cItemId
   return object: ImageGalleryProvider {
     override val initialIndex: Int = initialIndex
-    override val totalImagesSize = mutableStateOf(Int.MAX_VALUE)
-    override fun getImage(index: Int): Pair<Bitmap, Uri>? {
+    override val totalMediaSize = mutableStateOf(Int.MAX_VALUE)
+    override fun getMedia(index: Int): ProviderMedia? {
       val internalIndex = initialIndex - index
-      val file = item(internalIndex, initialChatId)?.second?.file
-      val imageBitmap: Bitmap? = getLoadedImage(SimplexApp.context, file)
-      val filePath = getLoadedFilePath(SimplexApp.context, file)
-      return if (imageBitmap != null && filePath != null) {
-        val uri = FileProvider.getUriForFile(SimplexApp.context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
-        imageBitmap to uri
-      } else null
+      val item = item(internalIndex, initialChatId)?.second ?: return null
+      return when (item.content.msgContent) {
+        is MsgContent.MCImage -> {
+          val imageBitmap: Bitmap? = getLoadedImage(SimplexApp.context, item.file)
+          val filePath = getLoadedFilePath(SimplexApp.context, item.file)
+          if (imageBitmap != null && filePath != null) {
+            val uri = FileProvider.getUriForFile(SimplexApp.context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
+            ProviderMedia.Image(uri, imageBitmap)
+          } else null
+        }
+        is MsgContent.MCVideo -> {
+          val filePath = getLoadedFilePath(SimplexApp.context, item.file)
+          if (filePath != null) {
+            val uri = FileProvider.getUriForFile(SimplexApp.context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
+            ProviderMedia.Video(uri, (item.content.msgContent as MsgContent.MCVideo).image)
+          } else null
+        }
+        else -> null
+      }
     }
 
     override fun currentPageChanged(index: Int) {
@@ -962,7 +1012,7 @@ private fun providerForGallery(
 
     override fun scrollToStart() {
       initialIndex = 0
-      initialChatId = chatItems.first { canShowImage(it) }.id
+      initialChatId = chatItems.first { canShowMedia(it) }.id
     }
 
     override fun onDismiss(index: Int) {
@@ -1033,6 +1083,7 @@ fun PreviewChatLayout() {
       searchValue,
       useLinkPreviews = true,
       linkMode = SimplexLinkMode.DESCRIPTION,
+      allowVideoAttachment = true,
       chatModelIncognito = false,
       back = {},
       info = {},
@@ -1040,6 +1091,7 @@ fun PreviewChatLayout() {
       loadPrevMessages = { _ -> },
       deleteMessage = { _, _ -> },
       receiveFile = {},
+      cancelFile = {},
       joinGroup = {},
       startCall = {},
       acceptCall = { _ -> },
@@ -1092,6 +1144,7 @@ fun PreviewGroupChatLayout() {
       searchValue,
       useLinkPreviews = true,
       linkMode = SimplexLinkMode.DESCRIPTION,
+      allowVideoAttachment = true,
       chatModelIncognito = false,
       back = {},
       info = {},
@@ -1099,6 +1152,7 @@ fun PreviewGroupChatLayout() {
       loadPrevMessages = { _ -> },
       deleteMessage = { _, _ -> },
       receiveFile = {},
+      cancelFile = {},
       joinGroup = {},
       startCall = {},
       acceptCall = { _ -> },

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt

@@ -7,13 +7,12 @@ import android.Manifest
 import android.app.Activity
 import android.content.*
 import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.graphics.ImageDecoder
-import android.graphics.ImageDecoder.DecodeException
+import android.graphics.*
 import android.graphics.drawable.AnimatedImageDrawable
+import android.media.MediaMetadataRetriever
 import android.net.Uri
+import android.os.Build
 import android.provider.MediaStore
-import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContract
@@ -51,6 +50,7 @@ sealed class ComposePreview {
   @Serializable object NoPreview: ComposePreview()
   @Serializable class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
   @Serializable class ImagePreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
+  @Serializable class VideoPreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
   @Serializable data class VoicePreview(val voice: String, val durationMs: Int, val finished: Boolean): ComposePreview()
   @Serializable class FilePreview(val fileName: String, val uri: Uri): ComposePreview()
 }
@@ -97,6 +97,7 @@ data class ComposeState(
     get() = {
       val hasContent = when (preview) {
         is ComposePreview.ImagePreview -> true
+        is ComposePreview.VideoPreview -> true
         is ComposePreview.VoicePreview -> true
         is ComposePreview.FilePreview -> true
         else -> message.isNotEmpty() || liveMessage != null
@@ -110,6 +111,7 @@ data class ComposeState(
     get() =
       when (preview) {
         is ComposePreview.ImagePreview -> false
+        is ComposePreview.VideoPreview -> false
         is ComposePreview.VoicePreview -> false
         is ComposePreview.FilePreview -> false
         else -> useLinkPreviews
@@ -160,6 +162,7 @@ fun chatItemPreview(chatItem: ChatItem): ComposePreview {
     is MsgContent.MCLink -> ComposePreview.CLinkPreview(linkPreview = mc.preview)
     // TODO: include correct type
     is MsgContent.MCImage -> ComposePreview.ImagePreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
+    is MsgContent.MCVideo -> ComposePreview.VideoPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
     is MsgContent.MCVoice -> ComposePreview.VoicePreview(voice = fileName, mc.duration / 1000, true)
     is MsgContent.MCFile -> ComposePreview.FilePreview(fileName, getAppFileUri(fileName))
     is MsgContent.MCUnknown, null -> ComposePreview.NoPreview
@@ -180,14 +183,17 @@ fun ComposeView(
   val pendingLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
   val cancelledLinks = rememberSaveable { mutableSetOf<String>() }
   val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
+  val xftpSendEnabled = chatModel.controller.appPrefs.xftpSendEnabled.get()
+  val maxFileSize = getMaxFileSize(fileProtocol = if (xftpSendEnabled) FileProtocol.XFTP else FileProtocol.SMP)
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember { mutableStateOf(smallFont) }
   val cameraLauncher = rememberCameraLauncher { uri: Uri? ->
     if (uri != null) {
-      val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-      val bitmap = ImageDecoder.decodeBitmap(source)
-      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
+      val bitmap: Bitmap? = getBitmapFromUri(uri)
+      if (bitmap != null) {
+        val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
+        composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
+      }
     }
   }
   val cameraPermissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
@@ -201,28 +207,21 @@ fun ComposeView(
     val content = ArrayList<UploadContent>()
     val imagesPreview = ArrayList<String>()
     uris.forEach { uri ->
-      val source = ImageDecoder.createSource(context.contentResolver, uri)
-      val drawable = try {
-        ImageDecoder.decodeDrawable(source)
-      } catch (e: DecodeException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-        Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
-        null
-      }
-      var bitmap: Bitmap? = if (drawable != null) ImageDecoder.decodeBitmap(source) else null
-      if (drawable is AnimatedImageDrawable) {
+      val drawable = getDrawableFromUri(uri)
+      var bitmap: Bitmap? = if (drawable != null) getBitmapFromUri(uri) else null
+      val isAnimNewApi = Build.VERSION.SDK_INT >= 28 && drawable is AnimatedImageDrawable
+      val isAnimOldApi = Build.VERSION.SDK_INT < 28 &&
+          (getFileName(SimplexApp.context, uri)?.endsWith(".gif") == true || getFileName(SimplexApp.context, uri)?.endsWith(".webp") == true)
+      if (isAnimNewApi || isAnimOldApi) {
         // It's a gif or webp
         val fileSize = getFileSize(context, uri)
-        if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
+        if (fileSize != null && fileSize <= maxFileSize) {
           content.add(UploadContent.AnimatedImage(uri))
         } else {
           bitmap = null
           AlertManager.shared.showAlertMsg(
             generalGetString(R.string.large_file),
-            String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
+            String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
           )
         }
       } else {
@@ -237,10 +236,25 @@ fun ComposeView(
       composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.ImagePreview(imagesPreview, content))
     }
   }
+  val processPickedVideo = { uris: List<Uri>, text: String? ->
+    val content = ArrayList<UploadContent>()
+    val imagesPreview = ArrayList<String>()
+    uris.forEach { uri ->
+      val (bitmap: Bitmap?, durationMs: Long?) = getBitmapFromVideo(uri)
+      content.add(UploadContent.Video(uri, durationMs?.div(1000)?.toInt() ?: 0))
+      if (bitmap != null) {
+        imagesPreview.add(resizeImageToStrSize(bitmap, maxDataSize = 14000))
+      }
+    }
+
+    if (imagesPreview.isNotEmpty()) {
+      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.VideoPreview(imagesPreview, content))
+    }
+  }
   val processPickedFile = { uri: Uri?, text: String? ->
     if (uri != null) {
       val fileSize = getFileSize(context, uri)
-      if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
+      if (fileSize != null && fileSize <= maxFileSize) {
         val fileName = getFileName(SimplexApp.context, uri)
         if (fileName != null) {
           composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.FilePreview(fileName, uri))
@@ -248,13 +262,15 @@ fun ComposeView(
       } else {
         AlertManager.shared.showAlertMsg(
           generalGetString(R.string.large_file),
-          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
+          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
         )
       }
     }
   }
-  val galleryLauncher = rememberLauncherForActivityResult(contract = PickMultipleFromGallery()) { processPickedImage(it, null) }
-  val galleryLauncherFallback = rememberGetMultipleContentsLauncher { processPickedImage(it, null) }
+  val galleryImageLauncher = rememberLauncherForActivityResult(contract = PickMultipleImagesFromGallery()) { processPickedImage(it, null) }
+  val galleryImageLauncherFallback = rememberGetMultipleContentsLauncher { processPickedImage(it, null) }
+  val galleryVideoLauncher = rememberLauncherForActivityResult(contract = PickMultipleVideosFromGallery()) { processPickedVideo(it, null) }
+  val galleryVideoLauncherFallback = rememberGetMultipleContentsLauncher { processPickedVideo(it, null) }
   val filesLauncher = rememberGetContentLauncher { processPickedFile(it, null) }
   val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }
 
@@ -273,9 +289,17 @@ fun ComposeView(
       }
       AttachmentOption.PickImage -> {
         try {
-          galleryLauncher.launch(0)
+          galleryImageLauncher.launch(0)
         } catch (e: ActivityNotFoundException) {
-          galleryLauncherFallback.launch("image/*")
+          galleryImageLauncherFallback.launch("image/*")
+        }
+        attachmentOption.value = null
+      }
+      AttachmentOption.PickVideo -> {
+        try {
+          galleryVideoLauncher.launch(0)
+        } catch (e: ActivityNotFoundException) {
+          galleryVideoLauncherFallback.launch("video/*")
         }
         attachmentOption.value = null
       }
@@ -396,6 +420,7 @@ fun ComposeView(
         is MsgContent.MCText -> checkLinkPreview()
         is MsgContent.MCLink -> checkLinkPreview()
         is MsgContent.MCImage -> MsgContent.MCImage(msgText, image = msgContent.image)
+        is MsgContent.MCVideo -> MsgContent.MCVideo(msgText, image = msgContent.image, duration = msgContent.duration)
         is MsgContent.MCVoice -> MsgContent.MCVoice(msgText, duration = msgContent.duration)
         is MsgContent.MCFile -> MsgContent.MCFile(msgText)
         is MsgContent.MCUnknown -> MsgContent.MCUnknown(type = msgContent.type, text = msgText, json = msgContent.json)
@@ -440,6 +465,7 @@ fun ComposeView(
             val file = when (it) {
               is UploadContent.SimpleImage -> saveImage(context, it.uri)
               is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
+              else -> return@forEachIndexed
             }
             if (file != null) {
               files.add(file)
@@ -447,6 +473,18 @@ fun ComposeView(
             }
           }
         }
+        is ComposePreview.VideoPreview -> {
+          preview.content.forEachIndexed { index, it ->
+            val file = when (it) {
+              is UploadContent.Video -> saveFileFromUri(context, it.uri)
+              else -> return@forEachIndexed
+            }
+            if (file != null) {
+              files.add(file)
+              msgs.add(MsgContent.MCVideo(if (preview.content.lastIndex == index) msgText else "", preview.images[index], it.duration))
+            }
+          }
+        }
         is ComposePreview.VoicePreview -> {
           val tmpFile = File(preview.voice)
           AudioPlayer.stop(tmpFile.absolutePath)
@@ -477,7 +515,12 @@ fun ComposeView(
           if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false
         )
       }
-      if (sent == null && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.FilePreview || cs.preview is ComposePreview.VoicePreview)) {
+      if (sent == null &&
+        (cs.preview is ComposePreview.ImagePreview ||
+            cs.preview is ComposePreview.VideoPreview ||
+            cs.preview is ComposePreview.FilePreview ||
+            cs.preview is ComposePreview.VoicePreview)
+        ) {
         sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live)
       }
     }
@@ -604,6 +647,11 @@ fun ComposeView(
         ::cancelImages,
         cancelEnabled = !composeState.value.editing
       )
+      is ComposePreview.VideoPreview -> ComposeImageView(
+        preview.images,
+        ::cancelImages,
+        cancelEnabled = !composeState.value.editing
+      )
       is ComposePreview.VoicePreview -> ComposeVoiceView(
         preview.voice,
         preview.durationMs,
@@ -645,6 +693,9 @@ fun ComposeView(
     chatModel.sharedContent.value = null
   }
 
+  val userCanSend = rememberUpdatedState(chat.userCanSend)
+  val userIsObserver = rememberUpdatedState(chat.userIsObserver)
+
   Column {
     contextItemView()
     when {
@@ -656,11 +707,11 @@ fun ComposeView(
       modifier = Modifier.padding(end = 8.dp),
       verticalAlignment = Alignment.Bottom,
     ) {
-      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled) {
+      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled && rememberUpdatedState(chat.userCanSend).value) {
         Icon(
           Icons.Filled.AttachFile,
           contentDescription = stringResource(R.string.attach),
-          tint = if (!composeState.value.attachmentDisabled) MaterialTheme.colors.primary else HighOrLowlight,
+          tint = if (!composeState.value.attachmentDisabled && userCanSend.value) MaterialTheme.colors.primary else HighOrLowlight,
           modifier = Modifier
             .size(28.dp)
             .clip(CircleShape)
@@ -698,6 +749,13 @@ fun ComposeView(
         }
       }
 
+      LaunchedEffect(rememberUpdatedState(chat.userCanSend).value) {
+        if (!chat.userCanSend) {
+          clearCurrentDraft()
+          clearState()
+        }
+      }
+
       val activity = LocalContext.current as Activity
       DisposableEffect(Unit) {
         val orientation = activity.resources.configuration.orientation
@@ -733,6 +791,8 @@ fun ComposeView(
         needToAllowVoiceToContact,
         allowedVoiceByPrefs,
         allowVoiceToContact = ::allowVoiceToContact,
+        userIsObserver = userIsObserver.value,
+        userCanSend = userCanSend.value,
         sendMessage = {
           sendMessage()
           resetLinkPreview()
@@ -759,7 +819,7 @@ class PickFromGallery: ActivityResultContract<Int, Uri?>() {
   override fun parseResult(resultCode: Int, intent: Intent?): Uri? = intent?.data
 }
 
-class PickMultipleFromGallery: ActivityResultContract<Int, List<Uri>>() {
+class PickMultipleImagesFromGallery: ActivityResultContract<Int, List<Uri>>() {
   override fun createIntent(context: Context, input: Int) =
     Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI).apply {
       putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
@@ -784,3 +844,30 @@ class PickMultipleFromGallery: ActivityResultContract<Int, List<Uri>>() {
     else
       emptyList()
 }
+
+
+class PickMultipleVideosFromGallery: ActivityResultContract<Int, List<Uri>>() {
+  override fun createIntent(context: Context, input: Int) =
+    Intent(Intent.ACTION_PICK, MediaStore.Video.Media.INTERNAL_CONTENT_URI).apply {
+      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+      type = "video/*"
+    }
+
+  override fun parseResult(resultCode: Int, intent: Intent?): List<Uri> =
+    if (intent?.data != null)
+      listOf(intent.data!!)
+    else if (intent?.clipData != null)
+      with(intent.clipData!!) {
+        val uris = ArrayList<Uri>()
+        for (i in 0 until kotlin.math.min(itemCount, 10)) {
+          val uri = getItemAt(i).uri
+          if (uri != null) uris.add(uri)
+        }
+        if (itemCount > 10) {
+          AlertManager.shared.showAlertMsg(R.string.videos_limit_title, R.string.videos_limit_desc)
+        }
+        uris
+      }
+    else
+      emptyList()
+}

apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt

@@ -8,10 +8,12 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.os.Build
 import android.text.InputType
+import android.util.Log
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.inputmethod.*
 import android.widget.EditText
+import android.widget.TextView
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -50,6 +52,7 @@ import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import kotlinx.coroutines.*
+import java.lang.reflect.Field
 
 @Composable
 fun SendMsgView(
@@ -60,6 +63,8 @@ fun SendMsgView(
   liveMessageAlertShown: SharedPreference<Boolean>,
   needToAllowVoiceToContact: Boolean,
   allowedVoiceByPrefs: Boolean,
+  userIsObserver: Boolean,
+  userCanSend: Boolean,
   allowVoiceToContact: () -> Unit,
   sendMessage: () -> Unit,
   sendLiveMessage: (suspend () -> Unit)? = null,
@@ -70,14 +75,22 @@ fun SendMsgView(
 ) {
   Box(Modifier.padding(vertical = 8.dp)) {
     val cs = composeState.value
-    val showProgress = cs.inProgress && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.FilePreview)
+    val showProgress = cs.inProgress && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.VideoPreview || cs.preview is ComposePreview.FilePreview)
     val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
         cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    NativeKeyboard(composeState, textStyle, showDeleteTextButton, onMessageChange)
+    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
     // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview) {
-      Box(Modifier.matchParentSize().clickable(enabled = false, onClick = { }))
+    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
+      Box(Modifier
+        .matchParentSize()
+        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
+          AlertManager.shared.showAlertMsg(
+            title = generalGetString(R.string.observer_cant_send_message_title),
+            text = generalGetString(R.string.observer_cant_send_message_desc)
+          )
+        })
+      )
     }
     if (showDeleteTextButton.value) {
       DeleteTextButton(composeState)
@@ -99,11 +112,11 @@ fun SendMsgView(
           Row(verticalAlignment = Alignment.CenterVertically) {
             val stopRecOnNextClick = remember { mutableStateOf(false) }
             when {
-              needToAllowVoiceToContact || !allowedVoiceByPrefs -> {
-                DisallowedVoiceButton {
+              needToAllowVoiceToContact || !allowedVoiceByPrefs || !userCanSend -> {
+                DisallowedVoiceButton(userCanSend) {
                   if (needToAllowVoiceToContact) {
                     showNeedToAllowVoiceAlert(allowVoiceToContact)
-                  } else {
+                  } else if (!allowedVoiceByPrefs) {
                     showDisabledVoiceAlert(isDirectChat)
                   }
                 }
@@ -118,7 +131,7 @@ fun SendMsgView(
                 && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
                 && cs.contextItem is ComposeContextItem.NoContextItem) {
               Spacer(Modifier.width(10.dp))
-              StartLiveMessageButton {
+              StartLiveMessageButton(userCanSend) {
                 if (composeState.value.preview is ComposePreview.NoPreview) {
                   startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
                 }
@@ -173,6 +186,7 @@ private fun NativeKeyboard(
   composeState: MutableState<ComposeState>,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
+  userIsObserver: Boolean,
   onMessageChange: (String) -> Unit
 ) {
   val cs = composeState.value
@@ -229,7 +243,17 @@ private fun NativeKeyboard(
     editText.background = drawable
     editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
     editText.setText(cs.message)
-    editText.textCursorDrawable?.let { DrawableCompat.setTint(it, HighOrLowlight.toArgb()) }
+    if (Build.VERSION.SDK_INT >= 29) {
+      editText.textCursorDrawable?.let { DrawableCompat.setTint(it, HighOrLowlight.toArgb()) }
+    } else {
+      try {
+        val f: Field = TextView::class.java.getDeclaredField("mCursorDrawableRes")
+        f.isAccessible = true
+        f.set(editText, R.drawable.edit_text_cursor)
+      } catch (e: Exception) {
+        Log.e(chat.simplex.app.TAG, e.stackTraceToString())
+      }
+    }
     editText.doOnTextChanged { text, _, _, _ -> onMessageChange(text.toString()) }
     editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
     editText
@@ -253,15 +277,22 @@ private fun NativeKeyboard(
     showDeleteTextButton.value = it.lineCount >= 4
   }
   if (composeState.value.preview is ComposePreview.VoicePreview) {
-    Text(
-      generalGetString(R.string.voice_message_send_text),
-      Modifier.padding(padding),
-      color = HighOrLowlight,
-      style = textStyle.value.copy(fontStyle = FontStyle.Italic)
-    )
+    ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
+  } else if (userIsObserver) {
+    ComposeOverlay(R.string.you_are_observer, textStyle, padding)
   }
 }
 
+@Composable
+private fun ComposeOverlay(textId: Int, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
+  Text(
+    generalGetString(textId),
+    Modifier.padding(padding),
+    color = HighOrLowlight,
+    style = textStyle.value.copy(fontStyle = FontStyle.Italic)
+  )
+}
+
 @Composable
 private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>) {
   IconButton(
@@ -322,8 +353,8 @@ private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNex
 }
 
 @Composable
-private fun DisallowedVoiceButton(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
+private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
+  IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
     Icon(
       Icons.Outlined.KeyboardVoice,
       stringResource(R.string.icon_descr_record_voice_message),
@@ -454,13 +485,13 @@ private fun SendMsgButton(
 }
 
 @Composable
-private fun StartLiveMessageButton(onClick: () -> Unit) {
+private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
   val interactionSource = remember { MutableInteractionSource() }
   Box(
     modifier = Modifier.requiredSize(36.dp)
       .clickable(
         onClick = onClick,
-        enabled = true,
+        enabled = enabled,
         role = Role.Button,
         interactionSource = interactionSource,
         indication = rememberRipple(bounded = false, radius = 24.dp)
@@ -470,7 +501,7 @@ private fun StartLiveMessageButton(onClick: () -> Unit) {
     Icon(
       Icons.Filled.Bolt,
       stringResource(R.string.icon_descr_send_message),
-      tint = MaterialTheme.colors.primary,
+      tint = if (enabled) MaterialTheme.colors.primary else HighOrLowlight,
       modifier = Modifier
         .size(36.dp)
         .padding(4.dp)
@@ -571,6 +602,8 @@ fun PreviewSendMsgView() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
+      userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},
       onMessageChange = { _ -> },
@@ -599,6 +632,8 @@ fun PreviewSendMsgViewEditing() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
+      userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},
       onMessageChange = { _ -> },
@@ -627,6 +662,8 @@ fun PreviewSendMsgViewInProgress() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
+      userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},
       onMessageChange = { _ -> },

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt

@@ -34,7 +34,7 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.*
 
 @Composable
-fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, onGroupLinkUpdated: (String?) -> Unit, close: () -> Unit) {
+fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit, close: () -> Unit) {
   BackHandler(onBack = close)
   val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
   val developerTools = chatModel.controller.appPrefs.developerTools.get()
@@ -82,6 +82,9 @@ fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, onGroupLinkUpdat
       editGroupProfile = {
         ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
       },
+      addOrEditWelcomeMessage = {
+        ModalManager.shared.showCustomModal { close -> GroupWelcomeView(chatModel, groupInfo, close) }
+      },
       openPreferences = {
         ModalManager.shared.showCustomModal { close ->
           GroupPreferencesView(
@@ -95,9 +98,7 @@ fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, onGroupLinkUpdat
       clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
       leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) },
       manageGroupLink = {
-        withApi {
-          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, onGroupLinkUpdated) }
-        }
+          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, groupLinkMemberRole, onGroupLinkUpdated) }
       }
     )
   }
@@ -149,6 +150,7 @@ fun GroupChatInfoLayout(
   addMembers: () -> Unit,
   showMemberInfo: (GroupMember) -> Unit,
   editGroupProfile: () -> Unit,
+  addOrEditWelcomeMessage: () -> Unit,
   openPreferences: () -> Unit,
   deleteGroup: () -> Unit,
   clearChat: () -> Unit,
@@ -173,6 +175,8 @@ fun GroupChatInfoLayout(
       if (groupInfo.canEdit) {
         SectionItemView(editGroupProfile) { EditGroupProfileButton() }
         SectionDivider()
+        SectionItemView(addOrEditWelcomeMessage) { AddOrEditWelcomeMessage(groupInfo.groupProfile.description) }
+        SectionDivider()
       }
       GroupPreferencesButton(openPreferences)
     }
@@ -300,6 +304,7 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
     verticalAlignment = Alignment.CenterVertically
   ) {
     Row(
+      Modifier.weight(1f).padding(end = DEFAULT_PADDING),
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.spacedBy(4.dp)
     ) {
@@ -388,6 +393,28 @@ fun EditGroupProfileButton() {
   }
 }
 
+@Composable
+private fun AddOrEditWelcomeMessage(welcomeMessage: String?) {
+  val text = if (welcomeMessage == null) {
+    stringResource(R.string.button_add_welcome_message)
+  } else {
+    stringResource(R.string.button_welcome_message)
+  }
+  Row(
+    Modifier
+      .fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.MapsUgc,
+      text,
+      tint = HighOrLowlight
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(text)
+  }
+}
+
 @Composable
 private fun LeaveGroupButton() {
   Row(
@@ -433,7 +460,7 @@ fun PreviewGroupChatInfoLayout() {
       members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
       developerTools = false,
       groupLink = null,
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
+      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, addOrEditWelcomeMessage = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt

@@ -1,6 +1,9 @@
 package chat.simplex.app.views.chat.group
 
+import SectionItemView
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
@@ -15,22 +18,26 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.GroupInfo
+import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.QRCode
 
 @Composable
-fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, onGroupLinkUpdated: (String?) -> Unit) {
+fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, memberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit) {
   var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
+  val groupLinkMemberRole = rememberSaveable { mutableStateOf(memberRole) }
   var creatingLink by rememberSaveable { mutableStateOf(false) }
   val cxt = LocalContext.current
   fun createLink() {
     creatingLink = true
     withApi {
-      groupLink = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
-      onGroupLinkUpdated(groupLink)
+      val link = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
+      if (link != null) {
+        groupLink = link.first
+        groupLinkMemberRole.value = link.second
+        onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
+      }
       creatingLink = false
     }
   }
@@ -41,9 +48,24 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
   }
   GroupLinkLayout(
     groupLink = groupLink,
+    groupInfo,
+    groupLinkMemberRole,
     creatingLink,
     createLink = ::createLink,
     share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
+    updateLink = {
+      val role = groupLinkMemberRole.value
+      if (role != null) {
+        withBGApi {
+          val link = chatModel.controller.apiGroupLinkMemberRole(groupInfo.groupId, role)
+          if (link != null) {
+            groupLink = link.first
+            groupLinkMemberRole.value = link.second
+            onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
+          }
+        }
+      }
+    },
     deleteLink = {
       AlertManager.shared.showAlertMsg(
         title = generalGetString(R.string.delete_link_question),
@@ -54,7 +76,7 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
             val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
             if (r) {
               groupLink = null
-              onGroupLinkUpdated(null)
+              onGroupLinkUpdated(null to null)
             }
           }
         }
@@ -69,13 +91,18 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
 @Composable
 fun GroupLinkLayout(
   groupLink: String?,
+  groupInfo: GroupInfo,
+  groupLinkMemberRole: MutableState<GroupMemberRole?>,
   creatingLink: Boolean,
   createLink: () -> Unit,
   share: () -> Unit,
+  updateLink: () -> Unit,
   deleteLink: () -> Unit
 ) {
   Column(
-    Modifier.padding(horizontal = DEFAULT_PADDING),
+    Modifier
+      .verticalScroll(rememberScrollState())
+      .padding(start = DEFAULT_PADDING, bottom = DEFAULT_BOTTOM_PADDING, end = DEFAULT_PADDING),
     horizontalAlignment = Alignment.Start,
     verticalArrangement = Arrangement.Top
   ) {
@@ -93,7 +120,17 @@ fun GroupLinkLayout(
       if (groupLink == null) {
         SimpleButton(stringResource(R.string.button_create_group_link), icon = Icons.Outlined.AddLink, disabled = creatingLink, click = createLink)
       } else {
-        QRCode(groupLink, Modifier.weight(1f, fill = false).aspectRatio(1f))
+        SectionItemView(padding = PaddingValues(bottom = DEFAULT_PADDING)) {
+          RoleSelectionRow(groupInfo, groupLinkMemberRole)
+        }
+        var initialLaunch by remember { mutableStateOf(true) }
+        LaunchedEffect(groupLinkMemberRole.value) {
+          if (!initialLaunch) {
+            updateLink()
+          }
+          initialLaunch = false
+        }
+        QRCode(groupLink, Modifier.aspectRatio(1f))
         Row(
           horizontalArrangement = Arrangement.spacedBy(10.dp),
           verticalAlignment = Alignment.CenterVertically,
@@ -116,6 +153,25 @@ fun GroupLinkLayout(
   }
 }
 
+@Composable
+private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole?>, enabled: Boolean = true) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    val values = listOf(GroupMemberRole.Member, GroupMemberRole.Observer).map { it to it.text }
+    ExposedDropDownSettingRow(
+      generalGetString(R.string.initial_member_role),
+      values,
+      selectedRole,
+      icon = null,
+      enabled = rememberUpdatedState(enabled),
+      onSelected = { selectedRole.value = it }
+    )
+  }
+}
+
 @Composable
 fun ProgressIndicator() {
   Box(

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt

@@ -5,7 +5,6 @@ import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionView
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -13,7 +12,6 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -23,7 +21,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.TAG
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
@@ -54,20 +51,15 @@ fun GroupMemberInfoView(
       developerTools,
       connectionCode,
       getContactChat = { chatModel.getContactChat(it) },
-      knownDirectChat = {
-        withApi {
-          chatModel.chatItems.clear()
-          chatModel.chatItems.addAll(it.chatItems)
-          chatModel.chatId.value = it.chatInfo.id
-          closeAll()
-        }
-      },
-      newDirectChat = {
+      openDirectChat = {
         withApi {
           val c = chatModel.controller.apiGetChat(ChatType.Direct, it)
           if (c != null) {
-            chatModel.addChat(c)
+            if (chatModel.getContactChat(it) == null) {
+              chatModel.addChat(c)
+            }
             chatModel.chatItems.clear()
+            chatModel.chatItems.addAll(c.chatItems)
             chatModel.chatId.value = c.id
             closeAll()
           }
@@ -150,8 +142,7 @@ fun GroupMemberInfoLayout(
   developerTools: Boolean,
   connectionCode: String?,
   getContactChat: (Long) -> Chat?,
-  knownDirectChat: (Chat) -> Unit,
-  newDirectChat: (Long) -> Unit,
+  openDirectChat: (Long) -> Unit,
   removeMember: () -> Unit,
   onRoleSelected: (GroupMemberRole) -> Unit,
   switchMemberAddress: () -> Unit,
@@ -176,13 +167,8 @@ fun GroupMemberInfoLayout(
       if (contactId != null) {
         SectionView {
           val chat = getContactChat(contactId)
-          if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-            OpenChatButton(onClick = { knownDirectChat(chat) })
-            if (connectionCode != null) {
-              SectionDivider()
-            }
-          } else if (groupInfo.fullGroupPreferences.directMessages.on) {
-            OpenChatButton(onClick = { newDirectChat(contactId) })
+          if ((chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) || groupInfo.fullGroupPreferences.directMessages.on) {
+            OpenChatButton(onClick = { openDirectChat(contactId) })
             if (connectionCode != null) {
               SectionDivider()
             }
@@ -364,8 +350,7 @@ fun PreviewGroupMemberInfoLayout() {
       developerTools = false,
       connectionCode = "123",
       getContactChat = { Chat.sampleData },
-      knownDirectChat = {},
-      newDirectChat = {},
+      openDirectChat = {},
       removeMember = {},
       onRoleSelected = {},
       switchMemberAddress = {},

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt

@@ -0,0 +1,94 @@
+package chat.simplex.app.views.chat.group
+
+import SectionItemView
+import SectionSpacer
+import SectionView
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
+  var groupInfo by remember { mutableStateOf(groupInfo) }
+  val welcomeText = remember { mutableStateOf(groupInfo.groupProfile.description ?: "") }
+
+  fun save(afterSave: () -> Unit = {}) {
+    withApi {
+      var welcome: String? = welcomeText.value.trim('\n', ' ')
+      if (welcome?.length == 0) {
+        welcome = null
+      }
+      val groupProfileUpdated = groupInfo.groupProfile.copy(description = welcome)
+      val res = m.controller.apiUpdateGroup(groupInfo.groupId, groupProfileUpdated)
+      if (res != null) {
+        groupInfo = res
+        m.updateGroup(res)
+        welcomeText.value = welcome ?: ""
+      }
+      afterSave()
+    }
+  }
+
+  ModalView(
+    close = {
+      if (welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)) close()
+      else showUnsavedChangesAlert({ save(close) }, close)
+    },
+    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+  ) {
+    GroupWelcomeLayout(
+      welcomeText,
+      groupInfo,
+      save = ::save
+    )
+  }
+}
+
+@Composable
+private fun GroupWelcomeLayout(
+  welcomeText: MutableState<String>,
+  groupInfo: GroupInfo,
+  save: () -> Unit,
+) {
+  Column(
+    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+  ) {
+    AppBarTitle(stringResource(R.string.group_welcome_title))
+    val welcomeText = remember { welcomeText }
+    TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
+    SectionSpacer()
+    SaveButton(
+      save = save,
+      disabled = welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
+    )
+  }
+}
+
+@Composable
+private fun SaveButton(save: () -> Unit, disabled: Boolean) {
+  SectionView {
+    SectionItemView(save, disabled = disabled) {
+      Text(stringResource(R.string.save_and_update_group_profile), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
+    }
+  }
+}
+
+private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
+  AlertManager.shared.showAlertDialogStacked(
+    title = generalGetString(R.string.save_welcome_message_question),
+    confirmText = generalGetString(R.string.save_and_update_group_profile),
+    dismissText = generalGetString(R.string.exit_without_saving),
+    onConfirm = save,
+    onDismiss = revert,
+  )
+}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt

@@ -3,6 +3,7 @@ package chat.simplex.app.views.chat.item
 import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -16,6 +17,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.*
 import androidx.compose.ui.unit.dp
@@ -64,7 +66,7 @@ fun CIFileView(
 
   fun fileSizeValid(): Boolean {
     if (file != null) {
-      return file.fileSize <= MAX_FILE_SIZE
+      return file.fileSize <= getMaxFileSize(file.fileProtocol)
     }
     return false
   }
@@ -72,22 +74,30 @@ fun CIFileView(
   fun fileAction() {
     if (file != null) {
       when (file.fileStatus) {
-        CIFileStatus.RcvInvitation -> {
+        is CIFileStatus.RcvInvitation -> {
           if (fileSizeValid()) {
             receiveFile(file.fileId)
           } else {
             AlertManager.shared.showAlertMsg(
               generalGetString(R.string.large_file),
-              String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(MAX_FILE_SIZE))
+              String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
             )
           }
         }
-        CIFileStatus.RcvAccepted ->
-          AlertManager.shared.showAlertMsg(
-            generalGetString(R.string.waiting_for_file),
-            String.format(generalGetString(R.string.file_will_be_received_when_contact_is_online), MAX_FILE_SIZE)
-          )
-        CIFileStatus.RcvComplete -> {
+        is CIFileStatus.RcvAccepted ->
+          when (file.fileProtocol) {
+            FileProtocol.XFTP ->
+              AlertManager.shared.showAlertMsg(
+                generalGetString(R.string.waiting_for_file),
+                generalGetString(R.string.file_will_be_received_when_contact_completes_uploading)
+              )
+            FileProtocol.SMP ->
+              AlertManager.shared.showAlertMsg(
+                generalGetString(R.string.waiting_for_file),
+                generalGetString(R.string.file_will_be_received_when_contact_is_online)
+              )
+          }
+        is CIFileStatus.RcvComplete -> {
           val filePath = getLoadedFilePath(context, file)
           if (filePath != null) {
             saveFileLauncher.launch(file.fileName)
@@ -105,10 +115,24 @@ fun CIFileView(
     CircularProgressIndicator(
       Modifier.size(32.dp),
       color = if (isInDarkTheme()) FileDark else FileLight,
-      strokeWidth = 4.dp
+      strokeWidth = 3.dp
     )
   }
 
+  @Composable
+  fun progressCircle(progress: Long, total: Long) {
+    val angle = 360f * (progress.toDouble() / total.toDouble()).toFloat()
+    val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
+    val strokeColor = if (isInDarkTheme()) FileDark else FileLight
+    Surface(
+      Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
+      color = Color.Transparent,
+      shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
+    ) {
+      Box(Modifier.size(32.dp))
+    }
+  }
+
   @Composable
   fun fileIndicator() {
     Box(
@@ -120,19 +144,32 @@ fun CIFileView(
     ) {
       if (file != null) {
         when (file.fileStatus) {
-          CIFileStatus.SndStored -> fileIcon()
-          CIFileStatus.SndTransfer -> progressIndicator()
-          CIFileStatus.SndComplete -> fileIcon(innerIcon = Icons.Filled.Check)
-          CIFileStatus.SndCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
-          CIFileStatus.RcvInvitation ->
+          is CIFileStatus.SndStored ->
+            when (file.fileProtocol) {
+              FileProtocol.XFTP -> progressIndicator()
+              FileProtocol.SMP -> fileIcon()
+            }
+          is CIFileStatus.SndTransfer ->
+            when (file.fileProtocol) {
+              FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
+              FileProtocol.SMP -> progressIndicator()
+            }
+          is CIFileStatus.SndComplete -> fileIcon(innerIcon = Icons.Filled.Check)
+          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
+          is CIFileStatus.RcvInvitation ->
             if (fileSizeValid())
               fileIcon(innerIcon = Icons.Outlined.ArrowDownward, color = MaterialTheme.colors.primary)
             else
               fileIcon(innerIcon = Icons.Outlined.PriorityHigh, color = WarningOrange)
-          CIFileStatus.RcvAccepted -> fileIcon(innerIcon = Icons.Outlined.MoreHoriz)
-          CIFileStatus.RcvTransfer -> progressIndicator()
-          CIFileStatus.RcvComplete -> fileIcon()
-          CIFileStatus.RcvCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
+          is CIFileStatus.RcvAccepted -> fileIcon(innerIcon = Icons.Outlined.MoreHoriz)
+          is CIFileStatus.RcvTransfer ->
+            if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
+              progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
+            } else {
+              progressIndicator()
+            }
+          is CIFileStatus.RcvComplete -> fileIcon()
+          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
         }
       } else {
         fileIcon()
@@ -191,7 +228,7 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
     ChatItem.getFileMsgContentSample(),
     ChatItem.getFileMsgContentSample(fileName = "some_long_file_name_here", fileStatus = CIFileStatus.RcvInvitation),
     ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvAccepted),
-    ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvTransfer),
+    ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10)),
     ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvCancelled),
     ChatItem.getFileMsgContentSample(fileSize = 1_000_000_000, fileStatus = CIFileStatus.RcvInvitation),
     ChatItem.getFileMsgContentSample(text = "Hello there", fileStatus = CIFileStatus.RcvInvitation),

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt

@@ -2,6 +2,7 @@ package chat.simplex.app.views.chat.item
 
 import android.graphics.Bitmap
 import android.os.Build.VERSION.SDK_INT
+import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
@@ -9,8 +10,7 @@ import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.outlined.ArrowDownward
-import androidx.compose.material.icons.outlined.MoreHoriz
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -18,6 +18,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.*
@@ -27,8 +28,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.content.FileProvider
 import chat.simplex.app.*
 import chat.simplex.app.R
-import chat.simplex.app.model.CIFile
-import chat.simplex.app.model.CIFileStatus
+import chat.simplex.app.model.*
 import chat.simplex.app.views.helpers.*
 import coil.ImageLoader
 import coil.compose.rememberAsyncImagePainter
@@ -45,6 +45,25 @@ fun CIImageView(
   showMenu: MutableState<Boolean>,
   receiveFile: (Long) -> Unit
 ) {
+  @Composable
+  fun progressIndicator() {
+    CircularProgressIndicator(
+      Modifier.size(16.dp),
+      color = Color.White,
+      strokeWidth = 2.dp
+    )
+  }
+
+  @Composable
+  fun fileIcon(icon: ImageVector, @StringRes stringId: Int) {
+    Icon(
+      icon,
+      stringResource(stringId),
+      Modifier.fillMaxSize(),
+      tint = Color.White
+    )
+  }
+
   @Composable
   fun loadingIndicator() {
     if (file != null) {
@@ -55,39 +74,18 @@ fun CIImageView(
         contentAlignment = Alignment.Center
       ) {
         when (file.fileStatus) {
-          CIFileStatus.SndTransfer ->
-            CircularProgressIndicator(
-              Modifier.size(16.dp),
-              color = Color.White,
-              strokeWidth = 2.dp
-            )
-          CIFileStatus.SndComplete ->
-            Icon(
-              Icons.Filled.Check,
-              stringResource(R.string.icon_descr_image_snd_complete),
-              Modifier.fillMaxSize(),
-              tint = Color.White
-            )
-          CIFileStatus.RcvAccepted ->
-            Icon(
-              Icons.Outlined.MoreHoriz,
-              stringResource(R.string.icon_descr_waiting_for_image),
-              Modifier.fillMaxSize(),
-              tint = Color.White
-            )
-          CIFileStatus.RcvTransfer ->
-            CircularProgressIndicator(
-              Modifier.size(16.dp),
-              color = Color.White,
-              strokeWidth = 2.dp
-            )
-          CIFileStatus.RcvInvitation ->
-            Icon(
-              Icons.Outlined.ArrowDownward,
-              stringResource(R.string.icon_descr_asked_to_receive),
-              Modifier.fillMaxSize(),
-              tint = Color.White
-            )
+          is CIFileStatus.SndStored ->
+            when (file.fileProtocol) {
+              FileProtocol.XFTP -> progressIndicator()
+              FileProtocol.SMP -> {}
+            }
+          is CIFileStatus.SndTransfer -> progressIndicator()
+          is CIFileStatus.SndComplete -> fileIcon(Icons.Filled.Check, R.string.icon_descr_image_snd_complete)
+          is CIFileStatus.SndCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
+          is CIFileStatus.RcvInvitation -> fileIcon(Icons.Outlined.ArrowDownward, R.string.icon_descr_asked_to_receive)
+          is CIFileStatus.RcvAccepted -> fileIcon(Icons.Outlined.MoreHoriz, R.string.icon_descr_waiting_for_image)
+          is CIFileStatus.RcvTransfer -> progressIndicator()
+          is CIFileStatus.RcvCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
           else -> {}
         }
       }
@@ -136,7 +134,7 @@ fun CIImageView(
 
   fun fileSizeValid(): Boolean {
     if (file != null) {
-      return file.fileSize <= MAX_FILE_SIZE
+      return file.fileSize <= getMaxFileSize(file.fileProtocol)
     }
     return false
   }
@@ -179,15 +177,23 @@ fun CIImageView(
               } else {
                 AlertManager.shared.showAlertMsg(
                   generalGetString(R.string.large_file),
-                  String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(MAX_FILE_SIZE))
+                  String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
                 )
               }
             CIFileStatus.RcvAccepted ->
-              AlertManager.shared.showAlertMsg(
-                generalGetString(R.string.waiting_for_image),
-                generalGetString(R.string.image_will_be_received_when_contact_is_online)
-              )
-            CIFileStatus.RcvTransfer -> {} // ?
+              when (file.fileProtocol) {
+                FileProtocol.XFTP ->
+                  AlertManager.shared.showAlertMsg(
+                    generalGetString(R.string.waiting_for_image),
+                    generalGetString(R.string.image_will_be_received_when_contact_completes_uploading)
+                  )
+                FileProtocol.SMP ->
+                  AlertManager.shared.showAlertMsg(
+                    generalGetString(R.string.waiting_for_image),
+                    generalGetString(R.string.image_will_be_received_when_contact_is_online)
+                  )
+              }
+            CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
             CIFileStatus.RcvComplete -> {} // ?
             CIFileStatus.RcvCancelled -> {} // TODO
             else -> {}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -58,7 +59,7 @@ private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
     StatusIconText(Icons.Filled.Circle, Color.Transparent)
     Spacer(Modifier.width(4.dp))
   }
-  Text(meta.timestampText, color = color, fontSize = 13.sp)
+  Text(meta.timestampText, color = color, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
 }
 
 // the conditions in this function should match CIMetaText

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt

@@ -0,0 +1,339 @@
+package chat.simplex.app.views.chat.item
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.*
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.*
+import androidx.compose.ui.platform.*
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.*
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.content.FileProvider
+import androidx.core.graphics.drawable.toDrawable
+import chat.simplex.app.*
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+import com.google.android.exoplayer2.ui.StyledPlayerView
+import java.io.File
+
+@Composable
+fun CIVideoView(
+  image: String,
+  duration: Int,
+  file: CIFile?,
+  imageProvider: () -> ImageGalleryProvider,
+  showMenu: MutableState<Boolean>,
+  receiveFile: (Long) -> Unit
+) {
+  Box(
+    Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID),
+    contentAlignment = Alignment.TopEnd
+  ) {
+    val context = LocalContext.current
+    val filePath = remember(file) { getLoadedFilePath(SimplexApp.context, file) }
+    val preview = remember(image) { base64ToBitmap(image) }
+    if (file != null && filePath != null) {
+      val uri = remember(filePath) { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))  }
+      val view = LocalView.current
+      VideoView(uri, file, preview, duration * 1000L, showMenu, onClick = {
+        hideKeyboard(view)
+        ModalManager.shared.showCustomModal(animated = false) { close ->
+          ImageFullScreenView(imageProvider, close)
+        }
+      })
+    } else {
+      Box {
+        ImageView(preview, showMenu, onClick = {
+          if (file != null) {
+            when (file.fileStatus) {
+              CIFileStatus.RcvInvitation ->
+                receiveFileIfValidSize(file, receiveFile)
+              CIFileStatus.RcvAccepted ->
+                when (file.fileProtocol) {
+                  FileProtocol.XFTP ->
+                    AlertManager.shared.showAlertMsg(
+                      generalGetString(R.string.waiting_for_video),
+                      generalGetString(R.string.video_will_be_received_when_contact_completes_uploading)
+                    )
+
+                  FileProtocol.SMP ->
+                    AlertManager.shared.showAlertMsg(
+                      generalGetString(R.string.waiting_for_video),
+                      generalGetString(R.string.video_will_be_received_when_contact_is_online)
+                    )
+                }
+              CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
+              CIFileStatus.RcvComplete -> {} // ?
+              CIFileStatus.RcvCancelled -> {} // TODO
+              else -> {}
+            }
+          }
+        })
+        if (file != null) {
+          DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
+        }
+        if (file?.fileStatus is CIFileStatus.RcvInvitation) {
+          PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, receiveFile) }
+        }
+      }
+    }
+    loadingIndicator(file)
+  }
+}
+
+@Composable
+private fun VideoView(uri: Uri, file: CIFile, defaultPreview: Bitmap, defaultDuration: Long, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
+  val context = LocalContext.current
+  val player = remember(uri) { VideoPlayer.getOrCreate(uri, false, defaultPreview, defaultDuration, true, context) }
+  val videoPlaying = remember(uri.path) { player.videoPlaying }
+  val progress = remember(uri.path) { player.progress }
+  val duration = remember(uri.path) { player.duration }
+  val preview by remember { player.preview }
+//  val soundEnabled by rememberSaveable(uri.path) { player.soundEnabled }
+  val brokenVideo by rememberSaveable(uri.path) { player.brokenVideo }
+  val play = {
+    player.enableSound(true)
+    player.play(true)
+  }
+  val stop = {
+    player.enableSound(false)
+    player.stop()
+  }
+  val showPreview = remember { derivedStateOf { !videoPlaying.value || progress.value == 0L } }
+  DisposableEffect(Unit) {
+    onDispose {
+      stop()
+    }
+  }
+  Box {
+    val windowWidth = LocalWindowWidth()
+    val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
+    AndroidView(
+      factory = { ctx ->
+        StyledPlayerView(ctx).apply {
+          useController = false
+          resizeMode = RESIZE_MODE_FIXED_WIDTH
+          this.player = player.player
+        }
+      },
+      Modifier
+        .width(width)
+        .combinedClickable(
+          onLongClick = { showMenu.value = true },
+          onClick = { if (player.player.playWhenReady) stop() else onClick() }
+        )
+    )
+    if (showPreview.value) {
+      ImageView(preview, showMenu, onClick)
+      PlayButton(brokenVideo, onLongClick =  { showMenu.value = true }, play)
+    }
+    DurationProgress(file, videoPlaying, duration, progress/*, soundEnabled*/)
+  }
+}
+
+@Composable
+private fun BoxScope.PlayButton(error: Boolean = false, onLongClick: () -> Unit, onClick: () -> Unit) {
+  Surface(
+    Modifier.align(Alignment.Center),
+    color = Color.Black.copy(alpha = 0.25f),
+    shape = RoundedCornerShape(percent = 50)
+  ) {
+    Box(
+      Modifier
+        .defaultMinSize(minWidth = 40.dp, minHeight = 40.dp)
+        .combinedClickable(onClick = onClick, onLongClick = onLongClick),
+      contentAlignment = Alignment.Center
+    ) {
+      Icon(
+        imageVector = Icons.Filled.PlayArrow,
+        contentDescription = null,
+        Modifier.size(25.dp),
+        tint = if (error) WarningOrange else Color.White
+      )
+    }
+  }
+}
+
+@Composable
+private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, duration: MutableState<Long>, progress: MutableState<Long>/*, soundEnabled: MutableState<Boolean>*/) {
+  if (duration.value > 0L || progress.value > 0) {
+    Row {
+      Box(
+        Modifier
+          .padding(DEFAULT_PADDING_HALF)
+          .background(Color.Black.copy(alpha = 0.35f), RoundedCornerShape(percent = 50))
+          .padding(vertical = 2.dp, horizontal = 4.dp)
+      ) {
+        val time = if (progress.value > 0) progress.value else duration.value
+        val timeStr = durationText((time / 1000).toInt())
+        val width = if (timeStr.length <= 5) 44 else 50
+        Text(
+          timeStr,
+          Modifier.widthIn(min = with(LocalDensity.current) { width.sp.toDp() }).padding(horizontal = 4.dp),
+          fontSize = 13.sp,
+          color = Color.White
+        )
+        /*if (!soundEnabled.value) {
+        Icon(Icons.Outlined.VolumeOff, null,
+          Modifier.padding(start = 5.dp).size(10.dp),
+          tint = Color.White
+        )
+      }*/
+      }
+      if (!playing.value) {
+        Box(
+          Modifier
+            .padding(top = DEFAULT_PADDING_HALF)
+            .background(Color.Black.copy(alpha = 0.35f), RoundedCornerShape(percent = 50))
+            .padding(vertical = 2.dp, horizontal = 4.dp)
+        ) {
+          Text(
+            formatBytes(file.fileSize),
+            Modifier.padding(horizontal = 4.dp),
+            fontSize = 13.sp,
+            color = Color.White
+          )
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun ImageView(preview: Bitmap, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
+  val windowWidth = LocalWindowWidth()
+  val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
+  Image(
+    preview.asImageBitmap(),
+    contentDescription = stringResource(R.string.video_descr),
+    modifier = Modifier
+      .width(width)
+      .combinedClickable(
+        onLongClick = { showMenu.value = true },
+        onClick = onClick
+      ),
+    contentScale = ContentScale.FillWidth,
+  )
+}
+
+@Composable
+private fun LocalWindowWidth(): Dp {
+  val view = LocalView.current
+  val density = LocalDensity.current.density
+  return remember {
+    val rect = Rect()
+    view.getWindowVisibleDisplayFrame(rect)
+    (rect.width() / density).dp
+  }
+}
+
+@Composable
+private fun progressIndicator() {
+  CircularProgressIndicator(
+    Modifier.size(16.dp),
+    color = Color.White,
+    strokeWidth = 2.dp
+  )
+}
+
+@Composable
+private fun fileIcon(icon: ImageVector, @StringRes stringId: Int) {
+  Icon(
+    icon,
+    stringResource(stringId),
+    Modifier.fillMaxSize(),
+    tint = Color.White
+  )
+}
+
+@Composable
+private fun progressCircle(progress: Long, total: Long) {
+  val angle = 360f * (progress.toDouble() / total.toDouble()).toFloat()
+  val strokeWidth = with(LocalDensity.current) { 2.dp.toPx() }
+  val strokeColor = Color.White
+  Surface(
+    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
+    color = Color.Transparent,
+    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
+  ) {
+    Box(Modifier.size(16.dp))
+  }
+}
+
+@Composable
+private fun loadingIndicator(file: CIFile?) {
+  if (file != null) {
+    Box(
+      Modifier
+        .padding(8.dp)
+        .size(20.dp),
+      contentAlignment = Alignment.Center
+    ) {
+      when (file.fileStatus) {
+        is CIFileStatus.SndStored ->
+          when (file.fileProtocol) {
+            FileProtocol.XFTP -> progressIndicator()
+            FileProtocol.SMP -> {}
+          }
+        is CIFileStatus.SndTransfer ->
+          when (file.fileProtocol) {
+            FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
+            FileProtocol.SMP -> progressIndicator()
+          }
+        is CIFileStatus.SndComplete -> fileIcon(Icons.Filled.Check, R.string.icon_descr_video_snd_complete)
+        is CIFileStatus.SndCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
+        is CIFileStatus.RcvInvitation -> fileIcon(Icons.Outlined.ArrowDownward, R.string.icon_descr_video_asked_to_receive)
+        is CIFileStatus.RcvAccepted -> fileIcon(Icons.Outlined.MoreHoriz, R.string.icon_descr_waiting_for_video)
+        is CIFileStatus.RcvTransfer ->
+          if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
+            progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
+          } else {
+            progressIndicator()
+          }
+        is CIFileStatus.RcvCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
+        else -> {}
+      }
+    }
+  }
+}
+
+private fun fileSizeValid(file: CIFile?): Boolean {
+  if (file != null) {
+    return file.fileSize <= getMaxFileSize(file.fileProtocol)
+  }
+  return false
+}
+
+private fun receiveFileIfValidSize(file: CIFile, receiveFile: (Long) -> Unit) {
+  if (fileSizeValid(file)) {
+    receiveFile(file.fileId)
+  } else {
+    AlertManager.shared.showAlertMsg(
+      generalGetString(R.string.large_file),
+      String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
+    )
+  }
+}
+
+private fun videoViewFullWidth(windowWidth: Dp): Dp {
+  val approximatePadding = 100.dp
+  return minOf(1000.dp, windowWidth - approximatePadding)
+}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt

@@ -210,9 +210,9 @@ private fun VoiceMsgIndicator(
       PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause, longClick = longClick)
     }
   } else {
-    if (file?.fileStatus == CIFileStatus.RcvInvitation
-      || file?.fileStatus == CIFileStatus.RcvTransfer
-      || file?.fileStatus == CIFileStatus.RcvAccepted
+    if (file?.fileStatus is CIFileStatus.RcvInvitation
+      || file?.fileStatus is CIFileStatus.RcvTransfer
+      || file?.fileStatus is CIFileStatus.RcvAccepted
     ) {
       Box(
         Modifier
@@ -228,7 +228,7 @@ private fun VoiceMsgIndicator(
   }
 }
 
-private fun Modifier.drawRingModifier(angle: Float, color: Color, strokeWidth: Float) = drawWithCache {
+fun Modifier.drawRingModifier(angle: Float, color: Color, strokeWidth: Float) = drawWithCache {
   val brush = Brush.linearGradient(
     0f to Color.Transparent,
     0f to color,

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt

@@ -1,5 +1,7 @@
 package chat.simplex.app.views.chat.item
 
+import android.Manifest
+import android.os.Build
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -25,6 +27,7 @@ import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.ComposeContextItem
 import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.helpers.*
+import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.datetime.Clock
 
 // TODO refactor so that FramedItemView can show all CIContent items if they're deleted (see Swift code)
@@ -40,6 +43,7 @@ fun ChatItemView(
   linkMode: SimplexLinkMode,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   receiveFile: (Long) -> Unit,
+  cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
   scrollToItem: (Long) -> Unit,
@@ -91,6 +95,14 @@ fun ChatItemView(
         }
       }
 
+      fun moderateMessageQuestionText(): String {
+        return if (fullDeleteAllowed) {
+          generalGetString(R.string.moderate_message_will_be_deleted_warning)
+        } else {
+          generalGetString(R.string.moderate_message_will_be_marked_warning)
+        }
+      }
+
       @Composable
       fun MsgContentItemDropdownMenu() {
         DropdownMenu(
@@ -120,14 +132,20 @@ fun ChatItemView(
             copyText(context, cItem.content.text)
             showMenu.value = false
           })
-          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
+          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
             val filePath = getLoadedFilePath(context, cItem.file)
             if (filePath != null) {
+              val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
               ItemAction(stringResource(R.string.save_verb), Icons.Outlined.SaveAlt, onClick = {
                 when (cItem.content.msgContent) {
-                  is MsgContent.MCImage -> saveImage(context, cItem.file)
-                  is MsgContent.MCFile -> saveFileLauncher.launch(cItem.file?.fileName)
-                  is MsgContent.MCVoice -> saveFileLauncher.launch(cItem.file?.fileName)
+                  is MsgContent.MCImage -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
+                      saveImage(context, cItem.file)
+                    } else {
+                      writePermissionState.launchPermissionRequest()
+                    }
+                  }
+                  is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> saveFileLauncher.launch(cItem.file?.fileName)
                   else -> {}
                 }
                 showMenu.value = false
@@ -150,9 +168,16 @@ fun ChatItemView(
               }
             )
           }
+          if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancellable) {
+            CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile)
+          }
           if (!(live && cItem.meta.isLive)) {
             DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
           }
+          val groupInfo = cItem.memberToModerate(cInfo)?.first
+          if (groupInfo != null) {
+            ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
+          }
         }
       }
 
@@ -163,14 +188,16 @@ fun ChatItemView(
           onDismissRequest = { showMenu.value = false },
           Modifier.width(220.dp)
         ) {
-          ItemAction(
-            stringResource(R.string.reveal_verb),
-            Icons.Outlined.Visibility,
-            onClick = {
-              revealed.value = true
-              showMenu.value = false
-            }
-          )
+          if (!cItem.isDeletedContent) {
+            ItemAction(
+              stringResource(R.string.reveal_verb),
+              Icons.Outlined.Visibility,
+              onClick = {
+                revealed.value = true
+                showMenu.value = false
+              }
+            )
+          }
           DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
         }
       }
@@ -238,14 +265,31 @@ fun ChatItemView(
         is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
         is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
         is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
-        is CIContent.SndModerated -> DeletedItem()
-        is CIContent.RcvModerated -> DeletedItem()
+        is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
         is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
       }
     }
   }
 }
 
+@Composable
+fun CancelFileItemAction(
+  fileId: Long,
+  showMenu: MutableState<Boolean>,
+  cancelFile: (Long) -> Unit
+) {
+  ItemAction(
+    stringResource(R.string.cancel_verb),
+    Icons.Outlined.Close,
+    onClick = {
+      showMenu.value = false
+      cancelFileAlertDialog(fileId, cancelFile = cancelFile)
+    },
+    color = Color.Red
+  )
+}
+
 @Composable
 fun DeleteItemAction(
   cItem: ChatItem,
@@ -264,6 +308,24 @@ fun DeleteItemAction(
   )
 }
 
+@Composable
+fun ModerateItemAction(
+  cItem: ChatItem,
+  questionText: String,
+  showMenu: MutableState<Boolean>,
+  deleteMessage: (Long, CIDeleteMode) -> Unit
+) {
+  ItemAction(
+    stringResource(R.string.moderate_verb),
+    Icons.Outlined.Flag,
+    onClick = {
+      showMenu.value = false
+      moderateMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
+    },
+    color = Color.Red
+  )
+}
+
 @Composable
 fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
   DropdownMenuItem(onClick) {
@@ -281,6 +343,18 @@ fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Colo
   }
 }
 
+fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.cancel_file__question),
+    text = generalGetString(R.string.file_transfer_will_be_cancelled_warning),
+    confirmText = generalGetString(R.string.confirm_verb),
+    destructive = true,
+    onConfirm = {
+      cancelFile(fileId)
+    }
+  )
+}
+
 fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
   AlertManager.shared.showAlertDialogButtons(
     title = generalGetString(R.string.delete_message__question),
@@ -308,6 +382,18 @@ fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMes
   )
 }
 
+fun moderateMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.delete_member_message__question),
+    text = questionText,
+    confirmText = generalGetString(R.string.delete_verb),
+    destructive = true,
+    onConfirm = {
+      deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
+    }
+  )
+}
+
 private fun showMsgDeliveryErrorAlert(description: String) {
   AlertManager.shared.showAlertMsg(
     title = generalGetString(R.string.message_delivery_error_title),
@@ -329,6 +415,7 @@ fun PreviewChatItemView() {
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       deleteMessage = { _, _ -> },
       receiveFile = {},
+      cancelFile = {},
       joinGroup = {},
       acceptCall = { _ -> },
       scrollToItem = {},
@@ -349,6 +436,7 @@ fun PreviewChatItemViewDeletedContent() {
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       deleteMessage = { _, _ -> },
       receiveFile = {},
+      cancelFile = {},
       joinGroup = {},
       acceptCall = { _ -> },
       scrollToItem = {},

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt

@@ -7,6 +7,7 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Flag
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -20,6 +21,7 @@ import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.*
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.util.fastMap
@@ -75,10 +77,7 @@ fun FramedItemView(
       Modifier
         .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
         .fillMaxWidth()
-        .padding(start = 8.dp)
-        .padding(end = 12.dp)
-        .padding(top = 6.dp)
-        .padding(bottom = if (ci.quotedItem == null) 6.dp else 0.dp),
+        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (ci.quotedItem == null) 6.dp else 0.dp),
       horizontalArrangement = Arrangement.spacedBy(4.dp),
     ) {
       if (icon != null) {
@@ -96,6 +95,8 @@ fun FramedItemView(
           }
         },
         style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
       )
     }
   }
@@ -124,6 +125,18 @@ fun FramedItemView(
             modifier = Modifier.size(68.dp).clipToBounds()
           )
         }
+        is MsgContent.MCVideo -> {
+          Box(Modifier.fillMaxWidth().weight(1f)) {
+            ciQuotedMsgView(qi)
+          }
+          val imageBitmap = base64ToBitmap(qi.content.image).asImageBitmap()
+          Image(
+            imageBitmap,
+            contentDescription = stringResource(R.string.video_descr),
+            contentScale = ContentScale.Crop,
+            modifier = Modifier.size(68.dp).clipToBounds()
+          )
+        }
         is MsgContent.MCFile, is MsgContent.MCVoice -> {
           Box(Modifier.fillMaxWidth().weight(1f)) {
             ciQuotedMsgView(qi)
@@ -150,7 +163,8 @@ fun FramedItemView(
     }
   }
 
-  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage) && !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null
+  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
+      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null
 
   Box(Modifier
     .clip(RoundedCornerShape(18.dp))
@@ -166,7 +180,11 @@ fun FramedItemView(
       Column(Modifier.width(IntrinsicSize.Max)) {
         PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
           if (ci.meta.itemDeleted != null) {
-            FramedItemHeader(stringResource(R.string.marked_deleted_description), true, Icons.Outlined.Delete)
+            if (ci.meta.itemDeleted is CIDeleted.Moderated) {
+              FramedItemHeader(String.format(stringResource(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, Icons.Outlined.Flag)
+            } else {
+              FramedItemHeader(stringResource(R.string.marked_deleted_description), true, Icons.Outlined.Delete)
+            }
           } else if (ci.meta.isLive) {
             FramedItemHeader(stringResource(R.string.live), false)
           }
@@ -193,6 +211,14 @@ fun FramedItemView(
                   CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                 }
               }
+              is MsgContent.MCVideo -> {
+                CIVideoView(image = mc.image, mc.duration, file = ci.file, imageProvider ?: return@PriorityLayout, showMenu, receiveFile)
+                if (mc.text == "" && !ci.meta.isLive) {
+                  metaColor = Color.White
+                } else {
+                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
+                }
+              }
               is MsgContent.MCVoice -> {
                 CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") })
                 if (mc.text != "") {

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt

@@ -3,21 +3,28 @@ package chat.simplex.app.views.chat.item
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
+import android.view.View
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.input.pointer.*
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.*
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.view.isVisible
 import chat.simplex.app.R
+import chat.simplex.app.views.chat.ProviderMedia
 import chat.simplex.app.views.helpers.*
 import coil.ImageLoader
 import coil.compose.rememberAsyncImagePainter
@@ -26,13 +33,16 @@ import coil.decode.ImageDecoderDecoder
 import coil.request.ImageRequest
 import coil.size.Size
 import com.google.accompanist.pager.*
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+import com.google.android.exoplayer2.ui.StyledPlayerView
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
 import kotlin.math.absoluteValue
 
 interface ImageGalleryProvider {
   val initialIndex: Int
-  val totalImagesSize: MutableState<Int>
-  fun getImage(index: Int): Pair<Bitmap, Uri>?
+  val totalMediaSize: MutableState<Int>
+  fun getMedia(index: Int): ProviderMedia?
   fun currentPageChanged(index: Int)
   fun scrollToStart()
   fun onDismiss(index: Int)
@@ -48,13 +58,17 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
   // Pager doesn't ask previous page at initialization step who knows why. By not doing this, prev page is not checked and can be blank,
   // which makes this blank page visible for a moment. Prevent it by doing the check ourselves
   LaunchedEffect(Unit) {
-    if (provider.getImage(provider.initialIndex - 1) == null) {
+    if (provider.getMedia(provider.initialIndex - 1) == null) {
       provider.scrollToStart()
       pagerState.scrollToPage(0)
     }
   }
   val scope = rememberCoroutineScope()
-  HorizontalPager(count = remember { provider.totalImagesSize }.value, state = pagerState) { index ->
+  val playersToRelease = rememberSaveable { mutableSetOf<Uri>() }
+  DisposableEffectOnGone(
+    whenGone = { playersToRelease.forEach { VideoPlayer.release(it, true, true) } }
+  )
+  HorizontalPager(count = remember { provider.totalMediaSize }.value, state = pagerState) { index ->
     Column(
       Modifier
         .fillMaxSize()
@@ -74,13 +88,13 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
         if (settledCurrentPage != provider.initialIndex)
           provider.currentPageChanged(index)
       }
-      val image = provider.getImage(index)
-      if (image == null) {
+      val media = provider.getMedia(index)
+      if (media == null) {
         // No such image. Let's shrink total pages size or scroll to start of the list of pages to remove blank page automatically
         SideEffect {
           scope.launch {
             when (settledCurrentPage) {
-              index - 1 -> provider.totalImagesSize.value = settledCurrentPage + 1
+              index - 1 -> provider.totalMediaSize.value = settledCurrentPage + 1
               index + 1 -> {
                 provider.scrollToStart()
                 pagerState.scrollToPage(0)
@@ -89,7 +103,6 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
           }
         }
       } else {
-        val (imageBitmap: Bitmap, uri: Uri) = image
         var scale by remember { mutableStateOf(1f) }
         var translationX by remember { mutableStateOf(0f) }
         var translationY by remember { mutableStateOf(0f) }
@@ -100,54 +113,106 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
           translationX = 0f
           translationY = 0f
         }
-        // I'm making a new instance of imageLoader here because if I use one instance in multiple places
-        // after end of composition here a GIF from the first instance will be paused automatically which isn't what I want
-        val imageLoader = ImageLoader.Builder(LocalContext.current)
-          .components {
-            if (Build.VERSION.SDK_INT >= 28) {
-              add(ImageDecoderDecoder.Factory())
-            } else {
-              add(GifDecoder.Factory())
-            }
+        val modifier = Modifier
+          .onGloballyPositioned {
+            viewWidth = it.size.width
           }
-          .build()
-        Image(
-          rememberAsyncImagePainter(
-            ImageRequest.Builder(LocalContext.current).data(data = uri).size(Size.ORIGINAL).build(),
-            placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
-            imageLoader = imageLoader
-          ),
-          contentDescription = stringResource(R.string.image_descr),
-          contentScale = ContentScale.Fit,
-          modifier = Modifier
-            .onGloballyPositioned {
-              viewWidth = it.size.width
-            }
-            .graphicsLayer(
-              scaleX = scale,
-              scaleY = scale,
-              translationX = translationX,
-              translationY = translationY,
-            )
-            .pointerInput(Unit) {
-              detectTransformGestures(
-                { allowTranslate },
-                onGesture = { _, pan, gestureZoom, _ ->
-                  scale = (scale * gestureZoom).coerceIn(1f, 20f)
-                  allowTranslate = viewWidth * (scale - 1f) - ((translationX + pan.x * scale).absoluteValue * 2) > 0
-                  if (scale > 1 && allowTranslate) {
-                    translationX += pan.x * scale
-                    translationY += pan.y * scale
-                  } else if (allowTranslate) {
-                    translationX = 0f
-                    translationY = 0f
-                  }
+          .graphicsLayer(
+            scaleX = scale,
+            scaleY = scale,
+            translationX = translationX,
+            translationY = translationY,
+          )
+          .pointerInput(Unit) {
+            detectTransformGestures(
+              { allowTranslate },
+              onGesture = { _, pan, gestureZoom, _ ->
+                scale = (scale * gestureZoom).coerceIn(1f, 20f)
+                allowTranslate = viewWidth * (scale - 1f) - ((translationX + pan.x * scale).absoluteValue * 2) > 0
+                if (scale > 1 && allowTranslate) {
+                  translationX += pan.x * scale
+                  translationY += pan.y * scale
+                } else if (allowTranslate) {
+                  translationX = 0f
+                  translationY = 0f
                 }
-              )
+              }
+            )
+          }
+          .fillMaxSize()
+        if (media is ProviderMedia.Image) {
+          val (uri: Uri, imageBitmap: Bitmap) = media
+          // I'm making a new instance of imageLoader here because if I use one instance in multiple places
+          // after end of composition here a GIF from the first instance will be paused automatically which isn't what I want
+          val imageLoader = ImageLoader.Builder(LocalContext.current)
+            .components {
+              if (Build.VERSION.SDK_INT >= 28) {
+                add(ImageDecoderDecoder.Factory())
+              } else {
+                add(GifDecoder.Factory())
+              }
             }
-            .fillMaxSize(),
-        )
+            .build()
+          Image(
+            rememberAsyncImagePainter(
+              ImageRequest.Builder(LocalContext.current).data(data = uri).size(Size.ORIGINAL).build(),
+              placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
+              imageLoader = imageLoader
+            ),
+            contentDescription = stringResource(R.string.image_descr),
+            contentScale = ContentScale.Fit,
+            modifier = modifier,
+          )
+        } else if (media is ProviderMedia.Video) {
+          val preview = remember(media.uri.path) { base64ToBitmap(media.preview) }
+          VideoView(modifier, media.uri, preview, index == settledCurrentPage)
+          DisposableEffect(Unit) {
+            onDispose { playersToRelease.add(media.uri) }
+          }
+        }
       }
     }
   }
 }
+
+@Composable
+private fun VideoView(modifier: Modifier, uri: Uri, defaultPreview: Bitmap, currentPage: Boolean) {
+  val context = LocalContext.current
+  val player = remember(uri) { VideoPlayer.getOrCreate(uri, true, defaultPreview, 0L, true, context) }
+  val isCurrentPage = rememberUpdatedState(currentPage)
+  val play = {
+    player.play(true)
+  }
+  val stop = {
+    player.stop()
+  }
+  LaunchedEffect(Unit) {
+    player.enableSound(true)
+    snapshotFlow { isCurrentPage.value }
+      .distinctUntilChanged()
+      .collect { if (it) play() else stop() }
+  }
+
+  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+    AndroidView(
+      factory = { ctx ->
+        StyledPlayerView(ctx).apply {
+          resizeMode = if (ctx.resources.configuration.screenWidthDp > ctx.resources.configuration.screenHeightDp) {
+            AspectRatioFrameLayout.RESIZE_MODE_FIXED_HEIGHT
+          } else {
+            AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+          }
+          setShowPreviousButton(false)
+          setShowNextButton(false)
+          setShowSubtitleButton(false)
+          setShowVrButton(false)
+          controllerAutoShow = false
+          findViewById<View>(com.google.android.exoplayer2.R.id.exo_controls_background).setBackgroundColor(Color.Black.copy(alpha = 0.3f).toArgb())
+          findViewById<View>(com.google.android.exoplayer2.R.id.exo_settings).isVisible = false
+          this.player = player.player
+        }
+      },
+      modifier
+    )
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt

@@ -1,8 +1,7 @@
 package chat.simplex.app.views.chat.item
 
 import android.content.res.Configuration
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
@@ -10,6 +9,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -30,19 +30,32 @@ fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Bool
       Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
       verticalAlignment = Alignment.CenterVertically
     ) {
-      Text(
-        buildAnnotatedString {
-          // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
-          withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(generalGetString(R.string.marked_deleted_description)) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
+      Box(Modifier.weight(1f, false)) {
+        if (ci.meta.itemDeleted is CIDeleted.Moderated) {
+          MarkedDeletedText(String.format(generalGetString(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName))
+        } else {
+          MarkedDeletedText(generalGetString(R.string.marked_deleted_description))
+        }
+      }
       CIMetaView(ci, timedMessagesTTL)
     }
   }
 }
 
+@Composable
+private fun MarkedDeletedText(text: String) {
+  Text(
+    buildAnnotatedString {
+      // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
+      withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(text) }
+    },
+    style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+    modifier = Modifier.padding(end = 8.dp),
+    maxLines = 1,
+    overflow = TextOverflow.Ellipsis,
+  )
+}
+
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.annotatedStringResource
+import chat.simplex.app.views.helpers.openUriCatching
 import chat.simplex.app.views.usersettings.MarkdownHelpView
 import chat.simplex.app.views.usersettings.simplexTeamUri
 
@@ -36,7 +37,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
     Text(
       annotatedStringResource(R.string.you_can_connect_to_simplex_chat_founder),
       modifier = Modifier.clickable(onClick = {
-        uriHandler.openUri(simplexTeamUri)
+        uriHandler.openUriCatching(simplexTeamUri)
       }),
       lineHeight = 22.sp
     )

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt

@@ -132,7 +132,7 @@ private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
   Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.Bottom) {
     val uriHandler = LocalUriHandler.current
     ConnectButton(generalGetString(R.string.chat_with_developers)) {
-      uriHandler.openUri(simplexTeamUri)
+      uriHandler.openUriCatching(simplexTeamUri)
     }
     Spacer(Modifier.height(DEFAULT_PADDING))
     ConnectButton(generalGetString(R.string.tap_to_start_new_chat), openNewChatSheet)
@@ -208,9 +208,9 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
       } else if (chatModel.users.isEmpty()) {
         NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
       } else {
-        val users by remember { derivedStateOf { chatModel.users.toList() } }
+        val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
         val allRead = users
-          .filter { !it.user.activeUser }
+          .filter { u -> !u.user.activeUser && !u.user.hidden }
           .all { u -> u.unreadCount == 0 }
         UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
           if (users.size == 1) {
@@ -247,7 +247,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
 }
 
 @Composable
-private fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
+fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
   IconButton(onClick = onButtonClicked) {
     Box {
       ProfileImage(

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt

@@ -24,12 +24,15 @@ import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.Indigo
 import chat.simplex.app.views.helpers.*
+import kotlinx.coroutines.flow.MutableStateFlow
 
 @Composable
 fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
   var searchInList by rememberSaveable { mutableStateOf("") }
+  val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
+  val switchingUsers = rememberSaveable { mutableStateOf(false) }
   Scaffold(
-    topBar = { Column { ShareListToolbar(chatModel, stopped) { searchInList = it.trim() } } },
+    topBar = { Column { ShareListToolbar(chatModel, userPickerState, stopped) { searchInList = it.trim() } } },
   ) {
     Box(Modifier.padding(it)) {
       Column(
@@ -45,23 +48,41 @@ fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
       }
     }
   }
+  UserPicker(chatModel, userPickerState, switchingUsers, showSettings = false, showCancel = true, cancelClicked = {
+    chatModel.sharedContent.value = null
+  })
 }
 
 @Composable
 private fun EmptyList() {
-  Box {
-    Text(stringResource(R.string.you_have_no_chats), Modifier.align(Alignment.Center), color = HighOrLowlight)
+  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+    Text(stringResource(R.string.you_have_no_chats), color = HighOrLowlight)
   }
 }
 
 @Composable
-private fun ShareListToolbar(chatModel: ChatModel, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
+private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedViewState>, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
   var showSearch by rememberSaveable { mutableStateOf(false) }
   val hideSearchOnBack = { onSearchValueChanged(""); showSearch = false }
   if (showSearch) {
     BackHandler(onBack = hideSearchOnBack)
   }
   val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
+  val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
+  val navButton: @Composable RowScope.() -> Unit = {
+    when {
+      showSearch -> NavigationButtonBack(hideSearchOnBack)
+      users.size > 1 -> {
+        val allRead = users
+          .filter { u -> !u.user.activeUser && !u.user.hidden }
+          .all { u -> u.unreadCount == 0 }
+        UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
+          userPickerState.value = AnimatedViewState.VISIBLE
+        }
+      }
+      else -> NavigationButtonBack { chatModel.sharedContent.value = null }
+    }
+  }
   if (chatModel.chats.size >= 8) {
     barButtons.add {
       IconButton({ showSearch = true }) {
@@ -87,7 +108,7 @@ private fun ShareListToolbar(chatModel: ChatModel, stopped: Boolean, onSearchVal
   }
 
   DefaultTopAppBar(
-    navigationButton = { if (showSearch) NavigationButtonBack(hideSearchOnBack) else NavigationButtonBack { chatModel.sharedContent.value = null } },
+    navigationButton = navButton,
     title = {
       Row(verticalAlignment = Alignment.CenterVertically) {
         Text(

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt

@@ -9,11 +9,12 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Done
-import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.*
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
@@ -33,10 +34,24 @@ import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
 @Composable
-fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedViewState>, switchingUsers: MutableState<Boolean>, openSettings: () -> Unit) {
+fun UserPicker(
+  chatModel: ChatModel,
+  userPickerState: MutableStateFlow<AnimatedViewState>,
+  switchingUsers: MutableState<Boolean>,
+  showSettings: Boolean = true,
+  showCancel: Boolean = false,
+  cancelClicked: () -> Unit = {},
+  settingsClicked: () -> Unit = {},
+) {
   val scope = rememberCoroutineScope()
   var newChat by remember { mutableStateOf(userPickerState.value) }
-  val users by remember { derivedStateOf { chatModel.users.sortedByDescending { it.user.activeUser } } }
+  val users by remember {
+    derivedStateOf {
+      chatModel.users
+        .filter { u -> u.user.activeUser || !u.user.hidden }
+        .sortedByDescending { it.user.activeUser }
+    }
+  }
   val animatedFloat = remember { Animatable(if (newChat.isVisible()) 0f else 1f) }
   LaunchedEffect(Unit) {
     launch {
@@ -94,23 +109,22 @@ fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedV
         .width(IntrinsicSize.Min)
         .height(IntrinsicSize.Min)
         .shadow(8.dp, MaterialTheme.shapes.medium, clip = false)
-        .background(MaterialTheme.colors.background, MaterialTheme.shapes.medium)
+        .background(if (isInDarkTheme()) MaterialTheme.colors.background.darker(-0.7f) else MaterialTheme.colors.background, MaterialTheme.shapes.medium)
     ) {
       Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
         users.forEach { u ->
           UserProfilePickerItem(u.user, u.unreadCount, openSettings = {
-            openSettings()
+            settingsClicked()
             userPickerState.value = AnimatedViewState.GONE
           }) {
             userPickerState.value = AnimatedViewState.HIDING
             if (!u.user.activeUser) {
-              chatModel.chats.clear()
               scope.launch {
                 val job = launch {
                   delay(500)
                   switchingUsers.value = true
                 }
-                chatModel.controller.changeActiveUser(u.user.userId)
+                chatModel.controller.changeActiveUser(u.user.userId, null)
                 job.cancel()
                 switchingUsers.value = false
               }
@@ -120,9 +134,17 @@ fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedV
           if (u.user.activeUser) Divider(Modifier.requiredHeight(0.5.dp))
         }
       }
-      SettingsPickerItem {
-        openSettings()
-        userPickerState.value = AnimatedViewState.GONE
+      if (showSettings) {
+        SettingsPickerItem {
+          settingsClicked()
+          userPickerState.value = AnimatedViewState.GONE
+        }
+      }
+      if (showCancel) {
+        CancelPickerItem {
+          cancelClicked()
+          userPickerState.value = AnimatedViewState.GONE
+        }
       }
     }
   }
@@ -144,33 +166,19 @@ fun UserProfilePickerItem(u: User, unreadCount: Int = 0, onLongClick: () -> Unit
     horizontalArrangement = Arrangement.SpaceBetween,
     verticalAlignment = Alignment.CenterVertically
   ) {
-    Row(
-      Modifier
-        .widthIn(max = LocalConfiguration.current.screenWidthDp.dp * 0.7f)
-        .padding(vertical = 8.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      ProfileImage(
-        image = u.image,
-        size = 54.dp
-      )
-      Text(
-        u.displayName,
-        modifier = Modifier
-          .padding(start = 8.dp, end = 8.dp),
-        fontWeight = if (u.activeUser) FontWeight.Medium else FontWeight.Normal
-      )
-    }
+    UserProfileRow(u)
     if (u.activeUser) {
-      Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+        Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+    } else if (u.hidden) {
+        Icon(Icons.Outlined.Lock, null, Modifier.size(20.dp), tint = HighOrLowlight)
     } else if (unreadCount > 0) {
       Row {
         Text(
           unreadCountStr(unreadCount),
-          color = MaterialTheme.colors.onPrimary,
+          color = Color.White,
           fontSize = 11.sp,
           modifier = Modifier
-            .background(MaterialTheme.colors.primary, shape = CircleShape)
+            .background(if (u.showNtfs) MaterialTheme.colors.primary else HighOrLowlight, shape = CircleShape)
             .sizeIn(minWidth = 20.dp, minHeight = 20.dp)
             .padding(horizontal = 3.dp)
             .padding(vertical = 1.dp),
@@ -179,12 +187,35 @@ fun UserProfilePickerItem(u: User, unreadCount: Int = 0, onLongClick: () -> Unit
         )
         Spacer(Modifier.width(2.dp))
       }
-    } else {
+    } else if (!u.showNtfs) {
+      Icon(Icons.Outlined.NotificationsOff, null, Modifier.size(20.dp), tint = HighOrLowlight)
+    }  else {
       Box(Modifier.size(20.dp))
     }
   }
 }
 
+@Composable
+fun UserProfileRow(u: User) {
+  Row(
+    Modifier
+      .widthIn(max = LocalConfiguration.current.screenWidthDp.dp * 0.7f)
+      .padding(vertical = 8.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    ProfileImage(
+      image = u.image,
+      size = 54.dp
+    )
+    Text(
+      u.displayName,
+      modifier = Modifier
+        .padding(start = 8.dp, end = 8.dp),
+      fontWeight = if (u.activeUser) FontWeight.Medium else FontWeight.Normal
+    )
+  }
+}
+
 @Composable
 private fun SettingsPickerItem(onClick: () -> Unit) {
   SectionItemViewSpaceBetween(onClick, minHeight = 68.dp) {
@@ -196,3 +227,15 @@ private fun SettingsPickerItem(onClick: () -> Unit) {
     Icon(Icons.Outlined.Settings, text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
   }
 }
+
+@Composable
+private fun CancelPickerItem(onClick: () -> Unit) {
+  SectionItemViewSpaceBetween(onClick, minHeight = 68.dp) {
+    val text = generalGetString(R.string.cancel_verb)
+    Text(
+      text,
+      color = MaterialTheme.colors.onBackground,
+    )
+    Icon(Icons.Outlined.Close, text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt

@@ -1,5 +1,6 @@
 package chat.simplex.app.views.database
 
+import SectionDivider
 import SectionItemView
 import SectionItemViewSpaceBetween
 import SectionTextFooter
@@ -25,13 +26,13 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.*
 import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.datetime.Clock
 import kotlin.math.log2
 
@@ -161,7 +162,9 @@ fun DatabaseEncryptionLayout(
       }
 
       if (!initialRandomDBPassphrase.value && chatDbEncrypted == true) {
-        DatabaseKeyField(
+        SectionDivider()
+
+        PassphraseField(
           currentKey,
           generalGetString(R.string.current_passphrase),
           modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -170,7 +173,9 @@ fun DatabaseEncryptionLayout(
         )
       }
 
-      DatabaseKeyField(
+      SectionDivider()
+
+      PassphraseField(
         newKey,
         generalGetString(R.string.new_passphrase),
         modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -201,7 +206,9 @@ fun DatabaseEncryptionLayout(
           !validKey(newKey.value) ||
           progressIndicator.value
 
-      DatabaseKeyField(
+      SectionDivider()
+
+      PassphraseField(
         confirmNewKey,
         generalGetString(R.string.confirm_new_passphrase),
         modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -212,7 +219,9 @@ fun DatabaseEncryptionLayout(
         }),
       )
 
-      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled) {
+      SectionDivider()
+
+      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled, minHeight = TextFieldDefaults.MinHeight) {
         Text(generalGetString(R.string.update_database_passphrase), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
       }
     }
@@ -285,9 +294,10 @@ fun SavePassphraseSetting(
   initialRandomDBPassphrase: Boolean,
   storedKey: Boolean,
   progressIndicator: Boolean,
+  minHeight: Dp = TextFieldDefaults.MinHeight,
   onCheckedChange: (Boolean) -> Unit,
 ) {
-  SectionItemView {
+  SectionItemView(minHeight = minHeight) {
     Row(verticalAlignment = Alignment.CenterVertically) {
       Icon(
         if (storedKey) Icons.Filled.VpnKey else Icons.Filled.VpnKeyOff,
@@ -349,13 +359,14 @@ private fun operationEnded(m: ChatModel, progressIndicator: MutableState<Boolean
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun DatabaseKeyField(
+fun PassphraseField(
   key: MutableState<String>,
   placeholder: String,
   modifier: Modifier = Modifier,
   showStrength: Boolean = false,
   isValid: (String) -> Boolean,
   keyboardActions: KeyboardActions = KeyboardActions(),
+  dependsOn: MutableState<String>? = null,
 ) {
   var valid by remember { mutableStateOf(validKey(key.value)) }
   var showKey by remember { mutableStateOf(false) }
@@ -436,6 +447,13 @@ fun DatabaseKeyField(
       )
     }
   )
+  LaunchedEffect(Unit) {
+    snapshotFlow { dependsOn?.value }
+      .distinctUntilChanged()
+      .collect {
+        valid = isValid(state.value.text)
+      }
+  }
 }
 
 // based on https://generatepasswords.org/how-to-calculate-entropy/

apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt

@@ -4,6 +4,7 @@ import SectionSpacer
 import SectionView
 import android.content.Context
 import android.util.Log
+import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -13,6 +14,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.*
@@ -20,6 +22,7 @@ import chat.simplex.app.R
 import chat.simplex.app.model.AppPreferences
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.usersettings.AppVersionText
 import chat.simplex.app.views.usersettings.NotificationsMode
 import kotlinx.coroutines.*
 import kotlinx.datetime.Clock
@@ -39,24 +42,39 @@ fun DatabaseErrorView(
   var useKeychain by remember { mutableStateOf(appPreferences.storeDBPassphrase.get()) }
   val context = LocalContext.current
   val restoreDbFromBackup = remember { mutableStateOf(shouldShowRestoreDbButton(appPreferences, context)) }
-  val saveAndRunChatOnClick: () -> Unit = {
+
+  fun callRunChat(confirmMigrations: MigrationConfirmation? = null) {
+    val useKey = if (useKeychain) null else dbKey.value
+    runChat(useKey, confirmMigrations, chatDbStatus, progressIndicator, appPreferences)
+  }
+
+  fun saveAndRunChatOnClick() {
     DatabaseUtils.setDatabaseKey(dbKey.value)
     storedDBKey = dbKey.value
     appPreferences.storeDBPassphrase.set(true)
     useKeychain = true
     appPreferences.initialRandomDBPassphrase.set(false)
-    runChat(dbKey.value, chatDbStatus, progressIndicator, appPreferences)
+    callRunChat()
   }
-  val title = when (chatDbStatus.value) {
-    is DBMigrationResult.OK -> ""
-    is DBMigrationResult.ErrorNotADatabase -> if (useKeychain && !storedDBKey.isNullOrEmpty())
-      generalGetString(R.string.wrong_passphrase)
-    else
-      generalGetString(R.string.encrypted_database)
-    is DBMigrationResult.Error -> generalGetString(R.string.database_error)
-    is DBMigrationResult.ErrorKeychain -> generalGetString(R.string.keychain_error)
-    is DBMigrationResult.Unknown -> generalGetString(R.string.database_error)
-    null -> "" // should never be here
+
+  @Composable
+  fun DatabaseErrorDetails(@StringRes title: Int, content: @Composable ColumnScope.() -> Unit) {
+    Text(
+      generalGetString(title),
+      Modifier.padding(start = 16.dp, top = 16.dp, bottom = 16.dp),
+      style = MaterialTheme.typography.h1
+    )
+    SectionView(null, padding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF), content)
+  }
+
+  @Composable
+  fun FileNameText(dbFile: String) {
+    Text(String.format(generalGetString(R.string.file_with_path), dbFile.split("/").lastOrNull() ?: dbFile))
+  }
+
+  @Composable
+  fun MigrationsText(ms: List<String>) {
+    Text(String.format(generalGetString(R.string.database_migrations), ms.joinToString(", ")))
   }
 
   Column(
@@ -64,63 +82,91 @@ fun DatabaseErrorView(
     horizontalAlignment = Alignment.Start,
     verticalArrangement = Arrangement.Center,
   ) {
-    Text(
-      title,
-      Modifier.padding(start = 16.dp, top = 16.dp, bottom = 24.dp),
-      style = MaterialTheme.typography.h1
-    )
-    SectionView(null, padding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)) {
-      val buttonEnabled = validKey(dbKey.value) && !progressIndicator.value
-      when (val status = chatDbStatus.value) {
-        is DBMigrationResult.ErrorNotADatabase -> {
-          if (useKeychain && !storedDBKey.isNullOrEmpty()) {
+    val buttonEnabled = validKey(dbKey.value) && !progressIndicator.value
+    when (val status = chatDbStatus.value) {
+      is DBMigrationResult.ErrorNotADatabase ->
+        if (useKeychain && !storedDBKey.isNullOrEmpty()) {
+          DatabaseErrorDetails(R.string.wrong_passphrase) {
             Text(generalGetString(R.string.passphrase_is_different))
             DatabaseKeyField(dbKey, buttonEnabled) {
               saveAndRunChatOnClick()
             }
-            SaveAndOpenButton(buttonEnabled, saveAndRunChatOnClick)
+            SaveAndOpenButton(buttonEnabled, ::saveAndRunChatOnClick)
             SectionSpacer()
-            Text(String.format(generalGetString(R.string.file_with_path), status.dbFile))
-          } else {
+            FileNameText(status.dbFile)
+          }
+        } else {
+          DatabaseErrorDetails(R.string.encrypted_database) {
             Text(generalGetString(R.string.database_passphrase_is_required))
-            DatabaseKeyField(dbKey, buttonEnabled) {
-              if (useKeychain) saveAndRunChatOnClick() else runChat(dbKey.value, chatDbStatus, progressIndicator, appPreferences)
-            }
             if (useKeychain) {
-              SaveAndOpenButton(buttonEnabled, saveAndRunChatOnClick)
+              DatabaseKeyField(dbKey, buttonEnabled, ::saveAndRunChatOnClick)
+              SaveAndOpenButton(buttonEnabled, ::saveAndRunChatOnClick)
             } else {
-              OpenChatButton(buttonEnabled) { runChat(dbKey.value, chatDbStatus, progressIndicator, appPreferences) }
+              DatabaseKeyField(dbKey, buttonEnabled) { callRunChat() }
+              OpenChatButton(buttonEnabled) { callRunChat() }
             }
           }
         }
-        is DBMigrationResult.Error -> {
-          Text(String.format(generalGetString(R.string.file_with_path), status.dbFile))
-          Text(String.format(generalGetString(R.string.error_with_info), status.migrationError))
+      is DBMigrationResult.ErrorMigration -> when (val err = status.migrationError) {
+        is MigrationError.Upgrade ->
+          DatabaseErrorDetails(R.string.database_upgrade) {
+            TextButton({ callRunChat(confirmMigrations = MigrationConfirmation.YesUp) }, Modifier.align(Alignment.CenterHorizontally), enabled = !progressIndicator.value) {
+              Text(generalGetString(R.string.upgrade_and_open_chat))
+            }
+            Spacer(Modifier.height(20.dp))
+            FileNameText(status.dbFile)
+            MigrationsText(err.upMigrations.map { it.upName })
+            AppVersionText()
+          }
+        is MigrationError.Downgrade ->
+          DatabaseErrorDetails(R.string.database_downgrade) {
+            TextButton({ callRunChat(confirmMigrations = MigrationConfirmation.YesUpDown) }, Modifier.align(Alignment.CenterHorizontally), enabled = !progressIndicator.value) {
+              Text(generalGetString(R.string.downgrade_and_open_chat))
+            }
+            Spacer(Modifier.height(20.dp))
+            Text(generalGetString(R.string.database_downgrade_warning), fontWeight = FontWeight.Bold)
+            FileNameText(status.dbFile)
+            MigrationsText(err.downMigrations)
+            AppVersionText()
+          }
+        is MigrationError.Error ->
+          DatabaseErrorDetails(R.string.incompatible_database_version) {
+            FileNameText(status.dbFile)
+            Text(String.format(generalGetString(R.string.error_with_info), mtrErrorDescription(err.mtrError)))
+          }
+      }
+      is DBMigrationResult.ErrorSQL ->
+        DatabaseErrorDetails(R.string.database_error) {
+          FileNameText(status.dbFile)
+          Text(String.format(generalGetString(R.string.error_with_info), status.migrationSQLError))
         }
-        is DBMigrationResult.ErrorKeychain -> {
+      is DBMigrationResult.ErrorKeychain ->
+        DatabaseErrorDetails(R.string.keychain_error) {
           Text(generalGetString(R.string.cannot_access_keychain))
         }
-        is DBMigrationResult.Unknown -> {
+      is DBMigrationResult.InvalidConfirmation ->
+        DatabaseErrorDetails(R.string.invalid_migration_confirmation) {
+          // this can only happen if incorrect parameter is passed
+        }
+      is DBMigrationResult.Unknown ->
+        DatabaseErrorDetails(R.string.database_error) {
           Text(String.format(generalGetString(R.string.unknown_database_error_with_info), status.json))
         }
-        is DBMigrationResult.OK -> {
-        }
-        null -> {
-        }
-      }
-      if (restoreDbFromBackup.value) {
-        SectionSpacer()
-        Text(generalGetString(R.string.database_backup_can_be_restored))
-        Spacer(Modifier.size(16.dp))
-        RestoreDbButton {
-          AlertManager.shared.showAlertDialog(
-            title = generalGetString(R.string.restore_database_alert_title),
-            text = generalGetString(R.string.restore_database_alert_desc),
-            confirmText = generalGetString(R.string.restore_database_alert_confirm),
-            onConfirm = { restoreDb(restoreDbFromBackup, appPreferences, context) },
-            destructive = true,
-          )
-        }
+      is DBMigrationResult.OK -> {}
+      null -> {}
+    }
+    if (restoreDbFromBackup.value) {
+      SectionSpacer()
+      Text(generalGetString(R.string.database_backup_can_be_restored))
+      Spacer(Modifier.size(16.dp))
+      RestoreDbButton {
+        AlertManager.shared.showAlertDialog(
+          title = generalGetString(R.string.restore_database_alert_title),
+          text = generalGetString(R.string.restore_database_alert_desc),
+          confirmText = generalGetString(R.string.restore_database_alert_confirm),
+          onConfirm = { restoreDb(restoreDbFromBackup, appPreferences, context) },
+          destructive = true,
+        )
       }
     }
   }
@@ -141,7 +187,8 @@ fun DatabaseErrorView(
 }
 
 private fun runChat(
-  dbKey: String,
+  dbKey: String? = null,
+  confirmMigrations: MigrationConfirmation? = null,
   chatDbStatus: State<DBMigrationResult?>,
   progressIndicator: MutableState<Boolean>,
   prefs: AppPreferences
@@ -150,7 +197,7 @@ private fun runChat(
   if (progressIndicator.value) return@launch
   progressIndicator.value = true
   try {
-    SimplexApp.context.initChatController(dbKey)
+    SimplexApp.context.initChatController(dbKey, confirmMigrations)
   } catch (e: Exception) {
     Log.d(TAG, "initializeChat ${e.stackTraceToString()}")
   }
@@ -163,18 +210,17 @@ private fun runChat(
         NotificationsMode.PERIODIC.name -> SimplexApp.context.schedulePeriodicWakeUp()
       }
     }
-    is DBMigrationResult.ErrorNotADatabase -> {
+    is DBMigrationResult.ErrorNotADatabase ->
       AlertManager.shared.showAlertMsg(generalGetString(R.string.wrong_passphrase_title), generalGetString(R.string.enter_correct_passphrase))
-    }
-    is DBMigrationResult.Error -> {
-      AlertManager.shared.showAlertMsg(generalGetString(R.string.database_error), status.migrationError)
-    }
-    is DBMigrationResult.ErrorKeychain -> {
+    is DBMigrationResult.ErrorSQL ->
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.database_error), status.migrationSQLError)
+    is DBMigrationResult.ErrorKeychain ->
       AlertManager.shared.showAlertMsg(generalGetString(R.string.keychain_error))
-    }
-    is DBMigrationResult.Unknown -> {
+    is DBMigrationResult.Unknown ->
       AlertManager.shared.showAlertMsg(generalGetString(R.string.unknown_error), status.json)
-    }
+    is DBMigrationResult.InvalidConfirmation ->
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.invalid_migration_confirmation))
+    is DBMigrationResult.ErrorMigration -> {}
     null -> {}
   }
 }
@@ -204,9 +250,17 @@ private fun restoreDb(restoreDbFromBackup: MutableState<Boolean>, prefs: AppPref
   }
 }
 
+private fun mtrErrorDescription(err: MTRError): String =
+  when (err) {
+    is MTRError.NoDown ->
+      String.format(generalGetString(R.string.mtr_error_no_down_migration), err.dbMigrations.joinToString(", "))
+    is MTRError.Different ->
+      String.format(generalGetString(R.string.mtr_error_different), err.appMigration, err.dbMigration)
+  }
+
 @Composable
 private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onClick: (() -> Unit)? = null) {
-  DatabaseKeyField(
+  PassphraseField(
     text,
     generalGetString(R.string.enter_passphrase),
     isValid = ::validKey,

apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt

@@ -8,7 +8,6 @@ import SectionView
 import android.content.Context
 import android.content.res.Configuration
 import android.net.Uri
-import android.os.FileUtils
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.ManagedActivityResultLauncher
@@ -40,6 +39,7 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.*
 import kotlinx.coroutines.*
 import kotlinx.datetime.*
+import org.apache.commons.io.IOUtils
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -154,7 +154,7 @@ fun DatabaseLayout(
   val operationsDisabled = !stopped || progressIndicator
 
   Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = 48.dp),
+    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = DEFAULT_BOTTOM_PADDING),
     horizontalAlignment = Alignment.Start,
   ) {
     AppBarTitle(stringResource(R.string.your_chat_database))
@@ -620,7 +620,7 @@ private fun saveArchiveFromUri(context: Context, importedArchiveUri: Uri): Strin
     if (inputStream != null && archiveName != null) {
       val archivePath = "${context.cacheDir}/$archiveName"
       val destFile = File(archivePath)
-      FileUtils.copy(inputStream, FileOutputStream(destFile))
+      IOUtils.copy(inputStream, FileOutputStream(destFile))
       archivePath
     } else {
       Log.e(TAG, "saveArchiveFromUri null inputStream")

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt

@@ -15,12 +15,14 @@ import chat.simplex.app.views.newchat.ActionButton
 sealed class AttachmentOption {
   object TakePhoto: AttachmentOption()
   object PickImage: AttachmentOption()
+  object PickVideo: AttachmentOption()
   object PickFile: AttachmentOption()
 }
 
 @Composable
 fun ChooseAttachmentView(
   attachmentOption: MutableState<AttachmentOption?>,
+  allowVideoAttachment: Boolean,
   hide: () -> Unit
 ) {
   Box(
@@ -45,6 +47,12 @@ fun ChooseAttachmentView(
         attachmentOption.value = AttachmentOption.PickImage
         hide()
       }
+      if (allowVideoAttachment) {
+        ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Videocam) {
+          attachmentOption.value = AttachmentOption.PickVideo
+          hide()
+        }
+      }
       ActionButton(null, stringResource(R.string.choose_file), icon = Icons.Outlined.InsertDriveFile) {
         attachmentOption.value = AttachmentOption.PickFile
         hide()

apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt

@@ -4,6 +4,7 @@ import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -22,7 +23,11 @@ fun CloseSheetBar(close: () -> Unit, endButtons: @Composable RowScope.() -> Unit
       Modifier
         .padding(top = 4.dp), // Like in DefaultAppBar
       content = {
-        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+        Row(
+          Modifier.fillMaxWidth().height(TextFieldDefaults.MinHeight),
+          horizontalArrangement = Arrangement.SpaceBetween,
+          verticalAlignment = Alignment.CenterVertically
+        ) {
           NavigationButtonBack(close)
           Row {
             endButtons()

apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt

@@ -66,8 +66,39 @@ object DatabaseUtils {
 @Serializable
 sealed class DBMigrationResult {
   @Serializable @SerialName("ok") object OK: DBMigrationResult()
+  @Serializable @SerialName("invalidConfirmation") object InvalidConfirmation: DBMigrationResult()
   @Serializable @SerialName("errorNotADatabase") class ErrorNotADatabase(val dbFile: String): DBMigrationResult()
-  @Serializable @SerialName("error") class Error(val dbFile: String, val migrationError: String): DBMigrationResult()
+  @Serializable @SerialName("errorMigration") class ErrorMigration(val dbFile: String, val migrationError: MigrationError): DBMigrationResult()
+  @Serializable @SerialName("errorSQL") class ErrorSQL(val dbFile: String, val migrationSQLError: String): DBMigrationResult()
   @Serializable @SerialName("errorKeychain") object ErrorKeychain: DBMigrationResult()
   @Serializable @SerialName("unknown") class Unknown(val json: String): DBMigrationResult()
+}
+
+
+enum class MigrationConfirmation(val value: String) {
+  YesUp("yesUp"),
+  YesUpDown ("yesUpDown"),
+  Error("error")
+}
+
+fun defaultMigrationConfirmation(appPrefs: AppPreferences): MigrationConfirmation =
+  if (appPrefs.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
+
+@Serializable
+sealed class MigrationError {
+  @Serializable @SerialName("upgrade") class Upgrade(val upMigrations: List<UpMigration>): MigrationError()
+  @Serializable @SerialName("downgrade") class Downgrade(val downMigrations: List<String>): MigrationError()
+  @Serializable @SerialName("migrationError") class Error(val mtrError: MTRError): MigrationError()
+}
+
+@Serializable
+data class UpMigration(
+  val upName: String,
+  // val withDown: Boolean
+)
+
+@Serializable
+sealed class MTRError {
+  @Serializable @SerialName("noDown") class NoDown(val dbMigrations: List<String>): MTRError()
+  @Serializable @SerialName("different") class Different(val appMigration: String, val dbMigration: String): MTRError()
 }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt

@@ -34,7 +34,7 @@ fun DefaultTopAppBar(
       if (!showSearch) {
         title?.invoke()
       } else {
-        SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), onSearchValueChanged)
+        SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), alwaysVisible = false, onSearchValueChanged)
       }
     },
     backgroundColor = if (isInDarkTheme()) ToolbarDark else ToolbarLight,

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt

@@ -48,4 +48,5 @@ object UriSerializer : KSerializer<Uri> {
 sealed class UploadContent {
   @Serializable data class SimpleImage(val uri: Uri): UploadContent()
   @Serializable data class AnimatedImage(val uri: Uri): UploadContent()
+  @Serializable data class Video(val uri: Uri, val duration: Int): UploadContent()
 }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt

@@ -6,7 +6,6 @@ import android.content.*
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.graphics.*
-import android.graphics.ImageDecoder.DecodeException
 import android.net.Uri
 import android.provider.MediaStore
 import android.util.Base64
@@ -114,7 +113,7 @@ fun base64ToBitmap(base64ImageString: String): Bitmap {
 class CustomTakePicturePreview(var uri: Uri?, var tmpFile: File?): ActivityResultContract<Void?, Uri?>() {
   @CallSuper
   override fun createIntent(context: Context, input: Void?): Intent {
-    tmpFile = File.createTempFile("image", ".bmp", context.filesDir)
+    tmpFile = File.createTempFile("image", ".bmp", File(getAppFilesDirectory(SimplexApp.context)))
     // Since the class should return Uri, the file should be deleted somewhere else. And in order to be sure, delegate this to system
     tmpFile?.deleteOnExit()
     uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", tmpFile!!)
@@ -205,17 +204,10 @@ fun GetImageBottomSheet(
   val context = LocalContext.current
   val processPickedImage = { uri: Uri? ->
     if (uri != null) {
-      val source = ImageDecoder.createSource(context.contentResolver, uri)
-      try {
-        val bitmap = ImageDecoder.decodeBitmap(source)
+      val bitmap = getBitmapFromUri(uri)
+      if (bitmap != null) {
         imageBitmap.value = uri
         onImageChange(bitmap)
-      } catch (e: DecodeException) {
-        Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
       }
     }
   }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt

@@ -39,6 +39,7 @@ class RecorderNative(private val recordedBytesLimit: Long): Recorder {
     }
 
   override fun start(onProgressUpdate: (position: Int?, finished: Boolean) -> Unit): String {
+    VideoPlayer.stopAll()
     AudioPlayer.stop()
     val rec: MediaRecorder
     recorder = initRecorder().also { rec = it }
@@ -152,6 +153,7 @@ object AudioPlayer {
       return null
     }
 
+    VideoPlayer.stopAll()
     RecorderNative.stopRecording?.invoke()
     val current = currentlyPlaying.value
     if (current == null || current.first != filePath) {

apps/android/app/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt

@@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.*
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -29,15 +30,18 @@ import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun SearchTextField(modifier: Modifier, placeholder: String, onValueChange: (String) -> Unit) {
+fun SearchTextField(modifier: Modifier, placeholder: String, alwaysVisible: Boolean, onValueChange: (String) -> Unit) {
   var searchText by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
   val focusRequester = remember { FocusRequester() }
+  val focusManager = LocalFocusManager.current
   val keyboard = LocalSoftwareKeyboardController.current
 
-  LaunchedEffect(Unit) {
-    focusRequester.requestFocus()
-    delay(200)
-    keyboard?.show()
+  if (!alwaysVisible) {
+    LaunchedEffect(Unit) {
+      focusRequester.requestFocus()
+      delay(200)
+      keyboard?.show()
+    }
   }
 
   DisposableEffect(Unit) {
@@ -87,7 +91,14 @@ fun SearchTextField(modifier: Modifier, placeholder: String, onValueChange: (Str
           Text(placeholder)
         },
         trailingIcon = if (searchText.text.isNotEmpty()) {{
-          IconButton({ searchText = TextFieldValue(""); onValueChange("") }) {
+          IconButton({
+            if (alwaysVisible) {
+              keyboard?.hide()
+              focusManager.clearFocus()
+            }
+            searchText = TextFieldValue("");
+            onValueChange("")
+          }) {
             Icon(Icons.Default.Close, stringResource(R.string.icon_descr_close_button), tint = MaterialTheme.colors.primary,)
           }
         }} else null,

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt

@@ -85,13 +85,14 @@ fun SectionItemView(
   click: (() -> Unit)? = null,
   minHeight: Dp = 46.dp,
   disabled: Boolean = false,
+  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
   content: (@Composable RowScope.() -> Unit)
 ) {
   val modifier = Modifier
     .fillMaxWidth()
     .sizeIn(minHeight = minHeight)
   Row(
-    if (click == null || disabled) modifier.padding(horizontal = DEFAULT_PADDING) else modifier.clickable(onClick = click).padding(horizontal = DEFAULT_PADDING),
+    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
     verticalAlignment = Alignment.CenterVertically
   ) {
     content()

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt

@@ -1,5 +1,6 @@
 package chat.simplex.app.views.helpers
 
+import android.Manifest
 import android.content.*
 import android.net.Uri
 import android.provider.MediaStore
@@ -81,6 +82,7 @@ fun imageMimeType(fileName: String): String {
   }
 }
 
+/** Before calling, make sure the user allows to write to external storage [Manifest.permission.WRITE_EXTERNAL_STORAGE] */
 fun saveImage(cxt: Context, ciFile: CIFile?) {
   val filePath = getLoadedFilePath(cxt, ciFile)
   val fileName = ciFile?.fileName

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt

@@ -1,12 +1,18 @@
 package chat.simplex.app.views.helpers
 
+import android.app.Activity
 import android.app.Application
+//import android.app.LocaleManager
+import android.content.ActivityNotFoundException
 import android.content.Context
+import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.*
 import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.media.MediaMetadataRetriever
 import android.net.Uri
-import android.os.FileUtils
+import android.os.*
 import android.provider.OpenableColumns
 import android.text.Spanned
 import android.text.SpannedString
@@ -29,11 +35,12 @@ import androidx.compose.ui.unit.*
 import androidx.core.content.FileProvider
 import androidx.core.text.HtmlCompat
 import chat.simplex.app.*
-import chat.simplex.app.model.CIFile
-import chat.simplex.app.model.json
+import chat.simplex.app.R
+import chat.simplex.app.model.*
 import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
+import org.apache.commons.io.IOUtils
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -231,12 +238,18 @@ const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE
 const val MAX_VOICE_SIZE_FOR_SENDING: Long = 94680 // 6 chunks * 15780 bytes per chunk
 const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 43_000
 
-const val MAX_FILE_SIZE: Long = 8000000
+const val MAX_FILE_SIZE_SMP: Long = 8000000
+
+const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824
 
 fun getFilesDirectory(context: Context): String {
   return context.filesDir.toString()
 }
 
+fun getTempFilesDirectory(context: Context): String {
+  return "${getFilesDirectory(context)}/temp_files"
+}
+
 fun getAppFilesDirectory(context: Context): String {
   return "${getFilesDirectory(context)}/app_files"
 }
@@ -319,6 +332,14 @@ fun getFileName(context: Context, uri: Uri): String? {
   }
 }
 
+fun getAppFilePath(context: Context, uri: Uri): String? {
+  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
+    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+    cursor.moveToFirst()
+    getAppFilePath(context, cursor.getString(nameIndex))
+  }
+}
+
 fun getFileSize(context: Context, uri: Uri): Long? {
   return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
     val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
@@ -327,9 +348,48 @@ fun getFileSize(context: Context, uri: Uri): Long? {
   }
 }
 
+fun getBitmapFromUri(uri: Uri, withAlertOnException: Boolean = true): Bitmap? {
+  return if (Build.VERSION.SDK_INT >= 28) {
+    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
+    try {
+      ImageDecoder.decodeBitmap(source)
+    } catch (e: android.graphics.ImageDecoder.DecodeException) {
+      Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
+      if (withAlertOnException) {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.image_decoding_exception_title),
+          text = generalGetString(R.string.image_decoding_exception_desc)
+        )
+      }
+      null
+    }
+  } else {
+    BitmapFactory.decodeFile(getAppFilePath(SimplexApp.context, uri))
+  }
+}
+
+fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable? {
+  return if (Build.VERSION.SDK_INT >= 28) {
+    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
+    try {
+      ImageDecoder.decodeDrawable(source)
+    } catch (e: android.graphics.ImageDecoder.DecodeException) {
+      if (withAlertOnException) {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.image_decoding_exception_title),
+          text = generalGetString(R.string.image_decoding_exception_desc)
+        )
+      }
+      Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
+      null
+    }
+  } else {
+    Drawable.createFromPath(getAppFilePath(SimplexApp.context, uri))
+  }
+}
+
 fun saveImage(context: Context, uri: Uri): String? {
-  val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-  val bitmap = ImageDecoder.decodeBitmap(source)
+  val bitmap = getBitmapFromUri(uri) ?: return null
   return saveImage(context, bitmap)
 }
 
@@ -400,7 +460,7 @@ fun saveFileFromUri(context: Context, uri: Uri): String? {
     if (inputStream != null && fileToSave != null) {
       val destFileName = uniqueCombine(context, fileToSave)
       val destFile = File(getAppFilePath(context, destFileName))
-      FileUtils.copy(inputStream, FileOutputStream(destFile))
+      IOUtils.copy(inputStream, FileOutputStream(destFile))
       destFileName
     } else {
       Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri null inputStream")
@@ -436,9 +496,9 @@ fun formatBytes(bytes: Long): String {
     return "0 bytes"
   }
   val bytesDouble = bytes.toDouble()
-  val k = 1000.toDouble()
+  val k = 1024.toDouble()
   val units = arrayOf("bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
-  val i = kotlin.math.floor(log2(bytesDouble) / log2(k))
+  val i = floor(log2(bytesDouble) / log2(k))
   val size = bytesDouble / k.pow(i)
   val unit = units[i.toInt()]
 
@@ -483,6 +543,26 @@ fun directoryFileCountAndSize(dir: String): Pair<Int, Long> { // count, size in
   return fileCount to bytes
 }
 
+fun getMaxFileSize(fileProtocol: FileProtocol): Long {
+  return when (fileProtocol) {
+    FileProtocol.XFTP -> MAX_FILE_SIZE_XFTP
+    FileProtocol.SMP -> MAX_FILE_SIZE_SMP
+  }
+}
+
+fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true): VideoPlayer.PreviewAndDuration {
+  val mmr = MediaMetadataRetriever()
+  mmr.setDataSource(SimplexApp.context, uri)
+  val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
+  val image = when {
+    timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
+    random -> mmr.frameAtTime
+    else -> mmr.getFrameAtIndex(0)
+  }
+  mmr.release()
+  return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0)
+}
+
 fun Color.darker(factor: Float = 0.1f): Color =
   Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)
 
@@ -501,3 +581,63 @@ inline fun <reified T> serializableSaver(): Saver<T, *> = Saver(
     save = { json.encodeToString(it) },
     restore = { json.decodeFromString(it) }
   )
+
+fun saveAppLocale(pref: SharedPreference<String?>, activity: Activity, languageCode: String? = null) {
+//  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+//    val localeManager = SimplexApp.context.getSystemService(LocaleManager::class.java)
+//    localeManager.applicationLocales = LocaleList(Locale.forLanguageTag(languageCode ?: return))
+//  } else {
+    pref.set(languageCode)
+    if (languageCode == null) {
+      activity.applyLocale(SimplexApp.context.defaultLocale)
+    }
+    activity.recreate()
+//  }
+}
+
+fun Activity.applyAppLocale(pref: SharedPreference<String?>) {
+//  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+    val lang = pref.get()
+    if (lang == null || lang == Locale.getDefault().language) return
+    applyLocale(Locale.forLanguageTag(lang))
+//  }
+}
+
+private fun Activity.applyLocale(locale: Locale) {
+  Locale.setDefault(locale)
+  val appConf = Configuration(SimplexApp.context.resources.configuration).apply { setLocale(locale) }
+  val activityConf = Configuration(resources.configuration).apply { setLocale(locale) }
+  @Suppress("DEPRECATION")
+  SimplexApp.context.resources.updateConfiguration(appConf, resources.displayMetrics)
+  @Suppress("DEPRECATION")
+  resources.updateConfiguration(activityConf, resources.displayMetrics)
+}
+
+fun UriHandler.openUriCatching(uri: String) {
+  try {
+    openUri(uri)
+  } catch (e: ActivityNotFoundException) {
+    Log.e(TAG, e.stackTraceToString())
+  }
+}
+
+fun IntSize.Companion.Saver(): Saver<IntSize, *> = Saver(
+  save = { it.width to it.height },
+  restore = { IntSize(it.first, it.second) }
+)
+
+@Composable
+fun DisposableEffectOnGone(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenGone: () -> Unit) {
+  val context = LocalContext.current
+  DisposableEffect(Unit) {
+    always()
+    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
+    val orientation = activity.resources.configuration.orientation
+    onDispose {
+      whenDispose()
+      if (orientation == activity.resources.configuration.orientation) {
+        whenGone()
+      }
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt

@@ -0,0 +1,246 @@
+package chat.simplex.app.views.helpers
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.media.session.PlaybackState
+import android.net.Uri
+import android.util.Log
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import chat.simplex.app.*
+import chat.simplex.app.R
+import com.google.android.exoplayer2.*
+import com.google.android.exoplayer2.C.*
+import com.google.android.exoplayer2.audio.AudioAttributes
+import com.google.android.exoplayer2.source.ProgressiveMediaSource
+import com.google.android.exoplayer2.upstream.DefaultDataSource
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import kotlinx.coroutines.*
+import java.io.File
+
+class VideoPlayer private constructor(
+  private val uri: Uri,
+  private val gallery: Boolean,
+  private val defaultPreview: Bitmap,
+  defaultDuration: Long,
+  soundEnabled: Boolean,
+  context: Context
+) {
+  companion object {
+    private val players: MutableMap<Pair<Uri, Boolean>, VideoPlayer> = mutableMapOf()
+    private val previewsAndDurations: MutableMap<Uri, PreviewAndDuration> = mutableMapOf()
+
+    fun getOrCreate(
+      uri: Uri,
+      gallery: Boolean,
+      defaultPreview: Bitmap,
+      defaultDuration: Long,
+      soundEnabled: Boolean,
+      context: Context
+    ): VideoPlayer =
+      players.getOrPut(uri to gallery) { VideoPlayer(uri, gallery, defaultPreview, defaultDuration, soundEnabled, context) }
+
+    fun enableSound(enable: Boolean, fileName: String?, gallery: Boolean): Boolean =
+      player(fileName, gallery)?.enableSound(enable) == true
+
+    private fun player(fileName: String?, gallery: Boolean): VideoPlayer? {
+      fileName ?: return null
+      return players.values.firstOrNull { player -> player.uri.path?.endsWith(fileName) == true && player.gallery == gallery }
+    }
+
+    fun release(uri: Uri, gallery: Boolean, remove: Boolean) =
+      player(uri.path, gallery)?.release(remove)
+
+    fun stopAll() {
+      players.values.forEach { it.stop() }
+    }
+
+    fun releaseAll() {
+      players.values.forEach { it.release(false) }
+      players.clear()
+      previewsAndDurations.clear()
+    }
+  }
+
+  data class PreviewAndDuration(val preview: Bitmap?, val duration: Long?, val timestamp: Long)
+
+  private val currentVolume: Float
+  val soundEnabled: MutableState<Boolean> = mutableStateOf(soundEnabled)
+  val brokenVideo: MutableState<Boolean> = mutableStateOf(false)
+  val videoPlaying: MutableState<Boolean> = mutableStateOf(false)
+  val progress: MutableState<Long> = mutableStateOf(0L)
+  val duration: MutableState<Long> = mutableStateOf(defaultDuration)
+  val preview: MutableState<Bitmap> = mutableStateOf(defaultPreview)
+
+  init {
+    setPreviewAndDuration()
+  }
+
+  val player = ExoPlayer.Builder(context,
+    DefaultRenderersFactory(context))
+    /*.setLoadControl(DefaultLoadControl.Builder()
+      .setPrioritizeTimeOverSizeThresholds(false) // Could probably save some megabytes in memory in case it will be needed
+      .createDefaultLoadControl())*/
+    .setSeekBackIncrementMs(10_000)
+    .setSeekForwardIncrementMs(10_000)
+    .build()
+    .apply {
+    // Repeat the same track endlessly
+    repeatMode = 1
+    currentVolume = volume
+    if (!soundEnabled) {
+      volume = 0f
+    }
+    setAudioAttributes(
+      AudioAttributes.Builder()
+        .setContentType(CONTENT_TYPE_MUSIC)
+        .setUsage(USAGE_MEDIA)
+        .build(),
+      true // disallow to play multiple instances simultaneously
+    )
+  }
+
+  private val listener: MutableState<((position: Long?, state: TrackState) -> Unit)?> = mutableStateOf(null)
+  private var progressJob: Job? = null
+
+  enum class TrackState {
+    PLAYING, PAUSED, STOPPED
+  }
+
+  private fun start(seek: Long? = null, onProgressUpdate: (position: Long?, state: TrackState) -> Unit): Boolean {
+    val filepath = getAppFilePath(SimplexApp.context, uri)
+    if (filepath == null || !File(filepath).exists()) {
+      Log.e(TAG, "No such file: $uri")
+      brokenVideo.value = true
+      return false
+    }
+
+    if (soundEnabled.value)  {
+      RecorderNative.stopRecording?.invoke()
+    }
+    AudioPlayer.stop()
+    stopAll()
+    if (listener.value == null) {
+      runCatching {
+        val dataSourceFactory = DefaultDataSource.Factory(SimplexApp.context, DefaultHttpDataSource.Factory())
+        val source = ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(uri))
+        player.setMediaSource(source, seek ?: 0L)
+      }.onFailure {
+        Log.e(TAG, it.stackTraceToString())
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.unknown_error), it.message)
+        brokenVideo.value = true
+        return false
+      }
+    }
+    if (player.playbackState == PlaybackState.STATE_NONE || player.playbackState == PlaybackState.STATE_STOPPED) {
+      runCatching { player.prepare() }.onFailure {
+        // Can happen when video file is broken
+        Log.e(TAG, it.stackTraceToString())
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.unknown_error), it.message)
+        brokenVideo.value = true
+        return false
+      }
+    }
+    if (seek != null) player.seekTo(seek)
+    player.play()
+    listener.value = onProgressUpdate
+    // Player can only be accessed in one specific thread
+    progressJob = CoroutineScope(Dispatchers.Main).launch {
+      onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+      while (isActive && player.playbackState != Player.STATE_IDLE && player.playWhenReady) {
+        // Even when current position is equal to duration, the player has isPlaying == true for some time,
+        // so help to make the playback stopped in UI immediately
+        if (player.currentPosition == player.duration) {
+          onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+          break
+        }
+        delay(50)
+        onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+      }
+      /*
+      * Since coroutine is still NOT canceled, means player ended (no stop/no pause). But in some cases
+      * the player can show position != duration even if they actually equal.
+      * Let's say to a listener that the position == duration in case of coroutine finished without cancel
+      * */
+      if (isActive) {
+        onProgressUpdate(player.duration, TrackState.PAUSED)
+      }
+      onProgressUpdate(null, TrackState.PAUSED)
+    }
+    player.addListener(object: Player.Listener{
+      override fun onIsPlayingChanged(isPlaying: Boolean) {
+        super.onIsPlayingChanged(isPlaying)
+        // Produce non-ideal transition from stopped to playing state while showing preview image in ChatView
+//        videoPlaying.value = isPlaying
+      }
+    })
+
+    return true
+  }
+
+  fun stop() {
+    player.stop()
+    stopListener()
+  }
+
+  private fun stopListener() {
+    val afterCoroutineCancel: CompletionHandler = {
+      // Notify prev video listener about stop
+      listener.value?.invoke(null, TrackState.STOPPED)
+    }
+    /** Preventing race by calling a code AFTER coroutine ends, so [TrackState] will be:
+     * [TrackState.PLAYING] -> [TrackState.PAUSED] -> [TrackState.STOPPED] (in this order)
+     * */
+    if (progressJob != null) {
+      progressJob?.invokeOnCompletion(afterCoroutineCancel)
+    } else {
+      afterCoroutineCancel(null)
+    }
+    progressJob?.cancel()
+    progressJob = null
+  }
+
+  fun play(resetOnEnd: Boolean) {
+    if (progress.value == duration.value) {
+      progress.value = 0
+    }
+    videoPlaying.value = start(progress.value) { pro, _ ->
+      if (pro != null) {
+        progress.value = pro
+      }
+      if (pro == null || pro == duration.value) {
+        videoPlaying.value = false
+        if (pro == duration.value) {
+          progress.value = if (resetOnEnd) 0 else duration.value
+        }/* else if (state == TrackState.STOPPED) {
+          progress.value = 0 //
+        }*/
+      }
+    }
+  }
+
+  fun enableSound(enable: Boolean): Boolean {
+    if (soundEnabled.value == enable) return false
+    soundEnabled.value = enable
+    player.volume = if (enable) currentVolume else 0f
+    return true
+  }
+
+  fun release(remove: Boolean) {
+    player.release()
+    if (remove) {
+      players.remove(uri to gallery)
+    }
+  }
+
+  private fun setPreviewAndDuration() {
+    // It freezes main thread, doing it in IO thread
+    CoroutineScope(Dispatchers.IO).launch {
+      val previewAndDuration = previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(uri) }
+      withContext(Dispatchers.Main) {
+        preview.value = previewAndDuration.preview ?: defaultPreview
+        duration.value = (previewAndDuration.duration ?: 0)
+      }
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt

@@ -36,7 +36,7 @@ fun HowItWorks(user: User?, onboardingStage: MutableState<OnboardingStage?>? = n
       val uriHandler = LocalUriHandler.current
       Text(
         annotatedStringResource(R.string.read_more_in_github_with_link),
-        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat#readme") },
+        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat#readme") },
         lineHeight = 22.sp
       )
     } else {

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt

@@ -35,7 +35,7 @@ fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
       Icon(
         Icons.Outlined.OpenInNew, stringResource(titleId), tint = MaterialTheme.colors.primary,
         modifier = Modifier
-          .clickable { uriHandler.openUri(link) }
+          .clickable { uriHandler.openUriCatching(link) }
       )
     }
 
@@ -270,8 +270,45 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
       )
     )
-  )
+  ),
+  VersionDescription(
+    version = "v4.6",
+    features = listOf(
+      FeatureDescription(
+        icon = Icons.Outlined.Lock,
+        titleId = R.string.v4_6_hidden_chat_profiles,
+        descrId = R.string.v4_6_hidden_chat_profiles_descr
+      ),
+      FeatureDescription(
+        icon = Icons.Outlined.Flag,
+        titleId = R.string.v4_6_group_moderation,
+        descrId = R.string.v4_6_group_moderation_descr
+      ),
+      FeatureDescription(
+        icon = Icons.Outlined.MapsUgc,
+        titleId = R.string.v4_6_group_welcome_message,
+        descrId = R.string.v4_6_group_welcome_message_descr
+      ),
+      FeatureDescription(
+        icon = Icons.Outlined.Call,
+        titleId = R.string.v4_6_audio_video_calls,
+        descrId = R.string.v4_6_audio_video_calls_descr
+      ),
+      FeatureDescription(
+        icon = Icons.Outlined.Battery3Bar,
+        titleId = R.string.v4_6_reduced_battery_usage,
+        descrId = R.string.v4_6_reduced_battery_usage_descr
+      ),
+      FeatureDescription(
+        icon = Icons.Outlined.Translate,
+        titleId = R.string.v4_6_chinese_spanish_interface,
+        descrId = R.string.v4_6_chinese_spanish_interface_descr,
+        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
+      )
+    )
+  ),
 )
+
 private val lastVersion = versionDescriptions.last().version
 
 fun setLastVersionDefault(m: ChatModel) {

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt

@@ -2,13 +2,20 @@ package chat.simplex.app.views.usersettings
 
 import SectionCustomFooter
 import SectionDivider
+import SectionItemView
 import SectionItemViewSpaceBetween
+import SectionItemWithValue
 import SectionSpacer
 import SectionView
+import android.app.Activity
 import android.content.ComponentName
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
@@ -17,6 +24,7 @@ import androidx.compose.material.MaterialTheme.colors
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Circle
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
@@ -30,9 +38,13 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import chat.simplex.app.*
 import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.SharedPreference
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import com.godaddy.android.colorpicker.*
+import kotlinx.coroutines.delay
+import java.util.*
 
 enum class AppIcon(val resId: Int) {
   DEFAULT(R.mipmap.icon),
@@ -40,7 +52,7 @@ enum class AppIcon(val resId: Int) {
 }
 
 @Composable
-fun AppearanceView() {
+fun AppearanceView(m: ChatModel) {
   val appIcon = remember { mutableStateOf(findEnabledIcon()) }
 
   fun setAppIcon(newIcon: AppIcon) {
@@ -62,6 +74,7 @@ fun AppearanceView() {
 
   AppearanceLayout(
     appIcon,
+    m.controller.appPrefs.appLanguage,
     changeIcon = ::setAppIcon,
     editPrimaryColor = { primary ->
       ModalManager.shared.showModalCloseable { close ->
@@ -73,6 +86,7 @@ fun AppearanceView() {
 
 @Composable fun AppearanceLayout(
   icon: MutableState<AppIcon>,
+  languagePref: SharedPreference<String?>,
   changeIcon: (AppIcon) -> Unit,
   editPrimaryColor: (Color) -> Unit,
 ) {
@@ -81,6 +95,37 @@ fun AppearanceView() {
     horizontalAlignment = Alignment.Start,
   ) {
     AppBarTitle(stringResource(R.string.appearance_settings))
+    SectionView(stringResource(R.string.settings_section_title_language), padding = PaddingValues()) {
+      val context = LocalContext.current
+//      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+//        SectionItemWithValue(
+//          generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
+//          remember { mutableStateOf("system") },
+//          listOf(ValueTitleDesc("system", generalGetString(R.string.change_verb), "")),
+//          onSelected = { openSystemLangPicker(context as? Activity ?: return@SectionItemWithValue) }
+//        )
+//      } else {
+        val state = rememberSaveable { mutableStateOf(languagePref.get() ?: "system") }
+        SectionItemView {
+          LangSelector(state) {
+            state.value = it
+            withApi {
+              delay(200)
+              val activity = context as? Activity
+              if (activity != null) {
+                if (it == "system") {
+                  saveAppLocale(languagePref, activity)
+                } else {
+                  saveAppLocale(languagePref, activity, it)
+                }
+              }
+            }
+          }
+        }
+//      }
+    }
+    SectionSpacer()
+
     SectionView(stringResource(R.string.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
       LazyRow {
         items(AppIcon.values().size, { index -> AppIcon.values()[index] }) { index ->
@@ -179,6 +224,32 @@ fun ColorPicker(initialColor: Color, onColorChanged: (Color) -> Unit) {
   )
 }
 
+@Composable
+private fun LangSelector(state: State<String>, onSelected: (String) -> Unit) {
+  // Should be the same as in app/build.gradle's `android.defaultConfig.resConfigs`
+  val supportedLanguages = mapOf(
+    "system" to generalGetString(R.string.language_system),
+    "en" to "English",
+    "cs" to "Čeština",
+    "de" to "Deutsch",
+    "es" to "Español",
+    "fr" to "Français",
+    "it" to "Italiano",
+    "nl" to "Nederlands",
+    "ru" to "Русский",
+    "zh-CN" to "简体中文"
+  )
+  val values by remember { mutableStateOf(supportedLanguages.map { it.key to it.value }) }
+  ExposedDropDownSettingRow(
+    generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
+    values,
+    state,
+    icon = null,
+    enabled = remember { mutableStateOf(true) },
+    onSelected = onSelected
+  )
+}
+
 @Composable
 private fun ThemeSelector(state: State<DefaultTheme>, onSelected: (DefaultTheme) -> Unit) {
   val darkTheme = isSystemInDarkTheme()
@@ -193,6 +264,9 @@ private fun ThemeSelector(state: State<DefaultTheme>, onSelected: (DefaultTheme)
   )
 }
 
+//private fun openSystemLangPicker(activity: Activity) {
+//  activity.startActivity(Intent(Settings.ACTION_APP_LOCALE_SETTINGS, Uri.parse("package:" + SimplexApp.context.packageName)))
+//}
 
 private fun findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
   SimplexApp.context.packageManager.getComponentEnabledSetting(
@@ -206,6 +280,7 @@ fun PreviewAppearanceSettings() {
   SimpleXTheme {
     AppearanceLayout(
       icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
+      languagePref = SharedPreference({ null }, {}),
       changeIcon = {},
       editPrimaryColor = {},
     )

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt

@@ -2,6 +2,7 @@ package chat.simplex.app.views.usersettings
 
 import SectionDivider
 import SectionItemView
+import SectionTextFooter
 import SectionView
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -43,16 +44,23 @@ fun CallSettingsLayout(
     AppBarTitle(stringResource(R.string.your_calls))
     val lockCallState = remember { mutableStateOf(callOnLockScreen.get()) }
     SectionView(stringResource(R.string.settings_section_title_settings)) {
-      SectionItemView() {
-        SharedPreferenceToggle(stringResource(R.string.connect_calls_via_relay), webrtcPolicyRelay)
-      }
+      SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) }
       SectionDivider()
 
       val enabled = remember { mutableStateOf(true) }
       SectionItemView { LockscreenOpts(lockCallState, enabled, onSelected = { callOnLockScreen.set(it); lockCallState.value = it }) }
       SectionDivider()
-      SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) }
+      SectionItemView() {
+        SharedPreferenceToggle(stringResource(R.string.always_use_relay), webrtcPolicyRelay)
+      }
     }
+    SectionTextFooter(
+      if (remember { webrtcPolicyRelay.state }.value) {
+        generalGetString(R.string.relay_server_protects_ip)
+      } else {
+        generalGetString(R.string.relay_server_if_necessary)
+      }
+    )
   }
 }
 

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt

@@ -0,0 +1,59 @@
+package chat.simplex.app.views.usersettings
+
+import SectionDivider
+import SectionSpacer
+import SectionTextFooter
+import SectionView
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.views.TerminalView
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun DeveloperView(
+  m: ChatModel,
+  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
+  withAuth: (block: () -> Unit) -> Unit
+) {
+  Column(Modifier.fillMaxWidth()) {
+    val uriHandler = LocalUriHandler.current
+    AppBarTitle(stringResource(R.string.settings_developer_tools))
+    val developerTools = m.controller.appPrefs.developerTools
+    val devTools = remember { mutableStateOf(developerTools.get()) }
+    SectionView() {
+      InstallTerminalAppItem(uriHandler)
+      SectionDivider()
+      ChatConsoleItem { withAuth(showCustomModal { it, close -> TerminalView(it, close) }) }
+      SectionDivider()
+      SettingsPreferenceItem(Icons.Outlined.DriveFolderUpload, stringResource(R.string.confirm_database_upgrades), m.controller.appPrefs.confirmDBUpgrades)
+      SectionDivider()
+      SettingsPreferenceItem(Icons.Outlined.Code, stringResource(R.string.show_developer_options), developerTools, devTools)
+    }
+    SectionTextFooter(
+      generalGetString(if (devTools.value) R.string.show_dev_options else R.string.hide_dev_options) + " " +
+        generalGetString(R.string.developer_options)
+    )
+    SectionSpacer()
+
+    val xftpSendEnabled = m.controller.appPrefs.xftpSendEnabled
+    val xftpEnabled = remember { mutableStateOf(xftpSendEnabled.get()) }
+    SectionView(generalGetString(R.string.settings_section_title_experimenta)) {
+      SettingsPreferenceItem(Icons.Outlined.UploadFile, stringResource(R.string.settings_send_files_via_xftp), xftpSendEnabled, xftpEnabled) {
+        withApi { m.controller.apiSetXFTPConfig(m.controller.getXFTPCfg()) }
+      }
+    }
+    if (xftpEnabled.value) {
+      SectionTextFooter(generalGetString(R.string.xftp_requires_v461))
+    }
+  }
+}
+

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt

@@ -5,18 +5,18 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Videocam
+import androidx.compose.material.icons.outlined.UploadFile
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
+import chat.simplex.app.views.helpers.withApi
 
 @Composable
-fun ExperimentalFeaturesView(chatModel: ChatModel, enableCalls: MutableState<Boolean>) {
+fun ExperimentalFeaturesView(chatModel: ChatModel) {
   Column(
     Modifier.fillMaxWidth(),
     horizontalAlignment = Alignment.Start
@@ -27,7 +27,11 @@ fun ExperimentalFeaturesView(chatModel: ChatModel, enableCalls: MutableState<Boo
       modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
     )
     SectionView("") {
-      SettingsPreferenceItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), chatModel.controller.appPrefs.experimentalCalls, enableCalls)
+      SettingsPreferenceItem(Icons.Outlined.UploadFile, stringResource(R.string.settings_send_files_via_xftp), chatModel.controller.appPrefs.xftpSendEnabled) {
+        withApi {
+          chatModel.controller.apiSetXFTPConfig(chatModel.controller.getXFTPCfg())
+        }
+      }
     }
   }
-}
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/HiddenProfileView.kt

@@ -0,0 +1,90 @@
+package chat.simplex.app.views.usersettings
+
+import SectionDivider
+import SectionItemView
+import SectionItemViewSpaceBetween
+import SectionSpacer
+import SectionTextFooter
+import SectionView
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.User
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chatlist.UserProfileRow
+import chat.simplex.app.views.database.PassphraseField
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun HiddenProfileView(
+  m: ChatModel,
+  user: User,
+  close: () -> Unit,
+) {
+  HiddenProfileLayout(
+    user,
+    saveProfilePassword = { hidePassword ->
+      withBGApi {
+        try {
+          val u = m.controller.apiHideUser(user.userId, hidePassword)
+          m.updateUser(u)
+          close()
+        } catch (e: Exception) {
+          AlertManager.shared.showAlertMsg(
+            title = generalGetString(R.string.error_saving_user_password),
+            text = e.stackTraceToString()
+          )
+        }
+      }
+    }
+  )
+}
+
+@Composable
+private fun HiddenProfileLayout(
+  user: User,
+  saveProfilePassword: (String) -> Unit
+) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState())
+      .padding(bottom = DEFAULT_BOTTOM_PADDING),
+  ) {
+    AppBarTitle(stringResource(R.string.hide_profile))
+    SectionView(padding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
+      UserProfileRow(user)
+    }
+    SectionSpacer()
+
+    val hidePassword = rememberSaveable { mutableStateOf("") }
+    val confirmHidePassword = rememberSaveable { mutableStateOf("") }
+    val passwordValid by remember { derivedStateOf { hidePassword.value == hidePassword.value.trim() } }
+    val confirmValid by remember { derivedStateOf { confirmHidePassword.value == "" || hidePassword.value == confirmHidePassword.value } }
+    val saveDisabled by remember { derivedStateOf { hidePassword.value == "" || !passwordValid || confirmHidePassword.value == "" || !confirmValid } }
+    SectionView(stringResource(R.string.hidden_profile_password).uppercase()) {
+      SectionItemView {
+        PassphraseField(hidePassword, generalGetString(R.string.password_to_show), isValid = { passwordValid }, showStrength = true)
+      }
+      SectionDivider()
+      SectionItemView {
+        PassphraseField(confirmHidePassword, stringResource(R.string.confirm_password), isValid = { confirmValid }, dependsOn = hidePassword)
+      }
+      SectionDivider()
+      SectionItemViewSpaceBetween({ saveProfilePassword(hidePassword.value) }, disabled = saveDisabled, minHeight = TextFieldDefaults.MinHeight) {
+        Text(generalGetString(R.string.save_profile_password), color = if (saveDisabled) HighOrLowlight else MaterialTheme.colors.primary)
+      }
+    }
+    SectionTextFooter(stringResource(R.string.to_reveal_profile_enter_password))
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt

@@ -25,6 +25,7 @@ fun NetworkAndServersView(
   chatModel: ChatModel,
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
 ) {
   // It's not a state, just a one-time value. Shouldn't be used in any state-related situations
   val netCfg = remember { chatModel.controller.getNetCfg() }
@@ -44,6 +45,7 @@ fun NetworkAndServersView(
     sessionMode = sessionMode,
     showModal = showModal,
     showSettingsModal = showSettingsModal,
+    showCustomModal = showCustomModal,
     toggleSocksProxy = { enable ->
       if (enable) {
         AlertManager.shared.showAlertMsg(
@@ -138,6 +140,7 @@ fun NetworkAndServersView(
   sessionMode: MutableState<TransportSessionMode>,
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
   toggleSocksProxy: (Boolean) -> Unit,
   useOnion: (OnionHosts) -> Unit,
   updateSessionMode: (TransportSessionMode) -> Unit,
@@ -149,7 +152,7 @@ fun NetworkAndServersView(
   ) {
     AppBarTitle(stringResource(R.string.network_and_servers))
     SectionView(generalGetString(R.string.settings_section_title_messages)) {
-      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showSettingsModal { SMPServersView(it) })
+      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showCustomModal { m, close -> SMPServersView(m, close) })
       SectionDivider()
       SectionItemView {
         UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
@@ -297,6 +300,7 @@ fun PreviewNetworkAndServersLayout() {
       networkUseSocksProxy = remember { mutableStateOf(true) },
       showModal = { {} },
       showSettingsModal = { {} },
+      showCustomModal = { {} },
       toggleSocksProxy = {},
       onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
       sessionMode = remember { mutableStateOf(TransportSessionMode.User) },

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt

@@ -198,7 +198,7 @@ private fun howToButton() {
   val uriHandler = LocalUriHandler.current
   Row(
     verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/WEBRTC.md#configure-mobile-apps") }
+    modifier = Modifier.clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/WEBRTC.md#configure-mobile-apps") }
   ) {
     Text(stringResource(R.string.how_to), color = MaterialTheme.colors.primary)
     Icon(

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SMPServersView.kt

@@ -27,7 +27,7 @@ import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.launch
 
 @Composable
-fun SMPServersView(m: ChatModel) {
+fun SMPServersView(m: ChatModel, close: () -> Unit) {
   var servers by remember {
     mutableStateOf(m.userSMPServersUnsaved.value ?: m.userSMPServers.value ?: emptyList())
   }
@@ -72,83 +72,90 @@ fun SMPServersView(m: ChatModel) {
     }
   }
   val scope = rememberCoroutineScope()
-
-  SMPServersLayout(
-    testing = testing.value,
-    servers = servers,
-    serversUnchanged = serversUnchanged.value,
-    saveDisabled = saveDisabled.value,
-    allServersDisabled = allServersDisabled.value,
-    m.currentUser.value,
-    addServer = {
-      AlertManager.shared.showAlertDialogButtonsColumn(
-        title = generalGetString(R.string.smp_servers_add),
-        buttons = {
-          Column {
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              servers = servers + ServerCfg.empty
-              // No saving until something will be changed on the next screen to prevent blank servers on the list
-              showServer(servers.last())
-            }) {
-              Text(stringResource(R.string.smp_servers_enter_manually))
-            }
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              ModalManager.shared.showModalCloseable { close ->
-                ScanSMPServer {
-                  close()
-                  servers = servers + it
-                  m.userSMPServersUnsaved.value = servers
+  ModalView(
+    close = {
+      if (saveDisabled.value) close()
+      else showUnsavedChangesAlert({ saveSMPServers(servers, m, close) }, close)
+    },
+    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+  ) {
+    SMPServersLayout(
+      testing = testing.value,
+      servers = servers,
+      serversUnchanged = serversUnchanged.value,
+      saveDisabled = saveDisabled.value,
+      allServersDisabled = allServersDisabled.value,
+      m.currentUser.value,
+      addServer = {
+        AlertManager.shared.showAlertDialogButtonsColumn(
+          title = generalGetString(R.string.smp_servers_add),
+          buttons = {
+            Column {
+              SectionItemView({
+                AlertManager.shared.hideAlert()
+                servers = servers + ServerCfg.empty
+                // No saving until something will be changed on the next screen to prevent blank servers on the list
+                showServer(servers.last())
+              }) {
+                Text(stringResource(R.string.smp_servers_enter_manually))
+              }
+              SectionItemView({
+                AlertManager.shared.hideAlert()
+                ModalManager.shared.showModalCloseable { close ->
+                  ScanSMPServer {
+                    close()
+                    servers = servers + it
+                    m.userSMPServersUnsaved.value = servers
+                  }
+                }
+              }
+              ) {
+                Text(stringResource(R.string.smp_servers_scan_qr))
+              }
+              val hasAllPresets = hasAllPresets(servers, m)
+              if (!hasAllPresets) {
+                SectionItemView({
+                  AlertManager.shared.hideAlert()
+                  servers = (servers + addAllPresets(servers, m)).sortedByDescending { it.preset }
+                }) {
+                  Text(stringResource(R.string.smp_servers_preset_add), color = MaterialTheme.colors.onBackground)
                 }
               }
             }
-            ) {
-              Text(stringResource(R.string.smp_servers_scan_qr))
-            }
-            val hasAllPresets = hasAllPresets(servers, m)
-            if (!hasAllPresets) {
-              SectionItemView({
-                AlertManager.shared.hideAlert()
-                servers = (servers + addAllPresets(servers, m)).sortedByDescending { it.preset }
-              }) {
-                Text(stringResource(R.string.smp_servers_preset_add), color = MaterialTheme.colors.onBackground)
-              }
-            }
+          }
+        )
+      },
+      testServers = {
+        scope.launch {
+          testServers(testing, servers, m) {
+            servers = it
+            m.userSMPServersUnsaved.value = servers
           }
         }
-      )
-    },
-    testServers = {
-      scope.launch {
-        testServers(testing, servers, m) {
-          servers = it
-          m.userSMPServersUnsaved.value = servers
-        }
-      }
-    },
-    resetServers = {
-      servers = m.userSMPServers.value ?: emptyList()
-      m.userSMPServersUnsaved.value = null
-    },
-    saveSMPServers = {
-      saveSMPServers(servers, m)
-    },
-    showServer = ::showServer,
-  )
+      },
+      resetServers = {
+        servers = m.userSMPServers.value ?: emptyList()
+        m.userSMPServersUnsaved.value = null
+      },
+      saveSMPServers = {
+        saveSMPServers(servers, m)
+      },
+      showServer = ::showServer,
+    )
 
-  if (testing.value) {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(horizontal = 2.dp)
-          .size(30.dp),
-        color = HighOrLowlight,
-        strokeWidth = 2.5.dp
-      )
+    if (testing.value) {
+      Box(
+        Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+      ) {
+        CircularProgressIndicator(
+          Modifier
+            .padding(horizontal = 2.dp)
+            .size(30.dp),
+          color = HighOrLowlight,
+          strokeWidth = 2.5.dp
+        )
+      }
     }
   }
 }
@@ -247,7 +254,7 @@ private fun HowToButton() {
   SettingsActionItem(
     Icons.Outlined.OpenInNew,
     stringResource(R.string.how_to_use_your_servers),
-    { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md") },
+    { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md") },
     textColor = MaterialTheme.colors.primary,
     iconColor = MaterialTheme.colors.primary
   )
@@ -324,12 +331,22 @@ private suspend fun runServersTest(servers: List<ServerCfg>, m: ChatModel, onUpd
   return fs
 }
 
-private fun saveSMPServers(servers: List<ServerCfg>, m: ChatModel) {
+private fun saveSMPServers(servers: List<ServerCfg>, m: ChatModel, afterSave: () -> Unit = {}) {
   withApi {
     if (m.controller.setUserSMPServers(servers)) {
       m.userSMPServers.value = servers
       m.userSMPServersUnsaved.value = null
     }
+    afterSave()
   }
 }
 
+private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
+  AlertManager.shared.showAlertDialogStacked(
+    title = generalGetString(R.string.smp_save_servers_question),
+    confirmText = generalGetString(R.string.save_verb),
+    dismissText = generalGetString(R.string.exit_without_saving),
+    onConfirm = save,
+    onDismiss = revert,
+  )
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt

@@ -6,6 +6,7 @@ import SectionSpacer
 import SectionView
 import android.content.Context
 import android.content.res.Configuration
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -13,6 +14,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -20,7 +22,9 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
@@ -53,11 +57,22 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
       chatModel.chatDbEncrypted.value == true,
       chatModel.incognito,
       chatModel.controller.appPrefs.incognito,
-      developerTools = chatModel.controller.appPrefs.developerTools,
       user.displayName,
       setPerformLA = setPerformLA,
       showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
       showSettingsModal = { modalView -> { ModalManager.shared.showModal(true) { modalView(chatModel) } } },
+      showSettingsModalWithSearch = { modalView ->
+        ModalManager.shared.showCustomModal { close ->
+          val search = rememberSaveable { mutableStateOf("") }
+          ModalView(
+            { close() },
+            if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight,
+            endButtons = {
+              SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), alwaysVisible = true) { search.value = it }
+            },
+            content = { modalView(chatModel, search) })
+        }
+      },
       showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
       showVersion = {
         withApi {
@@ -110,11 +125,11 @@ fun SettingsLayout(
   encrypted: Boolean,
   incognito: MutableState<Boolean>,
   incognitoPref: SharedPreference<Boolean>,
-  developerTools: SharedPreference<Boolean>,
   userDisplayName: String,
   setPerformLA: (Boolean) -> Unit,
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showSettingsModalWithSearch: (@Composable (ChatModel, MutableState<String>) -> Unit) -> Unit,
   showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
   showVersion: () -> Unit,
   withAuth: (block: () -> Unit) -> Unit
@@ -141,7 +156,8 @@ fun SettingsLayout(
           ProfilePreview(profile, stopped = stopped)
         }
         SectionDivider()
-        SettingsActionItem(Icons.Outlined.ManageAccounts, stringResource(R.string.your_chat_profiles), { withAuth { showSettingsModal { UserProfilesView(it) }() } }, disabled = stopped)
+        val profileHidden = rememberSaveable { mutableStateOf(false) }
+        SettingsActionItem(Icons.Outlined.ManageAccounts, stringResource(R.string.your_chat_profiles), { withAuth { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped)
         SectionDivider()
         SettingsIncognitoActionItem(incognitoPref, incognito, stopped) { showModal { IncognitoView() }() }
         SectionDivider()
@@ -154,13 +170,13 @@ fun SettingsLayout(
       SectionView(stringResource(R.string.settings_section_title_settings)) {
         SettingsActionItem(Icons.Outlined.Bolt, stringResource(R.string.notifications), showSettingsModal { NotificationsSettingsView(it) }, disabled = stopped)
         SectionDivider()
-        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, disabled = stopped)
+        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal, showCustomModal) }, disabled = stopped)
         SectionDivider()
         SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it, showModal) }, disabled = stopped)
         SectionDivider()
         SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) }, disabled = stopped)
         SectionDivider()
-        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showSettingsModal { AppearanceView() }, disabled = stopped)
+        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showSettingsModal { AppearanceView(it) }, disabled = stopped)
         SectionDivider()
         DatabaseItem(encrypted, showSettingsModal { DatabaseView(it, showSettingsModal) }, stopped)
       }
@@ -173,9 +189,9 @@ fun SettingsLayout(
         SectionDivider()
         SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
         SectionDivider()
-        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
+        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUriCatching(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
         SectionDivider()
-        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUri("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
+        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUriCatching("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
       }
       SectionSpacer()
 
@@ -189,16 +205,9 @@ fun SettingsLayout(
       SectionSpacer()
 
       SectionView(stringResource(R.string.settings_section_title_develop)) {
-        val devTools = remember { mutableStateOf(developerTools.get()) }
-        SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools, devTools)
+        SettingsActionItem(Icons.Outlined.Code, stringResource(R.string.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) })
         SectionDivider()
-        if (devTools.value) {
-          ChatConsoleItem { withAuth(showCustomModal { it, close -> TerminalView(it, close) }) }
-          SectionDivider()
-          InstallTerminalAppItem(uriHandler)
-          SectionDivider()
-        }
-//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
+//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it) })
 //        SectionDivider()
         AppVersionItem(showVersion)
       }
@@ -313,7 +322,7 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
 }
 
 @Composable private fun ContributeItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat#contribute") }) {
+  SectionItemView({ uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat#contribute") }) {
     Icon(
       Icons.Outlined.Keyboard,
       contentDescription = "GitHub",
@@ -326,8 +335,8 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
 
 @Composable private fun RateAppItem(uriHandler: UriHandler) {
   SectionItemView({
-    runCatching { uriHandler.openUri("market://details?id=chat.simplex.app") }
-      .onFailure { uriHandler.openUri("https://play.google.com/store/apps/details?id=chat.simplex.app") }
+    runCatching { uriHandler.openUriCatching("market://details?id=chat.simplex.app") }
+      .onFailure { uriHandler.openUriCatching("https://play.google.com/store/apps/details?id=chat.simplex.app") }
   }
   ) {
     Icon(
@@ -341,7 +350,7 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
 }
 
 @Composable private fun StarOnGithubItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
+  SectionItemView({ uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat") }) {
     Icon(
       painter = painterResource(id = R.drawable.ic_github),
       contentDescription = "GitHub",
@@ -352,7 +361,7 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
   }
 }
 
-@Composable private fun ChatConsoleItem(showTerminal: () -> Unit) {
+@Composable fun ChatConsoleItem(showTerminal: () -> Unit) {
   SectionItemView(showTerminal) {
     Icon(
       painter = painterResource(id = R.drawable.ic_outline_terminal),
@@ -364,8 +373,8 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
   }
 }
 
-@Composable private fun InstallTerminalAppItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
+@Composable fun InstallTerminalAppItem(uriHandler: UriHandler) {
+  SectionItemView({ uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat") }) {
     Icon(
       painter = painterResource(id = R.drawable.ic_github),
       contentDescription = "GitHub",
@@ -377,9 +386,11 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
 }
 
 @Composable private fun AppVersionItem(showVersion: () -> Unit) {
-  SectionItemView(showVersion) {
-    Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-  }
+  SectionItemView(showVersion) { AppVersionText() }
+}
+
+@Composable fun AppVersionText() {
+  Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
 }
 
 @Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondary, stopped: Boolean = false) {
@@ -526,11 +537,11 @@ fun PreviewSettingsLayout() {
       encrypted = false,
       incognito = remember { mutableStateOf(false) },
       incognitoPref = SharedPreference({ false }, {}),
-      developerTools = SharedPreference({ false }, {}),
       userDisplayName = "Alice",
       setPerformLA = {},
       showModal = { {} },
       showSettingsModal = { {} },
+      showSettingsModalWithSearch = { },
       showCustomModal = { {} },
       showVersion = {},
       withAuth = {},

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt

@@ -2,14 +2,18 @@ package chat.simplex.app.views.usersettings
 
 import SectionDivider
 import SectionItemView
+import SectionItemViewSpaceBetween
+import SectionSpacer
 import SectionTextFooter
 import SectionView
+import androidx.annotation.StringRes
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -17,18 +21,30 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
+import chat.simplex.app.chatPasswordHash
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.chatlist.UserProfilePickerItem
+import chat.simplex.app.views.chatlist.UserProfileRow
+import chat.simplex.app.views.database.PassphraseField
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.onboarding.CreateProfile
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @Composable
-fun UserProfilesView(m: ChatModel) {
+fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden: MutableState<Boolean>) {
+  val searchTextOrPassword = rememberSaveable { search }
   val users by remember { derivedStateOf { m.users.map { it.user } } }
+  val filteredUsers by remember { derivedStateOf { filteredUsers(m, searchTextOrPassword.value) } }
   UserProfilesView(
     users = users,
+    filteredUsers = filteredUsers,
+    profileHidden = profileHidden,
+    searchTextOrPassword = searchTextOrPassword,
+    showHiddenProfilesNotice = m.controller.appPrefs.showHiddenProfilesNotice,
+    visibleUsersCount = visibleUsersCount(m),
     addUser = {
       ModalManager.shared.showModalCloseable { close ->
         CreateProfile(m, close)
@@ -36,38 +52,85 @@ fun UserProfilesView(m: ChatModel) {
     },
     activateUser = { user ->
       withBGApi {
-        m.controller.changeActiveUser(user.userId)
+        m.controller.changeActiveUser(user.userId, userViewPassword(user, searchTextOrPassword.value.trim()))
       }
     },
     removeUser = { user ->
-      val text = buildAnnotatedString {
-        append(generalGetString(R.string.users_delete_all_chats_deleted) + "\n\n" + generalGetString(R.string.users_delete_profile_for) + " ")
-        withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-          append(user.displayName)
+      if (m.users.size > 1 && (user.hidden || visibleUsersCount(m) > 1)) {
+        val text = buildAnnotatedString {
+          append(generalGetString(R.string.users_delete_all_chats_deleted) + "\n\n" + generalGetString(R.string.users_delete_profile_for) + " ")
+          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
+            append(user.displayName)
+          }
+          append(":")
         }
-        append(":")
+        AlertManager.shared.showAlertDialogButtonsColumn(
+          title = generalGetString(R.string.users_delete_question),
+          text = text,
+          buttons = {
+            Column {
+              SectionItemView({
+                AlertManager.shared.hideAlert()
+                removeUser(m, user, users, true, searchTextOrPassword.value.trim())
+              }) {
+                Text(stringResource(R.string.users_delete_with_connections), color = Color.Red)
+              }
+              SectionItemView({
+                AlertManager.shared.hideAlert()
+                removeUser(m, user, users, false, searchTextOrPassword.value.trim())
+              }
+              ) {
+                Text(stringResource(R.string.users_delete_data_only), color = Color.Red)
+              }
+            }
+          }
+        )
+      } else {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.cant_delete_user_profile),
+          text = if (m.users.size > 1) {
+            generalGetString(R.string.should_be_at_least_one_visible_profile)
+          } else {
+            generalGetString(R.string.should_be_at_least_one_profile)
+          }
+        )
       }
-      AlertManager.shared.showAlertDialogButtonsColumn(
-        title = generalGetString(R.string.users_delete_question),
-        text = text,
-        buttons = {
-          Column {
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              removeUser(m, user, users, true)
-            }) {
-              Text(stringResource(R.string.users_delete_with_connections), color = Color.Red)
-            }
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              removeUser(m, user, users, false)
-            }
-            ) {
-              Text(stringResource(R.string.users_delete_data_only), color = Color.Red)
+    },
+    unhideUser = { user ->
+      if (passwordEntryRequired(user, searchTextOrPassword.value)) {
+        ModalManager.shared.showModalCloseable(true) { close ->
+          ProfileActionView(UserProfileAction.UNHIDE, user) { pwd ->
+            withBGApi {
+              setUserPrivacy(m) { m.controller.apiUnhideUser(user.userId, pwd) }
+              close()
             }
           }
         }
-      )
+      } else {
+        withBGApi { setUserPrivacy(m) { m.controller.apiUnhideUser(user.userId, searchTextOrPassword.value.trim()) } }
+      }
+    },
+    muteUser = { user ->
+      withBGApi {
+        setUserPrivacy(m, onSuccess = {
+          if (m.controller.appPrefs.showMuteProfileAlert.get()) showMuteProfileAlert(m.controller.appPrefs.showMuteProfileAlert)
+        }) { m.controller.apiMuteUser(user.userId) }
+      }
+    },
+    unmuteUser = { user ->
+      withBGApi { setUserPrivacy(m) { m.controller.apiUnmuteUser(user.userId) } }
+    },
+    showHiddenProfile = { user ->
+      ModalManager.shared.showModalCloseable(true) { close ->
+        HiddenProfileView(m, user) {
+          profileHidden.value = true
+          withBGApi {
+            delay(10_000)
+            profileHidden.value = false
+          }
+          close()
+        }
+      }
     }
   )
 }
@@ -75,9 +138,18 @@ fun UserProfilesView(m: ChatModel) {
 @Composable
 private fun UserProfilesView(
   users: List<User>,
+  filteredUsers: List<User>,
+  searchTextOrPassword: MutableState<String>,
+  profileHidden: MutableState<Boolean>,
+  visibleUsersCount: Int,
+  showHiddenProfilesNotice: SharedPreference<Boolean>,
   addUser: () -> Unit,
   activateUser: (User) -> Unit,
   removeUser: (User) -> Unit,
+  unhideUser: (User) -> Unit,
+  muteUser: (User) -> Unit,
+  unmuteUser: (User) -> Unit,
+  showHiddenProfile: (User) -> Unit,
 ) {
   Column(
     Modifier
@@ -85,25 +157,59 @@ private fun UserProfilesView(
       .verticalScroll(rememberScrollState())
       .padding(bottom = DEFAULT_PADDING),
   ) {
+    if (profileHidden.value) {
+      SectionView {
+        SettingsActionItem(Icons.Outlined.LockOpen, stringResource(R.string.enter_password_to_show), click = {
+          profileHidden.value = false
+        }
+        )
+      }
+      SectionSpacer()
+    }
     AppBarTitle(stringResource(R.string.your_chat_profiles))
 
     SectionView {
-      for (user in users) {
-        UserView(user, users, activateUser, removeUser)
+      for (user in filteredUsers) {
+        UserView(user, users, visibleUsersCount, activateUser, removeUser, unhideUser, muteUser, unmuteUser, showHiddenProfile)
         SectionDivider()
       }
-      SectionItemView(addUser, minHeight = 68.dp) {
-        Icon(Icons.Outlined.Add, stringResource(R.string.users_add), tint = MaterialTheme.colors.primary)
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.users_add), color = MaterialTheme.colors.primary)
+      if (searchTextOrPassword.value.trim().isEmpty()) {
+        SectionItemView(addUser, minHeight = 68.dp) {
+          Icon(Icons.Outlined.Add, stringResource(R.string.users_add), tint = MaterialTheme.colors.primary)
+          Spacer(Modifier.padding(horizontal = 4.dp))
+          Text(stringResource(R.string.users_add), color = MaterialTheme.colors.primary)
+        }
+      }
+    }
+    SectionTextFooter(stringResource(R.string.tap_to_activate_profile))
+    LaunchedEffect(Unit) {
+      if (showHiddenProfilesNotice.state.value && users.size > 1) {
+        AlertManager.shared.showAlertDialog(
+          title = generalGetString(R.string.make_profile_private),
+          text = generalGetString(R.string.you_can_hide_or_mute_user_profile),
+          confirmText = generalGetString(R.string.ok),
+          dismissText = generalGetString(R.string.dont_show_again),
+          onDismiss = {
+            showHiddenProfilesNotice.set(false)
+          },
+        )
       }
     }
-    SectionTextFooter(stringResource(R.string.your_chat_profiles_stored_locally))
   }
 }
 
 @Composable
-private fun UserView(user: User, users: List<User>, activateUser: (User) -> Unit, removeUser: (User) -> Unit) {
+private fun UserView(
+  user: User,
+  users: List<User>,
+  visibleUsersCount: Int,
+  activateUser: (User) -> Unit,
+  removeUser: (User) -> Unit,
+  unhideUser: (User) -> Unit,
+  muteUser: (User) -> Unit,
+  unmuteUser: (User) -> Unit,
+  showHiddenProfile: (User) -> Unit,
+) {
   var showDropdownMenu by remember { mutableStateOf(false) }
   UserProfilePickerItem(user, onLongClick = { if (users.size > 1) showDropdownMenu = true }) {
     activateUser(user)
@@ -114,28 +220,172 @@ private fun UserView(user: User, users: List<User>, activateUser: (User) -> Unit
       onDismissRequest = { showDropdownMenu = false },
       Modifier.width(220.dp)
     ) {
+      if (user.hidden) {
+        ItemAction(stringResource(R.string.user_unhide), Icons.Outlined.LockOpen, onClick = {
+          showDropdownMenu = false
+          unhideUser(user)
+        })
+      } else {
+        if (visibleUsersCount > 1) {
+          ItemAction(stringResource(R.string.user_hide), Icons.Outlined.Lock, onClick = {
+            showDropdownMenu = false
+            showHiddenProfile(user)
+          })
+        }
+        if (user.showNtfs) {
+          ItemAction(stringResource(R.string.user_mute), Icons.Outlined.NotificationsOff, onClick = {
+            showDropdownMenu = false
+            muteUser(user)
+          })
+        } else {
+          ItemAction(stringResource(R.string.user_unmute), Icons.Outlined.Notifications, onClick = {
+            showDropdownMenu = false
+            unmuteUser(user)
+          })
+        }
+      }
       ItemAction(stringResource(R.string.delete_verb), Icons.Outlined.Delete, color = Color.Red, onClick = {
         removeUser(user)
         showDropdownMenu = false
-      }
-      )
+      })
     }
   }
 }
 
-private fun removeUser(m: ChatModel, user: User, users: List<User>, delSMPQueues: Boolean) {
+enum class UserProfileAction {
+  DELETE,
+  UNHIDE
+}
+
+@Composable
+private fun ProfileActionView(action: UserProfileAction, user: User, doAction: (String) -> Unit) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState())
+      .padding(bottom = DEFAULT_BOTTOM_PADDING),
+  ) {
+    val actionPassword = rememberSaveable { mutableStateOf("") }
+    val passwordValid by remember { derivedStateOf { actionPassword.value == actionPassword.value.trim() } }
+    val actionEnabled by remember { derivedStateOf { actionPassword.value != "" && passwordValid && correctPassword(user, actionPassword.value) } }
+
+    @Composable fun ActionHeader(@StringRes title: Int) {
+      AppBarTitle(stringResource(title))
+      SectionView(padding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
+        UserProfileRow(user)
+      }
+      SectionSpacer()
+    }
+
+    @Composable fun PasswordAndAction(@StringRes label: Int, color: Color = MaterialTheme.colors.primary) {
+      SectionView() {
+        SectionItemView {
+          PassphraseField(actionPassword, generalGetString(R.string.profile_password), isValid = { passwordValid }, showStrength = true)
+        }
+        SectionItemViewSpaceBetween({ doAction(actionPassword.value) }, disabled = !actionEnabled, minHeight = TextFieldDefaults.MinHeight) {
+          Text(generalGetString(label), color = if (actionEnabled) color else HighOrLowlight)
+        }
+      }
+    }
+
+    when (action) {
+      UserProfileAction.DELETE -> {
+        ActionHeader(R.string.delete_profile)
+        PasswordAndAction(R.string.delete_chat_profile, color = Color.Red)
+        if (actionEnabled) {
+          SectionTextFooter(stringResource(R.string.users_delete_all_chats_deleted))
+        }
+      }
+      UserProfileAction.UNHIDE -> {
+        ActionHeader(R.string.unhide_profile)
+        PasswordAndAction(R.string.unhide_chat_profile)
+      }
+    }
+  }
+}
+
+private fun filteredUsers(m: ChatModel, searchTextOrPassword: String): List<User> {
+  val s = searchTextOrPassword.trim()
+  val lower = s.lowercase()
+  return m.users.filter { u ->
+    if ((u.user.activeUser || !u.user.hidden) && (s == "" || u.user.chatViewName.lowercase().contains(lower))) {
+      true
+    } else {
+      correctPassword(u.user, s)
+    }
+  }.map { it.user }
+}
+
+private fun visibleUsersCount(m: ChatModel): Int = m.users.filter { u -> !u.user.hidden }.size
+
+private fun correctPassword(user: User, pwd: String): Boolean {
+  val ph = user.viewPwdHash
+  return ph != null && pwd != "" && chatPasswordHash(pwd, ph.salt) == ph.hash
+}
+
+private fun userViewPassword(user: User, searchTextOrPassword: String): String? =
+  if (user.hidden) searchTextOrPassword.trim() else null
+
+private fun passwordEntryRequired(user: User, searchTextOrPassword: String): Boolean =
+  user.hidden && user.activeUser && !correctPassword(user, searchTextOrPassword.trim())
+
+private fun removeUser(m: ChatModel, user: User, users: List<User>, delSMPQueues: Boolean, searchTextOrPassword: String) {
+  if (passwordEntryRequired(user, searchTextOrPassword)) {
+    ModalManager.shared.showModalCloseable(true) { close ->
+      ProfileActionView(UserProfileAction.DELETE, user) { pwd ->
+        withBGApi {
+          doRemoveUser(m, user, users, delSMPQueues, pwd)
+          close()
+        }
+      }
+    }
+  } else {
+    withBGApi { doRemoveUser(m, user, users, delSMPQueues, userViewPassword(user, searchTextOrPassword.trim())) }
+  }
+}
+
+private suspend fun doRemoveUser(m: ChatModel, user: User, users: List<User>, delSMPQueues: Boolean, viewPwd: String?) {
   if (users.size < 2) return
 
-  withBGApi {
-    try {
-      if (user.activeUser) {
-        val newActive = users.first { !it.activeUser }
-        m.controller.changeActiveUser_(newActive.userId)
+  suspend fun deleteUser(user: User) {
+    m.controller.apiDeleteUser(user.userId, delSMPQueues, viewPwd)
+    m.removeUser(user)
+  }
+  try {
+    if (user.activeUser) {
+      val newActive = users.firstOrNull { u -> !u.activeUser && !u.hidden }
+      if (newActive != null) {
+        m.controller.changeActiveUser_(newActive.userId, null)
+        deleteUser(user.copy(activeUser = false))
       }
-      m.controller.apiDeleteUser(user.userId, delSMPQueues)
-      m.users.removeAll { it.user.userId == user.userId }
-    } catch (e: Exception) {
-      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_user), e.stackTraceToString())
+    } else {
+      deleteUser(user)
     }
+  } catch (e: Exception) {
+    AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_user), e.stackTraceToString())
   }
 }
+
+private suspend fun setUserPrivacy(m: ChatModel, onSuccess: (() -> Unit)? = null, api: suspend () -> User) {
+  try {
+    m.updateUser(api())
+    onSuccess?.invoke()
+  } catch (e: Exception) {
+    AlertManager.shared.showAlertMsg(
+      title = generalGetString(R.string.error_updating_user_privacy),
+      text = e.stackTraceToString()
+    )
+  }
+}
+
+private fun showMuteProfileAlert(showMuteProfileAlert: SharedPreference<Boolean>) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.muted_when_inactive),
+    text = generalGetString(R.string.you_will_still_receive_calls_and_ntfs),
+    confirmText = generalGetString(R.string.ok),
+    dismissText = generalGetString(R.string.dont_show_again),
+    onDismiss = {
+      showMuteProfileAlert.set(false)
+    },
+  )
+}

apps/android/app/src/main/res/drawable/edit_text_cursor.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+  <solid android:color="@color/highOrLowLight" />
+  <size android:width="1dp" />
+</shape>

apps/android/app/src/main/res/values-ar/strings.xml

@@ -1,2 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="accept_contact_button">اقبل</string>
+    <string name="about_simplex_chat">عن <xliff:g id="appNameFull"> ٍSimpleX </xliff:g></string>
+    <string name="a_plus_b">a + b</string>
+    <string name="accept">اقبل</string>
+    <string name="chat_item_ttl_week">اسبوع 1</string>
+    <string name="chat_item_ttl_month">شهر 1</string>
+    <string name="color_primary">لون تمييزي</string>
+    <string name="chat_item_ttl_day">يوم 1</string>
+    <string name="accept_feature">اقبل</string>
+    <string name="about_simplex">عن SimpleX</string>
+    <string name="above_then_preposition_continuation">أعلاه ، ثم:</string>
+    <string name="accept_call_on_lock_screen">اقبل</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">لا يمكن التراجع عن هذا الإجراء - سيتم فقد ملف التعريف وجهات الاتصال والرسائل والملفات الخاصة بك بشكل نهائي.</string>
+    <string name="alert_message_no_group">هذه المجموعة لم تعد موجودة.</string>
+    <string name="this_QR_code_is_not_a_link">رمز QR هذا ليس رابطًا!</string>
+    <string name="next_generation_of_private_messaging">الجيل القادم من الرسائل الخاصة</string>
+    <string name="delete_files_and_media_desc">لا يمكن التراجع عن هذا الإجراء - سيتم حذف جميع الملفات والوسائط المستلمة والمرسلة. ستبقى الصور منخفضة الدقة.</string>
+    <string name="enable_automatic_deletion_message">لا يمكن التراجع عن هذا الإجراء - سيتم حذف الرسائل المرسلة والمستلمة قبل التحديد. قد تأخذ عدة دقائق.</string>
+    <string name="messages_section_description">ينطبق هذا الإعداد على الرسائل الموجودة في ملف تعريف الدردشة الحالي الخاص بك</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">منصة الرسائل والتطبيقات تحمي خصوصيتك وأمنك.</string>
+    <string name="profile_is_only_shared_with_your_contacts">يتم مشاركة ملف التعريف مع جهات الاتصال الخاصة بك فقط.</string>
+    <string name="member_role_will_be_changed_with_notification">سيتم تغيير الدور إلى \"%s\". سيتم إبلاغ كل فرد في المجموعة.</string>
+    <string name="member_role_will_be_changed_with_invitation">سيتم تغيير الدور إلى \"%s\". سيتلقى العضو دعوة جديدة.</string>
+    <string name="smp_servers_per_user">خوادم الاتصالات الجديدة لملف تعريف الدردشة الحالي الخاص بك</string>
+    <string name="switch_receiving_address_desc">هذه الميزة تجريبية! ستعمل فقط إذا كان لدى العميل الآخر الإصدار 4.2 مثبتًا. يجب أن ترى الرسالة في المحادثة بمجرد اكتمال تغيير العنوان - يرجى التحقق من أنه لا يزال بإمكانك تلقي الرسائل من جهة الاتصال هذه (أو عضو المجموعة).</string>
+    <string name="this_link_is_not_a_valid_connection_link">هذا الارتباط ليس ارتباط اتصال صالح!</string>
+    <string name="allow_verb">يسمح</string>
+    <string name="smp_servers_preset_add">أضف خوادم محددة مسبقًا</string>
+    <string name="smp_servers_add_to_another_device">أضف إلى جهاز آخر</string>
+    <string name="users_delete_all_chats_deleted">سيتم حذف جميع الدردشات والرسائل - لا يمكن التراجع عن هذا!</string>
+    <string name="network_enable_socks_info">الوصول إلى الخوادم عبر بروكسي SOCKS على المنفذ 9050؟ يجب بدء تشغيل الوكيل قبل تمكين هذا الخيار.</string>
+    <string name="accept_requests">قبول طلبات</string>
+    <string name="smp_servers_add">إضافة خادم …</string>
+    <string name="network_settings">إعدادات الشبكة المتقدمة</string>
+    <string name="all_group_members_will_remain_connected">سيبقى جميع أعضاء المجموعة على اتصال.</string>
+    <string name="allow_disappearing_messages_only_if">السماح باختفاء الرسائل فقط إذا سمحت جهة الاتصال الخاصة بك بذلك.</string>
+    <string name="allow_irreversible_message_deletion_only_if">السماح بحذف الرسائل بشكل لا رجوع فيه فقط إذا سمحت لك جهة الاتصال بذلك.</string>
+    <string name="group_member_role_admin">مسؤل</string>
+    <string name="users_add">إضافة ملف التعريف</string>
+    <string name="allow_direct_messages">السماح بإرسال رسائل مباشرة إلى الأعضاء.</string>
+    <string name="accept_contact_incognito_button">قبول التخفي</string>
+    <string name="button_add_welcome_message">أضف رسالة ترحيب</string>
+    <string name="v4_3_improved_server_configuration_desc">أضف الخوادم عن طريق مسح رموز QR.</string>
+    <string name="v4_2_group_links_desc">يمكن للمسؤولين إنشاء روابط للانضمام إلى المجموعات.</string>
+    <string name="accept_connection_request__question">قبول طلب الاتصال؟</string>
+    <string name="clear_chat_warning">سيتم حذف جميع الرسائل - لا يمكن التراجع عن هذا! سيتم حذف الرسائل فقط من أجلك.</string>
+    <string name="callstatus_accepted">مكالمة مقبولة</string>
+</resources>

apps/android/app/src/main/res/values-cs/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="allow_voice_messages_only_if">Povolte hlasové zprávy, pouze pokud je váš kontakt povolí.</string>
-    <string name="allow_to_send_disappearing">Povolit odesílání mizejících zpráv.</string>
-    <string name="allow_to_send_voice">Povolit odesílání hlasových zpráv.</string>
+    <string name="allow_voice_messages_only_if">Povolit hlasové zprávy, pokud je váš kontakt povolí.</string>
+    <string name="allow_to_send_disappearing">Mizící zprávy povoleny.</string>
+    <string name="allow_to_send_voice">Hlasové zprávy povoleny.</string>
     <string name="v4_2_group_links_desc">Správci mohou vytvářet odkazy pro připojení ke skupinám.</string>
     <string name="accept_contact_button">Přijmout</string>
     <string name="smp_servers_preset_add">Přidejte přednastavené servery</string>
@@ -11,7 +11,7 @@
     <string name="smp_servers_add">Přidat server…</string>
     <string name="network_enable_socks_info">Přistupovat k serverům přes SOCKS proxy na portu 9050\? Před povolením této možnosti musí být spuštěna proxy.</string>
     <string name="accept_feature">Přijmout</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Umožněte svým kontaktům odesílat mizející zprávy.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Umožněte svým kontaktům odesílat mizící zprávy.</string>
     <string name="about_simplex_chat">O <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="smp_servers_add_to_another_device">Přidat do jiného zařízení</string>
     <string name="accept_requests">Přijímat žádosti</string>
@@ -24,7 +24,7 @@
     <string name="group_member_role_admin">správce</string>
     <string name="users_add">Přidat profil</string>
     <string name="users_delete_all_chats_deleted">Všechny chaty a zprávy budou smazány – tuto akci nelze vrátit zpět!</string>
-    <string name="allow_disappearing_messages_only_if">Povolte mizející zprávy, pouze pokud to váš kontakt povolí.</string>
+    <string name="allow_disappearing_messages_only_if">Povolte mizící zprávy, pouze pokud to váš kontakt povolí.</string>
     <string name="v4_3_improved_server_configuration_desc">Přidejte servery skenováním QR kódů.</string>
     <string name="chat_item_ttl_month">1 měsíci</string>
     <string name="chat_item_ttl_week">1 týdnu</string>
@@ -33,8 +33,8 @@
     <string name="accept_connection_request__question">Přijmout žádost o připojení\?</string>
     <string name="all_group_members_will_remain_connected">Všichni členové skupiny zůstanou připojeni.</string>
     <string name="allow_irreversible_message_deletion_only_if">Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí.</string>
-    <string name="allow_direct_messages">Povolit odesílání přímých zpráv členům.</string>
-    <string name="allow_to_delete_messages">Povolit nevratné smazání odeslaných zpráv.</string>
+    <string name="allow_direct_messages">Přímé zprávy členům povoleny.</string>
+    <string name="allow_to_delete_messages">Nevratné mazání odeslaných zpráv povoleno.</string>
     <string name="clear_chat_warning">Všechny zprávy budou smazány – tuto akci nelze vrátit zpět! Zprávy budou smazány POUZE pro vás.</string>
     <string name="allow_your_contacts_irreversibly_delete">Umožněte svým kontaktům nevratně odstranit odeslané zprávy.</string>
     <string name="allow_your_contacts_to_send_voice_messages">Povolte svým kontaktům odesílání hlasových zpráv.</string>
@@ -43,14 +43,14 @@
     <string name="button_send_direct_message">Odeslat přímou zprávu</string>
     <string name="member_info_section_title_member">ČLEN</string>
     <string name="change_member_role_question">Změnit roli ve skupině\?</string>
-    <string name="info_row_connection">Připojení</string>
+    <string name="info_row_connection">Připoj</string>
     <string name="conn_level_desc_indirect">nepřímé (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
     <string name="conn_stats_section_title_servers">SERVERY</string>
     <string name="receiving_via">Příjímáno přez</string>
     <string name="create_secret_group_title">Vytvoření tajné skupiny</string>
-    <string name="group_display_name_field">Zobrazení názvu skupiny:</string>
+    <string name="group_display_name_field">Zobrazený název skupiny:</string>
     <string name="group_full_name_field">Úplný název skupiny:</string>
-    <string name="group_main_profile_sent">Váš profil v chatu bude zaslán členům skupiny</string>
+    <string name="group_main_profile_sent">Váš chat profil bude zaslán členům skupiny</string>
     <string name="group_profile_is_stored_on_members_devices">Profil skupiny je uložen v zařízeních členů, nikoli na serverech.</string>
     <string name="network_options_save">Uložit</string>
     <string name="update_network_settings_question">Aktualizovat nastavení sítě\?</string>
@@ -58,8 +58,8 @@
     <string name="incognito_random_profile">Váš náhodný profil</string>
     <string name="incognito_random_profile_description">Vašemu kontaktu bude zaslán náhodný profil</string>
     <string name="save_color">Uložit barvu</string>
-    <string name="reset_color">Obnovení barev</string>
-    <string name="color_primary">Přízvuk</string>
+    <string name="reset_color">Obnovit barvu</string>
+    <string name="color_primary">Zbarvení</string>
     <string name="chat_preferences_you_allow">Povolujete</string>
     <string name="chat_preferences_default">výchozí (%s)</string>
     <string name="chat_preferences_yes">ano</string>
@@ -67,49 +67,49 @@
     <string name="chat_preferences_always">vždy</string>
     <string name="set_group_preferences">Nastavení skupinových předvoleb</string>
     <string name="your_preferences">Vaše preference</string>
-    <string name="timed_messages">Mizející zprávy</string>
+    <string name="timed_messages">Mizící zprávy</string>
     <string name="feature_enabled_for_contact">povoleno pro kontakt</string>
     <string name="feature_received_prohibited">přijaté, zakázané</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Vy i váš kontakt můžete posílat mizející zprávy.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Vy i váš kontakt můžete posílat mizící zprávy.</string>
     <string name="only_your_contact_can_send_disappearing">Zmizelé zprávy může odesílat pouze váš kontakt.</string>
     <string name="only_you_can_delete_messages">Nevratně mazat zprávy můžete pouze vy (váš kontakt je může označit ke smazání).</string>
     <string name="message_deletion_prohibited">Nevratné mazání zpráv je v tomto chatu zakázáno.</string>
-    <string name="prohibit_direct_messages">Zakázat odesílání přímých zpráv členům.</string>
+    <string name="prohibit_direct_messages">Přímé zprávy členům zakázány.</string>
     <string name="ttl_sec">%d sec</string>
     <string name="ttl_s">%ds</string>
     <string name="ttl_min">%d min</string>
-    <string name="ttl_hour">%d hodina</string>
+    <string name="ttl_hour">%d hodinu</string>
     <string name="feature_offered_item_with_param">offered %s: %2s</string>
     <string name="v4_2_group_links">Odkazy na skupiny</string>
     <string name="v4_3_voice_messages">Hlasové zprávy</string>
-    <string name="v4_3_irreversible_message_deletion_desc">Vaše kontakty mohou povolit úplné vymazání zpráv.</string>
-    <string name="v4_4_disappearing_messages">Zmizení zpráv</string>
+    <string name="v4_3_irreversible_message_deletion_desc">Vaše kontakty mohou povolit úplné mazání zpráv.</string>
+    <string name="v4_4_disappearing_messages">Mizící zprávy</string>
     <string name="v4_4_verify_connection_security_desc">Porovnejte bezpečnostní kódy se svými kontakty.</string>
     <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="thousand_abbreviation">k</string>
-    <string name="connect_via_contact_link">Připojit se přes kontaktní odkaz\?</string>
-    <string name="connect_via_invitation_link">Připojit se přes odkaz na pozvánku\?</string>
-    <string name="connect_via_group_link">Připojit se přes odkaz skupiny\?</string>
+    <string name="connect_via_contact_link">Připojit se odkazem\?</string>
+    <string name="connect_via_invitation_link">Připojit se pozvánkou\?</string>
+    <string name="connect_via_group_link">Připojit se odkazem skupiny\?</string>
     <string name="profile_will_be_sent_to_contact_sending_link">Váš profil bude odeslán kontaktu, od kterého jste obdrželi tento odkaz.</string>
     <string name="server_connected">připojeno</string>
     <string name="server_error">chyba</string>
-    <string name="server_connecting">připojení</string>
+    <string name="server_connecting">připojování</string>
     <string name="trying_to_connect_to_server_to_receive_messages">Pokus o připojení k serveru používanému pro příjem zpráv od tohoto kontaktu.</string>
     <string name="deleted_description">smazáno</string>
     <string name="invalid_chat">neplatný chat</string>
-    <string name="invalid_data">neplatné údaje</string>
+    <string name="invalid_data">neplatná data</string>
     <string name="connection_local_display_name">spojení <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
     <string name="display_name_connection_established">spojení navázáno</string>
     <string name="display_name_invited_to_connect">pozvánka k připojení</string>
-    <string name="display_name_connecting">připojení…</string>
-    <string name="description_you_shared_one_time_link">jste sdíleli jednorázové spojení</string>
+    <string name="display_name_connecting">připojování…</string>
+    <string name="description_you_shared_one_time_link">sdíleli jste jednorázový odkaz</string>
     <string name="description_you_shared_one_time_link_incognito">sdíleli jste jednorázový odkaz inkognito</string>
     <string name="description_via_group_link">prostřednictvím skupinového odkazu</string>
-    <string name="description_via_contact_address_link">prostřednictvím odkazu na kontaktní adresu</string>
-    <string name="description_via_contact_address_link_incognito">inkognito přes odkaz na kontaktní adresu</string>
-    <string name="description_via_one_time_link">prostřednictvím jednorázového odkazu</string>
-    <string name="description_via_one_time_link_incognito">inkognito přes jednorázový odkaz</string>
-    <string name="simplex_link_contact">SimpleX kontaktní adresa</string>
+    <string name="description_via_contact_address_link">prostřednictvím odkazu</string>
+    <string name="description_via_contact_address_link_incognito">inkognito přes odkaz</string>
+    <string name="description_via_one_time_link">jednorázovým odkazem</string>
+    <string name="description_via_one_time_link_incognito">inkognito jednorázovým odkazem</string>
+    <string name="simplex_link_contact">SimpleX adresa</string>
     <string name="simplex_link_invitation">Jednorázová pozvánka SimpleX</string>
     <string name="simplex_link_group">Skupinový odkaz SimpleX</string>
     <string name="simplex_link_connection">prostřednictvím <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
@@ -118,31 +118,31 @@
     <string name="simplex_link_mode_full">Úplný odkaz</string>
     <string name="simplex_link_mode_browser">Prostřednictvím prohlížeče</string>
     <string name="simplex_link_mode_browser_warning">Otevření odkazu v prohlížeči může snížit soukromí a bezpečnost připojení. Nedůvěryhodné odkazy SimpleX budou červené.</string>
-    <string name="error_saving_smp_servers">Chyba při ukládání serverů SMP</string>
-    <string name="error_setting_network_config">Chyba při aktualizaci konfigurace sítě</string>
+    <string name="error_saving_smp_servers">Chyba ukládání serverů SMP</string>
+    <string name="error_setting_network_config">Chyba změny konfigurace sítě</string>
     <string name="failed_to_parse_chat_title">Nepodařilo se načíst chat</string>
     <string name="failed_to_parse_chats_title">Nepodařilo se načíst chaty</string>
     <string name="contact_developers">Aktualizujte aplikaci a kontaktujte vývojáře.</string>
     <string name="connection_timeout">Časový limit připojení</string>
     <string name="connection_error">Chyba připojení</string>
     <string name="network_error_desc">Zkontrolujte prosím své síťové připojení pomocí <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> a zkuste to znovu.</string>
-    <string name="error_sending_message">Chyba při odesílání zprávy</string>
-    <string name="error_adding_members">Chyba při přidávání členů</string>
+    <string name="error_sending_message">Chyba odesílání zprávy</string>
+    <string name="error_adding_members">Chyba přidávání členů</string>
     <string name="contact_already_exists">Kontakt již existuje</string>
     <string name="you_are_already_connected_to_vName_via_this_link">Jste již připojeni k <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="invalid_connection_link">Neplatný odkaz na spojení</string>
     <string name="error_accepting_contact_request">Chyba příjmu požadavku od kontaktu</string>
     <string name="error_changing_address">Chyba změny adresy</string>
-    <string name="settings_notifications_mode_title">Služba oznamování</string>
+    <string name="settings_notifications_mode_title">Oznamovací služba</string>
     <string name="notifications_mode_service_desc">Služba na pozadí je spuštěna vždy - oznámení se zobrazí, jakmile jsou zprávy k dispozici.</string>
     <string name="notification_preview_mode_message">Text zprávy</string>
     <string name="notification_preview_mode_contact">Jméno kontaktu</string>
     <string name="notification_preview_mode_hidden">Skryté</string>
-    <string name="notification_preview_mode_message_desc">Zobrazit kontakt a zprávu</string>
-    <string name="notification_contact_connected">Připojeno</string>
+    <string name="notification_preview_mode_message_desc">Zobrazí kontakt a zprávu</string>
+    <string name="notification_contact_connected">Připojen</string>
     <string name="la_notice_title_simplex_lock">SimpleX Zámek</string>
-    <string name="auth_log_in_using_credential">Přihlaste se pomocí svého pověření</string>
-    <string name="auth_enable_simplex_lock">Zapnutí zámku SimpleX</string>
+    <string name="auth_log_in_using_credential">Přihlásit pomocí ověření</string>
+    <string name="auth_enable_simplex_lock">Zapnout zámek SimpleX</string>
     <string name="reply_verb">Odpověď</string>
     <string name="share_verb">Sdílet</string>
     <string name="copy_verb">Kopírovat</string>
@@ -159,11 +159,11 @@
     <string name="icon_descr_waiting_for_image">Čekání na obrázek</string>
     <string name="icon_descr_asked_to_receive">Požádáno o přijetí obrázku</string>
     <string name="icon_descr_image_snd_complete">Obrázek odeslán</string>
-    <string name="waiting_for_image">Čekáme na obrázek</string>
+    <string name="waiting_for_image">Čekám na obrázek</string>
     <string name="image_will_be_received_when_contact_is_online">Obrázek bude přijat, až bude váš kontakt online, vyčkejte prosím nebo se podívejte později!</string>
     <string name="contact_sent_large_file">Váš kontakt odeslal soubor, který je větší než aktuálně podporovaná maximální velikost (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
     <string name="maximum_supported_file_size">V současné době je maximální podporovaná velikost souboru <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="error_saving_file">Chyba při ukládání souboru</string>
+    <string name="error_saving_file">Chyba ukládání souboru</string>
     <string name="voice_message">Hlasová zpráva</string>
     <string name="voice_message_send_text">Hlasová zpráva…</string>
     <string name="icon_descr_server_status_connected">Připojeno</string>
@@ -179,9 +179,9 @@
     <string name="reset_verb">Obnovit</string>
     <string name="ok">OK</string>
     <string name="no_details">bez podrobností</string>
-    <string name="add_contact">Jednorázový zvací odkaz</string>
-    <string name="copied">Zkopírováno do schránky</string>
-    <string name="add_contact_or_create_group">Začít novou konverzaci</string>
+    <string name="add_contact">Jednorázová pozvánka</string>
+    <string name="copied">Zkopírováno</string>
+    <string name="add_contact_or_create_group">Nová konverzace</string>
     <string name="create_group">Vytvořit tajnou skupinu</string>
     <string name="to_share_with_your_contact">(sdílet s kontaktem)</string>
     <string name="only_stored_on_members_devices">(uloženo pouze členy skupiny)</string>
@@ -191,17 +191,17 @@
     <string name="choose_file">Vybrat soubor</string>
     <string name="to_start_a_new_chat_help_header">Pro zahájení nové konverzace</string>
     <string name="chat_help_tap_button">Klepněte na tlačítko</string>
-    <string name="above_then_preposition_continuation">nad, potom:</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Přidat nový kontakt</b>: pro vytvoření jednorázového QR kódu pro váš kontakt.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Skenovat QR kód</b>: připojení ke kontaktu, který vám ukáže QR kód.</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: scan displayed QR code from the app, via <b>Scan QR code</b>.</string>
+    <string name="above_then_preposition_continuation">potom:</string>
+    <string name="add_new_contact_to_create_one_time_QR_code"><b>Přidejte nový kontakt</b>: vytvořte jednorázý QR kód pro váš kontakt.</string>
+    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Naskenujte QR kód</b>: připojíte se ke kontaktu, který vám QR kód ukázal.</string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 počítač: naskenujte QR kód z aplikace přez <b>Skenovat QR kód</b>.</string>
     <string name="clear_chat_question">Vyčistit chat\?</string>
     <string name="clear_verb">Vyčistit</string>
     <string name="mark_read">Označit jako přečteno</string>
     <string name="mark_unread">Označit jako nepřečteno</string>
     <string name="mute_chat">Ztlumit</string>
     <string name="unmute_chat">Zrušit ztlumení</string>
-    <string name="you_invited_your_contact">Pozvali jste svůj kontakt</string>
+    <string name="you_invited_your_contact">Pozvali jste kontakt</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Kontakt, se kterým jste tento odkaz sdíleli, se NEBUDE moci připojit!</string>
     <string name="connection_you_accepted_will_be_cancelled">Připojení, které jste přijali, bude zrušeno!</string>
     <string name="icon_descr_help">help</string>
@@ -210,9 +210,9 @@
     <string name="you_will_be_connected_when_group_host_device_is_online">Ke skupině budete připojeni, až bude zařízení hostitele skupiny online, vyčkejte prosím nebo se podívejte později!</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">Budete připojeni, jakmile bude vaše žádost o připojení přijata, vyčkejte prosím nebo se podívejte později!</string>
     <string name="connection_request_sent">Požadavek na připojení byl odeslán!</string>
-    <string name="your_profile_will_be_sent">Váš profil v chatu bude odeslán vašemu kontaktu</string>
-    <string name="create_one_time_link">Vytvořte jednorázový odkaz na pozvánku</string>
-    <string name="one_time_link">Vytvořit jednorázový zvací odkaz</string>
+    <string name="your_profile_will_be_sent">Váš chat profil bude odeslán vašemu kontaktu</string>
+    <string name="create_one_time_link">Vytvořit jednorázovou pozvánku</string>
+    <string name="one_time_link">Jednorázová pozvánka</string>
     <string name="security_code">Bezpečnostní kód</string>
     <string name="is_verified">%s je ověřeno</string>
     <string name="chat_console">Chat konzole</string>
@@ -225,7 +225,7 @@
     <string name="smp_servers_invalid_address">Neplatná adresa serveru!</string>
     <string name="smp_servers_check_address">Zkontrolujte adresu serveru a zkuste to znovu.</string>
     <string name="smp_servers_delete_server">Smazat server</string>
-    <string name="contribute">Přispějte</string>
+    <string name="contribute">Přispět</string>
     <string name="how_to">Jak</string>
     <string name="how_to_use_your_servers">Jak používat servery</string>
     <string name="your_ICE_servers">Vaše servery ICE</string>
@@ -246,18 +246,18 @@
     <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Platforma pro zasílání zpráv a aplikace chránící vaše soukromí a bezpečnost.</string>
     <string name="create_profile">Vytvořit profil</string>
     <string name="profile_is_only_shared_with_your_contacts">Profil je sdílen pouze s vašimi kontakty.</string>
-    <string name="display_name_cannot_contain_whitespace">Zobrazované jméno nesmí obsahovat prázdné znaky.</string>
+    <string name="display_name_cannot_contain_whitespace">Zobrazované jméno nesmí obsahovat mezery.</string>
     <string name="bold">tučně</string>
     <string name="callstatus_in_progress">probíhající hovor</string>
     <string name="decentralized">Decentralizovaná</string>
     <string name="how_it_works">Jak to funguje</string>
     <string name="how_simplex_works">Jak funguje <xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy odesílané pomocí <b>2 vrstvého end-to-end šifrování</b>.</string>
-    <string name="onboarding_notifications_mode_title">Soukromá oznámení</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy odesílané pomocí <b>2 vrstvého koncového šifrování</b>.</string>
+    <string name="onboarding_notifications_mode_title">Oznámení</string>
     <string name="onboarding_notifications_mode_periodic">Pravidelné</string>
     <string name="ignore">Ignorovat</string>
     <string name="call_already_ended">Hovor již skončil!</string>
-    <string name="icon_descr_video_call">videohovor</string>
+    <string name="icon_descr_video_call">video hovor</string>
     <string name="icon_descr_audio_call">audio hovor</string>
     <string name="settings_audio_video_calls">Audio a video hovory</string>
     <string name="call_on_lock_screen">Hovory na uzamčené obrazovce:</string>
@@ -272,7 +272,7 @@
     <string name="settings_section_title_settings">NASTAVENÍ</string>
     <string name="settings_section_title_help">NÁPOVĚDA</string>
     <string name="settings_section_title_device">ZAŘÍZENÍ</string>
-    <string name="settings_section_title_chats">CHATS</string>
+    <string name="settings_section_title_chats">CHATY</string>
     <string name="settings_experimental_features">Experimentální funkce</string>
     <string name="settings_section_title_socks">SOCKS PROXY</string>
     <string name="settings_section_title_icon">IKONA APLIKACE</string>
@@ -281,11 +281,11 @@
     <string name="settings_section_title_calls">VOLÁNÍ</string>
     <string name="export_database">Export databáze</string>
     <string name="import_database">Import databáze</string>
-    <string name="delete_database">Smazání databáze</string>
-    <string name="error_exporting_chat_database">Chyba při exportu chat databáze</string>
+    <string name="delete_database">Smazat databázi</string>
+    <string name="error_exporting_chat_database">Chyba exportu chat databáze</string>
     <string name="import_database_confirmation">Import</string>
     <string name="restart_the_app_to_use_imported_chat_database">Restartujte aplikaci, abyste mohli používat importovanou chat databázi.</string>
-    <string name="delete_chat_profile_question">Smazat profil chatu\?</string>
+    <string name="delete_chat_profile_question">Smazat chat profil\?</string>
     <string name="delete_chat_profile_action_cannot_be_undone_warning">Tuto akci nelze vzít zpět! Váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</string>
     <string name="restart_the_app_to_create_a_new_chat_profile">Restartujte aplikaci a vytvořte nový chat profil.</string>
     <string name="you_must_use_the_most_recent_version_of_database">Nejnovější verzi chat databáze musíte používat POUZE v jednom zařízení, jinak se může stát, že přestanete přijímat zprávy od některých kontaktů.</string>
@@ -293,24 +293,24 @@
     <string name="files_and_media_section">Soubory a média</string>
     <string name="delete_files_and_media_question">Smazat soubory a média\?</string>
     <string name="delete_messages">Odstranit zprávy</string>
-    <string name="remove_passphrase_from_keychain">Odstranit přístupovou frázi z úložiště klíčů\?</string>
+    <string name="remove_passphrase_from_keychain">Odstranit frázi z úložiště klíčů\?</string>
     <string name="notifications_will_be_hidden">Oznámení budou doručována pouze do doby, než se aplikace zastaví!</string>
     <string name="remove_passphrase">Odstranit</string>
     <string name="update_database">Aktualizovat</string>
-    <string name="current_passphrase">Aktuální přístupová fráze…</string>
-    <string name="update_database_passphrase">Aktualizovat přístupovou frázi databáze</string>
+    <string name="current_passphrase">Aktuální fráze…</string>
+    <string name="update_database_passphrase">Aktualizovat přístupovou frázi</string>
     <string name="enter_correct_current_passphrase">Zadejte prosím správnou aktuální přístupovou frázi.</string>
-    <string name="database_is_not_encrypted">Váš chat databáze není šifrována - nastavte přístupovou frázi pro její ochranu.</string>
-    <string name="keychain_is_storing_securely">K bezpečnému uložení heslové fráze slouží úložiště klíčů Android - umožňuje fungování služby oznámení.</string>
+    <string name="database_is_not_encrypted">Chat databáze není šifrována - nastavte přístupovou frázi pro její ochranu.</string>
+    <string name="keychain_is_storing_securely">K bezpečnému uložení přístupové fráze slouží úložiště klíčů Android - umožňuje fungování služby oznámení.</string>
     <string name="impossible_to_recover_passphrase"><b>Upozornění</b>: pokud přístupovou frázi ztratíte, NEBUDE možné ji obnovit ani změnit.</string>
     <string name="database_will_be_encrypted_and_passphrase_stored">Databáze bude šifrována a přístupová fráze bude uložena v úložišti klíčů.</string>
     <string name="store_passphrase_securely">Heslo uložte bezpečně, v případě jeho ztráty jej NEBUDE možné změnit.</string>
     <string name="file_with_path">Soubor: %s</string>
-    <string name="database_passphrase_is_required">Pro otevření chatu je vyžadována přístupová fráze databáze.</string>
+    <string name="database_passphrase_is_required">Pro otevření chatu je vyžadována přístupová fráze.</string>
     <string name="unknown_error">Neznámá chyba</string>
     <string name="open_chat">Otevřete chat</string>
     <string name="restore_database">Obnovte zálohu databáze</string>
-    <string name="restore_database_alert_desc">Po obnovení zálohy databáze zadejte předchozí heslo. Tuto akci nelze vrátit zpět.</string>
+    <string name="restore_database_alert_desc">Po obnovení zálohy databáze zadejte předchozí frázi. Tuto akci nelze vrátit zpět.</string>
     <string name="chat_is_stopped_indication">Chat je zastaven</string>
     <string name="chat_archive_header">Chat se archivuje</string>
     <string name="delete_chat_archive_question">Smazat chat archiv\?</string>
@@ -327,7 +327,7 @@
     <string name="rcv_conn_event_switch_queue_phase_completed">změnila se vaše adresa</string>
     <string name="icon_descr_expand_role">Rozšířit výběr rolí</string>
     <string name="invite_prohibited">Nelze pozvat kontakt!</string>
-    <string name="failed_to_create_user_duplicate_desc">Již máte profil chatu se stejným názvem. Zvolte prosím jiné jméno.</string>
+    <string name="failed_to_create_user_duplicate_desc">Již máte chat profil se stejným názvem. Zvolte prosím jiné jméno.</string>
     <string name="smp_server_test_create_queue">Vytvořit frontu</string>
     <string name="smp_server_test_secure_queue">Zabezpečit frontu</string>
     <string name="service_notifications">Okamžitá oznámení!</string>
@@ -360,7 +360,7 @@
     <string name="integrity_msg_bad_hash">špatný kontrolní součet zprávy</string>
     <string name="chat_database_imported">Chat databáze importována</string>
     <string name="new_passphrase">Nová přístupová fráze…</string>
-    <string name="save_passphrase_and_open_chat">Uložte heslo a otevřete chat</string>
+    <string name="save_passphrase_and_open_chat">Uložte frázi a otevřete chat</string>
     <string name="chat_archive_section">CHAT ARCHIV</string>
     <string name="no_contacts_selected">Nebyl vybrán žádný kontakt</string>
     <string name="invite_prohibited_description">Snažíte se pozvat kontakt se kterým jste sdíleli inkognito profil, do skupiny ve které používáte svůj hlavní profil</string>
@@ -385,9 +385,9 @@
     <string name="clear_verification">Jasné ověření</string>
     <string name="to_verify_compare">Chcete-li ověřit koncové šifrování u svého kontaktu, porovnejte (nebo naskenujte) kód na svých zařízeních.</string>
     <string name="your_settings">Vaše nastavení</string>
-    <string name="your_simplex_contact_address">Vaše kontaktní adresa <xliff:g id="appName">SimpleX</xliff:g></string>
+    <string name="your_simplex_contact_address">Vaše adresa <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="database_passphrase_and_export">Heslo databáze a export</string>
-    <string name="your_chat_profiles">Vaše chat profily</string>
+    <string name="your_chat_profiles">Chat profily</string>
     <string name="chat_with_the_founder">Zaslat otázky a nápady</string>
     <string name="smp_servers_test_server">Test serveru</string>
     <string name="enter_one_ICE_server_per_line">Servery ICE (jeden na řádek)</string>
@@ -406,14 +406,14 @@
     <string name="ntf_channel_messages">Zprávy SimpleX Chat</string>
     <string name="settings_notification_preview_mode_title">Zobrazení náhledu</string>
     <string name="settings_notification_preview_title">Náhled oznámení</string>
-    <string name="notifications_mode_off">Spustí se při otevření aplikace</string>
+    <string name="notifications_mode_off">Spuštěna při otevřené aplikaci</string>
     <string name="notifications_mode_periodic">Spouští se pravidelně</string>
-    <string name="notifications_mode_service">Vždy zapnuto</string>
+    <string name="notifications_mode_service">Vždy zapnuta</string>
     <string name="notifications_mode_periodic_desc">Každých 10 minut kontroluje nové zprávy, po dobu až 1 minuty</string>
-    <string name="notification_preview_mode_contact_desc">Zobrazit pouze kontakt</string>
+    <string name="notification_preview_mode_contact_desc">Zobrazí pouze kontakt</string>
     <string name="notification_preview_somebody">Skrytý kontakt:</string>
     <string name="la_notice_turn_on">Zapněte funkci</string>
-    <string name="auth_simplex_lock_turned_on">Zapnutý zámek SimpleX Lock</string>
+    <string name="auth_simplex_lock_turned_on">Zámek SimpleX zapnut</string>
     <string name="auth_unlock">Odemknout</string>
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Ověřování zařízení není povoleno. Jakmile povolíte ověřování zařízení, můžete zámek SimpleX Lock zapnout prostřednictvím Nastavení.</string>
     <string name="auth_device_authentication_is_disabled_turning_off">Ověřování zařízení je zakázáno. Zámek SimpleX je vypnut.</string>
@@ -439,7 +439,7 @@
     <string name="voice_messages_prohibited">Hlasové zprávy jsou zakázány!</string>
     <string name="ask_your_contact_to_enable_voice">Prosím, požádejte kontaktní osobu, aby umožnila odesílání hlasových zpráv.</string>
     <string name="send_live_message_desc">Poslat živou zprávu - zpráva se bude aktualizovat pro příjemce během psaní.</string>
-    <string name="share_one_time_link">Vytvořte jednorázový odkaz na pozvánku</string>
+    <string name="share_one_time_link">Vytvořit jednorázovou pozvánku</string>
     <string name="scan_QR_code">Skenovat QR kód</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">( skenovat nebo vložit ze schránky)</string>
     <string name="edit_image">Upravit obrázek</string>
@@ -453,7 +453,7 @@
     <string name="status_contact_has_e2e_encryption">kontakt má šifrování e2e</string>
     <string name="status_contact_has_no_e2e_encryption">kontakt nemá šifrování e2e</string>
     <string name="call_connection_peer_to_peer">peer-to-peer</string>
-    <string name="call_connection_via_relay">přes relay</string>
+    <string name="call_connection_via_relay">přes relé</string>
     <string name="icon_descr_hang_up">Zavěsit</string>
     <string name="icon_descr_video_off">Video vypnuto</string>
     <string name="icon_descr_video_on">Video zapnuto</string>
@@ -463,14 +463,14 @@
     <string name="alert_title_skipped_messages">Přeskočené zprávy</string>
     <string name="privacy_and_security">Ochrana osobních údajů a zabezpečení</string>
     <string name="your_privacy">Vaše soukromí</string>
-    <string name="protect_app_screen">Ochrana obrazovky aplikace</string>
-    <string name="send_link_previews">Odesílání náhledů odkazů</string>
-    <string name="full_backup">Zálohování dat aplikace</string>
-    <string name="confirm_new_passphrase">Potvrdit novou heslovou frázi…</string>
+    <string name="protect_app_screen">Skrývat aplikaci</string>
+    <string name="send_link_previews">Odesílat náhledy odkazů</string>
+    <string name="full_backup">Zálohovat data aplikace</string>
+    <string name="confirm_new_passphrase">Potvrdit frázi…</string>
     <string name="error_with_info">Chyba: %s</string>
     <string name="leave_group_question">Opustit skupinu\?</string>
     <string name="icon_descr_group_inactive">Skupina je neaktivní</string>
-    <string name="rcv_group_event_member_left">vlevo</string>
+    <string name="rcv_group_event_member_left">odešel</string>
     <string name="clear_contacts_selection_button">Vyčistit</string>
     <string name="switch_verb">Přepnout</string>
     <string name="member_role_will_be_changed_with_notification">Role bude změněna na \"%s\". Všichni ve skupině budou informováni.</string>
@@ -479,7 +479,7 @@
     <string name="network_option_seconds_label">vteřin</string>
     <string name="incognito_info_allows">Umožňuje mít v jednom chat profilu mnoho anonymních spojení bez sdílení údajů mezi nimi.</string>
     <string name="incognito_info_share">Pokud s někým sdílíte inkognito profil, bude použit pro skupiny, do kterých vás pozve.</string>
-    <string name="theme_system">Systém</string>
+    <string name="theme_system">Systémové</string>
     <string name="voice_messages">Hlasové zprávy</string>
     <string name="both_you_and_your_contacts_can_delete">Vy i váš kontakt můžete nevratně mazat odeslané zprávy.</string>
     <string name="ttl_m">%dm</string>
@@ -518,10 +518,10 @@
     <string name="live">ŽIVĚ</string>
     <string name="description_via_group_link_incognito">inkognito přes skupinový odkaz</string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">Ujistěte se, že adresy serverů SMP jsou ve správném formátu, oddělené na řádcích a nejsou duplicitní.</string>
-    <string name="failed_to_create_user_title">Chyba při vytváření profilu!</string>
+    <string name="failed_to_create_user_title">Chyba vytváření profilu!</string>
     <string name="failed_to_create_user_duplicate_title">Duplicitní zobrazované jméno!</string>
-    <string name="failed_to_active_user_title">Chyba při přepínání profilu!</string>
-    <string name="error_joining_group">Chyba při připojování ke skupině</string>
+    <string name="failed_to_active_user_title">Chyba přepínání profilu!</string>
+    <string name="error_joining_group">Chyba připojování ke skupině</string>
     <string name="cannot_receive_file">Nelze přijmout soubor</string>
     <string name="sender_cancelled_file_transfer">Odesílatel zrušil přenos souboru.</string>
     <string name="error_receiving_file">Chyba příjmu souboru</string>
@@ -544,12 +544,12 @@
     <string name="periodic_notifications_disabled">Pravidelná oznámení jsou vypnuta!</string>
     <string name="database_initialization_error_desc">Databáze nefunguje správně. Klepnutím se dozvíte více</string>
     <string name="notifications_mode_off_desc">Aplikace může přijímat oznámení pouze při svém běhu, žádná služba na pozadí nebude spuštěna</string>
-    <string name="notification_display_mode_hidden_desc">Skrýt kontakt a zprávu</string>
+    <string name="notification_display_mode_hidden_desc">Skryje kontakt i zprávu</string>
     <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Chcete-li chránit své informace, zapněte zámek SimpleX Lock.
 \nPřed zapnutím této funkce budete vyzváni k dokončení ověření.</string>
-    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Při spuštění nebo obnovení aplikace po 30 sekundách na pozadí budete vyzváni k ověření.</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Při spuštění, nebo obnovení aplikace po 30 sekundách, budete vyzváni k odemčení.</string>
     <string name="auth_disable_simplex_lock">Vypnout zámek SimpleX</string>
-    <string name="auth_confirm_credential">Potvrďte své pověření</string>
+    <string name="auth_confirm_credential">Potvrďte vzor</string>
     <string name="auth_unavailable">Ověřování není k dispozici</string>
     <string name="auth_stop_chat">Zastavit chat</string>
     <string name="auth_open_chat_console">Otevřete chat konzoli</string>
@@ -565,7 +565,7 @@
     <string name="icon_descr_sent_msg_status_unauthorized_send">neautorizované odeslání</string>
     <string name="group_preview_you_are_invited">jste pozváni do skupiny</string>
     <string name="group_preview_join_as">připojit jako %s</string>
-    <string name="group_connection_pending">připojuje se…</string>
+    <string name="group_connection_pending">připojuji…</string>
     <string name="tap_to_start_new_chat">Začněte nový chat</string>
     <string name="chat_with_developers">Chat s vývojáři</string>
     <string name="you_have_no_chats">Nemáte žádné konverzace</string>
@@ -585,25 +585,25 @@
     <string name="live_message">Živá zpráva!</string>
     <string name="connect_via_link_or_qr">Připojit se prostřednictvím odkazu / QR kódu</string>
     <string name="thank_you_for_installing_simplex">Děkujeme za instalaci <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
-    <string name="you_can_connect_to_simplex_chat_founder">Můžete se <font color="#0088ff">připojit k <xliff:g id="appNameFull">SimpleX Chat</xliff:g> vývojářům a položit jim případné dotazy a získat aktualizace</font>.</string>
+    <string name="you_can_connect_to_simplex_chat_founder">Můžete se <font color="#0088ff">připojit k <xliff:g id="appNameFull">SimpleX Chat</xliff:g> vývojářům, položit jim případné dotazy a získat aktualizace</font>.</string>
     <string name="to_connect_via_link_title">Připojení prostřednictvím odkazu</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Pokud jste dostali <xliff:g id="appName">SimpleX Chat</xliff:g> zvací odkaz, Můžete ho otevřít v prohlížeči:</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Pokud jste dostali <xliff:g id="appName">SimpleX Chat</xliff:g> pozvánku, můžete ji otevřít v prohlížeči:</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Pokud zvolíte odmítnutí, odesílatel NEBUDE upozorněn.</string>
-    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 mobilní telefon: tap <b>Otevřete v mobilní aplikaci</b>, potom klikněte <b>Připojit</b>.</string>
+    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 telefon: <b>Otevřete v mobilní aplikaci</b>, potom klikněte na <b>Připojit</b>.</string>
     <string name="reject_contact_button">Odmítnout</string>
     <string name="clear_chat_button">Smazat chat</string>
     <string name="clear_chat_menu_action">Vyčistit</string>
     <string name="delete_contact_menu_action">Smazat</string>
     <string name="set_contact_name">Nastavit jméno kontaktu</string>
     <string name="you_accepted_connection">Přijali jste spojení</string>
-    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Aby se připojení dokončilo, musí být váš kontakt online.
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">K dokončení připojení, musí být váš kontakt online.
 \nToto připojení můžete zrušit a kontakt odebrat (a zkusit to později s novým odkazem).</string>
     <string name="contact_wants_to_connect_with_you">Chce se s vámi spojit!</string>
     <string name="icon_descr_profile_image_placeholder">Zástupný symbol profilového obrázku</string>
     <string name="image_descr_profile_image">profilový obrázek</string>
     <string name="icon_descr_close_button">Tlačítko Zavřít</string>
     <string name="alert_title_contact_connection_pending">Kontakt ještě není připojen!</string>
-    <string name="image_descr_link_preview">náhledový obrázek odkazu</string>
+    <string name="image_descr_link_preview">náhled odkazu</string>
     <string name="icon_descr_cancel_link_preview">Zrušit náhled odkazu</string>
     <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> Logo</string>
     <string name="icon_descr_email">E-mail</string>
@@ -634,7 +634,7 @@
     <string name="use_simplex_chat_servers__question">Použít <xliff:g id="appNameFull">SimpleX Chat</xliff:g> servery\?</string>
     <string name="using_simplex_chat_servers">Použití <xliff:g id="appNameFull">SimpleX Chat</xliff:g> serverů.</string>
     <string name="saved_ICE_servers_will_be_removed">Uložené servery WebRTC ICE budou odstraněny.</string>
-    <string name="error_saving_ICE_servers">Chyba při ukládání serverů ICE</string>
+    <string name="error_saving_ICE_servers">Chyba ukládání serverů ICE</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Ujistěte se, že adresy serverů WebRTC ICE jsou ve správném formátu, oddělené na řádcích a nejsou duplicitní.</string>
     <string name="save_servers_button">Uložit</string>
     <string name="network_and_servers">Síť a servery</string>
@@ -655,7 +655,7 @@
     <string name="app_version_title">Verze aplikace</string>
     <string name="app_version_name">Verze aplikace: v%s</string>
     <string name="core_version">Verze jádra: v%s</string>
-    <string name="core_build_timestamp">Jádro sestaveno na: %s</string>
+    <string name="core_build_timestamp">Jádro sestaveno: %s</string>
     <string name="delete_address__question">Smazat adresu\?</string>
     <string name="all_your_contacts_will_remain_connected">Všechny vaše kontakty zůstanou připojeny.</string>
     <string name="contact_requests">Žádosti o kontakt</string>
@@ -685,7 +685,7 @@
     <string name="callstate_waiting_for_confirmation">čekání na potvrzení…</string>
     <string name="callstate_received_answer">obdržel odpověď…</string>
     <string name="callstate_received_confirmation">obdržel potvrzení…</string>
-    <string name="callstate_connecting">připojení…</string>
+    <string name="callstate_connecting">připojování…</string>
     <string name="privacy_redefined">Nové vymezení soukromí</string>
     <string name="first_platform_without_user_ids">1. platforma bez jakýchkoliv uživatelských identifikátorů – soukromá již od návrhu.</string>
     <string name="immune_to_spam_and_abuse">Odolná vůči spamu a zneužití</string>
@@ -709,18 +709,20 @@
     <string name="audio_call_no_encryption">zvukový hovor (nešifrováno e2e)</string>
     <string name="reject">Odmítnout</string>
     <string name="your_calls">Vaše hovory</string>
-    <string name="connect_calls_via_relay">Spojení přes relay</string>
+    <string name="always_use_relay">Spojení přes relé</string>
     <string name="show_call_on_lock_screen">Zobrazit</string>
     <string name="no_call_on_lock_screen">Zakázat</string>
     <string name="your_ice_servers">Vaše servery ICE</string>
     <string name="webrtc_ice_servers">WebRTC servery ICE</string>
+    <string name="relay_server_protects_ip">Přenosový server chrání vaši IP adresu, ale může sledovat dobu trvání hovoru.</string>
+    <string name="relay_server_if_necessary">Přenosový server se používá pouze v případě potřeby. Jiná strana může sledovat vaši IP adresu.</string>
     <string name="status_no_e2e_encryption">bez šifrování e2e</string>
-    <string name="icon_descr_flip_camera">Otočit foťák</string>
+    <string name="icon_descr_flip_camera">Druhý foťák</string>
     <string name="icon_descr_call_pending_sent">Čekající hovor</string>
     <string name="icon_descr_call_missed">Zmeškaný hovor</string>
     <string name="icon_descr_call_rejected">Odmítnutý hovor</string>
     <string name="icon_descr_call_connecting">Spojování hovoru</string>
-    <string name="icon_descr_call_ended">Ukončený hovor</string>
+    <string name="icon_descr_call_ended">Skončený hovor</string>
     <string name="answer_call">Přijmout hovor</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> přeskočená zpráva (zprávy)</string>
     <string name="alert_text_skipped_messages_it_can_happen_when">Může se to stát, když:
@@ -731,31 +733,31 @@
 \nBudeme přidávat redundantní servery, abychom zabránili ztrátě zpráv.</string>
     <string name="settings_section_title_you">VY</string>
     <string name="settings_section_title_support">PODPOŘIT SIMPLEX CHAT</string>
-    <string name="settings_section_title_develop">ROZVÍJET</string>
+    <string name="settings_section_title_develop">VÝVOJ</string>
     <string name="settings_developer_tools">Nástroje pro vývojáře</string>
-    <string name="settings_section_title_incognito">Inkognito mód</string>
-    <string name="your_chat_database">Vaše chat databáze</string>
+    <string name="settings_section_title_incognito">inkognito mód</string>
+    <string name="your_chat_database">Chat databáze</string>
     <string name="run_chat_section">SPUSTIT CHAT</string>
     <string name="chat_is_running">Chat je spuštěn</string>
     <string name="chat_is_stopped">Chat je zastaven</string>
     <string name="chat_database_section">CHAT DATABÁZE</string>
-    <string name="database_passphrase">Heslo databáze</string>
+    <string name="database_passphrase">přístupová fráze databáze</string>
     <string name="new_database_archive">Archiv nové databáze</string>
     <string name="old_database_archive">Archiv staré databáze</string>
-    <string name="error_starting_chat">Chyba při spuštění chatu</string>
+    <string name="error_starting_chat">Chyba spouštění chatu</string>
     <string name="stop_chat_question">Zastavit chat\?</string>
     <string name="stop_chat_to_export_import_or_delete_chat_database">Zastavte chat pro export, import nebo smazání chat databáze. Během zastavení, nebudete moci přijímat ani odesílat zprávy.</string>
     <string name="stop_chat_confirmation">Zastavit</string>
-    <string name="set_password_to_export">Nastavení přístupové fráze pro export</string>
+    <string name="set_password_to_export">Nastavte přístupovou frázi pro export</string>
     <string name="set_password_to_export_desc">Databáze je šifrována pomocí náhodné přístupové fráze. Před exportem ji změňte.</string>
-    <string name="error_stopping_chat">Chyba při zastavení chatu</string>
+    <string name="error_stopping_chat">Chyba zastavování chatu</string>
     <string name="import_database_question">Importovat chat databázi\?</string>
     <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Vaše aktuální chat databáze bude SMAZÁNA a NAHRAZENA importovanou databází.
-\nTuto akci nelze vzít zpět - váš profily, kontakty, zprávy a soubory budou nenávratně ztraceny.</string>
+\nTuto akci nelze vzít zpět - vaše profily, kontakty, zprávy a soubory budou nenávratně ztraceny.</string>
     <string name="error_deleting_database">Chyba mazání chat databáze</string>
     <string name="error_importing_database">Chyba importu chat databáze</string>
     <string name="chat_database_deleted">Chat databáze odstraněna</string>
-    <string name="delete_files_and_media_for_all_users">Odstranění souborů pro všechny chat profily</string>
+    <string name="delete_files_and_media_for_all_users">Odstranit soubory všech chat profilů</string>
     <string name="delete_files_and_media_all">Odstranit všechny soubory</string>
     <string name="delete_files_and_media_desc">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.</string>
     <string name="no_received_app_files">Žádné přijaté ani odeslané soubory</string>
@@ -768,11 +770,11 @@
     <string name="enable_automatic_deletion_question">Povolit automatické mazání zpráv\?</string>
     <string name="enable_automatic_deletion_message">Tuto akci nelze vzít zpět - zprávy odeslané a přijaté dříve, než bylo zvoleno, budou smazány. Může to trvat několik minut.</string>
     <string name="error_changing_message_deletion">Chyba změny nastavení</string>
-    <string name="save_passphrase_in_keychain">Uložit přístupovou frázi do úložiště klíčů</string>
+    <string name="save_passphrase_in_keychain">Uložit frázi do úložiště klíčů</string>
     <string name="database_encrypted">Databáze šifrována!</string>
     <string name="error_encrypting_database">Chyba šifrování databáze</string>
     <string name="encrypt_database">Šifrovat</string>
-    <string name="encrypted_with_random_passphrase">Databáze je šifrována pomocí náhodné přístupové fráze, můžete ji změnit.</string>
+    <string name="encrypted_with_random_passphrase">Databáze je šifrována pomocí náhodné přístupové fráze, musíte ji změnit.</string>
     <string name="keychain_allows_to_receive_ntfs">K bezpečnému uložení přístupové fráze se použije úložiště klíčů Android, po restartování aplikace nebo změně přístupové fráze - umožní přijímání oznámení.</string>
     <string name="you_have_to_enter_passphrase_every_time">Musíte zadat přístupovou frázi při každém spuštění aplikace - není uložena v zařízení.</string>
     <string name="encrypt_database_question">Šifrovat databázi\?</string>
@@ -786,7 +788,7 @@
     <string name="database_error">Chyba databáze</string>
     <string name="keychain_error">Chyba klíčenky</string>
     <string name="passphrase_is_different">Přístupová fráze databáze se liší od té uložené v klíčence.</string>
-    <string name="cannot_access_keychain">Nelze získat přístup k úložišti klíčů pro uložení přístupová fráze k databázi.</string>
+    <string name="cannot_access_keychain">Nelze získat přístup ke klíčence pro uložení přístupová fráze k databázi.</string>
     <string name="unknown_database_error_with_info">Neznámá chyba databáze: %s</string>
     <string name="wrong_passphrase_title">Špatná přístupová fráze!</string>
     <string name="enter_correct_passphrase">Zadejte správnou přístupovou frázi.</string>
@@ -795,13 +797,13 @@
     <string name="restore_database_alert_title">Obnovit zálohu databáze\?</string>
     <string name="restore_database_alert_confirm">Obnovit</string>
     <string name="database_restore_error">Chyba obnovení databáze</string>
-    <string name="restore_passphrase_not_found_desc">Heslo nebylo nalezeno v úložišti klíčů, zadejte jej prosím ručně. K této situaci mohlo dojít, pokud jste obnovili data aplikace pomocí zálohovacího nástroje. Pokud tomu tak není, obraťte se na vývojáře.</string>
-    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Chat můžete spustit přes Nastavení aplikace / Databáze nebo restartováním aplikace.</string>
+    <string name="restore_passphrase_not_found_desc">Heslo nebylo v klíčence nalezeno, zadejte jej prosím ručně. K této situaci mohlo dojít, pokud jste obnovili data aplikace pomocí zálohovacího nástroje. Pokud tomu tak není, obraťte se na vývojáře.</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Chat můžete spustit v Nastavení / Databáze nebo restartováním aplikace.</string>
     <string name="save_archive">Uložit archiv</string>
     <string name="delete_archive">Smazat archiv</string>
     <string name="group_invitation_item_description">pozvánka do skupiny <xliff:g id="group_name">%1$s</xliff:g></string>
     <string name="archive_created_on_ts">Vytvořeno dne <xliff:g id="archive_ts">%1$s</xliff:g></string>
-    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Jste zváni do skupiny. Připojte se a spojte se s členy skupiny.</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Jste zváni do skupiny. Připojte se k členům skupiny.</string>
     <string name="join_group_incognito_button">Připojit se inkognito</string>
     <string name="joining_group">Připojit ke skupině</string>
     <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Připojili jste se k této skupině. Připojení k pozvání člena skupiny.</string>
@@ -835,15 +837,15 @@
     <string name="group_member_role_member">člen</string>
     <string name="group_member_role_owner">vlastník</string>
     <string name="group_member_status_removed">odstraněn</string>
-    <string name="group_member_status_left">vlevo</string>
+    <string name="group_member_status_left">odešel</string>
     <string name="group_member_status_group_deleted">skupina smazána</string>
-    <string name="group_member_status_invited">pozvánka</string>
-    <string name="group_member_status_introduced">připojující (zavedený)</string>
+    <string name="group_member_status_invited">pozván</string>
+    <string name="group_member_status_introduced">představen (zaveden)</string>
     <string name="group_member_status_intro_invitation">připojení (pozvánka na představení)</string>
-    <string name="group_member_status_accepted">připojení (přijato)</string>
-    <string name="group_member_status_announced">připojení (oznámeno)</string>
+    <string name="group_member_status_accepted">připojen (přijat)</string>
+    <string name="group_member_status_announced">připojen (oznámen)</string>
     <string name="group_member_status_connected">připojen</string>
-    <string name="group_member_status_complete">kompletní</string>
+    <string name="group_member_status_complete">komplet</string>
     <string name="group_member_status_creator">tvůrce</string>
     <string name="group_member_status_connecting">připojování</string>
     <string name="no_contacts_to_add">Žádné kontakty k přidání</string>
@@ -852,18 +854,18 @@
     <string name="skip_inviting_button">Přeskočit pozvání členů</string>
     <string name="select_contacts">Vybrat kontakty</string>
     <string name="icon_descr_contact_checked">Zkontrolované kontakty</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> kontakt(y) vybrán(y)</string>
+    <string name="num_contacts_selected">%d kontakt(y) vybrán(y)</string>
     <string name="button_add_members">Pozvat členy</string>
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> MEMBERS</string>
     <string name="group_info_member_you">vy: <xliff:g id="group_info_you">%1$s</xliff:g></string>
     <string name="button_delete_group">Smazat skupinu</string>
     <string name="delete_group_question">Smazat skupinu\?</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">Skupina bude smazána pro všechny členy - nelze to vzít zpět!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">Skupina bude smazána pro vás - toto nelze vzít zpět!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">Skupina bude smazána pouze pro vás - toto nelze vzít zpět!</string>
     <string name="button_leave_group">Opustit skupinu</string>
     <string name="button_edit_group_profile">Upravit profil skupiny</string>
-    <string name="group_link">Odkaz na skupinu</string>
-    <string name="create_group_link">Vytvořit odkaz na skupinu</string>
+    <string name="group_link">Odkaz skupiny</string>
+    <string name="create_group_link">Vytvořit odkaz skupiny</string>
     <string name="delete_link">Smazat odkaz</string>
     <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Můžete sdílet odkaz nebo QR kód - ke skupině se bude moci připojit kdokoli. O členy skupiny nepřijdete, pokud ji později odstraníte.</string>
     <string name="error_creating_link_for_group">Chyba vytváření odkazu skupiny</string>
@@ -899,10 +901,10 @@
     <string name="users_delete_with_connections">Profil a připojení k serveru</string>
     <string name="users_delete_data_only">Pouze místní data profilu</string>
     <string name="incognito_random_profile_from_contact_description">Náhodný profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz.</string>
-    <string name="incognito_info_protects">Režim inkognito chrání soukromí vašeho hlavního profilového jména a obrázku - pro každý nový kontakt je vytvořen nový náhodný profil.</string>
-    <string name="incognito_info_find">Chcete-li najít profil použitý pro inkognito připojení, klepněte na název kontaktu nebo skupiny v horní části chatu.</string>
-    <string name="theme_light">Světlý</string>
-    <string name="theme_dark">Tmavý</string>
+    <string name="incognito_info_protects">Režim inkognito chrání soukromí vašeho hlavního profilu, jména a obrázku - pro každý nový kontakt je vytvořen nový náhodný profil.</string>
+    <string name="incognito_info_find">Chcete-li najít profil použitý pro inkognito připojení, klepněte na název kontaktu nebo skupiny v horní části.</string>
+    <string name="theme_light">Světlé</string>
+    <string name="theme_dark">Tmavé</string>
     <string name="theme">Téma</string>
     <string name="chat_preferences_contact_allows">Kontakt povolil</string>
     <string name="chat_preferences_on">zapnuto</string>
@@ -911,32 +913,32 @@
     <string name="contact_preferences">Předvolby kontaktu</string>
     <string name="group_preferences">Předvolby skupiny</string>
     <string name="direct_messages">Přímé zprávy</string>
-    <string name="full_deletion">Smazat pro všechny</string>
-    <string name="feature_enabled">povoleno</string>
-    <string name="feature_enabled_for_you">povoleno pro vás</string>
-    <string name="feature_off">vypnuto</string>
-    <string name="prohibit_sending_disappearing_messages">Zakázat zasílání mizejících zpráv.</string>
+    <string name="full_deletion">Mazání všem</string>
+    <string name="feature_enabled">zapnuty</string>
+    <string name="feature_enabled_for_you">povoleno vám</string>
+    <string name="feature_off">vypnuty</string>
+    <string name="prohibit_sending_disappearing_messages">Mizící zprávy zakázány.</string>
     <string name="contacts_can_mark_messages_for_deletion">Kontakty mohou označit zprávy ke smazání; vy je budete moci zobrazit.</string>
-    <string name="prohibit_sending_voice_messages">Zakázat odesílání hlasových zpráv.</string>
-    <string name="only_you_can_send_disappearing">Mizející zprávy můžete odesílat pouze vy.</string>
-    <string name="disappearing_prohibited_in_this_chat">Mizející zprávy jsou v tomto chatu zakázány.</string>
+    <string name="prohibit_sending_voice_messages">Hlasové zprávy zakázány.</string>
+    <string name="only_you_can_send_disappearing">Pouze vy můžete odesílat mizící zprávy.</string>
+    <string name="disappearing_prohibited_in_this_chat">Mizící zprávy jsou v tomto chatu zakázány.</string>
     <string name="only_your_contact_can_delete">Nevratně mazat zprávy může pouze váš kontakt (vy je můžete označit ke smazání).</string>
     <string name="both_you_and_your_contact_can_send_voice">Hlasové zprávy můžete posílat vy i váš kontakt.</string>
     <string name="only_you_can_send_voice">Hlasové zprávy můžete posílat pouze vy.</string>
     <string name="only_your_contact_can_send_voice">Hlasové zprávy může odesílat pouze váš kontakt.</string>
     <string name="voice_prohibited_in_this_chat">Hlasové zprávy jsou v tomto chatu zakázány.</string>
-    <string name="prohibit_sending_disappearing">Zakázat posílání mizejících zpráv.</string>
-    <string name="prohibit_message_deletion">Zakázat nevratné mazání zpráv.</string>
-    <string name="prohibit_sending_voice">Zakázat odesílání hlasových zpráv.</string>
-    <string name="group_members_can_send_disappearing">Členové skupiny mohou posílat mizející zprávy.</string>
-    <string name="disappearing_messages_are_prohibited">Mizející zprávy jsou v této skupině zakázány.</string>
+    <string name="prohibit_sending_disappearing">Posílání mizících zpráv zakázáno.</string>
+    <string name="prohibit_message_deletion">Nevratné mazání odeslaných zpráv zakázáno.</string>
+    <string name="prohibit_sending_voice">Hlasové zprávy zakázány.</string>
+    <string name="group_members_can_send_disappearing">Členové skupiny mohou posílat mizící zprávy.</string>
+    <string name="disappearing_messages_are_prohibited">Mizící zprávy jsou v této skupině zakázány.</string>
     <string name="group_members_can_send_dms">Členové skupiny mohou posílat přímé zprávy.</string>
     <string name="direct_messages_are_prohibited_in_chat">Přímé zprávy mezi členy jsou v této skupině zakázány.</string>
     <string name="group_members_can_delete">Členové skupiny mohou nevratně mazat odeslané zprávy.</string>
     <string name="message_deletion_prohibited_in_chat">Nevratné mazání zpráv je v této skupině zakázáno.</string>
     <string name="group_members_can_send_voice">Členové skupiny mohou posílat hlasové zprávy.</string>
     <string name="voice_messages_are_prohibited">Hlasové zprávy jsou v této skupině zakázány.</string>
-    <string name="delete_after">Smazat po</string>
+    <string name="delete_after">Smazat za</string>
     <string name="ttl_month">%d měsíc</string>
     <string name="ttl_months">%d měsíců</string>
     <string name="ttl_day">%d den</string>
@@ -947,9 +949,9 @@
     <string name="feature_offered_item">nabízeno %s</string>
     <string name="feature_cancelled_item">zrušeno %s</string>
     <string name="whats_new">Co je nového</string>
-    <string name="new_in_version">Novinky v %s</string>
+    <string name="new_in_version">Novinky %s</string>
     <string name="v4_2_auto_accept_contact_requests">Automatické přijímání žádostí o kontakt</string>
-    <string name="v4_2_auto_accept_contact_requests_desc">S volitelnou uvítací zprávou.</string>
+    <string name="v4_2_auto_accept_contact_requests_desc">Volitelná uvítací zpráva.</string>
     <string name="v4_3_voice_messages_desc">Max. 40 sekund, přijímá se okamžitě.</string>
     <string name="v4_5_private_filenames">Soukromé názvy souborů</string>
     <string name="v4_5_private_filenames_descr">Pro ochranu časového pásma, obrazové/hlasové soubory používají UTC.</string>
@@ -957,14 +959,103 @@
     <string name="v4_5_reduced_battery_usage_descr">Další vylepšení se chystají již brzy!</string>
     <string name="v4_5_italian_interface">Italské rozhraní</string>
     <string name="v4_5_italian_interface_descr">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Budete připojeni, až bude zařízení vašeho kontaktu online, vyčkejte prosím nebo se podívejte později!</string>
-    <string name="your_contact_address">Vaše kontaktní adresa</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Budete připojeni, jakmile bude zařízení vašeho kontaktu online, vyčkejte prosím nebo se podívejte později!</string>
+    <string name="your_contact_address">Vaše adresa</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Váš chat profil bude odeslán
 \nvašemu kontaktu</string>
-    <string name="your_chat_profiles_stored_locally">Vaše chat profily jsou uloženy lokálně, pouze ve vašem zařízení.</string>
     <string name="your_chats">Vaše konverzace</string>
     <string name="paste_connection_link_below_to_connect">Do níže uvedeného pole vložte odkaz, který jste obdrželi pro spojení s kontaktem.</string>
-    <string name="share_invitation_link">Sdílet zvací odkaz</string>
-    <string name="status_e2e_encrypted">end-to-end šifrované</string>
+    <string name="share_invitation_link">Sdílet pozvánku</string>
+    <string name="status_e2e_encrypted">koncově šifrované</string>
     <string name="moderated_description">moderované</string>
+    <string name="moderated_item_description">moderovaný %s</string>
+    <string name="delete_member_message__question">Smazat zprávu člena\?</string>
+    <string name="moderate_verb">moderovaný</string>
+    <string name="observer_cant_send_message_desc">Kontaktujte prosím správce skupiny.</string>
+    <string name="you_are_observer">jste pozorovatel</string>
+    <string name="group_member_role_observer">pozorovatel</string>
+    <string name="moderate_message_will_be_deleted_warning">Zpráva bude smazána pro všechny členy.</string>
+    <string name="moderate_message_will_be_marked_warning">Zpráva bude pro všechny členy označena jako moderovaná.</string>
+    <string name="observer_cant_send_message_title">Nemůžete posílat zprávy!</string>
+    <string name="error_updating_link_for_group">Chyba aktualizace odkazu skupiny</string>
+    <string name="initial_member_role">Počáteční role</string>
+    <string name="language_system">Systém</string>
+    <string name="smp_save_servers_question">Uložit servery\?</string>
+    <string name="dont_show_again">Znovu neukazuj</string>
+    <string name="cant_delete_user_profile">Nemohu smazat uživatelský profil!</string>
+    <string name="button_add_welcome_message">Přidat uvítací zprávu</string>
+    <string name="v4_6_chinese_spanish_interface">Čínské a Španělské rozhranní</string>
+    <string name="v4_6_audio_video_calls">Hlasové a video hovory</string>
+    <string name="confirm_password">Potvrdit heslo</string>
+    <string name="enter_password_to_show">Zadejte heslo do hledání</string>
+    <string name="v4_6_reduced_battery_usage">Další snížení spotřeby baterie</string>
+    <string name="error_saving_user_password">Chyba ukládání hesla uživatele</string>
+    <string name="error_updating_user_privacy">Chyba aktualizace soukromí uživatele</string>
+    <string name="v4_6_group_moderation">Správa skupin</string>
+    <string name="v4_6_group_welcome_message">Uvítací zpráva skupin</string>
+    <string name="v4_6_hidden_chat_profiles">Skryté chat profily</string>
+    <string name="hidden_profile_password">Hesla skrytých profilů</string>
+    <string name="user_hide">Skrýt</string>
+    <string name="hide_profile">Skrýt profil</string>
+    <string name="make_profile_private">Změnit profil na soukromý!</string>
+    <string name="v4_6_reduced_battery_usage_descr">Další vylepšení již brzy!</string>
+    <string name="v4_6_group_moderation_descr">Nyní mohou správci:
+\n- mazat zprávy členů.
+\n- zakázat členy (role \"pozorovatel\")</string>
+    <string name="save_profile_password">Uložit heslo profilu</string>
+    <string name="user_mute">Ztlumit</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Chraňte své chat profily heslem!</string>
+    <string name="save_and_update_group_profile">Uložit a aktualizovat profil skupiny</string>
+    <string name="muted_when_inactive">Ztlumit při neaktivitě!</string>
+    <string name="password_to_show">Heslo k zobrazení</string>
+    <string name="save_welcome_message_question">Uložit uvítací zprávu\?</string>
+    <string name="v4_6_group_welcome_message_descr">Nastavte zprávu zobrazenou novým členům!</string>
+    <string name="v4_6_audio_video_calls_descr">Podpora bluetooth a další vylepšení.</string>
+    <string name="tap_to_activate_profile">Klepnutím aktivujete profil.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
+    <string name="should_be_at_least_one_profile">Měl by tam být alespoň jeden uživatelský profil.</string>
+    <string name="button_welcome_message">Uvítací zpráva</string>
+    <string name="group_welcome_title">Uvítací zpráva</string>
+    <string name="user_unmute">Zrušit ztlumení</string>
+    <string name="to_reveal_profile_enter_password">Chcete-li odhalit svůj skrytý profil, zadejte celé heslo do vyhledávacího pole na stránce Chat profily.</string>
+    <string name="should_be_at_least_one_visible_profile">Měl by tam být alespoň jeden viditelný uživatelský profil.</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Stále budete přijímat volání a upozornění od umlčených profilů pokud budou aktivní.</string>
+    <string name="you_can_hide_or_mute_user_profile">Můžete skrýt nebo ztlumit uživatelský profil - Podržte pro menu.</string>
+    <string name="user_unhide">Odkrýt</string>
+    <string name="settings_send_files_via_xftp">Poslat videa a soubory přes XFTP</string>
+    <string name="database_upgrade">Aktualizace databáze</string>
+    <string name="database_downgrade_warning">Upozornění: můžete ztratit nějaká data!</string>
+    <string name="confirm_database_upgrades">Potvrdit aktualizaci databáze</string>
+    <string name="database_downgrade">Původní databáze</string>
+    <string name="mtr_error_no_down_migration">verze databáze je novější než aplikace, ale žádný přechod dolů pro: %s</string>
+    <string name="downgrade_and_open_chat">Snížit a otevřít chat</string>
+    <string name="database_migrations">Migrací: %s</string>
+    <string name="mtr_error_different">různé migrace v aplikaci/databázi: %s / %s</string>
+    <string name="incompatible_database_version">Nekompatibilní verze databáze</string>
+    <string name="invalid_migration_confirmation">Neplatné potvrzení migrace</string>
+    <string name="upgrade_and_open_chat">Zvýšit a otevřít chat</string>
+    <string name="hide_dev_options">Skrýt:</string>
+    <string name="show_developer_options">Zobrazit možnosti vývojáře</string>
+    <string name="settings_section_title_experimenta">POKUSNÝ</string>
+    <string name="xftp_requires_v461">Pro příjem přes XFTP je vyžadována verze 4.6.1+.</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">Obrázek bude přijat, až kontakt dokončí jeho nahrání.</string>
+    <string name="show_dev_options">Zobrazit:</string>
+    <string name="developer_options">ID databáze a možnost Izolace přenosu.</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Soubor bude přijat, jakmile váš kontakt dokončí nahrávání.</string>
+    <string name="file_transfer_will_be_cancelled_warning">Přenos souboru bude zrušen. Pokud probíhá, bude zastaven.</string>
+    <string name="delete_chat_profile">Smazat chat profil</string>
+    <string name="delete_profile">Smazat profil</string>
+    <string name="profile_password">Heslo profilu</string>
+    <string name="unhide_chat_profile">Odkrýt chat profil</string>
+    <string name="unhide_profile">Odkrýt profil</string>
+    <string name="cancel_file__question">Zrušit přenos souboru\?</string>
+    <string name="icon_descr_video_asked_to_receive">Žádost o přijetí videa</string>
+    <string name="videos_limit_desc">Současně lze odeslat pouze 10 videí</string>
+    <string name="videos_limit_title">Příliš mnoho videí!</string>
+    <string name="video_descr">Video</string>
+    <string name="icon_descr_waiting_for_video">Čekám na video</string>
+    <string name="icon_descr_video_snd_complete">Video odesláno</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Video bude přijato, až kontakt dokončí jeho nahrávání.</string>
+    <string name="video_will_be_received_when_contact_is_online">Video obdržíte, až bude váš kontakt online, vyčkejte prosím nebo se podívejte později!</string>
+    <string name="waiting_for_video">Čekám na video</string>
 </resources>

apps/android/app/src/main/res/values-de/strings.xml

@@ -513,13 +513,15 @@
     <!-- Call settings -->
     <string name="settings_audio_video_calls">Audio- &amp; Videoanrufe</string>
     <string name="your_calls">Ihre Anrufe</string>
-    <string name="connect_calls_via_relay">Über ein Relais verbinden</string>
+    <string name="always_use_relay">Über ein Relais verbinden</string>
     <string name="call_on_lock_screen">Anrufe auf Sperrbildschirm:</string>
     <string name="accept_call_on_lock_screen">Akzeptieren</string>
     <string name="show_call_on_lock_screen">Anzeigen</string>
     <string name="no_call_on_lock_screen">Deaktivieren</string>
     <string name="your_ice_servers">Ihre ICE-Server</string>
     <string name="webrtc_ice_servers">WebRTC ICE-Server</string>
+    <string name="relay_server_protects_ip">Relais-Server schützen Ihre IP-Adresse, aber sie können die Anrufdauer erfassen.</string>
+    <string name="relay_server_if_necessary">Relais-Server werden nur genutzt, wenn sie benötigt werden. Ihre IP-Adresse kann von Anderen erfasst werden.</string>
     <!-- Call Lock Screen -->
     <string name="open_simplex_chat_to_accept_call">Öffnen Sie <xliff:g id="appNameFull">SimpleX Chat</xliff:g>, um den Anruf anzunehmen.</string>
     <string name="allow_accepting_calls_from_lock_screen">Aktivieren Sie Anrufe vom Sperrbildschirm über die Einstellungen.</string>
@@ -763,7 +765,7 @@
     <string name="select_contacts">Kontakte auswählen</string>
     <string name="icon_descr_contact_checked">Kontakt geprüft</string>
     <string name="clear_contacts_selection_button">Löschen</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> Kontakt(e) ausgewählt</string>
+    <string name="num_contacts_selected">%d Kontakt(e) ausgewählt</string>
     <string name="no_contacts_selected">Keine Kontakte ausgewählt</string>
     <string name="invite_prohibited">Kontakt kann nicht eingeladen werden!</string>
     <string name="invite_prohibited_description">Sie versuchen, einen Kontakt, mit dem Sie ein Inkognito-Profil geteilt haben, in die Gruppe einzuladen, in der Sie Ihr Hauptprofil verwenden.</string>
@@ -1021,7 +1023,6 @@
     <string name="users_delete_data_only">Nur lokale Profildaten</string>
     <string name="users_delete_with_connections">Profil und Serververbindungen</string>
     <string name="messages_section_description">Diese Einstellung gilt für Nachrichten in Ihrem aktuellen Chat-Profil</string>
-    <string name="your_chat_profiles_stored_locally">Ihre Chat-Profile werden nur lokal auf Ihrem Endgerät gespeichert</string>
     <string name="failed_to_create_user_duplicate_title">Doppelter Anzeigename!</string>
     <string name="failed_to_create_user_title">Fehler beim Erstellen des Profils!</string>
     <string name="failed_to_active_user_title">Fehler beim Umschalten des Profils!</string>
@@ -1041,4 +1042,94 @@
     <string name="v4_4_french_interface_descr">Dank der Nutzer - Tragen Sie per Weblate bei!</string>
     <string name="v4_5_private_filenames_descr">Bild- und Sprachdateinamen enthalten UTC, um Informationen zur Zeitzone zu schützen.</string>
     <string name="moderated_description">Moderiert</string>
+    <string name="moderated_item_description">Von %s moderiert</string>
+    <string name="moderate_verb">Moderieren</string>
+    <string name="moderate_message_will_be_marked_warning">Diese Nachricht wird für alle Mitglieder als moderiert gekennzeichnet.</string>
+    <string name="you_are_observer">Sie sind Beobachter</string>
+    <string name="observer_cant_send_message_title">Sie können keine Nachrichten versenden!</string>
+    <string name="group_member_role_observer">Beobachter</string>
+    <string name="initial_member_role">Anfängliche Rolle</string>
+    <string name="delete_member_message__question">Nachricht des Mitglieds löschen\?</string>
+    <string name="error_updating_link_for_group">Fehler beim Aktualisieren des Gruppen-Links</string>
+    <string name="observer_cant_send_message_desc">Bitte kontaktieren Sie den Gruppen-Administrator.</string>
+    <string name="moderate_message_will_be_deleted_warning">Diese Nachricht wird für alle Gruppenmitglieder gelöscht.</string>
+    <string name="language_system">System</string>
+    <string name="confirm_password">Passwort bestätigen</string>
+    <string name="cant_delete_user_profile">Das Benutzerprofil kann nicht gelöscht werden!</string>
+    <string name="dont_show_again">Nicht nochmals anzeigen</string>
+    <string name="v4_6_chinese_spanish_interface">Chinesische und spanische Bedienoberfläche</string>
+    <string name="v4_6_audio_video_calls">Audio- und Videoanrufe</string>
+    <string name="button_add_welcome_message">Begrüßungsmeldung hinzufügen</string>
+    <string name="error_updating_user_privacy">Fehler beim Aktualisieren der Benutzer-Privatsphäre</string>
+    <string name="smp_save_servers_question">Alle Server speichern\?</string>
+    <string name="hide_profile">Profil verbergen</string>
+    <string name="password_to_show">Passwort anzeigen</string>
+    <string name="save_profile_password">Profil-Passwort speichern</string>
+    <string name="error_saving_user_password">Fehler beim Speichern des Benutzer-Passworts</string>
+    <string name="hidden_profile_password">Verborgenes Profil-Passwort</string>
+    <string name="button_welcome_message">Begrüßungsmeldung</string>
+    <string name="save_welcome_message_question">Begrüßungsmeldung speichern\?</string>
+    <string name="user_unhide">Verbergen aufheben</string>
+    <string name="enter_password_to_show">Für die Anzeige das Passwort im Suchfeld eingeben</string>
+    <string name="make_profile_private">Privates Profil erzeugen!</string>
+    <string name="user_mute">Stummschalten</string>
+    <string name="tap_to_activate_profile">Tippen Sie, um das Profil zu aktivieren.</string>
+    <string name="should_be_at_least_one_profile">Es muss mindestens ein Benutzer-Profil vorhanden sein.</string>
+    <string name="should_be_at_least_one_visible_profile">Es muss mindestens ein sichtbares Benutzer-Profil vorhanden sein.</string>
+    <string name="user_unmute">Stummschaltung aufheben</string>
+    <string name="muted_when_inactive">Bei Inaktivität stummgeschaltet!</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Schützen Sie Ihre Chat-Profile mit einem Passwort!</string>
+    <string name="v4_6_audio_video_calls_descr">Bluetooth-Unterstützung und weitere Verbesserungen.</string>
+    <string name="v4_6_group_moderation_descr">Administratoren können nun
+\n- Nachrichten von Gruppenmitgliedern löschen
+\n- Gruppenmitglieder deaktivieren (\"Beobachter\"-Rolle)</string>
+    <string name="v4_6_group_welcome_message">Gruppen-Begrüßungsmeldung</string>
+    <string name="v4_6_reduced_battery_usage">Weiter reduzierter Batterieverbrauch</string>
+    <string name="v4_6_reduced_battery_usage_descr">Weitere Verbesserungen sind bald verfügbar!</string>
+    <string name="v4_6_group_welcome_message_descr">Definieren Sie eine Begrüßungsmeldung, die neuen Mitgliedern angezeigt wird!</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Dank der Nutzer - Tragen Sie per Weblate bei!</string>
+    <string name="v4_6_group_moderation">Gruppenmoderation</string>
+    <string name="v4_6_hidden_chat_profiles">Verborgene Chat-Profile</string>
+    <string name="user_hide">Verberge</string>
+    <string name="save_and_update_group_profile">Gruppen-Profil sichern und aktualisieren</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Sie können Anrufe und Benachrichtigungen auch von stummgeschalteten Profilen empfangen, solange diese aktiv sind.</string>
+    <string name="group_welcome_title">Begrüßungsmeldung</string>
+    <string name="you_can_hide_or_mute_user_profile">Sie können ein Benutzerprofil verbergen oder stummschalten - für das Menü gedrückt halten.</string>
+    <string name="to_reveal_profile_enter_password">Geben Sie ein vollständiges Passwort in das Suchfeld auf der Seite \"Meine Chat-Profile\" ein, um Ihr verborgenes Profil zu sehen.</string>
+    <string name="settings_send_files_via_xftp">Videos und Dateien per XFTP versenden</string>
+    <string name="invalid_migration_confirmation">Migrations-Bestätigung ungültig</string>
+    <string name="upgrade_and_open_chat">Aktualisieren und den Chat öffnen</string>
+    <string name="confirm_database_upgrades">Datenbank-Aktualisierungen bestätigen</string>
+    <string name="show_dev_options">Anzeigen:</string>
+    <string name="show_developer_options">Entwickleroptionen anzeigen</string>
+    <string name="settings_section_title_experimenta">EXPERIMENTELL</string>
+    <string name="database_upgrade">Datenbank-Aktualisierung</string>
+    <string name="mtr_error_different">Unterschiedlicher Migrationsstand in der App/Datenbank: %s / %s</string>
+    <string name="downgrade_and_open_chat">Herabstufen und den Chat öffnen</string>
+    <string name="incompatible_database_version">Inkompatible Datenbank-Version</string>
+    <string name="database_downgrade_warning">Warnung: Sie könnten einige Daten verlieren!</string>
+    <string name="database_downgrade">Datenbank-Herabstufung</string>
+    <string name="developer_options">Datenbank-IDs und Transport-Isolationsoption.</string>
+    <string name="mtr_error_no_down_migration">Die Datenbank-Version ist neuer als die App, keine Abwärts-Migration für: %s</string>
+    <string name="hide_dev_options">Verberge:</string>
+    <string name="database_migrations">Migrationen: %s</string>
+    <string name="xftp_requires_v461">Für den Empfang per XFTP wird v4.6.1 oder neuer benötigt.</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
+    <string name="cancel_file__question">Dateitransfer abbrechen\?</string>
+    <string name="file_transfer_will_be_cancelled_warning">Der Dateitransfer wird abgebrochen. Falls er gerade abläuft, wird er angehalten.</string>
+    <string name="delete_chat_profile">Chat-Profil löschen</string>
+    <string name="delete_profile">Profil löschen</string>
+    <string name="unhide_profile">Verbergen des Profils aufheben</string>
+    <string name="profile_password">Passwort für Profil</string>
+    <string name="unhide_chat_profile">Verbergen des Chat-Profils aufheben</string>
+    <string name="icon_descr_video_asked_to_receive">Aufforderung zum Empfang des Videos</string>
+    <string name="videos_limit_desc">Es können nur 10 Videos zur gleichen Zeit versendet werden</string>
+    <string name="videos_limit_title">Zu viele Videos auf einmal!</string>
+    <string name="video_descr">Video</string>
+    <string name="icon_descr_video_snd_complete">Video gesendet</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Das Video wird empfangen, sobald Ihr Kontakt das Hochladen beendet hat.</string>
+    <string name="icon_descr_waiting_for_video">Auf das Video warten</string>
+    <string name="waiting_for_video">Auf das Video warten</string>
+    <string name="video_will_be_received_when_contact_is_online">Das Video wird empfangen, wenn Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!</string>
 </resources>

apps/android/app/src/main/res/values-fr/strings.xml

@@ -598,12 +598,14 @@
     <string name="incoming_audio_call">Appel audio entrant</string>
     <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> veut se connecter à vous via</string>
     <string name="your_calls">Vos appels</string>
-    <string name="connect_calls_via_relay">Se connecter via relais</string>
+    <string name="always_use_relay">Se connecter via relais</string>
     <string name="call_on_lock_screen">Appels en écran verrouillé :</string>
     <string name="show_call_on_lock_screen">Montrer</string>
     <string name="no_call_on_lock_screen">Désactiver</string>
     <string name="your_ice_servers">Vos serveurs ICE</string>
     <string name="webrtc_ice_servers">Serveurs WebRTC ICE</string>
+    <string name="relay_server_protects_ip">Le serveur relais protège votre adresse IP, mais il peut observer la durée de l\'appel.</string>
+    <string name="relay_server_if_necessary">Le serveur relais n\'est utilisé que si nécessaire. Un tiers peut observer votre adresse IP.</string>
     <string name="open_simplex_chat_to_accept_call">Ouvrez <xliff:g id="appNameFull">SimpleX Chat</xliff:g> pour décrocher</string>
     <string name="status_no_e2e_encryption">sans chiffrement de bout en bout</string>
     <string name="status_contact_has_e2e_encryption">Ce contact a le chiffrement de bout en bout</string>
@@ -742,7 +744,7 @@
     <string name="member_role_will_be_changed_with_notification">Le rôle sera changé pour «%s». Les membres du groupe seront notifiés.</string>
     <string name="icon_descr_contact_checked">Contact vérifié⸱e</string>
     <string name="clear_contacts_selection_button">Effacer</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> contact·s sélectionné·e·s</string>
+    <string name="num_contacts_selected">%d contact·s sélectionné·e·s</string>
     <string name="skip_inviting_button">Passer l’invitation de membres</string>
     <string name="select_contacts">Sélectionnez des contacts</string>
     <string name="no_contacts_selected">Aucun contact sélectionné</string>
@@ -940,7 +942,6 @@
     <string name="users_delete_with_connections">Profil et connexions au serveur</string>
     <string name="network_session_mode_transport_isolation">Isolement du transport</string>
     <string name="update_network_session_mode_question">Mettre à jour le mode d\'isolation du transport \?</string>
-    <string name="your_chat_profiles_stored_locally">Vos profils de chat sont stockés localement, uniquement sur votre appareil</string>
     <string name="network_session_mode_entity_description">Une connexion TCP distincte (et identifiant SOCKS) sera utilisée <b>pour chaque contact et membre de groupe</b>.
 \n<b>Veuillez noter</b> : si vous avez de nombreuses connexions, votre consommation de batterie et de réseau peut être nettement plus élevée et certaines liaisons peuvent échouer.</string>
     <string name="network_session_mode_user">Profil de chat</string>
@@ -967,4 +968,85 @@
     <string name="v4_5_transport_isolation">Isolation du transport</string>
     <string name="v4_5_multiple_chat_profiles_descr">Différents noms, avatars et mode d\'isolation de transport.</string>
     <string name="moderated_description">modéré</string>
+    <string name="moderated_item_description">modéré par %s</string>
+    <string name="delete_member_message__question">Supprimer le message de ce membre \?</string>
+    <string name="moderate_verb">Modéré</string>
+    <string name="moderate_message_will_be_deleted_warning">Le message sera supprimé pour tous les membres.</string>
+    <string name="moderate_message_will_be_marked_warning">Le message sera marqué comme modéré pour tous les membres.</string>
+    <string name="you_are_observer">vous êtes observateur</string>
+    <string name="error_updating_link_for_group">Erreur lors de la mise à jour du lien de groupe</string>
+    <string name="initial_member_role">Rôle initial</string>
+    <string name="observer_cant_send_message_desc">Veuillez contacter l\'administrateur du groupe.</string>
+    <string name="observer_cant_send_message_title">Vous ne pouvez pas envoyer de messages !</string>
+    <string name="group_member_role_observer">observateur</string>
+    <string name="language_system">Système</string>
+    <string name="smp_save_servers_question">Sauvegarder les serveurs \?</string>
+    <string name="dont_show_again">Ne plus afficher</string>
+    <string name="button_add_welcome_message">Ajouter un message d\'accueil</string>
+    <string name="cant_delete_user_profile">Impossible de supprimer le profil d\'utilisateur !</string>
+    <string name="v4_6_group_moderation">Modération de groupe</string>
+    <string name="user_hide">Cacher</string>
+    <string name="muted_when_inactive">Mute en cas d\'inactivité !</string>
+    <string name="confirm_password">Confirmer le mot de passe</string>
+    <string name="v4_6_reduced_battery_usage">Réduction accrue de l\'utilisation de la batterie</string>
+    <string name="v4_6_chinese_spanish_interface">Interface en chinois et en espagnol</string>
+    <string name="enter_password_to_show">Entrez le mot de passe dans le champ de recherche</string>
+    <string name="v4_6_audio_video_calls">Appels audio et vidéo</string>
+    <string name="v4_6_group_welcome_message">Message d\'accueil du groupe</string>
+    <string name="error_saving_user_password">Erreur d\'enregistrement du mot de passe de l\'utilisateur</string>
+    <string name="error_updating_user_privacy">Erreur de mise à jour de la confidentialité de l\'utilisateur</string>
+    <string name="hidden_profile_password">Mot de passe de profil caché</string>
+    <string name="v4_6_hidden_chat_profiles">Profils de chat cachés</string>
+    <string name="v4_6_group_moderation_descr">Désormais, les administrateurs peuvent :
+\n- supprimer les messages des membres.
+\n- désactiver des membres (rôle \"observateur\")</string>
+    <string name="save_welcome_message_question">Sauvegarder le message d\'accueil \?</string>
+    <string name="v4_6_group_welcome_message_descr">Choisissez un message à l\'attention des nouveaux membres !</string>
+    <string name="hide_profile">Masquer le profil</string>
+    <string name="v4_6_reduced_battery_usage_descr">D\'autres améliorations sont à venir !</string>
+    <string name="password_to_show">Mot de passe à afficher</string>
+    <string name="make_profile_private">Rendre un profil privé !</string>
+    <string name="user_mute">Mute</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Protégez vos profils de chat par un mot de passe !</string>
+    <string name="tap_to_activate_profile">Appuyez pour activer le profil.</string>
+    <string name="save_and_update_group_profile">Sauvegarder et mettre à jour le profil du groupe</string>
+    <string name="save_profile_password">Enregistrer le mot de passe du profil</string>
+    <string name="to_reveal_profile_enter_password">Pour révéler votre profil caché, entrez le mot de passe dans le champ de recherche de la page Profils de chat.</string>
+    <string name="v4_6_audio_video_calls_descr">Prise en charge du Bluetooth et autres améliorations.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Merci aux utilisateurs - contribuez via Weblate !</string>
+    <string name="should_be_at_least_one_profile">Il doit y avoir au moins un profil d\'utilisateur.</string>
+    <string name="should_be_at_least_one_visible_profile">Il doit y avoir au moins un profil d\'utilisateur visible.</string>
+    <string name="user_unhide">Dévoiler</string>
+    <string name="user_unmute">Démute</string>
+    <string name="button_welcome_message">Message d\'accueil</string>
+    <string name="group_welcome_title">Message d\'accueil</string>
+    <string name="you_can_hide_or_mute_user_profile">Vous pouvez masquer ou mettre en sourdine un profil d\'utilisateur - maintenez-le enfoncé pour accéder au menu.</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Vous continuerez à recevoir des appels et des notifications des profils mis en sourdine lorsqu\'ils sont actifs.</string>
+    <string name="settings_send_files_via_xftp">Envoi de fichiers via XFTP</string>
+    <string name="database_downgrade">Rétrogradation de la base de données</string>
+    <string name="database_upgrade">Mise à niveau de la base de données</string>
+    <string name="incompatible_database_version">Version de la base de données incompatible</string>
+    <string name="downgrade_and_open_chat">Rétrograder et ouvrir le chat</string>
+    <string name="invalid_migration_confirmation">Confirmation de migration invalide</string>
+    <string name="upgrade_and_open_chat">Mettre à niveau et ouvrir le chat</string>
+    <string name="database_migrations">Migrations : %s</string>
+    <string name="database_downgrade_warning">Attention : vous risquez de perdre des données !</string>
+    <string name="confirm_database_upgrades">Confirmer la mise à niveau de la base de données</string>
+    <string name="mtr_error_no_down_migration">la base de données a une version plus récente que celle de l\'application, mais il n\'y a pas de rétrogradation pour : %s</string>
+    <string name="mtr_error_different">migration différente dans l\'app/la base de données : %s / %s</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">L\'image sera reçue lorsque votre contact aura terminé de la mettre en ligne.</string>
+    <string name="show_dev_options">Afficher :</string>
+    <string name="show_developer_options">Afficher les options pour les développeurs</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Le fichier sera reçu lorsque votre contact aura terminé de le mettre en ligne.</string>
+    <string name="xftp_requires_v461">v4.6.1+ nécessaire pour la réception via XFTP.</string>
+    <string name="developer_options">IDs de base de données et option d\'isolation du transport.</string>
+    <string name="settings_section_title_experimenta">EXPÉRIMENTALE</string>
+    <string name="hide_dev_options">Cacher :</string>
+    <string name="unhide_chat_profile">Dévoiler le profil de chat</string>
+    <string name="unhide_profile">Dévoiler le profil</string>
+    <string name="delete_chat_profile">Supprimer le profil de chat</string>
+    <string name="delete_profile">Supprimer le profil</string>
+    <string name="cancel_file__question">Annuler le transfert de fichiers \?</string>
+    <string name="file_transfer_will_be_cancelled_warning">Le transfert de fichiers sera annulé. S\'il est en cours, il sera interrompu.</string>
+    <string name="profile_password">Mot de passe de profil</string>
 </resources>

apps/android/app/src/main/res/values-it/strings.xml

@@ -378,7 +378,7 @@
     <string name="icon_descr_call_progress">Chiamata in corso</string>
     <string name="call_on_lock_screen">Chiamate sulla schermata di blocco:</string>
     <string name="icon_descr_call_connecting">Connessione chiamata</string>
-    <string name="connect_calls_via_relay">Connetti via relay</string>
+    <string name="always_use_relay">Connetti via relay</string>
     <string name="status_contact_has_e2e_encryption">il contatto ha la crittografia e2e</string>
     <string name="status_contact_has_no_e2e_encryption">il contatto non ha la crittografia e2e</string>
     <string name="no_call_on_lock_screen">Disattiva</string>
@@ -718,6 +718,8 @@
     <string name="icon_descr_video_off">Video off</string>
     <string name="icon_descr_video_on">Video on</string>
     <string name="webrtc_ice_servers">Server WebRTC ICE</string>
+    <string name="relay_server_protects_ip">Il server relay protegge il tuo indirizzo IP, ma può osservare la durata della chiamata.</string>
+    <string name="relay_server_if_necessary">Il server relay viene usato solo se necessario. Un altro utente può osservare il tuo indirizzo IP.</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> messaggio/i saltato/i</string>
     <string name="your_calls">Le tue chiamate</string>
     <string name="your_ice_servers">I tuoi server ICE</string>
@@ -817,7 +819,7 @@
     <string name="button_send_direct_message">Invia messaggio diretto</string>
     <string name="skip_inviting_button">Salta l\'invito di membri</string>
     <string name="switch_verb">Cambia</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> contatto/i selezionato/i</string>
+    <string name="num_contacts_selected">%d contatto/i selezionato/i</string>
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> MEMBRI</string>
     <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Puoi condividere un link o un codice QR: chiunque potrà unirsi al gruppo. Non perderai i membri del gruppo se in seguito lo elimini.</string>
     <string name="invite_prohibited_description">Stai tentando di invitare un contatto con cui hai condiviso un profilo in incognito nel gruppo in cui stai usando il tuo profilo principale</string>
@@ -946,7 +948,6 @@
     <string name="delete_files_and_media_for_all_users">Elimina i file per tutti i profili di chat</string>
     <string name="failed_to_active_user_title">Errore nel cambio di profilo!</string>
     <string name="failed_to_create_user_title">Errore nella creazione del profilo!</string>
-    <string name="your_chat_profiles_stored_locally">I tuoi profili di chat sono memorizzati localmente, solo sul tuo dispositivo</string>
     <string name="error_deleting_user">Errore nell\'eliminazione del profilo utente</string>
     <string name="users_delete_with_connections">Profilo e connessioni al server</string>
     <string name="your_chat_profiles">I tuoi profili di chat</string>
@@ -967,4 +968,85 @@
     <string name="v4_5_private_filenames_descr">Per proteggere il fuso orario, i file immagine/vocali usano UTC.</string>
     <string name="v4_5_multiple_chat_profiles_descr">Nomi e avatar diversi, isolamento del trasporto.</string>
     <string name="moderated_description">moderato</string>
+    <string name="moderated_item_description">moderato da %s</string>
+    <string name="delete_member_message__question">Eliminare il messaggio del membro\?</string>
+    <string name="moderate_verb">Modera</string>
+    <string name="moderate_message_will_be_deleted_warning">Il messaggio verrà eliminato per tutti i membri.</string>
+    <string name="moderate_message_will_be_marked_warning">Il messaggio sarà segnato come moderato per tutti i membri.</string>
+    <string name="you_are_observer">sei un osservatore</string>
+    <string name="initial_member_role">Ruolo iniziale</string>
+    <string name="error_updating_link_for_group">Errore nell\'aggiornamento del link del gruppo</string>
+    <string name="group_member_role_observer">osservatore</string>
+    <string name="observer_cant_send_message_desc">Contatta l\'amministratore del gruppo.</string>
+    <string name="observer_cant_send_message_title">Non puoi inviare messaggi!</string>
+    <string name="language_system">Sistema</string>
+    <string name="button_add_welcome_message">Aggiungi messaggio di benvenuto</string>
+    <string name="button_welcome_message">Messaggio di benvenuto</string>
+    <string name="save_welcome_message_question">Salvare il messaggio di benvenuto\?</string>
+    <string name="group_welcome_title">Messaggio di benvenuto</string>
+    <string name="save_and_update_group_profile">Salva e aggiorna il profilo del gruppo</string>
+    <string name="enter_password_to_show">Inserisci password nella ricerca</string>
+    <string name="user_mute">Silenzia</string>
+    <string name="tap_to_activate_profile">Tocca per attivare il profilo.</string>
+    <string name="user_unhide">Svela</string>
+    <string name="make_profile_private">Rendi privato il profilo!</string>
+    <string name="should_be_at_least_one_profile">Deve esserci almeno un profilo utente.</string>
+    <string name="should_be_at_least_one_visible_profile">Deve esserci almeno un profilo utente visibile.</string>
+    <string name="you_can_hide_or_mute_user_profile">Puoi nascondere o silenziare un profilo utente - tienilo premuto per il menu.</string>
+    <string name="dont_show_again">Non mostrare più</string>
+    <string name="muted_when_inactive">Silenzioso quando inattivo!</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Continuerai a ricevere chiamate e notifiche da profili silenziati quando sono attivi.</string>
+    <string name="v4_6_audio_video_calls">Chiamate audio e video</string>
+    <string name="v4_6_group_moderation">Moderazione del gruppo</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Proteggi i tuoi profili di chat con una password!</string>
+    <string name="v4_6_audio_video_calls_descr">Supporto a bluetooth e altri miglioramenti.</string>
+    <string name="v4_6_group_welcome_message">Messaggio di benvenuto del gruppo</string>
+    <string name="v4_6_reduced_battery_usage_descr">Altri miglioramenti sono in arrivo!</string>
+    <string name="v4_6_chinese_spanish_interface">Interfaccia cinese e spagnola</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Grazie agli utenti – contribuite via Weblate!</string>
+    <string name="hidden_profile_password">Password del profilo nascosta</string>
+    <string name="save_profile_password">Salva la password del profilo</string>
+    <string name="to_reveal_profile_enter_password">Per rivelare il tuo profilo nascosto, inserisci una password completa in un campo di ricerca nella pagina \"I tuoi profili di chat\".</string>
+    <string name="password_to_show">Password per mostrare</string>
+    <string name="v4_6_group_moderation_descr">Ora gli amministratori possono:
+\n- eliminare i messaggi dei membri.
+\n- disattivare i membri (ruolo \"osservatore\")</string>
+    <string name="cant_delete_user_profile">Impossibile eliminare il profilo utente!</string>
+    <string name="hide_profile">Nascondi il profilo</string>
+    <string name="confirm_password">Conferma password</string>
+    <string name="error_updating_user_privacy">Errore nell\'aggiornamento della privacy dell\'utente</string>
+    <string name="smp_save_servers_question">Salvare i server\?</string>
+    <string name="error_saving_user_password">Errore nel salvataggio della password utente</string>
+    <string name="v4_6_reduced_battery_usage">Ulteriore riduzione del consumo della batteria</string>
+    <string name="v4_6_hidden_chat_profiles">Profili di chat nascosti</string>
+    <string name="user_hide">Nascondi</string>
+    <string name="v4_6_group_welcome_message_descr">Imposta il messaggio mostrato ai nuovi membri!</string>
+    <string name="user_unmute">Riattiva audio</string>
+    <string name="settings_send_files_via_xftp">Invia file via XFTP</string>
+    <string name="database_downgrade">Downgrade del database</string>
+    <string name="database_upgrade">Aggiornamento del database</string>
+    <string name="incompatible_database_version">Versione del database incompatibile</string>
+    <string name="upgrade_and_open_chat">Aggiorna e apri chat</string>
+    <string name="developer_options">ID del database e opzione isolamento del trasporto.</string>
+    <string name="hide_dev_options">Nascondi:</string>
+    <string name="show_dev_options">Mostra:</string>
+    <string name="show_developer_options">Mostra opzioni sviluppatore</string>
+    <string name="xftp_requires_v461">v4.6.1+ necessaria per ricevere via XFTP.</string>
+    <string name="downgrade_and_open_chat">Esegui downgrade e apri chat</string>
+    <string name="database_migrations">Migrazioni: %s</string>
+    <string name="database_downgrade_warning">Attenzione: potresti perdere alcuni dati!</string>
+    <string name="confirm_database_upgrades">Conferma aggiornamenti database</string>
+    <string name="mtr_error_different">migrazione diversa nell\'app/nel database: %s / %s</string>
+    <string name="invalid_migration_confirmation">Conferma di migrazione non valida</string>
+    <string name="settings_section_title_experimenta">SPERIMENTALE</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">L\'immagine verrà ricevuta quando il tuo contatto completerà l\'invio.</string>
+    <string name="mtr_error_no_down_migration">la versione del database è più recente di quella dell\'app, ma nessuna migrazione downgrade per: %s</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Il file verrà ricevuto quando il tuo contatto completerà l\'invio.</string>
+    <string name="cancel_file__question">Annullare il trasferimento di file\?</string>
+    <string name="file_transfer_will_be_cancelled_warning">Il trasferimento di file verrà annullato. Se è in corso, verrà interrotto.</string>
+    <string name="unhide_chat_profile">Svela il profilo chat</string>
+    <string name="unhide_profile">Svela profilo</string>
+    <string name="delete_chat_profile">Elimina il profilo di chat</string>
+    <string name="delete_profile">Elimina profilo</string>
+    <string name="profile_password">Password del profilo</string>
 </resources>

apps/android/app/src/main/res/values-ja/strings.xml

@@ -459,7 +459,7 @@
     <string name="core_version">コアのバージョン: v%s</string>
     <string name="edit_image">画像を編集</string>
     <string name="callstatus_missed">不在着信</string>
-    <string name="connect_calls_via_relay">リレー経由で繋がる。</string>
+    <string name="always_use_relay">リレー経由で繋がる。</string>
     <string name="status_e2e_encrypted">エンドツーエンド暗号化済み</string>
     <string name="chat_database_deleted">チャットのデータベースが削除されました。</string>
     <string name="delete_messages_after">次の期間が経ったら、メッセージを削除:</string>
@@ -802,7 +802,7 @@
     <string name="you_sent_group_invitation">グループの招待を送りました</string>
     <string name="snd_group_event_changed_member_role">%sの役割を次に変えました：%s</string>
     <string name="button_send_direct_message">ダイレクトメッセージを送信</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g>連絡先が選択中</string>
+    <string name="num_contacts_selected">%d 連絡先が選択中</string>
     <string name="snd_group_event_member_deleted">除名しました： <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="switch_verb">切り替える</string>
     <string name="member_role_will_be_changed_with_notification">役割が「%s」となります。グループの全員に通知が出ます。</string>
@@ -812,7 +812,6 @@
     <string name="network_options_save">保存</string>
     <string name="update_network_settings_question">ネットワーク設定を更新しますか？</string>
     <string name="updating_settings_will_reconnect_client_to_all_servers">設定を更新すると、全サーバにクライントの再接続が行われます。</string>
-    <string name="your_chat_profiles_stored_locally">チャットプロフィールはローカルであなたの端末だけに保存されます。</string>
     <string name="save_color">色を保存</string>
     <string name="chat_preferences_you_allow">あなたが次を許可しています：</string>
     <string name="chat_preferences_yes">はい</string>

apps/android/app/src/main/res/values-ko/strings.xml

@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="server_connected">연결됨</string>
+    <string name="server_connecting">연결 중</string>
+    <string name="connect_via_group_link">그룹 링크를 통해 연결할까요\?</string>
+    <string name="connect_via_invitation_link">초대 링크로 연결할까요\?</string>
+    <string name="display_name_connection_established">연결 수립됨</string>
+    <string name="connection_timeout">연결 시간 초과</string>
+    <string name="cannot_receive_file">파일을 받을 수 없습니다</string>
+    <string name="contact_already_exists">이미 추가된 연락처에요.</string>
+    <string name="smp_server_test_connect">연결</string>
+    <string name="connection_error_auth">연결 오류 (인증)</string>
+    <string name="smp_server_test_create_queue">대기열 생성</string>
+    <string name="database_initialization_error_title">데이터베이스를 초기화할 수 없어요</string>
+    <string name="notifications_mode_service_desc">앱이 백그라운드에서 항상 실행돼요. 대신 메시지가 도착하자마자 바로 알림이 떠요.</string>
+    <string name="notifications_mode_periodic_desc">10분마다 최대 1분간 새 메시지 확인</string>
+    <string name="notification_contact_connected">연결됨</string>
+    <string name="notification_preview_somebody">숨긴 대화 상대 :</string>
+    <string name="notification_preview_mode_contact">대화 상대 이름</string>
+    <string name="allow_verb">허용</string>
+    <string name="auth_confirm_credential">자격 증명 확인</string>
+    <string name="copy_verb">복사</string>
+    <string name="contact_connection_pending">연결 중…</string>
+    <string name="group_connection_pending">연결 중…</string>
+    <string name="attach">첨부파일</string>
+    <string name="icon_descr_cancel_file_preview">파일 미리보기 취소</string>
+    <string name="icon_descr_context">컨텍스트 아이콘</string>
+    <string name="icon_descr_server_status_connected">연결됨</string>
+    <string name="back">뒤로</string>
+    <string name="add_new_contact_to_create_one_time_QR_code"><b>새 연락처 추가</b> : 일회용 QR 코드 만들기</string>
+    <string name="cancel_verb">취소</string>
+    <string name="icon_descr_cancel_live_message">라이브 메시지 취소</string>
+    <string name="choose_file">파일 선택</string>
+    <string name="confirm_verb">확인</string>
+    <string name="connect_via_link_or_qr">링크 / QR 코드를 통해 연결</string>
+    <string name="copied">클립보드로 복사됨</string>
+    <string name="create_group">비밀 그룹 생성</string>
+    <string name="accept_contact_button">수락</string>
+    <string name="clear_chat_warning">모든 메시지가 삭제돼요. 삭제 후 되돌릴 수 없어요! 메시지는 나에게서만 삭제돼요.</string>
+    <string name="clear_verb">지우기</string>
+    <string name="clear_chat_menu_action">지우기</string>
+    <string name="clear_chat_button">채팅 지우기</string>
+    <string name="clear_chat_question">채팅을 지울까요\?</string>
+    <string name="connection_request_sent">연결 요청 완료</string>
+    <string name="connect_via_link">링크를 통해 연결</string>
+    <string name="smp_servers_preset_add">프리셋 서버 추가</string>
+    <string name="smp_servers_add">서버 추가…</string>
+    <string name="chat_console">채팅 콘솔</string>
+    <string name="smp_servers_check_address">서버 주소를 확인 후 다시 시도하십시오.</string>
+    <string name="configure_ICE_servers">ICE 서버 설정</string>
+    <string name="contribute">기여</string>
+    <string name="network_settings">고급 네트워크 설정</string>
+    <string name="network_session_mode_user">채팅 프로필</string>
+    <string name="network_session_mode_entity">연결</string>
+    <string name="accept_requests">요청 수락</string>
+    <string name="app_version_code">앱 빌드 : %s</string>
+    <string name="appearance_settings">외관</string>
+    <string name="app_version_title">앱 버전</string>
+    <string name="app_version_name">앱 버전 : v%s</string>
+    <string name="accept_automatically">자동</string>
+    <string name="contact_requests">대화 상대의 요청</string>
+    <string name="core_version">코어 버전 : v%s</string>
+    <string name="callstatus_accepted">전화 받음</string>
+    <string name="bold">굵게</string>
+    <string name="callstatus_in_progress">전화 연결 중</string>
+    <string name="colored">색깔</string>
+    <string name="confirm_password">암호 확인</string>
+    <string name="callstatus_connecting">전화 연결 중</string>
+    <string name="create_profile_button">생성</string>
+    <string name="create_profile">프로필 생성</string>
+    <string name="callstatus_error">통화 오류</string>
+    <string name="callstate_connected">연결됨</string>
+    <string name="callstate_connecting">연결 중…</string>
+    <string name="create_your_profile">내 프로필 생성</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>배터리에 좋음</b>. 백그라운드 서비스는 10분마다 새 메시지를 확인합니다. 전화 및 긴급 메시지를 놓칠 수 있습니다.</string>
+    <string name="call_already_ended">전화가 이미 종료되었습니다!</string>
+    <string name="always_use_relay">항상 릴레이 사용</string>
+    <string name="icon_descr_audio_call">음성 전화</string>
+    <string name="settings_audio_video_calls">음성 &amp; 영상 전화</string>
+    <string name="call_on_lock_screen">잠금 화면에서의 전화</string>
+    <string name="status_contact_has_no_e2e_encryption">대화 상대와 종단간 암호화되지 않음</string>
+    <string name="answer_call">응답</string>
+    <string name="icon_descr_audio_on">소리 켜기</string>
+    <string name="icon_descr_audio_off">소리 끄기</string>
+    <string name="icon_descr_call_ended">통화 종료됨</string>
+    <string name="icon_descr_call_connecting">전화 연결 중</string>
+    <string name="auto_accept_images">이미지 자동 다운로드하기</string>
+    <string name="integrity_msg_bad_hash">잘못된 메시지 해시</string>
+    <string name="integrity_msg_bad_id">잘못된 메시지 아이디</string>
+    <string name="settings_section_title_calls">전화</string>
+    <string name="chat_is_running">채팅 기능이 작동하고 있어요</string>
+    <string name="settings_section_title_chats">채팅</string>
+    <string name="chat_database_imported">채팅 데이테베이스를 불러 왔어요</string>
+    <string name="impossible_to_recover_passphrase"><b>주의</b>: 비밀번호를 분실하면 복구나 비밀번호 변경을 할 수 없어요.</string>
+    <string name="change_database_passphrase_question">데이터베이스 암호를 바꾸겠습니까\?</string>
+    <string name="confirm_new_passphrase">새로운 암호 확인…</string>
+    <string name="chat_archive_section">채팅 기록 보관함</string>
+    <string name="rcv_group_event_changed_your_role">내 역할이 %s 역할로 변경되었습니다.</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">주소 바꾸기…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">주소 바꾸기…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">%s의 주소 바꾸기…</string>
+    <string name="rcv_group_event_member_connected">연결됨</string>
+    <string name="group_member_status_complete">완료</string>
+    <string name="group_member_status_connected">연결됨</string>
+    <string name="group_member_status_connecting">연결 중</string>
+    <string name="group_member_status_accepted">연결 중 (수락됨)</string>
+    <string name="group_member_status_announced">연결 중 (알림)</string>
+    <string name="group_member_status_intro_invitation">연결 중(초대 시작)</string>
+    <string name="group_member_status_creator">제작자</string>
+    <string name="invite_prohibited">상대를 초대할 수 없습니다</string>
+    <string name="clear_contacts_selection_button">지우기</string>
+    <string name="icon_descr_contact_checked">대화 상대 확인됨</string>
+    <string name="create_group_link">그룹 링크 생성</string>
+    <string name="button_create_group_link">링크 생성</string>
+    <string name="change_member_role_question">그룹 역할을 바꾸겠습니까\?</string>
+    <string name="info_row_connection">연결</string>
+    <string name="users_add">프로필 추가</string>
+    <string name="incognito_random_profile_description">대화 상대에게 랜덤으로 만들어진 익명 프로필이 보내져요</string>
+    <string name="cant_delete_user_profile">사용자 프로필을 삭제할 수 없습니다</string>
+    <string name="chat_preferences_always">항상</string>
+    <string name="chat_preferences_contact_allows">대화 상대가 허용했어요.</string>
+    <string name="contact_preferences">연락처 설정</string>
+    <string name="allow_voice_messages_only_if">대화 상대도 허용한 경우에만 음성 메시지를 보낼 수 있습니다.</string>
+    <string name="allow_your_contacts_irreversibly_delete">모두에게서 메시지 영구 삭제 허용하기.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">대화 상대에게 자동 삭제되는 메시지 허용하기.</string>
+    <string name="allow_your_contacts_to_send_voice_messages">상대가 음성 메시지를 보내는 것을 허용하기.</string>
+    <string name="both_you_and_your_contacts_can_delete">나와 대화 상대 모두 메시지를 영구 삭제할 수 있어요.</string>
+    <string name="both_you_and_your_contact_can_send_voice">나와 대화 상대 모두 음성 메시지를 보낼 수 있어요.</string>
+    <string name="contacts_can_mark_messages_for_deletion">상대가 메시지에 삭제 표시를 할 수 있습니다. 그러나 삭제 표시된 메시지 내용은 여전히 볼 수 있습니다.</string>
+    <string name="allow_to_delete_messages">모두에게서 메시지 영구 삭제 허용하기.</string>
+    <string name="feature_cancelled_item">%s 취소됨</string>
+    <string name="v4_2_auto_accept_contact_requests">대화 상대의 요청 자동 수락</string>
+    <string name="v4_5_transport_isolation_descr">채팅 프로필(기본값) 또는 연결(베타).</string>
+    <string name="v4_4_verify_connection_security_desc">대화 상대와 보안 코드를 비교해 보세요.</string>
+    <string name="v4_6_chinese_spanish_interface">중국어 및 스페인어 인터페이스</string>
+    <string name="about_simplex">SimpleX에 대하여</string>
+    <string name="accept">수락</string>
+    <string name="share_one_time_link">일회용 초대 링크 생성</string>
+    <string name="create_address">주소 생성</string>
+    <string name="chat_item_ttl_day">1일</string>
+    <string name="about_simplex_chat"><xliff:g id="appNameFull">SimpleX</xliff:g>에 대하여</string>
+    <string name="color_primary">강조 색상</string>
+    <string name="accept_call_on_lock_screen">응답</string>
+    <string name="accept_connection_request__question">연결 요청을 수락할까요\?</string>
+    <string name="accept_feature">수락</string>
+    <string name="network_enable_socks_info">SOCKS 프록시(포트 9050)를 통해 서버에 액세스할까요\? 이 설정을 활성화하기 전에 프록시를 시작해야 해요.</string>
+    <string name="smp_servers_add_to_another_device">다른 기기에 추가</string>
+    <string name="v4_3_improved_server_configuration_desc">QR 코드 스캔으로 서버 추가</string>
+    <string name="button_add_welcome_message">환영 메시지 추가</string>
+    <string name="group_member_role_admin">관리자</string>
+    <string name="v4_2_group_links_desc">관리자는 그룹 가입을 위한 링크를 만들 수 있어요.</string>
+    <string name="allow_to_send_disappearing">자동 삭제되는 메시지 허용하기.</string>
+    <string name="users_delete_all_chats_deleted">모든 채팅과 메시지가 삭제돼요. 삭제 후 되돌릴 수 없어요!</string>
+    <string name="allow_to_send_voice">음성 메시지 허용하기.</string>
+    <string name="allow_voice_messages_question">음성 메시지를 허용하겠습니까\?</string>
+    <string name="allow_disappearing_messages_only_if">상대도 허용하는 경우에만 자동 삭제되는 메시지를 사용할 수 있어요.</string>
+    <string name="allow_direct_messages">그룹 멤버에게 1:1 채팅 허용하기.</string>
+    <string name="all_group_members_will_remain_connected">모든 그룹 멤버는 연결 상태가 계속 유지돼요.</string>
+    <string name="allow_irreversible_message_deletion_only_if">상대도 허용한 경우에만 모두에게서 메시지 영구 삭제가 가능해요.</string>
+    <string name="all_your_contacts_will_remain_connected">모든 연락처와 연결 상태가 계속 유지돼요.</string>
+    <string name="notifications_mode_service">항상 켜기</string>
+    <string name="keychain_is_storing_securely">안드로이드 암호 저장소는 비밀번호를 안전하게 저장하는 데 사용되고 알림이 작동하도록 해요.</string>
+    <string name="keychain_allows_to_receive_ntfs">안드로이드 암호 저장소는 앱을 다시 시작하거나 비밀번호 변경을 하고 나서 비밀번호를 안전하게 저장하는 데 사용되고 알림이 작동되도록 해요.</string>
+    <string name="notifications_mode_off_desc">앱이 실행 중일 때만 알림을 받을 수 있고 백그라운드에서 실행되지 않아요.</string>
+    <string name="full_backup">앱 데이터 백업</string>
+    <string name="settings_section_title_icon">앱 아이콘</string>
+    <string name="incognito_random_profile_from_contact_description">링크를 보낸 사람한테 랜덤으로 만들어진 익명 프로필이 보내져요</string>
+    <string name="network_session_mode_user_description">별도로 분리된 TCP 연결(그리고 SOCKS 자격 증명)이 <b>각각의 채팅 프로필</b>에 사용될 거예요.</string>
+    <string name="network_session_mode_entity_description">별도로 분리된 TCP 연결(및 SOCKS 자격 증명)이 <b>각각의 연락처 및 그룹 구성원</b>에게 사용될 거예요.
+\n<b>참고</b>: 연결이 많은 경우 배터리 및 트래픽 소비가 엄청 높을 수 있고 일부 연결이 실패할 수 있어요.</string>
+    <string name="icon_descr_asked_to_receive">이미지 수신 요청됨</string>
+    <string name="v4_6_audio_video_calls">음성 및 영상 전화</string>
+    <string name="audio_call_no_encryption">음성 전화 (종단간 암호화 X)</string>
+    <string name="auth_unavailable">인증할 수 없어요</string>
+    <string name="turning_off_service_and_periodic">새 메시지를 수신하기 위해 배터리 최적화 설정을 바꿉니다. 설정에서 언제든지 다시 바꿀 수 있습니다.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>배터리에 가장 좋음</b>. 앱이 실행 중일 때만 알림을 받게 되며 백그라운드에서 실행되지 않습니다.</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>설정을 통해 비활성화할 수 있어요.</b> – 앱이 실행되는 동안 알림이 표시되요.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">나와 대화 상대 모두 자동 삭제되는 메시지를 보낼 수 있어요.</string>
+    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>QR 코드 스캔</b>: QR 코드를 보여주는 사람과 연결해요.</string>
+    <string name="cannot_access_keychain">데이터베이스 암호를 저장하고 있는 암호키 저장소에 접근할 수 없습니다</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>배터리 많이 사용</b>! 백그라운드에서 항상 실행돼요. 메시지를 수신하자마자 알림이 떠요.</string>
+    <string name="callstatus_ended">통화 종료됨 <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
+    <string name="callstatus_calling">전화 중…</string>
+    <string name="icon_descr_call_progress">전화 연결 중</string>
+    <string name="icon_descr_cancel_link_preview">링크 미리보기 취소</string>
+    <string name="icon_descr_cancel_image_preview">이미지 미리보기 취소</string>
+    <string name="rcv_group_event_changed_member_role">%s 역할에서 %s 역할로 변경되었습니다</string>
+    <string name="chat_database_section">채팅 데이터베이스</string>
+    <string name="alert_title_cant_invite_contacts">대화 상대를 초대할 수 없습니다!</string>
+    <string name="change_verb">변경</string>
+    <string name="chat_archive_header">채팅 기록 보관함</string>
+    <string name="change_role">역할 바꾸기</string>
+    <string name="chat_database_deleted">채팅 데이터베이스를 삭제했어요</string>
+    <string name="chat_is_stopped">채팅 기능이 멈췄어요</string>
+    <string name="chat_is_stopped_indication">채팅 기능이 멈췄어요</string>
+    <string name="chat_preferences">채팅 설정</string>
+    <string name="chat_with_developers">개발자와 대화</string>
+    <string name="connect_via_link_verb">연결</string>
+    <string name="display_name_connecting">연결 중…</string>
+    <string name="icon_descr_close_button">닫기 버튼</string>
+    <string name="connect_button">연결</string>
+    <string name="group_member_status_introduced">연결 중 (도입)</string>
+    <string name="connection_error">연결 오류</string>
+    <string name="connection_local_display_name">연결 <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
+    <string name="connect_via_contact_link">링크를 통해 연결하겠습니까\?</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">대화 상대와 메시지가 삭제돼요. 삭제 후 되돌릴 수 없어요!</string>
+    <string name="status_contact_has_e2e_encryption">대화 상대와 종단간 암호화됨</string>
+    <string name="alert_title_contact_connection_pending">대화 상대와 아직 연결되지 않았어요!</string>
+    <string name="core_build_timestamp">코어 빌드: %s</string>
+    <string name="archive_created_on_ts"><xliff:g id="archive_ts">%1$s</xliff:g>에 생성 완료</string>
+    <string name="create_one_time_link">일회용 초대 링크 생성</string>
+    <string name="create_secret_group_title">비밀 그룹 생성</string>
+    <string name="accept_contact_incognito_button">익명 수락</string>
+    <string name="chat_item_ttl_month">1개월</string>
+    <string name="chat_item_ttl_week">1주</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="deleted_description">삭제됨</string>
+    <string name="simplex_link_mode_description">설명</string>
+    <string name="smp_server_test_delete_queue">대기열 삭제</string>
+    <string name="delete_verb">삭제</string>
+    <string name="delete_message__question">메시지를 삭제할까요\?</string>
+    <string name="for_me_only">나에게서만 삭제</string>
+    <string name="delete_member_message__question">멤버의 메시지를 삭제할까요\?</string>
+    <string name="maximum_supported_file_size">현재 지원되는 최대 파일 크기는 <xliff:g id="maxFileSize">%1$s</xliff:g>입니다.</string>
+    <string name="image_decoding_exception_title">디코딩 오류</string>
+    <string name="button_delete_contact">대화 상대 삭제</string>
+    <string name="delete_contact_question">연락처를 삭제할까요\?</string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 데스크톱: <b>QR 코드 스캔</b>을 통해 앱에서 표시된 QR 코드를 스캔해 주세요.</string>
+    <string name="delete_contact_menu_action">삭제</string>
+    <string name="delete_group_menu_action">삭제</string>
+    <string name="delete_pending_connection__question">대기 중인 연결을 삭제할까요\?</string>
+    <string name="clear_verification">인증 취소</string>
+    <string name="database_passphrase_and_export">데이터베이스 비밀번호 &amp; 내보내기</string>
+    <string name="smp_servers_delete_server">서버 삭제</string>
+    <string name="delete_address">주소 삭제</string>
+    <string name="delete_address__question">주소를 삭제할까요\?</string>
+    <string name="delete_image">이미지 삭제</string>
+    <string name="decentralized">탈중앙화</string>
+    <string name="settings_section_title_develop">개발</string>
+    <string name="settings_developer_tools">개발자 도구</string>
+    <string name="settings_section_title_device">기기</string>
+    <string name="database_passphrase">데이터베이스 비밀번호</string>
+    <string name="delete_files_and_media_for_all_users">모든 채팅 프로필 파일 삭제</string>
+    <string name="database_error">데이터베이스 에러</string>
+    <string name="passphrase_is_different">데이터베이스 비밀번호가 암호 저장소에 저장된 것과 일치하지 않습니다.</string>
+    <string name="database_passphrase_is_required">채팅을 열려면 데이터베이스 비밀번호가 필요해요.</string>
+    <string name="delete_archive">보관된 채팅 삭제</string>
+    <string name="delete_chat_archive_question">보관된 채팅을 삭제할까요\?</string>
+    <string name="num_contacts_selected">%d 개의 연락처가 선택되었습니다.</string>
+    <string name="info_row_database_id">데이터베이스 아이디</string>
+    <string name="users_delete_profile_for">다음 채팅 프로필 삭제</string>
+    <string name="theme_dark">어둡게</string>
+    <string name="delete_after">다음 기간 이후 자동 삭제</string>
+    <string name="above_then_preposition_continuation">위 다음 :</string>
+    <string name="delete_database">데이터베이스 삭제</string>
+    <string name="set_password_to_export_desc">데이터베이스는 임의의 비밀번호로 암호화되었습니다. 내보내기 기능 사용 전 비밀번호를 변경해 주세요.</string>
+    <string name="delete_files_and_media_question">파일과 미디어를 삭제할까요\?</string>
+    <string name="current_passphrase">현재 비밀번호…</string>
+    <string name="database_encrypted">데이터베이스 암호화 완료!</string>
+    <string name="database_passphrase_will_be_updated">데이터베이스 비밀번호가 업데이트되요.</string>
+    <string name="encrypted_with_random_passphrase">데이터베이스는 임의의 비밀번호로 암호화되었고, 원하시면 비밀번호를 변경할 수 있어요.</string>
+    <string name="database_will_be_encrypted">데이터베이스는 암호화될 거예요.</string>
+    <string name="delete_messages">메시지 삭제</string>
+    <string name="delete_messages_after">다음 기간 이후 자동 삭제</string>
+    <string name="rcv_group_event_group_deleted">삭제된 그룹</string>
+    <string name="delete_link">링크 삭제</string>
+    <string name="delete_link_question">링크를 삭제할까요\?</string>
+    <string name="chat_preferences_default">기본값 (%s)</string>
+    <string name="ttl_day">%d일</string>
+    <string name="ttl_d">%d일</string>
+    <string name="ttl_days">%d일</string>
+    <string name="button_delete_group">그룹 삭제</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">주소가 변경되었습니다.</string>
+    <string name="database_encryption_will_be_updated">데이터베이스 비밀번호가 업데이트되고 암호 저장소에 보관됩니다.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">데이터베이스는 암호화되고, 비밀번호는 암호 저장소에 보관될 거에요.</string>
+    <string name="users_delete_question">채팅 프로필을 삭제할까요\?</string>
+    <string name="delete_files_and_media_all">모든 파일 삭제</string>
+    <string name="delete_chat_profile_question">채팅 프로필을 삭제할까요\?</string>
+    <string name="full_deletion">모두에게서 삭제</string>
+    <string name="delete_group_question">그룹을 삭제할까요\?</string>
+    <string name="failed_to_create_user_duplicate_title">표시 이름이 중복되어요!</string>
+    <string name="smp_server_test_disconnect">연결 끊기</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">기기 인증이 비활성화되어 SimpleX 잠금 기능이 작동하지 않아요.</string>
+    <string name="auth_disable_simplex_lock">SimpleX 잠금 비활성화</string>
+    <string name="icon_descr_server_status_disconnected">연결 끊김</string>
+    <string name="add_contact">일회용 초대 링크</string>
+    <string name="add_contact_or_create_group">새로운 채팅 시작</string>
+    <string name="display_name__field">표시 이름</string>
+    <string name="display_name_cannot_contain_whitespace">표시 이름에는 공백문자가 쓰일 수 없어요.</string>
+    <string name="display_name">표시 이름</string>
+    <string name="encrypted_audio_call">종단간 암호화된 음성 전화</string>
+    <string name="encrypted_video_call">종단간 암호화된 영상 전화</string>
+    <string name="no_call_on_lock_screen">비활성화</string>
+    <string name="status_e2e_encrypted">종단간 암호화</string>
+    <string name="integrity_msg_duplicate">중복된 메시지</string>
+    <string name="accept_feature_set_1_day">1일로 설정</string>
+    <string name="v4_4_disappearing_messages">자동 삭제되는 메시지</string>
+    <string name="total_files_count_and_size">전체 크기가 %s인 %d개의 파일</string>
+    <string name="conn_level_desc_direct">다이렉트</string>
+    <string name="disappearing_prohibited_in_this_chat">이 채팅에서는 자동 삭제되는 메시지를 사용할 수 없어요.</string>
+    <string name="disappearing_messages_are_prohibited">이 그룹에서는 자동 삭제되는 메시지를 사용할 수 없어요.</string>
+    <string name="ttl_m">%d분</string>
+    <string name="ttl_months">%d 개월</string>
+    <string name="ttl_min">%d 분</string>
+    <string name="ttl_month">%d 개월</string>
+    <string name="ttl_week">%d 주</string>
+    <string name="downgrade_and_open_chat">다운그레이드하고 채팅 열기</string>
+    <string name="direct_messages">1:1 메시지</string>
+    <string name="timed_messages">자동 삭제되는 메시지</string>
+    <string name="direct_messages_are_prohibited_in_chat">이 그룹에서는 멤버들의 1:1 채팅이 금지되어 있어요.</string>
+    <string name="ttl_s">%d초</string>
+    <string name="ttl_sec">%d 초</string>
+    <string name="ttl_h">%d시</string>
+    <string name="ttl_mth">%d개월</string>
+    <string name="ttl_w">%d주</string>
+    <string name="ttl_weeks">%d 주</string>
+    <string name="confirm_database_upgrades">데이터베이스 업그레이드 확인</string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">기기 인증을 하고 있지 않아요. 기기 인증을 켜면 설정에서 SimpleX 잠금 기능을 사용할 수 있어요.</string>
+    <string name="ttl_hour">%d 시간</string>
+    <string name="ttl_hours">%d 시간</string>
+    <string name="mtr_error_different">앱/데이터베이스의 다른 마이그레이션: %s / %s</string>
+    <string name="v4_5_multiple_chat_profiles_descr">다른 이름, 아바타 그리고 전송 격리.</string>
+    <string name="dont_show_again">다시 보지 않기</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">이 대화 상대로부터의 메시지를 수신할 서버와 연결되었어요.</string>
+    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
+    <string name="contact_developers">앱 업데이트 후 개발자에게 연락해 주세요.</string>
+    <string name="connection_error_auth_desc">대화 상대가 나갔거나 초대 링크가 이미 사용된 경우가 아니면 버그일 수 있어요. 이 경우 개발자에게 알려주세요.
+\n대화 상대에게 다른 초대 링크 만들도록 부탁하고 네트워크 연결이 안정적인지 확인하세요.</string>
+    <string name="auth_enable_simplex_lock">SimpleX 잠금 활성화</string>
+    <string name="auth_log_in_using_credential">자격 증명으로 로그인</string>
+    <string name="auth_open_chat_console">채팅 콘솔 열기</string>
+    <string name="auth_stop_chat">채팅 중지하기</string>
+    <string name="auth_unlock">잠금 해제하기</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">앱을 사용하지 않는 지 30초가 지나면 다시 인증해야 해요.</string>
+    <string name="contact_wants_to_connect_with_you">님이 연결하고 싶어해요!</string>
+    <string name="callstate_starting">시작…</string>
+    <string name="callstate_waiting_for_answer">응답 대기 중…</string>
+    <string name="callstate_waiting_for_confirmation">확인 대기 중…</string>
+    <string name="alert_title_skipped_messages">읽지 않는 메시지</string>
+    <string name="alert_title_cant_invite_contacts_descr">이 그룹에서 익명 프로필을 사용하고 있어요. 내 원래 프로필이 노출되는 걸 방지하기 위해 대화 상대 초대가 허용되지 않아요.</string>
+    <string name="button_remove_member">멤버 삭제하기</string>
+    <string name="chat_item_ttl_seconds">%s 초</string>
+    <string name="alert_message_group_invitation_expired">이 링크로 참여할 수 없어요. 이미 삭제된 링크에요.</string>
+    <string name="alert_message_no_group">존재하지 않는 그룹이에요.</string>
+    <string name="alert_title_no_group">그룹을 찾을 수 없어요!</string>
+    <string name="button_add_members">맴버 초대하기</string>
+    <string name="button_welcome_message">환영 메시지</string>
+    <string name="button_edit_group_profile">그룹 프로필 수정</string>
+    <string name="button_leave_group">그룹 나가기</string>
+    <string name="button_send_direct_message">1:1 채팅 시작하기</string>
+    <string name="conn_stats_section_title_servers">서버</string>
+    <string name="conn_level_desc_indirect">인다이렉트 (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
+    <string name="chat_preferences_you_allow">허용함</string>
+    <string name="chat_preferences_off">꺼짐</string>
+    <string name="chat_preferences_on">켜짐</string>
+    <string name="chat_preferences_no">아니요</string>
+    <string name="ask_your_contact_to_enable_voice">대화 상대에게 음성 메시지 기능을 활성화 해달라고 부탁해보세요.</string>
+    <string name="chat_help_tap_button">탭 버튼</string>
+    <string name="connection_you_accepted_will_be_cancelled">수락한 연결이 취소됩니다!</string>
+    <string name="chat_lock">SimpleX 잠금</string>
+    <string name="callstatus_rejected">거절된 전화</string>
+    <string name="callstate_ended">종료됨</string>
+    <string name="call_connection_peer_to_peer">P2P</string>
+    <string name="call_connection_via_relay">릴레이를 경유</string>
+    <string name="alert_title_group_invitation_expired">만료된 초대 링크에요!</string>
+    <string name="chat_preferences_yes">네</string>
+    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g>님이 다음을 통해 연결하려고 해요 :</string>
+    <string name="allow_accepting_calls_from_lock_screen">설정에서 잠금 화면에서 바로 전화를 받을 수 있도록 설정할 수 있어요.</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">연결을 완료하려면 대화 상대가 온라인 상태여야 해요.
+\n연결 요청을 취소하고 대화 상대를 삭제할 수 있어요 (그리고 새 링크로 재시도).</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">다음과 같은 경우에 발생할 수 있어요.
+\n1. 대화 상대가 메시지를 보낸 지 30일 지나서 서버에서 삭제된 경우
+\n2. 메시지를 수신하는 데 사용된 서버가 업데이트되고 재부팅된 경우
+\n3. 침해된 연결의 경우
+\n서버 업데이트를 받으려면 설정을 통해 개발자에게 연락해 주세요.
+\n저희 개발팀은 메시지 손실을 방지하기 위해 중복된 서버를 추가할 예정이에요.</string>
+    <string name="auth_simplex_lock_turned_on">SimpleX 잠금 켜짐</string>
+    <string name="callstate_received_answer">응답됨…</string>
+    <string name="callstate_received_confirmation">확인 받음…</string>
+    <string name="callstatus_missed">부재 중 전화</string>
+    <string name="chat_item_ttl_none">사용 안 함</string>
+    <string name="chat_with_the_founder">질문이나 아이디어 보내기</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(스캔하거나 클립보드에서 붙여넣기)</string>
+    <string name="contact_sent_large_file">대화 상대가 현재 지원되는 최대 크기(<xliff:g id="maxFileSize">%1$s</xliff:g>)보다 큰 파일을 보냈습니다.</string>
+    <string name="display_name_invited_to_connect">초대를 받았어요.</string>
+    <string name="failed_to_create_user_title">프로필 생성 오류!</string>
+    <string name="description_via_group_link_incognito">그룹 링크로 익명 채팅</string>
+    <string name="description_via_group_link">그룹 링크로 채팅</string>
+    <string name="description_via_one_time_link">일회용 링크로 채팅</string>
+    <string name="description_you_shared_one_time_link_incognito">일회용 익명 연락처를 공유했어요.</string>
+    <string name="description_you_shared_one_time_link">일회용 프로필 연락처를 공유했어요.</string>
+    <string name="description_via_contact_address_link_incognito">상대의 연락처 링크로 익명 채팅</string>
+    <string name="description_via_contact_address_link">상대의 연락처 링크로 채팅</string>
+    <string name="description_via_one_time_link_incognito">일회용 연락처로 익명 채팅</string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">SMP 서버 주소가 올바른 형식이고 줄로 구분되어 있고 중복이 없는지 확인해 주세요.</string>
+    <string name="error_saving_smp_servers">SMP 서버 저장 오류</string>
+    <string name="error_setting_network_config">네트워크 설정 업데이트 오류</string>
+    <string name="failed_to_active_user_title">프로필 변경 오류!</string>
+    <string name="failed_to_create_user_duplicate_desc">동일한 표시 이름을 가진 채팅 프로필이 있어요. 다른 이름을 선택해 주세요.</string>
+    <string name="failed_to_parse_chats_title">채팅 불러오기 실패</string>
+    <string name="failed_to_parse_chat_title">채팅 불러오기 실패</string>
+    <string name="error_adding_members">멤버 추가 오류</string>
+    <string name="error_joining_group">그룹 참여 오류</string>
+    <string name="error_sending_message">메시지 전송 오류</string>
+    <string name="error_creating_address">주소 생성 오류</string>
+    <string name="error_receiving_file">파일 다운로드 오류</string>
+    <string name="error_accepting_contact_request">상대 요청 수락 오류</string>
+    <string name="error_changing_address">주소 변경 오류</string>
+    <string name="error_deleting_contact">연락처 삭제 오류</string>
+    <string name="error_deleting_contact_request">대화 요청 삭제 오류</string>
+    <string name="error_deleting_group">그룹 삭제 오류</string>
+    <string name="error_deleting_pending_contact_connection">대기 중 대화 요청 삭제 오류</string>
+    <string name="error_smp_test_certificate">서버 주소의 인증서의 지문(fingerprint)이 잘못되었을 수도 있어요.</string>
+    <string name="error_smp_test_failed_at_step">테스트가 %s단계에서 실패했어요.</string>
+    <string name="error_smp_test_server_auth">서버는 대기열을 생성하고 비밀번호를 확인하려면 인증이 필요해요.</string>
+    <string name="enter_passphrase_notification_desc">알림을 받으려면 데이터베이스 암호를 입력해 주세요.</string>
+    <string name="enter_passphrase_notification_title">비밀번호가 필요해요.</string>
+    <string name="error_deleting_user">프로필 삭제 오류</string>
+    <string name="error_updating_user_privacy">사용자 개인정보 업데이트 오류</string>
+    <string name="database_initialization_error_desc">데이터베이스가 올바르게 작동하지 안하요. 자세히 알아보려면 탭하세요.</string>
+    <string name="edit_verb">수정하기</string>
+    <string name="delete_message_cannot_be_undone_warning">메시지가 삭제돼요. 삭제 후 복구할 수 없어요!</string>
+    <string name="delete_message_mark_deleted_warning">메시지가 삭제 표시될 거예요. 대화 상대는 여전히 삭제된 내용을 볼 수 있어요.</string>
+    <string name="ensure_ICE_server_address_are_correct_format_and_unique">WebRTC ICE 서버 주소가 올바른 형식이고 줄로 구분되고 중복이 없는지 확인해 주세요.</string>
+    <string name="enter_one_ICE_server_per_line">ICE 서버(한 줄에 하나씩)</string>
+    <string name="error_saving_ICE_servers">ICE 서버 저장 오류</string>
+    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="exit_without_saving">저장하지 않고 나가기</string>
+    <string name="encrypt_database">암호화</string>
+    <string name="encrypted_database">암호화된 데이터베이스</string>
+    <string name="feature_off">꺼짐</string>
+    <string name="feature_enabled_for_you">나에게 켜짐</string>
+    <string name="feature_enabled_for_contact">대화 상대에게 켜짐</string>
+    <string name="feature_enabled">켜짐</string>
+    <string name="feature_received_prohibited">수신됨, 금지됨</string>
+    <string name="export_database">데이터베이스 내보내기</string>
+    <string name="enable_automatic_deletion_question">자동 삭제되는 메시지를 사용할까요\?</string>
+    <string name="error_changing_message_deletion">설정 변경 오류</string>
+    <string name="enable_automatic_deletion_message">이 작업은 되돌릴 수 없어요. 선택한 시간보다 일찍 보내거나 받은 메시지는 삭제돼요. 이는 몇 분 걸릴 수 있어요.</string>
+    <string name="error_with_info">오류: %s</string>
+    <string name="enter_correct_passphrase">올바른 비밀번호를 입력해 주세요.</string>
+    <string name="database_backup_can_be_restored">데이터베이스 비밀번호 변경이 완료되지 않았어요.</string>
+    <string name="database_restore_error">데이터베이스 오류 복구</string>
+    <string name="error_creating_link_for_group">그룹 링크 생성 오류</string>
+    <string name="error_updating_link_for_group">그룹 링크 업데이트 오류</string>
+    <string name="error_changing_role">역할 변경 오류</string>
+    <string name="error_removing_member">멤버 삭제 오류</string>
+    <string name="database_downgrade">데이터베이스 다운그레이드</string>
+    <string name="database_migrations">마이그레이션: %s</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">모든 멤버에게서 그룹이 삭제돼요. 삭제 후 복구할 수 없어요!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">나에게서만 그룹이 삭제되요. 삭제 후 복구할 수 없어요!</string>
+    <string name="file_not_found">파일을 찾을 수 없음</string>
+    <string name="error_saving_user_password">사용자 비밀번호 저장 오류</string>
+    <string name="error_stopping_chat">채팅 정지하기 오류</string>
+    <string name="error_exporting_chat_database">채팅 데이터베이스 내보내기 오류</string>
+    <string name="database_is_not_encrypted">채팅 데이터베이스가 암호화되지 않았어요. 비밀번호를 설정하여 보호해 주세요.</string>
+    <string name="enter_passphrase">비밀번호를 입력해 주세요…</string>
+    <string name="enter_password_to_show">검색에 비밀번호 입력</string>
+    <string name="edit_image">이미지 수정하기</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">이 작업은 실행 취소될 수 없어요. 프로필, 연락처, 메시지 및 파일이 영구적으로 손실돼요.</string>
+    <string name="error_importing_database">채팅 데이터베이스 가져오기 오류</string>
+    <string name="encrypt_database_question">데이터베이스를 암호화할까요\?</string>
+    <string name="developer_options">데이터베이스 ID 및 전송 격리 옵션.</string>
+    <string name="error_starting_chat">채팅 시작하기 오류</string>
+    <string name="error_encrypting_database">데이터베이스 암호화 오류</string>
+    <string name="enter_correct_current_passphrase">올바른 현재 비밀번호를 입력해 주세요.</string>
+    <string name="delete_chat_profile">채팅 프로필 삭제</string>
+    <string name="delete_profile">프로필 삭제</string>
+    <string name="database_downgrade_warning">경고: 일부 데이터가 손실될 수 있어요!</string>
+    <string name="database_upgrade">데이터베이스 업그레이드</string>
+    <string name="delete_files_and_media_desc">이 작업은 실행 취소될 수 없어요. 수신 및 전송된 모든 파일과 미디어가 삭제돼요. 저해상도 사진만 삭제되지 않아요.</string>
+    <string name="error_deleting_database">채팅 데이터베이스 삭제 오류</string>
+    <string name="error_deleting_link_for_group">그룹 링크 삭제 오류</string>
+    <string name="error_saving_file">파일 저장 오류</string>
+    <string name="error_saving_group_profile">그룹 프로필 저장 오류</string>
+    <string name="feature_offered_item">%s 제안</string>
+    <string name="feature_offered_item_with_param">%s 제안: %2s</string>
+    <string name="icon_descr_instant_notifications">즉시 알림</string>
+    <string name="hide_notification">숨김</string>
+    <string name="hide_verb">숨기기</string>
+    <string name="for_everybody">모두에게</string>
+    <string name="icon_descr_edited">수정됨</string>
+    <string name="icon_descr_image_snd_complete">이미지 보냄</string>
+    <string name="full_name__field">이름 :</string>
+    <string name="hide_profile">프로필 숨기기</string>
+    <string name="icon_descr_flip_camera">카메라 전환</string>
+    <string name="icon_descr_hang_up">전화 끊기</string>
+    <string name="file_with_path">파일 : %s</string>
+    <string name="group_invitation_tap_to_join">탭하여 참여</string>
+    <string name="group_invitation_tap_to_join_incognito">탭하여 익명으로 참여</string>
+    <string name="group_member_status_left">나감</string>
+    <string name="group_member_role_member">멤버</string>
+    <string name="group_member_role_owner">소유자</string>
+    <string name="group_member_status_group_deleted">그룹 삭제됨</string>
+    <string name="group_member_status_invited">초대됨</string>
+    <string name="group_member_status_removed">삭제됨</string>
+    <string name="icon_descr_expand_role">역할 선택지 펼치기</string>
+    <string name="files_and_media_section">파일 &amp; 미디어</string>
+    <string name="group_invitation_item_description">그룹으로 초대 <xliff:g id="group_name">%1$s</xliff:g></string>
+    <string name="group_link">그룹 링크</string>
+    <string name="group_welcome_title">환영 메시지</string>
+    <string name="group_display_name_field">보여지는 그룹 이름</string>
+    <string name="group_full_name_field">그룹 이름 :</string>
+    <string name="group_is_decentralized">그룹은 완전히 탈중앙화되어 있으며 구성원만 그룹을 볼 수 있어요.</string>
+    <string name="group_unsupported_incognito_main_profile_sent">여기에서는 시크릿 모드가 지원되지 않아요. 기본 프로필이 그룹 멤버들에게 전송될 거예요.</string>
+    <string name="group_main_profile_sent">프로필이 그룹 구성원에게 전송될 거예요.</string>
+    <string name="group_profile_is_stored_on_members_devices">그룹 프로필은 서버가 아닌 멤버들의 기기에 저장되어요.</string>
+    <string name="group_preferences">그룹 설정</string>
+    <string name="group_members_can_send_disappearing">그룹 구성원은 자동 삭제되는 메시지를 보낼 수 있어요.</string>
+    <string name="group_members_can_send_dms">그룹 멤버들끼리 1:1 채팅을 할 수 있어요.</string>
+    <string name="icon_descr_add_members">멤버 초대하기</string>
+    <string name="icon_descr_group_inactive">비활성 그룹</string>
+    <string name="group_member_role_observer">관찰자</string>
+    <string name="group_info_member_you">나 : <xliff:g id="group_info_you">%1$s</xliff:g></string>
+    <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> 멤버</string>
+    <string name="file_saved">파일 저장됨</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">대화 상대가 업로드를 완료하면 파일이 저장되어요.</string>
+    <string name="file_will_be_received_when_contact_is_online">대화 상대가 온라인 상태일 때 파일이 전송되어요. 대화 상대가 온라인이 되기를 기다리거나 나중에 다시 확인해 주세요!</string>
+    <string name="icon_descr_record_voice_message">음성 메시지 녹화하기</string>
+    <string name="from_gallery_button">갤러리에서</string>
+    <string name="icon_descr_profile_image_placeholder">프로필 이미지 플레이스 홀더</string>
+    <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> 주소</string>
+    <string name="how_to">설명서</string>
+    <string name="how_to_use_your_servers">내 서버 사용법</string>
+    <string name="how_to_use_markdown">마크다운 사용법</string>
+    <string name="how_simplex_works"><xliff:g id="appName">SimpleX</xliff:g> 작동 방식</string>
+    <string name="group_invitation_expired">그룹 초대가 만료되었어요.</string>
+    <string name="group_members_can_delete">그룹 멤버는 보낸 메시지를 영구 삭제할 수 있어요.</string>
+    <string name="group_members_can_send_voice">그룹 멤버는 음성 메시지를 보낼 수 있어요.</string>
+    <string name="hidden_profile_password">숨긴 프로필 비밀번호</string>
+    <string name="full_name_optional__prompt">이름 (선택 사항)</string>
+    <string name="how_it_works">작동 방식</string>
+    <string name="hide_dev_options">숨기기 :</string>
+    <string name="cancel_file__question">파일 전송을 취소할까요\?</string>
+    <string name="file_transfer_will_be_cancelled_warning">파일 전송이 취소될 거예요. 이미 전송이 시작되었다면 중지될 거예요.</string>
+    <string name="icon_descr_sent_msg_status_sent">보냄</string>
+    <string name="group_preview_join_as">%s(으)로 참여</string>
+    <string name="group_preview_you_are_invited">그룹에 초대되었어요.</string>
+    <string name="icon_descr_received_msg_status_unread">잃지 않음</string>
+    <string name="icon_descr_sent_msg_status_send_failed">보내기 실패</string>
+    <string name="icon_descr_sent_msg_status_unauthorized_send">비인증 전송</string>
+    <string name="icon_descr_help">도움말</string>
+    <string name="first_platform_without_user_ids">개인을 식별할 수 있는 어떠한 정보(임의의 숫자 포함)도 없는 첫 번째 플랫폼. 단순히 약속이 아니라 프로그램 설계상 완전한 익명성을 제공해요.</string>
+    <string name="icon_descr_call_rejected">거절된 전화</string>
+    <string name="icon_descr_call_pending_sent">대기 중인 전화</string>
+    <string name="icon_descr_call_missed">부재중 전화</string>
+    <string name="icon_descr_file">파일</string>
+    <string name="icon_descr_more_button">더 보기</string>
+    <string name="icon_descr_send_message">메시지 보내기</string>
+    <string name="icon_descr_server_status_error">오류</string>
+    <string name="how_to_use_simplex_chat">사용법</string>
+    <string name="icon_descr_email">이메일</string>
+    <string name="icon_descr_server_status_pending">대기 중</string>
+    <string name="icon_descr_settings">설정</string>
+    <string name="icon_descr_waiting_for_image">이미지 기다리는 중</string>
+    <string name="image_decoding_exception_desc">이미지를 디코딩할 수 없어요. 다른 이미지를 시도하거나 개발자에게 문의해 주세요.</string>
+    <string name="image_descr">이미지</string>
+    <string name="image_saved">갤러리에 사진 저장됨</string>
+    <string name="images_limit_desc">동시에 최대 10개까지만 이미지를 보낼 수 있어요.</string>
+    <string name="images_limit_title">이미지 수가 너무 많아요!</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">거절해도 상대에게 알림이 전송되지 않아요.</string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">직접 만날 수 없다면 <b>영상 통화에서 QR 코드를 보여주거나</b> 링크를 공유해 주세요.</string>
+    <string name="icon_descr_video_call">영상 전화</string>
+    <string name="icon_descr_video_off">영상 끄기</string>
+    <string name="icon_descr_speaker_on">스피커 켜기</string>
+    <string name="icon_descr_video_on">영상 켜기</string>
+    <string name="icon_descr_speaker_off">스피커 끄기</string>
+    <string name="import_database">데이터베이스 가져오기</string>
+    <string name="import_database_confirmation">가져오기</string>
+    <string name="incognito">익명 모드</string>
+    <string name="incognito_info_find">익명 채팅에 사용되는 프로필을 찾으려면 채팅 상단에 있는 연락처 또는 그룹 이름을 탭하세요.</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">대화 상대가 업로드를 완료하면 이미지가 수신될 거예요.</string>
+    <string name="image_descr_profile_image">프로필 이미지</string>
+    <string name="incognito_info_allows">하나의 프로필로 여러 사람과 연락할 필요 없이 무수히 많은 익명 프로필로 연락할 수 있어요.</string>
+    <string name="immune_to_spam_and_abuse">스팸 및 남용에 면역</string>
+    <string name="ignore">무시하기</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser"><xliff:g id="appName">SimpleX Chat</xliff:g> 초대 링크를 받으면 브라우저에서 참여할 수 있어요 :</string>
+    <string name="image_descr_link_preview">링크 미리보기 이미지</string>
+    <string name="image_descr_qr_code">QR 코드</string>
+    <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> 팀</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">직접 만날 수 없다면 <b>영상 통화에서 QR 코드를 스캔</b>하거나 상대에게 초대 링크를 공유할 수 있어요.</string>
+    <string name="icon_descr_video_snd_complete">동영상 보내짐</string>
+    <string name="icon_descr_video_asked_to_receive">동영상 수신 요청됨</string>
+    <string name="icon_descr_waiting_for_video">동영상 기다리는 중</string>
+    <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> 로고</string>
+    <string name="image_will_be_received_when_contact_is_online">대화 상대가 온라인 상태일 때 이미지가 수신될 거예요. 기다리거나 나중에 확인하세요!</string>
+    <string name="import_database_question">채팅 데이터베이스를 가져올까요\?</string>
+    <string name="server_error">오류</string>
+    <string name="invalid_chat">유효하지 않는 채팅</string>
+    <string name="invalid_data">잘못된 데이터</string>
+    <string name="invalid_message_format">잘못된 메시지 형식</string>
+    <string name="invalid_connection_link">잘못된 연결 링크</string>
+    <string name="notifications">알림</string>
+    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> 읽지 않은 메시지</string>
+    <string name="keychain_error">키체인 오류</string>
+    <string name="invite_to_group_button">그룹에 초대하기</string>
+    <string name="info_row_local_name">로컬 네임</string>
+    <string name="join_group_button">참여</string>
+    <string name="join_group_question">그룹에 참여할까요\?</string>
+    <string name="invite_prohibited_description">이 그룹에서는 기본 프로필을 사용하는 중인데 반해, 익명 프로필로 연락하고 있는 대화 상대를 초대하려고 하셨어요.</string>
+    <string name="initial_member_role">초기 역할</string>
+    <string name="info_row_group">그룹</string>
+    <string name="incompatible_database_version">호환되지 않는 데이터베이스 버전</string>
+    <string name="joining_group">그룹에 참여 중</string>
+    <string name="incognito_info_protects">익명 모드는 기본 프로필 이름과 사진과 같은 개인 정보를 보호해줘요. 새 대화 상대마다 새로운 랜덤 프로필이 만들어져요.</string>
+    <string name="is_verified">%s 은(는) 인증되었어요.</string>
+    <string name="italic">기울게</string>
+    <string name="incognito_info_share">익명 프로필 사용 중 초대받은 그룹에 참여하면, 그 그룹에서도 동일한 익명 프로필이 사용되어요.</string>
+    <string name="incognito_random_profile">내 랜덤 프로필</string>
+    <string name="incoming_audio_call">음성 전화 옴</string>
+    <string name="is_not_verified">%s은(는) 인증되지 않았어요.</string>
+    <string name="install_simplex_chat_for_terminal">터미널용 <xliff:g id="appNameFull">SimpleX Chat</xliff:g>를 설치하세요</string>
+    <string name="incoming_video_call">영상 전화 옴</string>
+    <string name="invalid_migration_confirmation">잘못된 마이그레이션 확인</string>
+    <string name="join_group_incognito_button">익명 모드로 참여</string>
+    <string name="invalid_QR_code">잘못된 QR 코드</string>
+    <string name="incorrect_code">잘못된 보안 코드!</string>
+    <string name="invalid_contact_link">잘못된 링크!</string>
+</resources>

apps/android/app/src/main/res/values-lt/strings.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="chat_item_ttl_month">1 mėnuo</string>
+    <string name="chat_item_ttl_week">1 savaitė</string>
+    <string name="about_simplex_chat">Apie <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
+    <string name="chat_item_ttl_day">1 diena</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="about_simplex">Apie SimpleX</string>
+    <string name="smp_servers_add">Pridėti serverį…</string>
+    <string name="v4_3_improved_server_configuration_desc">Pridėti serverius skenuojant QR kodus.</string>
+    <string name="appearance_settings">Išvaizda</string>
+    <string name="app_version_title">Programėlės versija</string>
+    <string name="app_version_name">Programėlės versija: v%s</string>
+    <string name="app_version_code">Programėlės darinys: %s</string>
+    <string name="accept_automatically">Automatiškai</string>
+    <string name="callstatus_calling">skambinama…</string>
+    <string name="callstatus_error">skambučio klaida</string>
+    <string name="call_already_ended">Skambutis jau baigtas!</string>
+    <string name="answer_call">Atsiliepti</string>
+    <string name="icon_descr_call_ended">Skambutis baigtas</string>
+    <string name="settings_section_title_calls">SKAMBUČIAI</string>
+    <string name="allow_your_contacts_irreversibly_delete">Leisti jūsų adresatams negrįžtamai ištrinti išsiųstas žinutes.</string>
+    <string name="back">Atgal</string>
+    <string name="settings_section_title_icon">PROGRAMĖLĖS PIKTOGRAMA</string>
+    <string name="incognito_random_profile_from_contact_description">Adresatui, iš kurio gavote šią nuorodą, bus išsiųstas atsitiktinis profilis</string>
+    <string name="chat_preferences_always">visada</string>
+    <string name="allow_your_contacts_to_send_voice_messages">Leisti jūsų adresatams siųsti balso žinutes.</string>
+    <string name="allow_irreversible_message_deletion_only_if">Leisti negrįžtamą žinučių ištrynimą tik tuo atveju, jei jūsų adresatas jums tai leidžia.</string>
+    <string name="allow_voice_messages_only_if">Leisti balso žinutes tik tuo atveju, jei jūsų adresatas jas leidžia.</string>
+    <string name="allow_verb">Leisti</string>
+    <string name="allow_voice_messages_question">Leisti balso žinutes\?</string>
+    <string name="bold">pusjuodis</string>
+    <string name="callstatus_ended">skambutis baigtas <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
+    <string name="icon_descr_audio_call">garso skambutis</string>
+    <string name="settings_audio_video_calls">Garso ir vaizdo skambučiai</string>
+    <string name="integrity_msg_bad_hash">bloga žinutės maiša</string>
+    <string name="integrity_msg_bad_id">blogas žinutės ID</string>
+    <string name="incognito_random_profile_description">Jūsų adresatui bus išsiųstas atsitiktinis profilis</string>
+    <string name="allow_disappearing_messages_only_if">Leisti išnykstančias žinutes tik tuo atveju, jei jūsų adresatas jas leidžia.</string>
+    <string name="clear_chat_warning">Visos žinutės bus ištrintos – to neįmanoma bus atšaukti! Žinutės bus ištrintos TIK jums.</string>
+    <string name="allow_to_delete_messages">Leisti negrįžtamai ištrinti išsiųstas žinutes.</string>
+    <string name="allow_to_send_disappearing">Leisti siųsti išnykstančias žinutes.</string>
+    <string name="allow_to_send_voice">Leisti siųsti balso žinutes.</string>
+    <string name="allow_direct_messages">Leisti siųsti tiesiogines žinutes nariams.</string>
+    <string name="v4_6_audio_video_calls">Garso ir vaizdo skambučiai</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Leisti jūsų adresatams siųsti išnykstančias žinutes.</string>
+    <string name="auth_unavailable">Tapatybės nustatymas neprieinamas</string>
+    <string name="impossible_to_recover_passphrase"><b>Turėkite omenyje</b>: jeigu prarasite slaptafrazę, NEBEGALĖSITE jos atkurti ar pakeisti.</string>
+    <string name="cancel_verb">Atsisakyti</string>
+</resources>

apps/android/app/src/main/res/values-night/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="Theme.SimpleX" parent="android:Theme.Material.Light.NoActionBar">
+    <item name="android:statusBarColor">@android:color/black</item>
+    <item name="android:windowBackground">@color/window_background_dark</item>
+  </style>
+</resources>

apps/android/app/src/main/res/values-nl/strings.xml

@@ -11,7 +11,7 @@
     <string name="icon_descr_cancel_image_preview">Annuleer afbeeldingsvoorbeeld</string>
     <string name="feature_cancelled_item">geannuleerd %s</string>
     <string name="icon_descr_cancel_live_message">Live bericht annuleren</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">veranderend adres…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">adres wijzigen…</string>
     <string name="notifications_mode_service">Altijd aan</string>
     <string name="icon_descr_asked_to_receive">Gevraagd om de afbeelding te ontvangen</string>
     <string name="change_verb">Wijziging</string>
@@ -21,7 +21,7 @@
     <string name="allow_direct_messages">Sta het verzenden van directe berichten naar leden toe.</string>
     <string name="allow_to_delete_messages">Sta toe om verzonden berichten onomkeerbaar te verwijderen.</string>
     <string name="allow_to_send_voice">Sta toe om spraak berichten te verzenden.</string>
-    <string name="chat_is_running">Chat is aktief</string>
+    <string name="chat_is_running">Chat is actief</string>
     <string name="clear_chat_menu_action">Wissen</string>
     <string name="chat_database_section">CHAT DATABASE</string>
     <string name="chat_archive_section">CHAT ARCHIEF</string>
@@ -57,7 +57,7 @@
     <string name="auto_accept_images">Afbeeldingen automatisch accepteren</string>
     <string name="auth_unavailable">Verificatie niet beschikbaar</string>
     <string name="back">Terug</string>
-    <string name="v4_2_auto_accept_contact_requests">Contactverzoeken automatisch accepteren</string>
+    <string name="v4_2_auto_accept_contact_requests">Contact verzoeken automatisch accepteren</string>
     <string name="bold">vetgedrukt</string>
     <string name="incognito_random_profile_description">Er wordt een willekeurig profiel naar uw contactpersoon verzonden</string>
     <string name="attach">Bijvoegen</string>
@@ -67,17 +67,17 @@
     <string name="all_your_contacts_will_remain_connected">Al uw contacten blijven verbonden.</string>
     <string name="allow_voice_messages_question">Spraak berichten toestaan\?</string>
     <string name="onboarding_notifications_mode_periodic_desc"><b>Goed voor batterij</b>. Achtergrondservice controleert elke 10 minuten op nieuwe berichten. U kunt oproepen en dringende berichten missen.</string>
-    <string name="integrity_msg_bad_hash">Onjuiste bericht-hash</string>
+    <string name="integrity_msg_bad_hash">Onjuiste bericht hash</string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Scan QR-code</b>: om verbinding te maken met uw contactpersoon die u de QR-code laat zien.</string>
-    <string name="integrity_msg_bad_id">Onjuiste bericht-ID</string>
+    <string name="integrity_msg_bad_id">Onjuiste bericht ID</string>
     <string name="call_already_ended">Oproep al beëindigd!</string>
     <string name="chat_item_ttl_month">1 maand</string>
     <string name="about_simplex">Over SimpleX</string>
     <string name="about_simplex_chat">Over <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="above_then_preposition_continuation">hierboven, dan:</string>
+    <string name="above_then_preposition_continuation">hier boven, dan:</string>
     <string name="accept_requests">Verzoeken accepteren</string>
-    <string name="users_delete_all_chats_deleted">Alle gesprekken en berichten worden verwijderd - dit kan niet ongedaan worden gemaakt!</string>
-    <string name="clear_chat_warning">Alle berichten worden verwijderd - dit kan niet ongedaan worden gemaakt! De berichten worden ALLEEN voor jou verwijderd.</string>
+    <string name="users_delete_all_chats_deleted">Alle gesprekken en berichten worden verwijderd, dit kan niet ongedaan worden gemaakt!</string>
+    <string name="clear_chat_warning">Alle berichten worden verwijderd, dit kan niet ongedaan worden gemaakt! De berichten worden ALLEEN voor jou verwijderd.</string>
     <string name="allow_disappearing_messages_only_if">Sta verdwijnende berichten alleen toe als uw contactpersoon dit toestaat.</string>
     <string name="allow_voice_messages_only_if">Sta spraak berichten alleen toe als uw contactpersoon ze toestaat.</string>
     <string name="allow_your_contacts_irreversibly_delete">Laat uw contacten verzonden berichten onomkeerbaar verwijderen.</string>
@@ -86,28 +86,28 @@
     <string name="icon_descr_audio_off">Geluid uit</string>
     <string name="full_backup">Back-up van app gegevens</string>
     <string name="answer_call">Beantwoord oproep</string>
-    <string name="keychain_is_storing_securely">Android Keychain wordt gebruikt om het wachtwoord veilig op te slaan - hierdoor kan de meldings service werken.</string>
-    <string name="keychain_allows_to_receive_ntfs">Android Keychain wordt gebruikt om het wachtwoord veilig op te slaan nadat u de app opnieuw hebt opgestart of het wachtwoord heeft gewijzigd - hiermee kunt u meldingen ontvangen.</string>
+    <string name="keychain_is_storing_securely">Android Keychain wordt gebruikt om het wachtwoord veilig op te slaan, hierdoor kan de meldings service werken.</string>
+    <string name="keychain_allows_to_receive_ntfs">Android Keychain wordt gebruikt om het wachtwoord veilig op te slaan nadat u de app opnieuw hebt opgestart of het wachtwoord heeft gewijzigd, hiermee kunt u meldingen ontvangen.</string>
     <string name="app_version_code">App build: %s</string>
     <string name="notifications_mode_off_desc">App kan alleen meldingen ontvangen wanneer deze actief is, er wordt geen achtergrondservice gestart</string>
     <string name="appearance_settings">Uiterlijk</string>
     <string name="settings_section_title_icon">APP ICON</string>
     <string name="app_version_title">App versie</string>
-    <string name="app_version_name">App-versie: v%s</string>
+    <string name="app_version_name">App versie: v%s</string>
     <string name="network_session_mode_user_description">Er wordt een aparte TCP-verbinding (en SOCKS-referentie) gebruikt <b> voor elk chat profiel dat je in de app hebt </b>.</string>
     <string name="audio_call_no_encryption">audio oproep (niet e2e versleuteld)</string>
     <string name="accept_automatically">Automatisch</string>
-    <string name="notifications_mode_service_desc">Achtergrondservice is altijd actief - meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
+    <string name="notifications_mode_service_desc">Achtergrondservice is altijd actief, meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
     <string name="add_new_contact_to_create_one_time_QR_code"><b>Nieuw contact toevoegen</b>: om uw eenmalige QR-code voor uw contact te maken.</string>
     <string name="icon_descr_call_ended">Oproep beëindigd</string>
     <string name="turning_off_service_and_periodic">Batterijoptimalisatie is actief, waardoor achtergrondservice en periodieke verzoeken om nieuwe berichten worden uitgeschakeld. Je kunt ze weer inschakelen via instellingen.</string>
     <string name="onboarding_notifications_mode_off_desc"><b>Beste voor de batterij</b>. U ontvangt alleen meldingen als de app draait, de achtergronddienst wordt NIET gebruikt.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Het kan worden uitgeschakeld via instellingen</b> - meldingen worden nog steeds weergegeven terwijl de app actief is.</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Het kan worden uitgeschakeld via instellingen</b>, meldingen worden nog steeds weergegeven terwijl de app actief is.</string>
     <string name="both_you_and_your_contacts_can_delete">Zowel jij als je contactpersoon kunnen verzonden berichten onherroepelijk verwijderen.</string>
     <string name="both_you_and_your_contact_can_send_disappearing">Zowel jij als je contactpersoon kunnen verdwijnende berichten sturen.</string>
     <string name="both_you_and_your_contact_can_send_voice">Zowel jij als je contactpersoon kunnen spraak berichten verzenden.</string>
     <string name="impossible_to_recover_passphrase"><b>Let op</b>: u kunt het wachtwoord NIET herstellen of wijzigen als u het kwijt raakt.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Gebruikt meer batterij</b>! Achtergrondservice is altijd actief - meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Gebruikt meer batterij</b>! Achtergrondservice is altijd actief, meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
     <string name="icon_descr_cancel_link_preview">link voorbeeld annuleren</string>
     <string name="callstatus_ended">oproep beëindigd <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
     <string name="database_initialization_error_title">Kan de database niet initialiseren</string>
@@ -116,7 +116,7 @@
     <string name="cannot_access_keychain">Geen toegang tot Keystore om database wachtwoord op te slaan</string>
     <string name="cannot_receive_file">Kan bestand niet ontvangen</string>
     <string name="change_role">Rol wijzigen</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">veranderend adres…</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">adres wijzigen…</string>
     <string name="rcv_conn_event_switch_queue_phase_completed">adres voor u gewijzigd</string>
     <string name="rcv_group_event_changed_member_role">veranderde rol van %s naar %s</string>
     <string name="change_member_role_question">Groep rol wijzigen\?</string>
@@ -130,8 +130,8 @@
     <string name="network_session_mode_user">Chat profiel</string>
     <string name="settings_section_title_chats">GESPREKKEN</string>
     <string name="chat_with_developers">Praat met de ontwikkelaars</string>
-    <string name="smp_servers_check_address">Controleer het serveradres en probeer het opnieuw.</string>
-    <string name="choose_file">Kies bestand</string>
+    <string name="smp_servers_check_address">Controleer het server adres en probeer het opnieuw.</string>
+    <string name="choose_file">Bestand</string>
     <string name="clear_verb">Wissen</string>
     <string name="v4_4_verify_connection_security_desc">Vergelijk beveiligingscodes met je contacten.</string>
     <string name="icon_descr_contact_checked">Contact gecontroleerd</string>
@@ -143,7 +143,7 @@
     <string name="group_member_status_intro_invitation">verbinden (introductie uitnodiging)</string>
     <string name="display_name_connection_established">verbinding gemaakt</string>
     <string name="connection_request_sent">Verbindingsverzoek verzonden!</string>
-    <string name="connection_timeout">Time-out verbinding</string>
+    <string name="connection_timeout">Timeout verbinding</string>
     <string name="share_one_time_link">Maak een eenmalige uitnodiging link</string>
     <string name="create_address">Adres aanmaken</string>
     <string name="create_group_link">Groep link maken</string>
@@ -166,13 +166,13 @@
     <string name="notification_preview_somebody">Contact verborgen:</string>
     <string name="image_decoding_exception_title">Decodeerfout</string>
     <string name="maximum_supported_file_size">De momenteel maximaal ondersteunde bestandsgrootte is <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contact en alle berichten worden verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contact en alle berichten worden verwijderd, dit kan niet ongedaan worden gemaakt!</string>
     <string name="icon_descr_server_status_connected">Verbonden</string>
     <string name="confirm_verb">Bevestigen</string>
     <string name="connect_via_link_or_qr">Maak verbinding via link / QR-code</string>
     <string name="copied">Gekopieerd naar het klembord</string>
     <string name="contribute">Bijdragen</string>
-    <string name="configure_ICE_servers">ICE-servers configureren</string>
+    <string name="configure_ICE_servers">ICE servers configureren</string>
     <string name="network_session_mode_entity">Verbinding</string>
     <string name="core_build_timestamp">Core gebouwd op: %s</string>
     <string name="core_version">Core versie: v%s</string>
@@ -215,9 +215,9 @@
     <string name="create_profile_button">Maak</string>
     <string name="create_profile">Maak een profiel aan</string>
     <string name="delete_address">Adres verwijderen</string>
-    <string name="connect_calls_via_relay">Verbinden via relais</string>
+    <string name="always_use_relay">Verbinden via relais</string>
     <string name="status_contact_has_e2e_encryption">contact heeft e2e-codering</string>
-    <string name="status_contact_has_no_e2e_encryption">contact heeft geen e2e-encryptie</string>
+    <string name="status_contact_has_no_e2e_encryption">contact heeft geen e2e versleuteling</string>
     <string name="set_password_to_export_desc">De database is versleuteld met een willekeurige wachtwoord. Wijzig dit voordat u exporteert.</string>
     <string name="database_passphrase">Database wachtwoord</string>
     <string name="confirm_new_passphrase">Bevestig nieuw wachtwoord…</string>
@@ -267,16 +267,16 @@
     <string name="delete_pending_connection__question">Wachtende verbinding verwijderen\?</string>
     <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: scan weergegeven QR-code vanuit de app, via <b>Scan QR-code</b>.</string>
     <string name="settings_developer_tools">Ontwikkel gereedschap</string>
-    <string name="auth_device_authentication_is_disabled_turning_off">Apparaatverificatie is uitgeschakeld. SimpleX Lock uitschakelen.</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">Apparaatverificatie is uitgeschakeld. SimpleX Vergrendelen uitschakelen.</string>
     <string name="display_name">Weergavenaam</string>
-    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Apparaatverificatie is niet ingeschakeld. Je kunt SimpleX Lock inschakelen via Instellingen zodra je apparaatverificatie hebt ingeschakeld.</string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Apparaatverificatie is niet ingeschakeld. Je kunt SimpleX Vergrendelen inschakelen via Instellingen zodra je apparaatverificatie hebt ingeschakeld.</string>
     <string name="direct_messages_are_prohibited_in_chat">Directe berichten tussen leden zijn verboden in deze groep.</string>
     <string name="total_files_count_and_size">%d bestand(en) met een totale grootte van %s</string>
     <string name="ttl_hour">%d uur</string>
     <string name="no_call_on_lock_screen">Uitzetten</string>
     <string name="v4_4_disappearing_messages">Verdwijnende berichten</string>
     <string name="disappearing_prohibited_in_this_chat">Verdwijnende berichten zijn verboden in dit gesprek.</string>
-    <string name="auth_disable_simplex_lock">SimpleX Lock uitschakelen</string>
+    <string name="auth_disable_simplex_lock">SimpleX Vergrendelen uitschakelen</string>
     <string name="timed_messages">Verdwijnende berichten</string>
     <string name="smp_server_test_disconnect">Verbinding verbreken</string>
     <string name="icon_descr_server_status_disconnected">Verbinding verbroken</string>
@@ -314,14 +314,14 @@
     <string name="error_changing_address">Fout bij wijzigen van adres</string>
     <string name="error_deleting_pending_contact_connection">Fout bij het verwijderen van in behandeling zijnde contact verbinding</string>
     <string name="error_deleting_user">Fout bij het verwijderen van gebruikers profiel</string>
-    <string name="auth_enable_simplex_lock">SimpleX Lock inschakelen</string>
+    <string name="auth_enable_simplex_lock">SimpleX Vergrendelen inschakelen</string>
     <string name="hide_verb">Verbergen</string>
     <string name="icon_descr_edited">bewerkt</string>
     <string name="for_everybody">Voor iedereen</string>
     <string name="icon_descr_server_status_error">Fout</string>
     <string name="icon_descr_email">Email</string>
     <string name="edit_image">Bewerk afbeelding</string>
-    <string name="exit_without_saving">Afsluiten zonder op te slaan</string>
+    <string name="exit_without_saving">Afsluiten zonder opslaan</string>
     <string name="full_name_optional__prompt">Volledige naam (optioneel)</string>
     <string name="encrypted_video_call">e2e versleuteld video gesprek</string>
     <string name="allow_accepting_calls_from_lock_screen">Schakel oproepen vanaf het vergrendelscherm in via Instellingen.</string>
@@ -343,7 +343,7 @@
     <string name="snd_group_event_group_profile_updated">groep profiel bijgewerkt</string>
     <string name="group_member_status_group_deleted">groep verwijderd</string>
     <string name="icon_descr_expand_role">Vouw de rolselectie uit</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">Groep wordt verwijderd voor alle leden - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">Groep wordt verwijderd voor alle leden, dit kan niet ongedaan worden gemaakt!</string>
     <string name="error_creating_link_for_group">Fout bij maken van groep link</string>
     <string name="error_deleting_link_for_group">Fout bij verwijderen groep link</string>
     <string name="group_link">Groep link</string>
@@ -356,7 +356,7 @@
     <string name="feature_enabled_for_contact">ingeschakeld voor contact</string>
     <string name="feature_enabled_for_you">voor u ingeschakeld</string>
     <string name="group_members_can_delete">Groepsleden kunnen verzonden berichten onherroepelijk verwijderen.</string>
-    <string name="group_members_can_send_dms">Groepsleden kunnen directe berichten sturen.</string>
+    <string name="group_members_can_send_dms">Groepsleden kunnen directe berichten sturen</string>
     <string name="group_members_can_send_voice">Groepsleden kunnen spraak berichten verzenden.</string>
     <string name="v4_5_transport_isolation_descr">Per chat profiel (standaard) of per verbinding (BETA).</string>
     <string name="v4_5_multiple_chat_profiles_descr">Verschillende namen, avatars en transportisolatie.</string>
@@ -368,7 +368,7 @@
     <string name="enable_automatic_deletion_question">Automatisch verwijderen van berichten aanzetten\?</string>
     <string name="enter_correct_passphrase">Voer het juiste wachtwoord in.</string>
     <string name="button_edit_group_profile">Groep profiel bewerken</string>
-    <string name="network_option_enable_tcp_keep_alive">Schakel TCP-keep-alive in</string>
+    <string name="network_option_enable_tcp_keep_alive">Schakel TCP keep-alive in</string>
     <string name="encrypt_database">Versleutelen</string>
     <string name="error_adding_members">Fout bij het toevoegen van gebruiker(s)</string>
     <string name="smp_servers_enter_manually">Voer de server handmatig in</string>
@@ -378,15 +378,15 @@
     <string name="section_title_for_console">VOOR CONSOLE</string>
     <string name="group_profile_is_stored_on_members_devices">Groep profiel wordt opgeslagen op de apparaten van de leden, niet op de servers.</string>
     <string name="notification_preview_mode_hidden">Verborgen</string>
-    <string name="delete_group_for_self_cannot_undo_warning">De groep wordt voor u verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">De groep wordt voor u verwijderd, dit kan niet ongedaan worden gemaakt!</string>
     <string name="hide_notification">Verbergen</string>
     <string name="server_error">fout</string>
     <string name="file_will_be_received_when_contact_is_online">Het bestand wordt ontvangen wanneer uw contact persoon online is, even geduld a.u.b. of controleer later!</string>
     <string name="error_saving_file">Fout bij opslaan van bestand</string>
     <string name="file_not_found">Bestand niet gevonden</string>
     <string name="file_saved">Bestand opgeslagen</string>
-    <string name="from_gallery_button">Uit galerij</string>
-    <string name="error_saving_ICE_servers">Fout bij opslaan van ICE-servers</string>
+    <string name="from_gallery_button">Galerij</string>
+    <string name="error_saving_ICE_servers">Fout bij opslaan van ICE servers</string>
     <string name="callstate_ended">geëindigd</string>
     <string name="group_members_can_send_disappearing">Groepsleden kunnen verdwijnende berichten sturen.</string>
     <string name="ttl_week">%d week</string>
@@ -397,8 +397,8 @@
     <string name="error_with_info">Fout: %s</string>
     <string name="error_creating_address">Fout bij aanmaken van adres</string>
     <string name="icon_descr_help">help</string>
-    <string name="icon_descr_flip_camera">Flip-camera</string>
-    <string name="error_saving_smp_servers">Fout bij opslaan van SMP-servers</string>
+    <string name="icon_descr_flip_camera">Draai camera</string>
+    <string name="error_saving_smp_servers">Fout bij opslaan van SMP servers</string>
     <string name="error_setting_network_config">Fout bij updaten van netwerk configuratie</string>
     <string name="failed_to_parse_chat_title">Kan het gesprek niet laden</string>
     <string name="failed_to_parse_chats_title">Kan de gesprekken niet laden</string>
@@ -420,7 +420,7 @@
     <string name="notification_new_contact_request">Nieuw contactverzoek</string>
     <string name="auth_log_in_using_credential">Log in met uw inloggegevens</string>
     <string name="message_delivery_error_desc">Hoogstwaarschijnlijk heeft dit contact de verbinding met jou verwijderd.</string>
-    <string name="delete_message_cannot_be_undone_warning">Bericht wordt verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="delete_message_cannot_be_undone_warning">Bericht wordt verwijderd, dit kan niet ongedaan worden gemaakt!</string>
     <string name="large_file">Groot bestand!</string>
     <string name="mark_read">Markeer gelezen</string>
     <string name="mark_unread">Markeer als ongelezen</string>
@@ -440,11 +440,11 @@
     <string name="how_it_works">Hoe het werkt</string>
     <string name="callstatus_missed">gemiste oproep</string>
     <string name="how_simplex_works">Hoe <xliff:g id="appName">SimpleX</xliff:g> werkt</string>
-    <string name="many_people_asked_how_can_it_deliver">Veel mensen vroegen: <i>als <xliff:g id="appName">SimpleX</xliff:g> geen gebruikers-ID\'s heeft, hoe kan het dan berichten bezorgen\?</i></string>
+    <string name="many_people_asked_how_can_it_deliver">Veel mensen vroegen: <i>als <xliff:g id="appName">SimpleX</xliff:g> geen gebruikers ID\'s heeft, hoe kan het dan berichten bezorgen\?</i></string>
     <string name="incoming_audio_call">Inkomende audio oproep</string>
     <string name="incoming_video_call">Inkomend video gesprek</string>
     <string name="ignore">Negeren</string>
-    <string name="status_no_e2e_encryption">geen e2e-encryptie</string>
+    <string name="status_no_e2e_encryption">geen e2e versleuteling</string>
     <string name="import_database_question">Chat database importeren\?</string>
     <string name="chat_item_ttl_none">nooit</string>
     <string name="no_received_app_files">Geen ontvangen of verzonden bestanden</string>
@@ -454,17 +454,17 @@
     <string name="group_member_status_invited">uitgenodigd</string>
     <string name="button_leave_group">Groep verlaten</string>
     <string name="info_row_local_name">Lokale naam</string>
-    <string name="group_unsupported_incognito_main_profile_sent">Incognito modus wordt hier niet ondersteund - uw hoofdprofiel wordt naar groepsleden verzonden</string>
+    <string name="group_unsupported_incognito_main_profile_sent">Incognito modus wordt hier niet ondersteund, uw hoofdprofiel wordt naar groepsleden verzonden</string>
     <string name="users_delete_data_only">Alleen lokale profielgegevens</string>
     <string name="message_deletion_prohibited_in_chat">Het onomkeerbaar verwijderen van berichten is verboden in deze groep.</string>
-    <string name="v4_3_improved_privacy_and_security_desc">App-scherm verbergen in de recente apps.</string>
+    <string name="v4_3_improved_privacy_and_security_desc">App scherm verbergen in de recente apps.</string>
     <string name="settings_section_title_incognito">Incognito modus</string>
     <string name="messages_section_title">Berichten</string>
     <string name="new_passphrase">Nieuw wachtwoord…</string>
     <string name="keychain_error">Keychain fout</string>
     <string name="join_group_button">Word lid van</string>
     <string name="leave_group_question">Groep verlaten\?</string>
-    <string name="new_member_role">Nieuwe ledenrol</string>
+    <string name="new_member_role">Nieuwe leden rol</string>
     <string name="no_contacts_to_add">Geen contacten om toe te voegen</string>
     <string name="incognito_info_allows">Het maakt het mogelijk om veel anonieme verbindingen te hebben zonder enige gedeelde gegevens tussen hen in een enkel chat profiel.</string>
     <string name="theme_light">Licht</string>
@@ -491,12 +491,12 @@
 \nWe zullen serverredundantie toevoegen om verloren berichten te voorkomen.</string>
     <string name="joining_group">Deel nemen aan groep</string>
     <string name="leave_group_button">Verlaten</string>
-    <string name="group_member_role_member">gebruiker</string>
+    <string name="group_member_role_member">Gebruiker</string>
     <string name="image_descr_link_preview">link voorbeeld afbeelding</string>
     <string name="member_info_section_title_member">GEBRUIKER</string>
     <string name="settings_section_title_messages">BERICHTEN</string>
     <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 mobiel: tik op <b>Openen in mobiele app</b> en tik vervolgens op <b>Verbinden</b> in de app.</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">Gebruiker wordt uit de groep verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">Gebruiker wordt uit de groep verwijderd, dit kan niet ongedaan worden gemaakt!</string>
     <string name="message_delivery_error_title">Fout bij bezorging van bericht</string>
     <string name="delete_message_mark_deleted_warning">Bericht wordt gemarkeerd voor verwijdering. De ontvanger(s) kunnen dit bericht onthullen.</string>
     <string name="network_status">Netwerk status</string>
@@ -506,7 +506,7 @@
     <string name="import_database">Database importeren</string>
     <string name="v4_3_improved_privacy_and_security">Verbeterde privacy en veiligheid</string>
     <string name="image_will_be_received_when_contact_is_online">De afbeelding wordt ontvangen wanneer uw contact online is, even geduld a.u.b. of kijk later!</string>
-    <string name="incognito_info_protects">De incognito modus beschermt de privacy van uw hoofdprofielnaam en -afbeelding - voor elk nieuw contact wordt een nieuw willekeurig profiel gemaakt.</string>
+    <string name="incognito_info_protects">De incognito modus beschermt de privacy van uw hoofdprofielnaam en afbeelding, voor elk nieuw contact wordt een nieuw willekeurig profiel gemaakt.</string>
     <string name="new_database_archive">Nieuw database archief</string>
     <string name="no_details">geen details</string>
     <string name="conn_level_desc_indirect">indirect (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
@@ -516,14 +516,14 @@
     <string name="settings_notifications_mode_title">Meldingsservice</string>
     <string name="notifications">Meldingen</string>
     <string name="invalid_contact_link">Ongeldige link!</string>
-    <string name="smp_servers_invalid_address">Ongeldig serveradres!</string>
+    <string name="smp_servers_invalid_address">Ongeldig server adres!</string>
     <string name="install_simplex_chat_for_terminal">Installeer <xliff:g id="appNameFull">SimpleX Chat</xliff:g> voor terminal</string>
     <string name="how_to">Hoe</string>
     <string name="how_to_use_your_servers">Hoe u uw servers gebruikt</string>
     <string name="network_and_servers">Netwerk &amp; servers</string>
-    <string name="enter_one_ICE_server_per_line">ICE-servers (één per lijn)</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Zorg ervoor dat WebRTC ICE-serveradressen de juiste indeling hebben, regelgescheiden zijn en niet gedupliceerd zijn.</string>
-    <string name="network_disable_socks_info">Als u bevestigt, kunnen de berichtenservers uw IP-adres zien en uw provider - met welke servers u verbinding maakt.</string>
+    <string name="enter_one_ICE_server_per_line">ICE servers (één per lijn)</string>
+    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Zorg ervoor dat WebRTC ICE server adressen de juiste indeling hebben, regel gescheiden zijn en niet gedupliceerd zijn.</string>
+    <string name="network_disable_socks_info">Als u bevestigt, kunnen de berichten servers uw IP-adres zien en uw provider, met welke servers u verbinding maakt.</string>
     <string name="network_use_onion_hosts_no">Nee</string>
     <string name="immune_to_spam_and_abuse">Immuun voor spam en misbruik</string>
     <string name="make_private_connection">Maak een privéverbinding</string>
@@ -535,7 +535,7 @@
     <string name="rcv_group_event_invited_via_your_group_link">uitgenodigd via je groep link</string>
     <string name="incognito">Incognito</string>
     <string name="icon_descr_call_missed">Gemiste oproep</string>
-    <string name="description_via_contact_address_link_incognito">incognito via link naar contactadres</string>
+    <string name="description_via_contact_address_link_incognito">incognito via contact adres link</string>
     <string name="description_via_group_link_incognito">incognito via groep link</string>
     <string name="description_via_one_time_link_incognito">incognito via eenmalige link</string>
     <string name="invalid_chat">ongeldige gesprek</string>
@@ -543,21 +543,21 @@
     <string name="invalid_message_format">ongeldig berichtformaat</string>
     <string name="display_name_invited_to_connect">uitgenodigd om te verbinden</string>
     <string name="live">LIVE</string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">Zorg ervoor dat SMP-serveradressen de juiste indeling hebben, regelgescheiden zijn en niet gedupliceerd zijn.</string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">Zorg ervoor dat SMP server adressen de juiste indeling hebben, regel gescheiden zijn en niet gedupliceerd zijn.</string>
     <string name="marked_deleted_description">gemarkeerd als verwijderd</string>
     <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Controleer of u de juiste link heeft gebruikt of vraag uw contactpersoon om u een andere te sturen.</string>
     <string name="image_descr_profile_image">profielfoto</string>
     <string name="privacy_redefined">Privacy opnieuw gedefinieerd</string>
     <string name="privacy_and_security">Privacy en beveiliging</string>
     <string name="network_error_desc">Controleer uw netwerkverbinding met <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> en probeer het opnieuw.</string>
-    <string name="error_smp_test_certificate">Mogelijk is de certificaatvingerafdruk in het serveradres onjuist</string>
+    <string name="error_smp_test_certificate">Mogelijk is de certificaat vingerafdruk in het server adres onjuist</string>
     <string name="periodic_notifications">Periodieke meldingen</string>
     <string name="auth_open_chat_console">Chat console openen</string>
     <string name="toast_permission_denied">Geen toestemming!</string>
     <string name="icon_descr_profile_image_placeholder">profielafbeelding tijdelijke aanduiding</string>
     <string name="one_time_link">Eenmalige uitnodiging link</string>
     <string name="paste_button">Plakken</string>
-    <string name="smp_servers_preset_address">Vooraf ingesteld serveradres</string>
+    <string name="smp_servers_preset_address">Vooraf ingesteld server adres</string>
     <string name="network_use_onion_hosts_no_desc_in_alert">Onion hosts worden niet gebruikt.</string>
     <string name="onboarding_notifications_mode_title">Privé meldingen</string>
     <string name="paste_the_link_you_received">Plak de ontvangen link</string>
@@ -573,12 +573,12 @@
     <string name="only_you_can_send_disappearing">Alleen jij kunt verdwijnende berichten verzenden.</string>
     <string name="only_your_contact_can_send_disappearing">Alleen uw contactpersoon kan verdwijnende berichten verzenden.</string>
     <string name="only_you_can_delete_messages">Alleen jij kunt berichten onomkeerbaar verwijderen (je contactpersoon kan ze markeren voor verwijdering).</string>
-    <string name="feature_offered_item_with_param">aangeboden %s: %2s</string>
+    <string name="feature_offered_item_with_param">voorgesteld %s: %2s</string>
     <string name="old_database_archive">Oud database archief</string>
     <string name="enter_correct_current_passphrase">Voer het juiste huidige wachtwoord in.</string>
-    <string name="group_member_role_owner">eigenaar</string>
-    <string name="network_option_ping_count">PING-telling</string>
-    <string name="network_option_ping_interval">PING-interval</string>
+    <string name="group_member_role_owner">Eigenaar</string>
+    <string name="network_option_ping_count">PING count</string>
+    <string name="network_option_ping_interval">PING interval</string>
     <string name="v4_5_message_draft_descr">Bewaar het laatste berichtconcept, met bijlagen.</string>
     <string name="v4_5_private_filenames">Privé bestandsnamen</string>
     <string name="images_limit_desc">Er kunnen slechts 10 afbeeldingen tegelijk worden verzonden</string>
@@ -599,13 +599,13 @@
     <string name="network_use_onion_hosts_prefer_desc">Onion hosts worden gebruikt indien beschikbaar.</string>
     <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion hosts worden gebruikt indien beschikbaar.</string>
     <string name="network_use_onion_hosts_no_desc">Onion hosts worden niet gebruikt.</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">Open-source protocol en code – iedereen kan de servers draaien.</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">Open-source protocol en code. Iedereen kan de servers draaien.</string>
     <string name="people_can_connect_only_via_links_you_share">Mensen kunnen alleen verbinding met u maken via de links die u deelt.</string>
     <string name="only_your_contact_can_delete">Alleen uw contactpersoon kan berichten onherroepelijk verwijderen (u kunt ze markeren voor verwijdering).</string>
     <string name="only_you_can_send_voice">Alleen jij kunt spraak berichten verzenden.</string>
     <string name="only_your_contact_can_send_voice">Alleen uw contactpersoon kan spraak berichten verzenden.</string>
     <string name="prohibit_message_deletion">Verbied het onomkeerbaar verwijderen van berichten.</string>
-    <string name="feature_offered_item">aangeboden %s</string>
+    <string name="feature_offered_item">voorgesteld %s</string>
     <string name="store_passphrase_securely_without_recover">Sla het wachtwoord veilig op. Als u deze kwijtraakt, heeft u GEEN toegang tot de gesprekken.</string>
     <string name="store_passphrase_securely">Bewaar het wachtwoord veilig, u kunt deze NIET wijzigen als u deze kwijtraakt.</string>
     <string name="open_chat">Gesprekken openen</string>
@@ -613,9 +613,9 @@
     <string name="icon_descr_call_pending_sent">Oproep in behandeling</string>
     <string name="simplex_link_mode_browser_warning">Het openen van de link in de browser kan de privacy en beveiliging van de verbinding verminderen. Niet vertrouwde SimpleX links worden rood weergegeven.</string>
     <string name="contact_developers">Werk de app bij en neem contact op met de ontwikkelaars.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Alleen client-apparaten slaan gebruikersprofielen, contacten, groepen en berichten op die zijn verzonden met <b>2-laags end-to-end-codering</b>.</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Alleen client apparaten slaan gebruikers profielen, contacten, groepen en berichten op die zijn verzonden met <b>2-laags end-to-end codering</b>.</string>
     <string name="sender_may_have_deleted_the_connection_request">De afzender heeft mogelijk het verbindingsverzoek verwijderd.</string>
-    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Schakel SimpleX Lock in om uw informatie te beschermen.
+    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Schakel SimpleX Vergrendelen in om uw informatie te beschermen.
 \nU wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingeschakeld.</string>
     <string name="la_notice_turn_on">Aanzetten</string>
     <string name="auth_unlock">Ontgrendelen</string>
@@ -629,15 +629,15 @@
     <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Uw contactpersoon kan de QR-code vanuit de app scannen.</string>
     <string name="share_invitation_link">Uitnodiging link delen</string>
     <string name="scan_code">Code scannen</string>
-    <string name="your_contact_address">Uw contactadres</string>
+    <string name="your_contact_address">Uw contact adres</string>
     <string name="your_settings">Uw instellingen</string>
     <string name="share_link">Deel link</string>
     <string name="you_control_your_chat">Jij beheert je gesprek!</string>
     <string name="your_profile_is_stored_on_your_device">Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.</string>
     <string name="callstate_starting">beginnen…</string>
-    <string name="you_control_servers_to_receive_your_contacts_to_send">U bepaalt via welke server(s) je de berichten <b>ontvangt</b>, uw contacten – de servers die u gebruikt om ze berichten te sturen.</string>
+    <string name="you_control_servers_to_receive_your_contacts_to_send">U bepaalt via welke server(s) je de berichten <b>ontvangt</b>, uw contacten de servers die u gebruikt om ze berichten te sturen.</string>
     <string name="icon_descr_video_on">Video aan</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Deze actie kan niet ongedaan worden gemaakt - uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
     <string name="messages_section_description">Deze instelling is van toepassing op berichten in jou huidige chat profiel</string>
     <string name="save_archive">Bewaar archief</string>
     <string name="rcv_group_event_updated_group_profile">bijgewerkt groep profiel</string>
@@ -654,7 +654,7 @@
     <string name="notification_preview_mode_message_desc">Toon contact en bericht</string>
     <string name="notification_preview_mode_contact_desc">Toon alleen contactpersoon</string>
     <string name="ntf_channel_messages">SimpleX Chat berichten</string>
-    <string name="auth_simplex_lock_turned_on">SimpleX Lock ingeschakeld</string>
+    <string name="auth_simplex_lock_turned_on">SimpleX Vergrendelen ingeschakeld</string>
     <string name="auth_stop_chat">Stop chat</string>
     <string name="reply_verb">Antwoord</string>
     <string name="save_verb">Opslaan</string>
@@ -669,7 +669,7 @@
     <string name="welcome">Welkom!</string>
     <string name="group_preview_you_are_invited">je bent uitgenodigd voor de groep</string>
     <string name="you_have_no_chats">Je hebt geen gesprekken</string>
-    <string name="your_chats">Je gesprekken</string>
+    <string name="your_chats">Jouw gesprekken</string>
     <string name="share_file">Deel bestand…</string>
     <string name="share_image">Afbeelding delen…</string>
     <string name="icon_descr_waiting_for_image">Wachten op afbeelding</string>
@@ -706,14 +706,14 @@
     <string name="security_code">Beveiligingscode</string>
     <string name="is_not_verified">%s is niet geverifieerd</string>
     <string name="is_verified">%s is geverifieerd</string>
-    <string name="to_verify_compare">Vergelijk (of scan) de code op uw apparaten om end-to-end-codering met uw contactpersoon te verifiëren.</string>
+    <string name="to_verify_compare">Vergelijk (of scan) de code op uw apparaten om end-to-end codering met uw contactpersoon te verifiëren.</string>
     <string name="you_can_also_connect_by_clicking_the_link">U kunt ook verbinding maken door op de link te klikken. Als het in de browser wordt geopend, klikt u op de knop <b> Openen in mobiele app </b>.</string>
     <string name="your_profile_will_be_sent">Uw chat profiel wordt naar uw contactpersoon verzonden</string>
-    <string name="your_chat_profiles">Je chat profielen</string>
-    <string name="your_simplex_contact_address">Uw <xliff:g id="appName">SimpleX</xliff:g> contactadres</string>
+    <string name="your_chat_profiles">Uw chat profielen</string>
+    <string name="your_simplex_contact_address">Uw <xliff:g id="appName">SimpleX</xliff:g> contact adres</string>
     <string name="chat_with_the_founder">Stuur vragen en ideeën</string>
     <string name="send_us_an_email">Stuur ons een e-mail</string>
-    <string name="chat_lock">SimpleX Lock</string>
+    <string name="chat_lock">SimpleX Vergrendelen</string>
     <string name="smp_servers">SMP servers</string>
     <string name="smp_servers_save">Bewaar servers</string>
     <string name="smp_servers_test_failed">Servertest mislukt!</string>
@@ -722,17 +722,17 @@
     <string name="smp_servers_test_server">Server test</string>
     <string name="rate_the_app">Beoordeel de app</string>
     <string name="smp_servers_use_server">Gebruik server</string>
-    <string name="using_simplex_chat_servers">Gebruik van <xliff:g id="appNameFull">SimpleX Chat</xliff:g>-servers.</string>
-    <string name="smp_servers_your_server_address">Uw serveradres</string>
+    <string name="using_simplex_chat_servers">Gebruik van <xliff:g id="appNameFull">SimpleX Chat</xliff:g> servers.</string>
+    <string name="smp_servers_your_server_address">Uw server adres</string>
     <string name="smp_servers_your_server">Uw server</string>
     <string name="network_session_mode_transport_isolation">Transport isolation</string>
     <string name="network_socks_toggle">SOCKS-proxy gebruiken (poort 9050)</string>
     <string name="save_preferences_question">Voorkeuren opslaan\?</string>
     <string name="save_and_notify_contact">Opslaan en Contact melden</string>
-    <string name="section_title_welcome_message">WELKOMS BERICHT</string>
+    <string name="section_title_welcome_message">WELKOMST BERICHT</string>
     <string name="your_current_profile">Je huidige profiel</string>
     <string name="save_and_notify_contacts">Opslaan en Contacten melden</string>
-    <string name="save_and_notify_group_members">Opslaan en Groepleden melden</string>
+    <string name="save_and_notify_group_members">Opslaan en Groepsleden melden</string>
     <string name="strikethrough">staking</string>
     <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Het berichten- en applicatieplatform dat uw privacy en veiligheid beschermt.</string>
     <string name="profile_is_only_shared_with_your_contacts">Het profiel wordt alleen gedeeld met uw contacten.</string>
@@ -742,7 +742,7 @@
     <string name="secret">geheim</string>
     <string name="next_generation_of_private_messaging">De volgende generatie privéberichten</string>
     <string name="callstate_waiting_for_answer">wachten op antwoord…</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Om de privacy te beschermen, heeft <xliff:g id="appName">SimpleX</xliff:g> in plaats van gebruikers-ID\'s die door alle andere platforms worden gebruikt, ID\'s voor berichtenwachtrijen, afzonderlijk voor elk van uw contacten.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Om de privacy te beschermen, heeft <xliff:g id="appName">SimpleX</xliff:g> in plaats van gebruikers ID\'s die door alle andere platforms worden gebruikt, ID\'s voor berichten wachtrijen, afzonderlijk voor elk van uw contacten.</string>
     <string name="use_chat">Gebruik chat</string>
     <string name="onboarding_notifications_mode_off">Wanneer de app actief is</string>
     <string name="video_call_no_encryption">video gesprek (niet e2e versleuteld)</string>
@@ -751,8 +751,10 @@
     <string name="icon_descr_video_call">video oproep</string>
     <string name="your_calls">Uw oproepen</string>
     <string name="show_call_on_lock_screen">Toon</string>
-    <string name="webrtc_ice_servers">WebRTC ICE-servers</string>
-    <string name="your_ice_servers">Uw ICE-servers</string>
+    <string name="webrtc_ice_servers">WebRTC ICE servers</string>
+    <string name="relay_server_protects_ip">Relay server beschermt uw IP-adres, maar kan de duur van het gesprek observeren.</string>
+    <string name="relay_server_if_necessary">Relay server wordt alleen gebruikt als dat nodig is. Een andere partij kan uw IP-adres zien.</string>
+    <string name="your_ice_servers">Uw ICE servers</string>
     <string name="alert_title_skipped_messages">Overgeslagen berichten</string>
     <string name="call_connection_via_relay">via relais</string>
     <string name="icon_descr_video_off">Video uit</string>
@@ -769,7 +771,7 @@
     <string name="you_must_use_the_most_recent_version_of_database">U mag de meest recente versie van uw chat database ALLEEN op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</string>
     <string name="restart_the_app_to_use_imported_chat_database">Start de app opnieuw om de geïmporteerde chat database te gebruiken.</string>
     <string name="stop_chat_to_enable_database_actions">Stop de chat om database acties mogelijk te maken.</string>
-    <string name="delete_files_and_media_desc">Deze actie kan niet ongedaan worden gemaakt - alle ontvangen en verzonden bestanden en media worden verwijderd. Foto\'s met een lage resolutie blijven behouden.</string>
+    <string name="delete_files_and_media_desc">Deze actie kan niet ongedaan worden gemaakt, alle ontvangen en verzonden bestanden en media worden verwijderd. Foto\'s met een lage resolutie blijven behouden.</string>
     <string name="remove_passphrase_from_keychain">Wachtwoord verwijderen uit Keychain\?</string>
     <string name="remove_passphrase">Verwijderen</string>
     <string name="update_database">Update</string>
@@ -783,13 +785,13 @@
     <string name="rcv_group_event_user_deleted">heeft je verwijderd</string>
     <string name="group_info_member_you">jij: <xliff:g id="group_info_you">%1$s</xliff:g></string>
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> LEDEN</string>
-    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">U kunt een link of een QR-code delen - iedereen kan lid worden van de groep. U verliest geen leden van de groep als u deze later verwijdert.</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">U kunt een link of een QR-code delen. Iedereen kan lid worden van de groep. U verliest geen leden van de groep als u deze later verwijdert.</string>
     <string name="switch_verb">Wijzig</string>
     <string name="member_role_will_be_changed_with_notification">De rol wordt gewijzigd in \"%s\". Iedereen in de groep wordt op de hoogte gebracht.</string>
     <string name="receiving_via">Ontvang via</string>
     <string name="save_group_profile">Groep profiel opslaan</string>
     <string name="group_is_decentralized">De groep is volledig gedecentraliseerd – het is alleen zichtbaar voor de leden.</string>
-    <string name="network_option_tcp_connection_timeout">Time-out van TCP-verbinding</string>
+    <string name="network_option_tcp_connection_timeout">Timeout van TCP-verbinding</string>
     <string name="voice_messages">Spraak berichten</string>
     <string name="voice_prohibited_in_this_chat">Spraak berichten zijn verboden in dit gesprek.</string>
     <string name="prohibit_sending_disappearing">Verbied het verzenden van verdwijnende berichten.</string>
@@ -800,7 +802,7 @@
     <string name="stop_chat_to_export_import_or_delete_chat_database">Stop de chat om de chat database te exporteren, importeren of verwijderen. U kunt geen berichten ontvangen en verzenden terwijl de chat is gestopt.</string>
     <string name="chat_item_ttl_seconds">%s seconde(n)</string>
     <string name="update_database_passphrase">Database wachtwoord bijwerken</string>
-    <string name="database_is_not_encrypted">Uw chat database is niet versleuteld - stel een wachtwoord in om deze te beschermen.</string>
+    <string name="database_is_not_encrypted">Uw chat database is niet versleuteld, stel een wachtwoord in om deze te beschermen.</string>
     <string name="database_restore_error">Databasefout herstellen</string>
     <string name="unknown_error">Onbekende fout</string>
     <string name="wrong_passphrase_title">Verkeerd wachtwoord!</string>
@@ -813,7 +815,7 @@
     <string name="snd_conn_event_switch_queue_phase_completed">je bent van adres veranderd</string>
     <string name="select_contacts">Selecteer contacten</string>
     <string name="skip_inviting_button">Sla het uitnodigen van leden over</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> contact(en) geselecteerd</string>
+    <string name="num_contacts_selected">%d contact(en) geselecteerd</string>
     <string name="remove_member_confirmation">Verwijderen</string>
     <string name="button_remove_member">Gebruiker verwijderen</string>
     <string name="role_in_group">Rol</string>
@@ -823,7 +825,7 @@
     <string name="conn_stats_section_title_servers">SERVERS</string>
     <string name="network_options_reset_to_defaults">Resetten naar standaardwaarden</string>
     <string name="switch_receiving_address">Ontvangst adres wijzigen</string>
-    <string name="network_option_protocol_timeout">Protocol time-out</string>
+    <string name="network_option_protocol_timeout">Protocol timeout</string>
     <string name="network_options_revert">Terugdraaien</string>
     <string name="network_options_save">Opslaan</string>
     <string name="network_option_seconds_label">sec</string>
@@ -857,16 +859,16 @@
     <string name="voice_messages_prohibited">Spraak berichten verboden!</string>
     <string name="reset_verb">Resetten</string>
     <string name="send_verb">Verstuur</string>
-    <string name="send_live_message_desc">Stuur een live bericht - het wordt bijgewerkt voor de ontvanger(s) terwijl u het typt</string>
+    <string name="send_live_message_desc">Stuur een live bericht, het wordt bijgewerkt voor de ontvanger(s) terwijl u het typt</string>
     <string name="to_share_with_your_contact">(om te delen met uw contact)</string>
     <string name="thank_you_for_installing_simplex">Bedankt voor het installeren van <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
-    <string name="use_camera_button">Gebruik camera</string>
+    <string name="use_camera_button">Camera</string>
     <string name="smp_servers_use_server_for_new_conn">Gebruik voor nieuwe verbindingen</string>
     <string name="star_on_github">Star on GitHub</string>
     <string name="smp_servers_per_user">De servers voor nieuwe verbindingen van je huidige chat profiel</string>
-    <string name="your_SMP_servers">Uw SMP-servers</string>
-    <string name="saved_ICE_servers_will_be_removed">Opgeslagen WebRTC ICE-servers worden verwijderd.</string>
-    <string name="your_ICE_servers">Uw ICE-servers</string>
+    <string name="your_SMP_servers">Uw SMP servers</string>
+    <string name="saved_ICE_servers_will_be_removed">Opgeslagen WebRTC ICE servers worden verwijderd.</string>
+    <string name="your_ICE_servers">Uw ICE servers</string>
     <string name="save_servers_button">Opslaan</string>
     <string name="network_enable_socks">SOCKS-proxy gebruiken\?</string>
     <string name="network_use_onion_hosts">Gebruik .onion-hosts</string>
@@ -877,26 +879,25 @@
     <string name="update_network_session_mode_question">Transportisolatiemodus updaten\?</string>
     <string name="callstate_received_confirmation">bevestiging ontvangen…</string>
     <string name="callstate_waiting_for_confirmation">Wachten op bevestiging…</string>
-    <string name="first_platform_without_user_ids">Het eerste platform zonder gebruikers-ID\'s - privé door ontwerp.</string>
+    <string name="first_platform_without_user_ids">Het eerste platform zonder gebruikers ID\'s, privé door ontwerp.</string>
     <string name="prohibit_direct_messages">Verbied het sturen van directe berichten naar leden.</string>
     <string name="prohibit_sending_voice">Verbieden het verzenden van spraak berichten.</string>
     <string name="v4_2_security_assessment_desc">De beveiliging van SimpleX Chat is gecontroleerd door Trail of Bits.</string>
-    <string name="v4_2_auto_accept_contact_requests_desc">Met optioneel welkomstbericht.</string>
+    <string name="v4_2_auto_accept_contact_requests_desc">Met optioneel welkomst bericht.</string>
     <string name="v4_3_voice_messages">Spraak berichten</string>
     <string name="v4_3_irreversible_message_deletion_desc">Uw contacten kunnen volledige verwijdering van berichten toestaan.</string>
-    <string name="you_have_to_enter_passphrase_every_time">U moet elke keer dat de app start het wachtwoord invoeren - deze wordt niet op het apparaat opgeslagen.</string>
+    <string name="you_have_to_enter_passphrase_every_time">U moet elke keer dat de app start het wachtwoord invoeren, deze wordt niet op het apparaat opgeslagen.</string>
     <string name="wrong_passphrase">Verkeerd wachtwoord voor de database</string>
     <string name="save_passphrase_and_open_chat">Bewaar het wachtwoord en open je gesprekken</string>
     <string name="database_backup_can_be_restored">De poging om het wachtwoord van de database te wijzigen is niet voltooid.</string>
-    <string name="restore_database">Databaseback-up terugzetten</string>
-    <string name="restore_database_alert_title">Databaseback-up terugzetten\?</string>
+    <string name="restore_database">Database back-up terugzetten</string>
+    <string name="restore_database_alert_title">Database back-up terugzetten\?</string>
     <string name="restore_database_alert_confirm">Herstellen</string>
     <string name="snd_group_event_changed_member_role">je veranderde de rol van %s in %s</string>
     <string name="snd_group_event_changed_role_for_yourself">je veranderde de rol voor jezelf naar %s</string>
     <string name="update_network_settings_question">Netwerk instellingen bijwerken\?</string>
     <string name="updating_settings_will_reconnect_client_to_all_servers">Door de instellingen bij te werken, wordt de client opnieuw verbonden met alle servers.</string>
     <string name="update_network_settings_confirmation">Update</string>
-    <string name="your_chat_profiles_stored_locally">Uw chat profielen worden lokaal opgeslagen, alleen op uw apparaat</string>
     <string name="incognito_random_profile">Je willekeurige profiel</string>
     <string name="prohibit_sending_disappearing_messages">Verbied het verzenden van verdwijnende berichten.</string>
     <string name="prohibit_sending_voice_messages">Verbieden het verzenden van spraak berichten.</string>
@@ -906,38 +907,38 @@
     <string name="error_smp_test_server_auth">Server vereist autorisatie om wachtrijen te maken, controleer wachtwoord</string>
     <string name="set_group_preferences">Groep voorkeuren instellen</string>
     <string name="share_message">Bericht delen…</string>
-    <string name="la_notice_title_simplex_lock">SimpleX Lock</string>
+    <string name="la_notice_title_simplex_lock">SimpleX Vergrendelen</string>
     <string name="save_passphrase_in_keychain">Sla het wachtwoord op in Keychain</string>
     <string name="settings_section_title_socks">SOCKS PROXY</string>
     <string name="v4_5_italian_interface_descr">Dank aan de gebruikers – draag bij via Weblate!</string>
-    <string name="periodic_notifications_desc">De app haalt regelmatig nieuwe berichten op - het gebruikt een paar procent van de batterij per dag. De app maakt geen gebruik van push meldingen - gegevens van uw apparaat worden niet naar de servers verzonden.</string>
+    <string name="periodic_notifications_desc">De app haalt regelmatig nieuwe berichten op - het gebruikt een paar procent van de batterij per dag. De app maakt geen gebruik van push meldingen, gegevens van uw apparaat worden niet naar de servers verzonden.</string>
     <string name="image_decoding_exception_desc">De afbeelding kan niet worden gedecodeerd. Probeer een andere afbeelding of neem contact op met de ontwikkelaars.</string>
     <string name="settings_section_title_themes">THEMA\'S</string>
     <string name="smp_servers_scan_qr">Scan server QR-code</string>
     <string name="this_string_is_not_a_connection_link">Deze string is geen verbinding link!</string>
-    <string name="enable_automatic_deletion_message">Deze actie kan niet ongedaan worden gemaakt - de berichten die eerder zijn verzonden en ontvangen dan geselecteerd, worden verwijderd. Het kan enkele minuten duren.</string>
+    <string name="enable_automatic_deletion_message">Deze actie kan niet ongedaan worden gemaakt, de berichten die eerder zijn verzonden en ontvangen dan geselecteerd, worden verwijderd. Het kan enkele minuten duren.</string>
     <string name="switch_receiving_address_desc">Deze functie is experimenteel! Het werkt alleen als op de andere client versie 4.2 is geïnstalleerd. U zou het bericht in het gesprek moeten zien zodra de adreswijziging is voltooid. Controleer of u nog steeds berichten van dit contact (of groepslid) kunt ontvangen.</string>
     <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Om je privacy te behouden, heeft de app in plaats van push meldingen een <b><xliff:g id="appName">SimpleX</xliff:g> achtergrondservice</b> – deze gebruikt een paar procent van de batterij per dag.</string>
     <string name="chat_preferences_you_allow">Jij staat toe</string>
     <string name="you_are_invited_to_group">Je bent uitgenodigd voor de groep</string>
     <string name="you_can_connect_to_simplex_chat_founder">U kunt <font color="#0088ff">verbinding maken met <xliff:g id="appNameFull">SimpleX Chat</xliff:g> ontwikkelaars om vragen te stellen en updates te ontvangen</font>.</string>
-    <string name="connection_error_auth_desc">Tenzij uw contactpersoon de verbinding heeft verwijderd of deze link al is gebruikt, kan het een bug zijn - meld het alstublieft.
+    <string name="connection_error_auth_desc">Tenzij uw contactpersoon de verbinding heeft verwijderd of deze link al is gebruikt, kan het een bug zijn. Meld het alstublieft.
 \nOm verbinding te maken, vraagt u uw contactpersoon om een andere verbinding link te maken en te controleren of u een stabiele netwerkverbinding heeft.</string>
     <string name="update_onion_hosts_settings_question">.onion hosts-instelling updaten\?</string>
-    <string name="use_simplex_chat_servers__question"><xliff:g id="appNameFull">SimpleX Chat</xliff:g>-servers gebruiken\?</string>
+    <string name="use_simplex_chat_servers__question"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> servers gebruiken\?</string>
     <string name="voice_messages_are_prohibited">Spraak berichten zijn verboden in deze groep.</string>
     <string name="personal_welcome">Welkom <xliff:g>%1$s</xliff:g>!</string>
-    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">U kunt uw adres delen als een link of als een QR-code - iedereen kan verbinding met u maken. U verliest uw contacten niet als u deze later verwijdert.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">U kunt uw adres delen als een link of als een QR-code. Iedereen kan verbinding met u maken. U verliest uw contacten niet als u deze later verwijdert.</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">U kunt de chat starten via app Instellingen / Database of door de app opnieuw op te starten.</string>
     <string name="snd_conn_event_switch_queue_phase_completed_for_member">je hebt het adres gewijzigd voor %s</string>
     <string name="snd_group_event_member_deleted">je hebt <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> verwijderd</string>
     <string name="contact_sent_large_file">Je contactpersoon heeft een bestand verzonden dat groter is dan de momenteel ondersteunde maximale grootte (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Uw huidige chat database wordt VERWIJDERD en VERVANGEN door de geïmporteerde.
-\nDeze actie kan niet ongedaan worden gemaakt - uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Uw huidige chatdatabase wordt VERWIJDERD en VERVANGEN door de geïmporteerde.
+\nDeze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
     <string name="invite_prohibited_description">Je probeert een contact met wie je een incognito profiel hebt gedeeld, uit te nodigen voor de groep waarin je je hoofdprofiel gebruikt</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten.
 \n
-\n<xliff:g id="appName">SimpleX</xliff:g>-servers kunnen uw profiel niet zien.</string>
+\n<xliff:g id="appName">SimpleX</xliff:g> servers kunnen uw profiel niet zien.</string>
     <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">U moet zich authenticeren wanneer u de app na 30 seconden op de achtergrond start of hervat.</string>
     <string name="images_limit_title">Te veel afbeeldingen!</string>
     <string name="icon_descr_speaker_off">Luidspreker uit</string>
@@ -946,7 +947,7 @@
     <string name="sender_cancelled_file_transfer">Afzender heeft bestandsoverdracht geannuleerd.</string>
     <string name="receiving_files_not_yet_supported">het ontvangen van bestanden wordt nog niet ondersteund</string>
     <string name="sending_files_not_yet_supported">het verzenden van bestanden wordt nog niet ondersteund</string>
-    <string name="simplex_link_contact">SimpleX contactadres</string>
+    <string name="simplex_link_contact">SimpleX contact adres</string>
     <string name="simplex_link_group">SimpleX groep link</string>
     <string name="simplex_link_mode">SimpleX links</string>
     <string name="simplex_link_invitation">Eenmalige SimpleX uitnodiging</string>
@@ -954,7 +955,7 @@
     <string name="trying_to_connect_to_server_to_receive_messages_with_error">Er wordt geprobeerd verbinding te maken met de server die wordt gebruikt om berichten van dit contact te ontvangen (fout: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
     <string name="unknown_message_format">onbekend berichtformaat</string>
     <string name="simplex_link_mode_browser">Via browser</string>
-    <string name="description_via_contact_address_link">via contactadres link</string>
+    <string name="description_via_contact_address_link">via contact adres link</string>
     <string name="description_via_group_link">via groep link</string>
     <string name="description_via_one_time_link">via een eenmalige link</string>
     <string name="simplex_link_connection">via <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
@@ -962,8 +963,98 @@
     <string name="description_you_shared_one_time_link">je hebt een eenmalige link gedeeld</string>
     <string name="description_you_shared_one_time_link_incognito">je hebt een eenmalige link incognito gedeeld</string>
     <string name="chat_help_tap_button">Tik op de knop</string>
-    <string name="read_more_in_github_with_link">Lees meer in onze <font color="#0088ff">GitHub-repository</font>.</string>
-    <string name="read_more_in_github">Lees meer in onze GitHub-repository.</string>
+    <string name="read_more_in_github_with_link">Lees meer in onze <font color="#0088ff">GitHub repository</font>.</string>
+    <string name="read_more_in_github">Lees meer in onze GitHub repository.</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> bericht(en) overgeslagen</string>
     <string name="moderated_description">gemodereerd</string>
+    <string name="moderated_item_description">gemodereerd door %s</string>
+    <string name="delete_member_message__question">Bericht van lid verwijderen\?</string>
+    <string name="moderate_verb">Modereren</string>
+    <string name="moderate_message_will_be_deleted_warning">Het bericht wordt verwijderd voor alle leden.</string>
+    <string name="moderate_message_will_be_marked_warning">Het bericht wordt gemarkeerd als gemodereerd voor alle leden.</string>
+    <string name="observer_cant_send_message_desc">Neem contact op met de groep beheerder.</string>
+    <string name="error_updating_link_for_group">Fout bij bijwerken van groep link</string>
+    <string name="initial_member_role">Initiële rol</string>
+    <string name="group_member_role_observer">Waarnemer</string>
+    <string name="observer_cant_send_message_title">Je kunt geen berichten versturen!</string>
+    <string name="you_are_observer">jij bent waarnemer</string>
+    <string name="language_system">Systeem</string>
+    <string name="v4_6_audio_video_calls">Audio en video oproepen</string>
+    <string name="cant_delete_user_profile">Kan gebruikers profiel niet verwijderen!</string>
+    <string name="confirm_password">Bevestig wachtwoord</string>
+    <string name="v4_6_chinese_spanish_interface">Chinese en Spaanse interface</string>
+    <string name="enter_password_to_show">Voer wachtwoord in bij zoeken</string>
+    <string name="error_saving_user_password">Fout bij opslaan gebruikers wachtwoord</string>
+    <string name="button_add_welcome_message">Welkomst bericht toevoegen</string>
+    <string name="dont_show_again">Niet meer weergeven</string>
+    <string name="v4_6_group_moderation">Groep moderatie</string>
+    <string name="error_updating_user_privacy">Fout bij updaten van gebruikers privacy</string>
+    <string name="v4_6_reduced_battery_usage">Verder verminderd batterij verbruik</string>
+    <string name="v4_6_group_welcome_message">Groep welkomst bericht</string>
+    <string name="v4_6_hidden_chat_profiles">Verborgen chat profielen</string>
+    <string name="hide_profile">Profiel verbergen</string>
+    <string name="user_hide">Verbergen</string>
+    <string name="hidden_profile_password">Verborgen profiel wachtwoord</string>
+    <string name="muted_when_inactive">Gedempt wanneer inactief!</string>
+    <string name="user_mute">Dempen</string>
+    <string name="v4_6_reduced_battery_usage_descr">Meer verbeteringen volgen snel!</string>
+    <string name="make_profile_private">Profiel privé maken!</string>
+    <string name="v4_6_group_moderation_descr">Nu kunnen beheerders:
+\n- berichten van leden verwijderen.
+\n- schakel leden uit (\"waarnemer\" rol)</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Bescherm je chat profielen met een wachtwoord!</string>
+    <string name="password_to_show">Wachtwoord om weer te geven</string>
+    <string name="save_and_update_group_profile">Groep profiel opslaan en bijwerken</string>
+    <string name="smp_save_servers_question">Servers opslaan\?</string>
+    <string name="save_profile_password">Bewaar profiel wachtwoord</string>
+    <string name="v4_6_group_welcome_message_descr">Stel het getoonde bericht in voor nieuwe leden!</string>
+    <string name="save_welcome_message_question">Welkomst bericht opslaan\?</string>
+    <string name="v4_6_audio_video_calls_descr">Ondersteuning voor bluetooth en andere verbeteringen.</string>
+    <string name="tap_to_activate_profile">Tik om profiel te activeren.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Dank aan de gebruikers – draag bij via Weblate!</string>
+    <string name="should_be_at_least_one_profile">Er moet ten minste één gebruikers profiel zijn.</string>
+    <string name="you_can_hide_or_mute_user_profile">U kunt een gebruikers profiel verbergen of dempen - houd het vast voor het menu.</string>
+    <string name="user_unhide">zichtbaar maken</string>
+    <string name="user_unmute">Dempen opheffen</string>
+    <string name="group_welcome_title">Welkomst bericht</string>
+    <string name="should_be_at_least_one_visible_profile">"Er moet ten minste één zichtbaar gebruikers  profiel zijn."</string>
+    <string name="to_reveal_profile_enter_password">Om uw verborgen profiel te onthullen, voert u een volledig wachtwoord in een zoekveld in op de pagina Uw chat profielen.</string>
+    <string name="button_welcome_message">Welkomst bericht</string>
+    <string name="you_will_still_receive_calls_and_ntfs">U ontvangt nog steeds oproepen en meldingen van gedempte profielen wanneer deze actief zijn.</string>
+    <string name="settings_send_files_via_xftp">Verzend video\'s en bestanden via XFTP</string>
+    <string name="database_downgrade">Database downgraden</string>
+    <string name="invalid_migration_confirmation">Ongeldige migratie bevestiging</string>
+    <string name="upgrade_and_open_chat">Upgrade en open chat</string>
+    <string name="mtr_error_different">verschillende migratie in de app/database: %s / %s</string>
+    <string name="downgrade_and_open_chat">Downgraden en chat openen</string>
+    <string name="database_migrations">Migraties: %s</string>
+    <string name="database_downgrade_warning">Waarschuwing: u kunt sommige gegevens verliezen!</string>
+    <string name="database_upgrade">Database upgrade</string>
+    <string name="confirm_database_upgrades">Bevestig database upgrades</string>
+    <string name="mtr_error_no_down_migration">database versie is nieuwer dan de app, maar geen down migratie voor: %s</string>
+    <string name="incompatible_database_version">Incompatibele database versie</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Het bestand wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">De afbeelding wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</string>
+    <string name="show_dev_options">Toon:</string>
+    <string name="developer_options">Database ID\'s en Transport isolatie optie.</string>
+    <string name="hide_dev_options">Verbergen:</string>
+    <string name="show_developer_options">Ontwikkelaars opties tonen</string>
+    <string name="settings_section_title_experimenta">EXPERIMENTEEL</string>
+    <string name="xftp_requires_v461">v4.6.1+ is vereist om te ontvangen via XFTP.</string>
+    <string name="cancel_file__question">Bestand overdracht annuleren\?</string>
+    <string name="file_transfer_will_be_cancelled_warning">Bestand overdracht wordt geannuleerd. Als het bezig is, wordt het gestopt.</string>
+    <string name="delete_profile">Verwijder profiel</string>
+    <string name="profile_password">Profiel wachtwoord</string>
+    <string name="unhide_chat_profile">Chat profiel zichtbaar maken</string>
+    <string name="unhide_profile">Profiel zichtbaar maken</string>
+    <string name="delete_chat_profile">Chat profiel verwijderen\?</string>
+    <string name="icon_descr_video_asked_to_receive">Gevraagd om de video te ontvangen</string>
+    <string name="videos_limit_desc">Er kunnen slechts 10 video\'s tegelijk worden verzonden</string>
+    <string name="videos_limit_title">Te veel video\'s!</string>
+    <string name="icon_descr_video_snd_complete">Video verzonden</string>
+    <string name="video_will_be_received_when_contact_is_online">De video wordt ontvangen wanneer uw contact online is, even geduld a.u.b. of kijk later!</string>
+    <string name="icon_descr_waiting_for_video">Wachten op video</string>
+    <string name="waiting_for_video">Wachten op video</string>
+    <string name="video_descr">Video</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">De video wordt ontvangen wanneer uw contactpersoon het uploaden heeft voltooid.</string>
 </resources>

apps/android/app/src/main/res/values-pl/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

apps/android/app/src/main/res/values-pt-rBR/strings.xml

@@ -6,4 +6,433 @@
     <string name="chat_item_ttl_week">1 semana</string>
     <string name="chat_item_ttl_month">1 mês</string>
     <string name="a_plus_b">a + b</string>
+    <string name="alert_title_cant_invite_contacts">Não é possível convidar contatos!</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">mudando endereço…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">mudando endereço para %s…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">"mudando  endereço…"</string>
+    <string name="change_role">Mudar regra</string>
+    <string name="change_verb">Mudar</string>
+    <string name="incognito_random_profile_from_contact_description">Um perfil aleatório será enviado para o contato do qual você recebeu este link</string>
+    <string name="both_you_and_your_contacts_can_delete">Você e seu contato podem excluir mensagens enviadas de forma irreversível.</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Pode ser desativado nas configurações</b> – as notificações ainda serão exibidas enquanto o aplicativo estiver em execução.</string>
+    <string name="both_you_and_your_contact_can_send_voice">Você e seu contato podem enviar mensagens de voz.</string>
+    <string name="notifications_mode_off_desc">O aplicativo pode receber notificações apenas quando estiver em execução, nenhum serviço em segundo plano será iniciado</string>
+    <string name="notifications_mode_service">Sempre On</string>
+    <string name="notifications_mode_periodic_desc">Verifica novas mensagens a cada 10 minutos por até 1 minuto</string>
+    <string name="auth_unavailable">Autenticação indisponível</string>
+    <string name="icon_descr_cancel_file_preview">Cancelar visualização do arquivo</string>
+    <string name="icon_descr_asked_to_receive">Pediu para receber a imagem</string>
+    <string name="icon_descr_cancel_live_message">Cancelar mensagem ao vivo</string>
+    <string name="back">Voltar</string>
+    <string name="choose_file">Selecione o arquivo</string>
+    <string name="add_new_contact_to_create_one_time_QR_code"><b>Adicionar novo contato</b>: para criar seu QR code único para seu contato.</string>
+    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Escanear \u0020QR code</b>: para se conectar ao seu contato que mostra o código QR para você.</string>
+    <string name="accept_contact_button">Aceitar</string>
+    <string name="clear_chat_question">Limpar bate-papo\?</string>
+    <string name="clear_verb">Limpar</string>
+    <string name="clear_chat_button">Limpar bate-papo</string>
+    <string name="clear_chat_menu_action">Limpar</string>
+    <string name="icon_descr_cancel_link_preview">cancelar pré-visualização do link</string>
+    <string name="feature_cancelled_item">cancelado %s</string>
+    <string name="app_version_name">Versão do App: v%s</string>
+    <string name="callstatus_calling">chamando…</string>
+    <string name="callstatus_in_progress">chamada em andamento</string>
+    <string name="accept">Aceitar</string>
+    <string name="call_already_ended">Chamada já encerrada!</string>
+    <string name="icon_descr_call_progress">Chamada em andamento</string>
+    <string name="icon_descr_call_ended">Chamada finalizada</string>
+    <string name="answer_call">Atender ligação</string>
+    <string name="integrity_msg_bad_hash">hash de mensagem ruim</string>
+    <string name="integrity_msg_bad_id">ID de mensagem incorreta</string>
+    <string name="impossible_to_recover_passphrase"><b>Observação</b>: você NÃO poderá recuperar ou alterar a senha se a perder.</string>
+    <string name="cannot_receive_file">Não é possível receber o arquivo</string>
+    <string name="icon_descr_cancel_image_preview">Cancelar visualização da imagem</string>
+    <string name="icon_descr_close_button">Botão Fechar</string>
+    <string name="clear_verification">Limpar verificação</string>
+    <string name="app_version_title">Versão do App</string>
+    <string name="accept_automatically">Automaticamente</string>
+    <string name="bold">negrito</string>
+    <string name="callstatus_error">erro de chamada</string>
+    <string name="settings_audio_video_calls">Chamadas de áudio e vídeo</string>
+    <string name="accept_call_on_lock_screen">Aceitar</string>
+    <string name="call_on_lock_screen">Chamadas na tela de bloqueio:</string>
+    <string name="icon_descr_audio_on">Áudio ligado</string>
+    <string name="chat_database_imported">Banco de dados de bate-papo importado</string>
+    <string name="keychain_is_storing_securely">"Android Keystore é usado para armazenar passphrase  com segurança - permite que o serviço de notificação funcione."</string>
+    <string name="keychain_allows_to_receive_ntfs">"O Android Keystore será usado para armazenar passphrase  com segurança depois que você reiniciar o aplicativo ou alterar a senha - isso permitirá o recebimento de notificações."</string>
+    <string name="cannot_access_keychain">Não é possível acessar o Keystore para salvar a senha do banco de dados</string>
+    <string name="chat_archive_section">ARQUIVO DE BATE-PAPO</string>
+    <string name="chat_is_stopped_indication">O bate-papo está parado</string>
+    <string name="clear_contacts_selection_button">Limpar</string>
+    <string name="incognito_random_profile_description">Um perfil aleatório será enviado para o seu contato</string>
+    <string name="chat_preferences">Preferências de bate-papo</string>
+    <string name="network_session_mode_user">perfil de bate-papo</string>
+    <string name="accept_requests">Aceitar pedidos</string>
+    <string name="icon_descr_audio_off">Áudio desligado</string>
+    <string name="auto_accept_images">Aceitar imagens automaticamente</string>
+    <string name="chat_database_deleted">Banco de dados de bate-papo excluído</string>
+    <string name="invite_prohibited">Não é possível convidar o contato!</string>
+    <string name="turning_off_service_and_periodic">A otimização da bateria está ativa, desligando o serviço em segundo plano e as solicitações periódicas de novas mensagens. Você pode reativá-los através das configurações.</string>
+    <string name="database_initialization_error_title">Não é possível inicializar o banco de dados</string>
+    <string name="attach">Anexar</string>
+    <string name="cancel_verb">Cancelar</string>
+    <string name="chat_console">Console de bate-papo</string>
+    <string name="smp_servers_check_address">Verifique o endereço do servidor e tente novamente.</string>
+    <string name="network_session_mode_user_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b>para cada perfil de bate-papo que você tiver no aplicativo</b>.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Melhor para bateria</b>. Você receberá notificações apenas quando o aplicativo estiver em execução, o serviço em segundo plano NÃO será usado.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Consome mais bateria</b>! O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
+    <string name="settings_section_title_chats">CONVERSAS</string>
+    <string name="settings_section_title_icon">ÍCONE DO APP</string>
+    <string name="chat_database_section">BANCO DE DADOS DE BATE-PAPO</string>
+    <string name="chat_is_running">O bate-papo está em execução</string>
+    <string name="chat_is_stopped">O bate-papo está parado</string>
+    <string name="change_database_passphrase_question">Alterar passphrase do banco de dados\?</string>
+    <string name="chat_archive_header">Arquivo de bate-papo</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">endereço alterado para você</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Você e seu contato podem enviar mensagens que desaparecem.</string>
+    <string name="full_backup">Backup de dados do aplicativo</string>
+    <string name="settings_section_title_calls">CHAMADAS</string>
+    <string name="v4_2_auto_accept_contact_requests">Aceitar solicitações de contato automaticamente</string>
+    <string name="appearance_settings">Aparência</string>
+    <string name="notifications_mode_service_desc">O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
+    <string name="network_session_mode_entity_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b>para cada contato e membro do grupo</b>. <b>Observação</b>: se você tiver muitas conexões, o consumo de bateria e tráfego pode ser substancialmente maior e algumas conexões podem falhar.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Bom para bateria</b>. O serviço em segundo plano verifica novas mensagens a cada 10 minutos. Você pode perder chamadas e mensagens urgentes.</string>
+    <string name="callstatus_ended">chamada finalizada <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
+    <string name="chat_with_developers">Bate-papo com os desenvolvedores</string>
+    <string name="create_group_link">Criar link de grupo</string>
+    <string name="button_create_group_link">Criar link</string>
+    <string name="create_secret_group_title">Criar grupo secreto</string>
+    <string name="theme_dark">Escuro</string>
+    <string name="connect_via_invitation_link">Conectar via link de convite\?</string>
+    <string name="connect_via_contact_link">Conectar via link de contato\?</string>
+    <string name="smp_server_test_create_queue">Criar fila</string>
+    <string name="notification_preview_mode_contact">Nome de contato</string>
+    <string name="notification_preview_somebody">Contato oculto:</string>
+    <string name="copy_verb">Copiar</string>
+    <string name="allow_verb">Permitir</string>
+    <string name="allow_to_send_disappearing">Permitir enviar mensagens que desaparecem.</string>
+    <string name="allow_direct_messages">Permitir o envio de mensagens diretas aos membros.</string>
+    <string name="connect_via_link_or_qr">Conectar via link/ QR Code</string>
+    <string name="clear_chat_warning">"Todas as mensagens serão excluídas - isso não pode ser desfeito!  As mensagens serão excluídas APENAS para você."</string>
+    <string name="smp_servers_preset_add">Adicionar servidores predefinidos</string>
+    <string name="smp_servers_add">Adicionar servidor…</string>
+    <string name="create_your_profile">Crie seu perfil</string>
+    <string name="icon_descr_context">Ícone de contexto</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contato e todas as mensagens serão excluídas - isso não pode ser desfeito!</string>
+    <string name="copied">Copiado para a área de transferência</string>
+    <string name="accept_connection_request__question">Aceitar solicitação de conexão\?</string>
+    <string name="network_settings">Configurações de rede avançadas</string>
+    <string name="contact_requests">Solicitações de contato</string>
+    <string name="create_address">Criar endereço</string>
+    <string name="all_your_contacts_will_remain_connected">Todos os seus contatos permanecerão conectados.</string>
+    <string name="callstatus_accepted">chamada aceita</string>
+    <string name="status_contact_has_e2e_encryption">Contato tem criptografia e2e</string>
+    <string name="status_contact_has_no_e2e_encryption">contato não tem criptografia e2e</string>
+    <string name="contact_preferences">Preferências de contato</string>
+    <string name="allow_to_delete_messages">Permite excluir irreversivelmente as mensagens enviadas.</string>
+    <string name="chat_preferences_always">sempre</string>
+    <string name="v4_3_improved_server_configuration_desc">Adicione servidores digitalizando QR code.</string>
+    <string name="allow_to_send_voice">Permitir enviar mensagens de voz.</string>
+    <string name="create_group">Criar grupo secreto</string>
+    <string name="always_use_relay">Conectar via relay</string>
+    <string name="users_add">Adicionar perfil</string>
+    <string name="connect_via_link">Conectar via link</string>
+    <string name="create_profile">Criar perfil</string>
+    <string name="database_encrypted">Banco de dados criptografado!</string>
+    <string name="group_member_status_creator">criador</string>
+    <string name="users_delete_all_chats_deleted">Todos os bate-papos e mensagens serão excluídos - isso não pode ser desfeito!</string>
+    <string name="accept_feature">Aceitar</string>
+    <string name="allow_disappearing_messages_only_if">Permitir mensagens que desaparecem apenas se o seu contato permitir.</string>
+    <string name="allow_irreversible_message_deletion_only_if">Permita a exclusão irreversível da mensagem somente se o seu contato permitir.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Permitir que seus contatos enviem mensagens que desaparecem.</string>
+    <string name="allow_voice_messages_only_if">Permitir mensagens de voz somente se o seu contato permitir.</string>
+    <string name="allow_your_contacts_to_send_voice_messages">Permitir que seus contatos enviem mensagens de voz.</string>
+    <string name="group_member_role_admin">admin</string>
+    <string name="all_group_members_will_remain_connected">Todos os membros do grupo permanecerão conectados.</string>
+    <string name="contacts_can_mark_messages_for_deletion">"Contatos podem marcar mensagens para exclusão;  você será capaz de visualizá-los."</string>
+    <string name="connect_via_group_link">Conectar via link do grupo\?</string>
+    <string name="contact_already_exists">Contato já existe</string>
+    <string name="icon_descr_contact_checked">Contato verificado</string>
+    <string name="alert_title_contact_connection_pending">Contato ainda não está conectado!</string>
+    <string name="contribute">Contribuir</string>
+    <string name="create_profile_button">Criar</string>
+    <string name="network_enable_socks_info">"Acessar os servidores via proxy SOCKS na porta 9050\?  O proxy deve ser iniciado antes de habilitar esta opção."</string>
+    <string name="allow_your_contacts_irreversibly_delete">Permitir que seus contatos excluam de forma irreversível as mensagens enviadas.</string>
+    <string name="smp_servers_add_to_another_device">Adicionar a outro dispositivo</string>
+    <string name="v4_2_group_links_desc">Os administradores podem criar os links para ingressar em grupos.</string>
+    <string name="allow_voice_messages_question">Permitir mensagens de voz\?</string>
+    <string name="button_delete_group">Excluir grupo</string>
+    <string name="info_row_connection">Conexão</string>
+    <string name="users_delete_question">Excluir perfil de bate-papo\?</string>
+    <string name="full_deletion">Excluir para todos</string>
+    <string name="connect_via_link_verb">Conectar</string>
+    <string name="server_connected">conectado</string>
+    <string name="server_connecting">conectando</string>
+    <string name="deleted_description">excluído</string>
+    <string name="smp_server_test_connect">Conectar</string>
+    <string name="delete_group_menu_action">Excluir</string>
+    <string name="connect_button">Conectar</string>
+    <string name="callstatus_connecting">conectando chamada…</string>
+    <string name="delete_chat_profile_question">Excluir perfil de bate-papo\?</string>
+    <string name="delete_files_and_media_for_all_users">Excluir arquivos de todos os perfis de bate-papo</string>
+    <string name="display_name_connecting">conectando…</string>
+    <string name="connection_error">Erro de conexão</string>
+    <string name="button_delete_contact">Excluir contato</string>
+    <string name="configure_ICE_servers">Configurar servidores ICE</string>
+    <string name="delete_address__question">Excluir endereço\?</string>
+    <string name="decentralized">Descentralizado</string>
+    <string name="delete_database">Excluir banco de dados</string>
+    <string name="set_password_to_export_desc">"O banco de dados é criptografado usando um passphrase aleatório.  Por favor, altere-o antes de exportar."</string>
+    <string name="confirm_new_passphrase">Confirmar nova passphrase…</string>
+    <string name="current_passphrase">Passphrase atual…</string>
+    <string name="database_passphrase_is_required">Passphrase do banco de dados é necessária para abrir o chat.</string>
+    <string name="delete_archive">Excluir arquivo</string>
+    <string name="delete_chat_archive_question">Excluir arquivo de bate-papo\?</string>
+    <string name="rcv_group_event_changed_member_role">regra alterada de %s para %s</string>
+    <string name="rcv_group_event_member_connected">conectado</string>
+    <string name="delete_link">Excluir link</string>
+    <string name="delete_link_question">Excluir link\?</string>
+    <string name="chat_preferences_default">padrão (%s)</string>
+    <string name="connection_request_sent">Solicitação de conexão enviada!</string>
+    <string name="group_member_status_connecting">conectando</string>
+    <string name="contact_connection_pending">conectando…</string>
+    <string name="for_me_only">Excluir para mim</string>
+    <string name="group_connection_pending">conectando…</string>
+    <string name="delete_contact_question">Excluir contato\?</string>
+    <string name="confirm_verb">confirmar</string>
+    <string name="database_passphrase_and_export">Passphrase e exportação do banco de dados</string>
+    <string name="icon_descr_call_connecting">Conectando chamada</string>
+    <string name="delete_messages">Excluir mensagens</string>
+    <string name="database_passphrase_will_be_updated">Passphrase de criptografia do banco de dados será atualizada.</string>
+    <string name="database_error">Erro de banco de dados</string>
+    <string name="passphrase_is_different">Passphrase do banco de dados é diferente da salva no Keystore.</string>
+    <string name="group_member_status_complete">completo</string>
+    <string name="info_row_database_id">ID do banco de dados</string>
+    <string name="colored">colorido</string>
+    <string name="callstate_connected">conectado</string>
+    <string name="notification_contact_connected">Conectado</string>
+    <string name="icon_descr_server_status_connected">Conectado</string>
+    <string name="audio_call_no_encryption">chamada de áudio (não criptografada em e2e)</string>
+    <string name="change_member_role_question">Alterar a regra do grupo\?</string>
+    <string name="icon_descr_audio_call">chamada de áudio</string>
+    <string name="rcv_group_event_changed_your_role">mudou sua regra para %s</string>
+    <string name="v4_4_verify_connection_security_desc">Compare os códigos de segurança com seus contatos.</string>
+    <string name="auth_confirm_credential">Confirme sua credencial</string>
+    <string name="callstate_connecting">conectando…</string>
+    <string name="group_member_status_announced">conectando (anunciado)</string>
+    <string name="network_session_mode_entity">Conexão</string>
+    <string name="connection_error_auth">Erro de conexão (AUTH)</string>
+    <string name="display_name_connection_established">conexão estabelecida</string>
+    <string name="connection_local_display_name">conexão <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
+    <string name="archive_created_on_ts">Criado em <xliff:g id="archive_ts">%1$s</xliff:g></string>
+    <string name="maximum_supported_file_size">Atualmente, o tamanho máximo de arquivo suportado é <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
+    <string name="delete_verb">Excluir</string>
+    <string name="database_encryption_will_be_updated">Passphase de criptografia do banco de dados será atualizada e armazenada no Keystore.</string>
+    <string name="delete_address">Excluir endereço</string>
+    <string name="encrypted_with_random_passphrase">"O banco de dados é criptografado usando um passphrase  aleatório, você pode alterá-la."</string>
+    <string name="database_passphrase">Passphrase do banco de dados</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">O banco de dados será criptografado e o passphrase armazenado no Keystore.</string>
+    <string name="database_will_be_encrypted">O banco de dados será criptografado.</string>
+    <string name="ttl_day">%d dia</string>
+    <string name="image_decoding_exception_title">Erro de decodificação</string>
+    <string name="delete_contact_menu_action">Excluir</string>
+    <string name="ttl_days">%d dias</string>
+    <string name="delete_files_and_media_all">Excluir todos os arquivos</string>
+    <string name="delete_message__question">Excluir mensagem\?</string>
+    <string name="delete_after">Excluir depois</string>
+    <string name="users_delete_profile_for">Excluir perfil de bate-papo para</string>
+    <string name="rcv_group_event_group_deleted">grupo excluído</string>
+    <string name="delete_group_question">Excluir grupo\?</string>
+    <string name="delete_image">Excluir imagem</string>
+    <string name="delete_files_and_media_question">Excluir arquivos e mídia\?</string>
+    <string name="group_member_status_connected">conectado</string>
+    <string name="group_member_status_accepted">conectando (aceito)</string>
+    <string name="ttl_d">%dd</string>
+    <string name="v4_5_transport_isolation_descr">Por perfil de bate-papo (padrão) ou por conexão (BETA).</string>
+    <string name="accept_contact_incognito_button">Aceitar anônimo</string>
+    <string name="delete_messages_after">Excluir mensagens após</string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: Scaneie o QR code exibido no aplicativo, via <b>Scan QR code</b></string>
+    <string name="delete_pending_connection__question">Excluir conexão pendente\?</string>
+    <string name="simplex_link_mode_description">Descrição</string>
+    <string name="smp_servers_delete_server">Excluir servidor</string>
+    <string name="group_member_status_intro_invitation">conectando (introduction invitation)</string>
+    <string name="connection_timeout">Tempo de conexão esgotado</string>
+    <string name="delete_member_message__question">Excluir mensagem do membro\?</string>
+    <string name="smp_server_test_delete_queue">Excluir fila</string>
+    <string name="settings_section_title_device">DISPOSITIVO</string>
+    <string name="settings_developer_tools">Ferramentas de desenvolvimento</string>
+    <string name="group_member_status_introduced">conectando (introduced)</string>
+    <string name="color_primary">Realçar</string>
+    <string name="error_removing_member">Erro ao remover membro</string>
+    <string name="error_changing_role">Erro ao alterar regra</string>
+    <string name="conn_level_desc_direct">direto</string>
+    <string name="server_error">erro</string>
+    <string name="failed_to_parse_chat_title">Falha ao carregar o bate-papo</string>
+    <string name="error_setting_network_config">Erro ao atualizar a configuração de rede</string>
+    <string name="error_sending_message">Erro ao enviar mensagem</string>
+    <string name="error_adding_members">Erro ao adicionar membro(s)</string>
+    <string name="smp_server_test_disconnect">Desconectar</string>
+    <string name="error_deleting_user">Erro ao excluir perfil do usuário</string>
+    <string name="ttl_s">%ds</string>
+    <string name="ttl_months">%d meses</string>
+    <string name="ttl_weeks">%d semanas</string>
+    <string name="encrypt_database_question">Criptografar banco de dados\?</string>
+    <string name="error_receiving_file">Erro ao receber arquivo</string>
+    <string name="error_creating_address">Erro ao criar endereço</string>
+    <string name="display_name__field">Nome de exibição:</string>
+    <string name="error_starting_chat">Erro ao iniciar o bate-papo</string>
+    <string name="error_deleting_database">Erro ao excluir banco de dados de bate-papo</string>
+    <string name="encrypt_database">Criptografar</string>
+    <string name="network_option_enable_tcp_keep_alive">Ativar TCP keep-alive</string>
+    <string name="failed_to_create_user_title">Erro ao criar perfil!</string>
+    <string name="error_joining_group">Erro ao ingressar no grupo</string>
+    <string name="failed_to_create_user_duplicate_title">Nome de exibição duplicado!</string>
+    <string name="error_deleting_contact">Erro ao excluir contato</string>
+    <string name="error_changing_address">Erro ao alterar endereço</string>
+    <string name="error_deleting_pending_contact_connection">Erro ao excluir conexão de contato pendente</string>
+    <string name="edit_verb">Editar</string>
+    <string name="enable_automatic_deletion_question">Ativar exclusão automática de mensagens\?</string>
+    <string name="ttl_sec">%d sec</string>
+    <string name="error_saving_smp_servers">Erro ao salvar servidores SMP</string>
+    <string name="error_accepting_contact_request">Erro ao aceitar solicitação de contato</string>
+    <string name="error_deleting_contact_request">Erro ao excluir solicitação de contato</string>
+    <string name="failed_to_active_user_title">Erro ao trocar de perfil!</string>
+    <string name="auth_disable_simplex_lock">Desativar Bloqueio SimpleX</string>
+    <string name="auth_enable_simplex_lock">Ativar Bloqueio SimpleX</string>
+    <string name="icon_descr_edited">editado</string>
+    <string name="icon_descr_server_status_error">Erro</string>
+    <string name="icon_descr_email">Email</string>
+    <string name="error_saving_ICE_servers">Erro ao salvar servidores ICE</string>
+    <string name="exit_without_saving">Sair sem salvar</string>
+    <string name="display_name">Nome de exibição</string>
+    <string name="encrypted_video_call">chamada de vídeo criptografada e2e</string>
+    <string name="integrity_msg_duplicate">mensagem duplicada</string>
+    <string name="status_e2e_encrypted">criptografado e2e</string>
+    <string name="export_database">Exportar banco de dados</string>
+    <string name="total_files_count_and_size">%d arquivo(s) com tamanho total de %s</string>
+    <string name="error_exporting_chat_database">Erro ao exportar banco de dados de bate-papo</string>
+    <string name="error_importing_database">Erro ao importar banco de dados de bate-papo</string>
+    <string name="error_stopping_chat">Erro ao interromper o bate-papo</string>
+    <string name="error_changing_message_deletion">Erro ao alterar configuração</string>
+    <string name="error_encrypting_database">Erro ao criptografar o banco de dados</string>
+    <string name="encrypted_database">Banco de dados criptografado</string>
+    <string name="enter_correct_passphrase">Digite o passphrase correto.</string>
+    <string name="enter_passphrase">Digite o passphrase…</string>
+    <string name="error_with_info">Erro: %s</string>
+    <string name="button_edit_group_profile">Editar perfil do grupo</string>
+    <string name="icon_descr_expand_role">Expandir seleção de regra</string>
+    <string name="error_saving_group_profile">Erro ao salvar o perfil do grupo</string>
+    <string name="direct_messages">Mensagens diretas</string>
+    <string name="feature_enabled">habilitado</string>
+    <string name="feature_enabled_for_contact">habilitado para contato</string>
+    <string name="feature_enabled_for_you">ativado para você</string>
+    <string name="ttl_m">%dm</string>
+    <string name="ttl_min">%d min</string>
+    <string name="ttl_month">%d mês</string>
+    <string name="ttl_week">%d semana</string>
+    <string name="ttl_hour">%d hora</string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">A autenticação do dispositivo não está habilitada. Você pode ativar o Bloqueio SimpleX em Configurações, depois de ativar a autenticação do dispositivo.</string>
+    <string name="no_call_on_lock_screen">Desativar</string>
+    <string name="icon_descr_server_status_disconnected">Desconectado</string>
+    <string name="disappearing_messages_are_prohibited">Mensagens que desaparecem(temporárias) são proibidas neste grupo.</string>
+    <string name="error_saving_file">Erro ao salvar arquivo</string>
+    <string name="display_name_cannot_contain_whitespace">O nome de exibição não pode conter espaços em branco.</string>
+    <string name="encrypted_audio_call">chamada de áudio criptografada e2e</string>
+    <string name="edit_image">Editar imagem</string>
+    <string name="smp_servers_enter_manually">Insira o servidor manualmente</string>
+    <string name="error_deleting_group">Erro ao excluir grupo</string>
+    <string name="settings_experimental_features">Funcionalidades experimentais</string>
+    <string name="error_creating_link_for_group">Erro ao criar o link de grupo</string>
+    <string name="error_deleting_link_for_group">Erro ao excluir o link de grupo</string>
+    <string name="direct_messages_are_prohibited_in_chat">Mensagens diretas entre membros são proibidas neste grupo.</string>
+    <string name="ttl_h">%dh</string>
+    <string name="ttl_hours">%d horas</string>
+    <string name="description_via_contact_address_link_incognito">anônimo via link de endereço de contato</string>
+    <string name="description_via_one_time_link_incognito">anônimo via link único</string>
+    <string name="hide_verb">Esconder</string>
+    <string name="from_gallery_button">Da Galeria</string>
+    <string name="group_members_can_send_disappearing">Os membros do grupo podem enviar mensagens que desaparecem.</string>
+    <string name="icon_descr_file">Arquivo</string>
+    <string name="full_name__field">Nome completo:</string>
+    <string name="incoming_audio_call">Chamada de áudio recebida</string>
+    <string name="v4_4_disappearing_messages">Mensagens que desaparecem</string>
+    <string name="v4_3_improved_privacy_and_security_desc">"Ocultar  aplicativo nos aplicativos recentes."</string>
+    <string name="icon_descr_image_snd_complete">Imagem enviada</string>
+    <string name="group_link">Link do grupo</string>
+    <string name="import_database">Importar banco de dados</string>
+    <string name="alert_message_group_invitation_expired">O convite de grupo não é mais válido, foi removido pelo remetente.</string>
+    <string name="icon_descr_group_inactive">Grupo inativo</string>
+    <string name="alert_title_no_group">Grupo não encontrado!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">O grupo será excluído para você - isso não pode ser desfeito!</string>
+    <string name="info_row_group">Grupo</string>
+    <string name="conn_level_desc_indirect">indireto (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
+    <string name="incognito">Anônimo</string>
+    <string name="timed_messages">Mensagens que desaparecem</string>
+    <string name="group_preferences">Preferências de grupo</string>
+    <string name="disappearing_prohibited_in_this_chat">Mensagens que desaparecem são proibidas nesse bate-papo.</string>
+    <string name="group_members_can_send_dms">Os membros do grupo podem enviar mensagens diretas.</string>
+    <string name="ttl_mth">%dmês</string>
+    <string name="simplex_link_mode_full">Link completo</string>
+    <string name="hide_notification">Esconder</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">A autenticação do dispositivo está desativada. Desativando o SimpleX Lock.</string>
+    <string name="for_everybody">Para todos</string>
+    <string name="notification_preview_mode_hidden">Escondido</string>
+    <string name="create_one_time_link">Gerar um link de convite único.</string>
+    <string name="how_to_use_your_servers">Como usar seus servidores</string>
+    <string name="import_database_confirmation">Importar</string>
+    <string name="import_database_question">Importar banco de dados de bate-papo\?</string>
+    <string name="group_display_name_field">Nome de exibição do grupo:</string>
+    <string name="group_full_name_field">Nome completo do grupo:</string>
+    <string name="v4_2_group_links">Links de grupo</string>
+    <string name="v4_3_improved_privacy_and_security">Privacidade e segurança aprimoradas</string>
+    <string name="failed_to_parse_chats_title">Falha ao carregar bate-papos</string>
+    <string name="file_with_path">Arquivo: %s</string>
+    <string name="file_saved">Arquivo salvo</string>
+    <string name="group_members_can_send_voice">Os membros do grupo podem enviar mensagens de voz.</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">O grupo será excluído para todos os membros - isso não pode ser desfeito!</string>
+    <string name="settings_section_title_help">AJUDA</string>
+    <string name="notification_display_mode_hidden_desc">Ocultar contato e mensagem</string>
+    <string name="how_to_use_simplex_chat">Como usar</string>
+    <string name="how_to_use_markdown">Como usar markdown</string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Se você não puder se encontrar pessoalmente, <b>mostre o QR code na videochamada</b> ou compartilhe o link.</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Se você não puder encontrar pessoalmente, você pode <b>escanear o QR code na videochamada</b> ou seu contato pode compartilhar um link de convite.</string>
+    <string name="network_disable_socks_info">Se você confirmar, os servidores de mensagens poderão ver seu endereço IP e seu provedor - e quais servidores você está se conectando.</string>
+    <string name="image_descr">Imagem</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Se você recebeu o link de convite <xliff:g id="appName">SimpleX Chat</xliff:g>, você pode abri-lo em seu navegador:</string>
+    <string name="image_saved">Imagem salva na galeria</string>
+    <string name="group_unsupported_incognito_main_profile_sent">O modo de navegação anônima não é suportado aqui - seu perfil principal será enviado aos membros do grupo</string>
+    <string name="description_via_group_link_incognito">anônimo via link do grupo</string>
+    <string name="incoming_video_call">Chamada de vídeo recebida</string>
+    <string name="turn_off_battery_optimization">Para usá-lo, por favor <b>desative a otimização da bateria</b> para <xliff:g id="appName">SimpleX</xliff:g> na próxima caixa de diálogo. Caso contrário, as notificações serão desativadas.</string>
+    <string name="share_one_time_link">Gerar um link de convite único</string>
+    <string name="file_not_found">Arquivo não encontrado</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Se você optar por rejeitar o remetente NÃO será notificado.</string>
+    <string name="incorrect_code">Código de segurança incorreto!</string>
+    <string name="install_simplex_chat_for_terminal">Instale o <xliff:g id="appNameFull">SimpleX Chat</xliff:g> para o terminal</string>
+    <string name="full_name_optional__prompt">Nome Completo (opcional)</string>
+    <string name="how_it_works">Como funciona</string>
+    <string name="immune_to_spam_and_abuse">Imune a spam e abuso</string>
+    <string name="icon_descr_flip_camera">Vire a câmera</string>
+    <string name="icon_descr_hang_up">Desligar</string>
+    <string name="settings_section_title_incognito">Modo anônimo</string>
+    <string name="initial_member_role">Regra inicial</string>
+    <string name="snd_group_event_group_profile_updated">perfil do grupo atualizado</string>
+    <string name="group_member_status_group_deleted">Grupo excluído</string>
+    <string name="incognito_info_protects">O modo de navegação anônima protege a privacidade do nome e da imagem do seu perfil principal — para cada novo contato, um novo perfil aleatório é criado.</string>
+    <string name="group_members_can_delete">Os membros do grupo podem excluir mensagens enviadas de forma irreversível.</string>
+    <string name="ttl_w">%dsemana</string>
+    <string name="v4_3_improved_server_configuration">Configuração de servidor aprimorada</string>
+    <string name="v4_4_french_interface">Interface francesa</string>
+    <string name="callstate_ended">terminou</string>
+    <string name="allow_accepting_calls_from_lock_screen">Ative as chamadas pela tela de bloqueio nas Configurações.</string>
+    <string name="files_and_media_section">Arquivos &amp; mídia</string>
+    <string name="error_updating_link_for_group">Erro ao atualizar o link do grupo</string>
+    <string name="group_invitation_expired">O convite do grupo expirou</string>
+    <string name="file_will_be_received_when_contact_is_online">O arquivo será recebido quando seu contato estiver online, aguarde ou verifique mais tarde!</string>
+    <string name="group_profile_is_stored_on_members_devices">O perfil do grupo é armazenado nos dispositivos dos membros, não nos servidores.</string>
+    <string name="icon_descr_help">ajuda</string>
+    <string name="how_simplex_works">Como <xliff:g id="appName">SimpleX</xliff:g> funciona</string>
+    <string name="enter_one_ICE_server_per_line">Servidores ICE (um por linha)</string>
+    <string name="ignore">Ignorar</string>
+    <string name="image_will_be_received_when_contact_is_online">A imagem será recebida quando seu contato estiver online, aguarde ou verifique mais tarde!</string>
 </resources>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -6,22 +6,22 @@
     <string name="connect_via_contact_link">Соединиться через ссылку-контакт?</string>
     <string name="connect_via_invitation_link">Соединиться через ссылку-приглашение?</string>
     <string name="connect_via_group_link">Соединиться через ссылку группы?</string>
-    <string name="profile_will_be_sent_to_contact_sending_link">Ваш профиль будет отправлен контакту, от которого вы получили эту ссылку.</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">Ваш профиль будет отправлен контакту, от которого Вы получили эту ссылку.</string>
     <string name="you_will_join_group">Вы вступите в группу, на которую ссылается эта ссылка.</string>
     <string name="connect_via_link_verb">Соединиться</string>
     <!-- Server info - ChatModel.kt -->
     <string name="server_connected">соединено</string>
     <string name="server_error">ошибка</string>
     <string name="server_connecting">соединяется</string>
-    <string name="connected_to_server_to_receive_messages_from_contact">Установлено соединение с сервером, через который вы получаете сообщения от этого контакта.</string>
-    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта (ошибка: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
-    <string name="trying_to_connect_to_server_to_receive_messages">Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта.</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">Установлено соединение с сервером, через который Вы получаете сообщения от этого контакта.</string>
+    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Устанавливается соединение с сервером, через который Вы получаете сообщения от этого контакта (ошибка: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
+    <string name="trying_to_connect_to_server_to_receive_messages">Устанавливается соединение с сервером, через который Вы получаете сообщения от этого контакта.</string>
     <!-- Item Content - ChatModel.kt -->
     <string name="deleted_description">удалено</string>
     <string name="marked_deleted_description">помечено к удалению</string>
     <string name="sending_files_not_yet_supported">отправка файлов не поддерживается</string>
     <string name="receiving_files_not_yet_supported">получение файлов не поддерживается</string>
-    <string name="sender_you_pronoun">вы</string>
+    <string name="sender_you_pronoun">Вы</string>
     <string name="unknown_message_format">неизвестный формат сообщения</string>
     <string name="invalid_message_format">неверный формат сообщения</string>
     <!-- PendingContactConnection - ChatModel.kt -->
@@ -29,8 +29,8 @@
     <string name="display_name_connection_established">соединение установлено</string>
     <string name="display_name_invited_to_connect">приглашение соединиться</string>
     <string name="display_name_connecting">соединяется…</string>
-    <string name="description_you_shared_one_time_link">вы создали одноразовую ссылку</string>
-    <string name="description_you_shared_one_time_link_incognito">вы создали одноразовую ссылку инкогнито</string>
+    <string name="description_you_shared_one_time_link">Вы создали одноразовую ссылку</string>
+    <string name="description_you_shared_one_time_link_incognito">Вы создали одноразовую ссылку инкогнито</string>
     <string name="description_via_group_link">через ссылку группы</string>
     <string name="description_via_group_link_incognito">инкогнито через ссылку группы</string>
     <string name="description_via_contact_address_link">через ссылку-контакт</string>
@@ -54,7 +54,7 @@
     <!-- API Error Responses - SimpleXAPI.kt -->
     <string name="connection_timeout">Превышено время соединения</string>
     <string name="connection_error">Ошибка соединения</string>
-    <string name="network_error_desc">Пожалуйста, проверьте ваше соединение с сервером <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> и попробуйте еще раз.</string>
+    <string name="network_error_desc">Пожалуйста, проверьте Ваше соединение с сервером <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> и попробуйте еще раз.</string>
     <string name="error_sending_message">Ошибка при отправке сообщения</string>
     <string name="error_adding_members">Ошибка при добавлении членов группы</string>
     <string name="error_joining_group">Ошибка при вступлении в группу</string>
@@ -65,9 +65,10 @@
     <string name="contact_already_exists">Существующий контакт</string>
     <string name="you_are_already_connected_to_vName_via_this_link">Вы уже соединены с контактом <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="invalid_connection_link">Ошибка в ссылке контакта</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Пожалуйста, проверьте, что вы использовали правильную ссылку, или попросите ваш контакт отправить вам новую.</string>
+    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Пожалуйста, проверьте, что Вы использовали правильную ссылку, или попросите Ваш контакт отправить Вам новую.</string>
     <string name="connection_error_auth">Ошибка соединения (AUTH)</string>
-    <string name="connection_error_auth_desc">Возможно, ваш контакт удалил ссылку, или она уже была использована. Если это не так, то это может быть ошибкой - пожалуйста, сообщите нам об этом.\nЧтобы установить соединение, попросите ваш контакт создать еще одну ссылку и проверьте ваше соединение с сетью.</string>
+    <string name="connection_error_auth_desc">Возможно, Ваш контакт удалил ссылку, или она уже была использована. Если это не так, то это может быть ошибкой - пожалуйста, сообщите нам об этом.
+\nЧтобы установить соединение, попросите Ваш контакт создать еще одну ссылку и проверьте Ваше соединение с сетью.</string>
     <string name="error_accepting_contact_request">Ошибка при принятии запроса на соединение</string>
     <string name="sender_may_have_deleted_the_connection_request">Отправитель мог удалить запрос на соединение.</string>
     <string name="error_deleting_contact">Ошибка при удалении контакта</string>
@@ -87,13 +88,13 @@
     <string name="icon_descr_instant_notifications">Мгновенные уведомления</string>
     <string name="service_notifications">Мгновенные уведомления!</string>
     <string name="service_notifications_disabled">Мгновенные уведомления выключены!</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Чтобы защитить ваши личные данные, вместо уведомлений от сервера приложение запускает <b>фоновый сервис <xliff:g id="appName">SimpleX</xliff:g></b>, который потребляет несколько процентов батареи в день.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Он может быть выключен через Настройки</b> – вы продолжите получать уведомления о сообщениях пока приложение запущено.</string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Чтобы защитить Ваши личные данные, вместо уведомлений от сервера приложение запускает <b>фоновый сервис <xliff:g id="appName">SimpleX</xliff:g></b>, который потребляет несколько процентов батареи в день.</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Он может быть выключен через Настройки</b> – Вы продолжите получать уведомления о сообщениях пока приложение запущено.</string>
     <string name="turn_off_battery_optimization">Для использования этой функции, пожалуйста, отключите оптимизацию батареи для <xliff:g id="appName">SimpleX</xliff:g> в следующем диалоге. Иначе уведомления будут выключены.</string>
     <string name="turning_off_service_and_periodic">Оптимизация батареи включена, поэтому сервис уведомлений выключен. Вы можете снова включить его через Настройки.</string>
     <string name="periodic_notifications">Периодические уведомления</string>
     <string name="periodic_notifications_disabled">Периодические уведомления выключены!</string>
-    <string name="periodic_notifications_desc">Приложение периодически получает новые сообщения — это потребляет несколько процентов батареи в день. Приложение не использует push уведомления — данные не отправляются с вашего устройства на сервер.</string>
+    <string name="periodic_notifications_desc">Приложение периодически получает новые сообщения — это потребляет несколько процентов батареи в день. Приложение не использует push уведомления — данные не отправляются с Вашего устройства на сервер.</string>
     <string name="enter_passphrase_notification_title">Введите пароль</string>
     <string name="enter_passphrase_notification_desc">Для получения уведомлений, пожалуйста, введите пароль от базы данных</string>
     <string name="database_initialization_error_title">Ошибка базы данных</string>
@@ -127,7 +128,8 @@
     <string name="notification_contact_connected">Соединен(а)</string>
     <!-- local authentication notice - SimpleXAPI.kt -->
     <string name="la_notice_title_simplex_lock">Блокировка SimpleX</string>
-    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Чтобы защитить вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
+    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Чтобы защитить Вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.
+\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
     <string name="la_notice_turn_on">Включить</string>
     <!-- LocalAuthentication.kt -->
     <string name="auth_simplex_lock_turned_on">Блокировка SimpleX включена</string>
@@ -144,7 +146,7 @@
     <string name="auth_open_chat_console">Открыть консоль</string>
     <!-- Chat Alerts - ChatItemView.kt -->
     <string name="message_delivery_error_title">Ошибка доставки сообщения</string>
-    <string name="message_delivery_error_desc">Скорее всего, этот контакт удалил соединение с вами.</string>
+    <string name="message_delivery_error_desc">Скорее всего, этот контакт удалил соединение с Вами.</string>
     <!-- Chat Actions - ChatItemView.kt (and general) -->
     <string name="reply_verb">Ответить</string>
     <string name="share_verb">Поделиться</string>
@@ -172,12 +174,12 @@
     <string name="this_text_is_available_in_settings">Этот текст можно найти в Настройках</string>
     <string name="your_chats">Ваши чаты</string>
     <string name="contact_connection_pending">соединяется…</string>
-    <string name="group_preview_you_are_invited">вы приглашены в группу</string>
+    <string name="group_preview_you_are_invited">Вы приглашены в группу</string>
     <string name="group_preview_join_as">вступить как %s</string>
     <string name="group_connection_pending">соединяется…</string>
     <string name="tap_to_start_new_chat">Нажмите, чтобы начать чат</string>
     <string name="chat_with_developers">Соединиться с разработчиками</string>
-    <string name="you_have_no_chats">У вас нет чатов</string>
+    <string name="you_have_no_chats">У Вас нет чатов</string>
     <!-- ShareListView.kt -->
     <string name="share_message">Отправить сообщение…</string>
     <string name="share_image">Отправить изображение…</string>
@@ -197,7 +199,7 @@
     <string name="icon_descr_asked_to_receive">Предложено получить изображение</string>
     <string name="icon_descr_image_snd_complete">Изображение отправлено</string>
     <string name="waiting_for_image">Ожидается прием изображения</string>
-    <string name="image_will_be_received_when_contact_is_online">Изображение будет принято, когда ваш контакт будет в сети, подождите или проверьте позже!</string>
+    <string name="image_will_be_received_when_contact_is_online">Изображение будет принято, когда Ваш контакт будет в сети, подождите или проверьте позже!</string>
     <string name="image_saved">Изображение сохранено в Галерею</string>
     <!-- Files - CIFileView.kt -->
     <string name="icon_descr_file">Файл</string>
@@ -205,7 +207,7 @@
     <string name="contact_sent_large_file">Ваш контакт отправил файл, размер которого превышает поддерживаемый в настоящее время максимальный размер (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
     <string name="maximum_supported_file_size">В настоящее время максимальный поддерживаемый размер файла составляет <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
     <string name="waiting_for_file">Ожидается прием файла</string>
-    <string name="file_will_be_received_when_contact_is_online">Файл будет принят, когда ваш контакт будет в сети, подождите или проверьте позже!</string>
+    <string name="file_will_be_received_when_contact_is_online">Файл будет принят, когда Ваш контакт будет в сети, подождите или проверьте позже!</string>
     <string name="file_saved">Файл сохранен</string>
     <string name="file_not_found">Файл не найден</string>
     <string name="error_saving_file">Ошибка сохранения файла</string>
@@ -225,14 +227,14 @@
     <string name="icon_descr_server_status_error">Ошибка соединения с сервером</string>
     <string name="icon_descr_server_status_pending">Ожидается соединение с сервером</string>
     <string name="switch_receiving_address_question">Переключить адрес получения?</string>
-    <string name="switch_receiving_address_desc">Это экспериментальная функция! Она будет работать, только если на другом клиенте установлена версия 4.2. После завершения смены адреса вы увидите сообщение — убедитесь, что вы все еще можете получать сообщения от этого контакта (или члена группы).</string>
+    <string name="switch_receiving_address_desc">Это экспериментальная функция! Она будет работать, только если на другом клиенте установлена версия 4.2. После завершения смены адреса Вы увидите сообщение — убедитесь, что Вы все еще можете получать сообщения от этого контакта (или члена группы).</string>
     <!-- Message Actions - SendMsgView.kt -->
     <string name="icon_descr_send_message">Отправить сообщение</string>
     <string name="icon_descr_record_voice_message">Записать голосовое сообщение</string>
     <string name="allow_voice_messages_question">Разрешить голосовые сообщения?</string>
-    <string name="you_need_to_allow_to_send_voice">Чтобы включить отправку голосовых сообщений, разрешите их вашему контакту.</string>
+    <string name="you_need_to_allow_to_send_voice">Чтобы включить отправку голосовых сообщений, разрешите их Вашему контакту.</string>
     <string name="voice_messages_prohibited">Голосовые сообщения запрещены!</string>
-    <string name="ask_your_contact_to_enable_voice">Попросите вашего контакта разрешить отправку голосовых сообщений.</string>
+    <string name="ask_your_contact_to_enable_voice">Попросите Вашего контакта разрешить отправку голосовых сообщений.</string>
     <string name="only_group_owners_can_enable_voice">Только владельцы группы могут разрешить голосовые сообщения.</string>
     <!-- General Actions / Responses -->
     <string name="back">Назад</string>
@@ -249,7 +251,7 @@
     <string name="connect_via_link_or_qr">Соединиться через ссылку / QR код</string>
     <string name="scan_QR_code">Сканировать\nQR код</string>
     <string name="create_group">Создать секретную группу</string>
-    <string name="to_share_with_your_contact">(чтобы отправить вашему контакту)</string>
+    <string name="to_share_with_your_contact">(чтобы отправить Вашему контакту)</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(сканировать или вставить из буфера)</string>
     <string name="only_stored_on_members_devices">(хранится только у членов группы)</string>
     <!-- GetImageView -->
@@ -263,21 +265,21 @@
     <string name="to_start_a_new_chat_help_header">Чтобы начать новый чат</string>
     <string name="chat_help_tap_button">Нажмите кнопку</string>
     <string name="above_then_preposition_continuation">сверху, затем:</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Добавить новый контакт</b>: чтобы создать одноразовый QR код/ссылку для вашего контакта.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Сканировать QR код</b>: чтобы соединиться с контактом, который показывает вам QR код.</string>
+    <string name="add_new_contact_to_create_one_time_QR_code"><b>Добавить новый контакт</b>: чтобы создать одноразовый QR код/ссылку для Вашего контакта.</string>
+    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Сканировать QR код</b>: чтобы соединиться с контактом, который показывает Вам QR код.</string>
     <string name="to_connect_via_link_title">Чтобы соединиться через ссылку</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Если вы получили ссылку с приглашением из <xliff:g id="appName">SimpleX Chat</xliff:g>, вы можете открыть ее в браузере:</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Если Вы получили ссылку с приглашением из <xliff:g id="appName">SimpleX Chat</xliff:g>, Вы можете открыть ее в браузере:</string>
     <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 на компьютере: сосканируйте показанный QR код из приложения через <b>Сканировать QR код</b>.</string>
     <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 на мобильном: намжите кнопку <b>Open in mobile app</b> на веб странице, затем нажмите <b>Соединиться</b> в приложении.</string>
     <!-- Contact Request Alert Dialogue - CharListNavLinkView.kt -->
     <string name="accept_connection_request__question">Принять запрос на соединение?</string>
-    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Отправителю НЕ будет послано уведомление, если вы отклоните запрос на соединение.</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Отправителю НЕ будет послано уведомление, если Вы отклоните запрос на соединение.</string>
     <string name="accept_contact_button">Принять</string>
     <string name="accept_contact_incognito_button">Принять инкогнито</string>
     <string name="reject_contact_button">Отклонить</string>
     <!-- Clear Chat - ChatListNavLinkView.kt -->
     <string name="clear_chat_question">Очистить чат?</string>
-    <string name="clear_chat_warning">Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас.</string>
+    <string name="clear_chat_warning">Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для Вас.</string>
     <string name="clear_verb">Очистить</string>
     <string name="clear_chat_button">Очистить чат</string>
     <string name="clear_chat_menu_action">Очистить</string>
@@ -290,16 +292,16 @@
     <string name="mute_chat">Без звука</string>
     <string name="unmute_chat">Уведомлять</string>
     <!-- Pending contact connection alert dialogues -->
-    <string name="you_invited_your_contact">Вы пригласили ваш контакт</string>
+    <string name="you_invited_your_contact">Вы пригласили Ваш контакт</string>
     <string name="you_accepted_connection">Вы приняли приглашение соединиться</string>
     <string name="delete_pending_connection__question">Удалить ожидаемое соединение?</string>
-    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, которому вы отправили эту ссылку, не сможет соединиться!</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, которому Вы отправили эту ссылку, не сможет соединиться!</string>
     <string name="connection_you_accepted_will_be_cancelled">Подтвержденное соединение будет отменено!</string>
     <!-- Connection Pending Alert Dialogue - ChatListNavLinkView.kt -->
     <string name="alert_title_contact_connection_pending">Соединение еще не установлено!</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Ваш контакт должен быть в сети чтобы установить соединение.\nВы можете отменить соединение и удалить контакт (и попробовать позже с другой ссылкой).</string>
     <!-- Contact Request Information - ContactRequestView.kt -->
-    <string name="contact_wants_to_connect_with_you">хочет соединиться с вами!</string>
+    <string name="contact_wants_to_connect_with_you">хочет соединиться с Вами!</string>
     <!-- Image Placeholder - ChatInfoImage.kt -->
     <string name="icon_descr_profile_image_placeholder">аватар не установлен</string>
     <string name="image_descr_profile_image">аватар</string>
@@ -324,15 +326,16 @@
     <string name="this_link_is_not_a_valid_connection_link">Эта ссылка не является ссылкой-приглашением!</string>
     <string name="connection_request_sent">Запрос на соединение послан!</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">Соединение с группой будет установлено, когда хост группы будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Соединение будет установлено, когда ваш запрос будет принят. Пожалуйста, подождите или проверьте позже!</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Соединение будет установлено, когда ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Соединение будет установлено, когда Ваш запрос будет принят. Пожалуйста, подождите или проверьте позже!</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Соединение будет установлено, когда Ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
     <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Ваш контакт может сосканировать QR код в приложении.</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Если вы не можете встретиться лично, вы можете <b>показать QR код во время видеозвонка</b> или поделиться ссылкой.</string>
-    <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профиль будет отправлен\nвашему контакту</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Если вы не можете встретиться лично, вы можете <b>сосканировать QR код во время видеозвонка</b>, или ваш контакт может отправить вам ссылку.</string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Если Вы не можете встретиться лично, Вы можете <b>показать QR код во время видеозвонка</b> или поделиться ссылкой.</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профиль будет отправлен
+\nВашему контакту</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Если Вы не можете встретиться лично, Вы можете <b>сосканировать QR код во время видеозвонка</b>, или Ваш контакт может отправить Вам ссылку.</string>
     <string name="share_invitation_link">Поделиться ссылкой</string>
-    <string name="paste_connection_link_below_to_connect">Чтобы соединиться, вставьте в это поле ссылку, полученную от вашего контакта.</string>
-    <string name="your_profile_will_be_sent">Ваш профиль будет отправлен вашему контакту</string>
+    <string name="paste_connection_link_below_to_connect">Чтобы соединиться, вставьте в это поле ссылку, полученную от Вашего контакта.</string>
+    <string name="your_profile_will_be_sent">Ваш профиль будет отправлен Вашему контакту</string>
     <!-- PasteToConnect.kt -->
     <string name="connect_button">Соединиться</string>
     <string name="paste_button">Вставить</string>
@@ -365,7 +368,7 @@
     <string name="smp_servers_enter_manually">Ввести сервер вручную</string>
     <string name="smp_servers_preset_server">Сервер по умолчанию</string>
     <string name="smp_servers_your_server">Ваш сервер</string>
-    <string name="smp_servers_your_server_address">Адрес вашего сервера</string>
+    <string name="smp_servers_your_server_address">Адрес Вашего сервера</string>
     <string name="smp_servers_use_server">Использовать сервер</string>
     <string name="smp_servers_use_server_for_new_conn">Использовать для новых соединений</string>
     <string name="smp_servers_add_to_another_device">Добавить на другое устройство</string>
@@ -395,7 +398,7 @@
     <string name="network_enable_socks">Использовать SOCKS прокси?</string>
     <string name="network_enable_socks_info">Соединяться с серверами через SOCKS прокси через порт 9050? Прокси должен быть запущен до включения этой опции.</string>
     <string name="network_disable_socks">Использовать прямое соединение с Интернет?</string>
-    <string name="network_disable_socks_info">Если вы подтвердите, серверы смогут видеть ваш IP адрес, а провайдер - с какими серверами вы соединяетесь.</string>
+    <string name="network_disable_socks_info">Если Вы подтвердите, серверы смогут видеть Ваш IP адрес, а провайдер - с какими серверами Вы соединяетесь.</string>
     <string name="update_onion_hosts_settings_question">Обновить настройки .onion хостов?</string>
     <string name="network_use_onion_hosts">Использовать .onion хосты</string>
     <string name="network_use_onion_hosts_prefer">Когда возможно</string>
@@ -412,7 +415,7 @@
     <string name="create_address">Создать адрес</string>
     <string name="delete_address__question">Удалить адрес?</string>
     <string name="all_your_contacts_will_remain_connected">Все контакты, которые соединились через этот адрес, сохранятся.</string>
-    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Вы можете использовать ваш адрес как ссылку или как QR код - кто угодно сможет соединиться с вами. Вы сможете удалить адрес, сохранив контакты, которые через него соединились.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Вы можете использовать Ваш адрес как ссылку или как QR код - кто угодно сможет соединиться с Вами. Вы сможете удалить адрес, сохранив контакты, которые через него соединились.</string>
     <string name="share_link">Поделиться\nссылкой</string>
     <string name="delete_address">Удалить\nадрес</string>
     <!-- AcceptRequestsView.kt -->
@@ -424,7 +427,9 @@
     <string name="display_name__field">Имя профиля:</string>
     <string name="full_name__field">"Полное имя:</string>
     <string name="your_current_profile">Ваш активный профиль</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профиль хранится на вашем устройстве и отправляется только вашим контактам.\n\n<xliff:g id="appName">SimpleX</xliff:g> серверы не могут получить доступ к вашему профилю.</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам.
+\n
+\n<xliff:g id="appName">SimpleX</xliff:g> серверы не могут получить доступ к Вашему профилю.</string>
     <string name="edit_image">Поменять аватар</string>
     <string name="delete_image">Удалить аватар</string>
     <string name="save_preferences_question">Сохранить предпочтения?</string>
@@ -433,12 +438,12 @@
     <string name="save_and_notify_group_members">Сохранить и уведомить членов группы</string>
     <string name="exit_without_saving">Выйти без сохранения</string>
     <!-- Welcome Prompts - WelcomeView.kt -->
-    <string name="you_control_your_chat">Вы котролируете ваш чат!</string>
-    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Платформа для сообщений и приложений, которая защищает вашу личную информацию и безопасность.</string>
-    <string name="we_do_not_store_contacts_or_messages_on_servers">Мы не храним ваши контакты и сообщения (после доставки) на серверах.</string>
+    <string name="you_control_your_chat">Вы котролируете Ваш чат!</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Платформа для сообщений и приложений, которая защищает Вашу личную информацию и безопасность.</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">Мы не храним Ваши контакты и сообщения (после доставки) на серверах.</string>
     <string name="create_profile">Создать профиль</string>
-    <string name="your_profile_is_stored_on_your_device">Ваш профиль, контакты и доставленные сообщения хранятся на вашем устройстве.</string>
-    <string name="profile_is_only_shared_with_your_contacts">Профиль отправляется только вашим контактам.</string>
+    <string name="your_profile_is_stored_on_your_device">Ваш профиль, контакты и доставленные сообщения хранятся на Вашем устройстве.</string>
+    <string name="profile_is_only_shared_with_your_contacts">Профиль отправляется только Вашим контактам.</string>
     <string name="display_name_cannot_contain_whitespace">Имя профиля не может содержать пробелы.</string>
     <string name="display_name">Имя профиля</string>
     <string name="full_name_optional__prompt">Полное имя (не обязательно)</string>
@@ -455,7 +460,7 @@
     <string name="secret">секрет</string>
     <string name="connect_via_link">Соединиться через ссылку</string>
     <string name="this_string_is_not_a_connection_link">Эта строка не является ссылкой-приглашением!</string>
-    <string name="you_can_also_connect_by_clicking_the_link">Вы также можете соединиться, открыв ссылку там, где вы её получили. Если ссылка откроется в браузере, нажмите кнопку <b>Открыть в приложении</b>.</string>
+    <string name="you_can_also_connect_by_clicking_the_link">Вы также можете соединиться, открыв ссылку там, где Вы её получили. Если ссылка откроется в браузере, нажмите кнопку <b>Открыть в приложении</b>.</string>
     <!-- CICallStatus -->
     <string name="callstatus_calling">входящий звонок…</string>
     <string name="callstatus_missed">пропущенный звонок</string>
@@ -479,7 +484,7 @@
     <string name="privacy_redefined">Более конфиденциальный</string>
     <string name="first_platform_without_user_ids">Первая в мире платформа без идентификаторов пользователей.</string>
     <string name="immune_to_spam_and_abuse">Защищен от спама</string>
-    <string name="people_can_connect_only_via_links_you_share">С вами можно соединиться только через созданные вами ссылки.</string>
+    <string name="people_can_connect_only_via_links_you_share">С Вами можно соединиться только через созданные Вами ссылки.</string>
     <string name="decentralized">Децентрализованный</string>
     <string name="opensource_protocol_and_code_anybody_can_run_servers">Открытый протокол и код - кто угодно может запустить сервер.</string>
     <string name="create_your_profile">Создать профиль</string>
@@ -488,8 +493,8 @@
     <!-- How SimpleX Works -->
     <string name="how_simplex_works">Как <xliff:g id="appName">SimpleX</xliff:g> работает</string>
     <string name="many_people_asked_how_can_it_deliver">Много пользователей спросили: <i>как <xliff:g id="appName">SimpleX</xliff:g> доставляет сообщения без идентификаторов пользователей?</i></string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Чтобы защитить вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, <xliff:g id="appName">SimpleX</xliff:g> использует ID для очередей сообщений, разные для каждого контакта.</string>
-    <string name="you_control_servers_to_receive_your_contacts_to_send">Вы определяете через какие серверы вы <b>получаете сообщения</b>, ваши контакты - серверы, которые вы используете для отправки.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Чтобы защитить Вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, <xliff:g id="appName">SimpleX</xliff:g> использует ID для очередей сообщений, разные для каждого контакта.</string>
+    <string name="you_control_servers_to_receive_your_contacts_to_send">Вы определяете через какие серверы Вы <b>получаете сообщения</b>, Ваши контакты - серверы, которые Вы используете для отправки.</string>
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Только пользовательские устройства хранят контакты, группы и сообщения, которые отправляются <b>с двухуровневым end-to-end шифрованием</b>.</string>
     <string name="read_more_in_github">Узнайте больше из нашего GitHub репозитория.</string>
     <string name="read_more_in_github_with_link">Узнайте больше из нашего <font color="#0088ff">GitHub репозитория</font>.</string>
@@ -500,7 +505,7 @@
     <!-- Call -->
     <string name="incoming_video_call">Входящий видеозвонок</string>
     <string name="incoming_audio_call">Входящий аудиозвонок</string>
-    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> хочет связаться с вами через </string>
+    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> хочет связаться с Вами через </string>
     <string name="video_call_no_encryption">видеозвонок (не e2e зашифрованный)</string>
     <string name="encrypted_video_call">e2e зашифрованный видеозвонок</string>
     <string name="audio_call_no_encryption">аудиозвонок (не e2e зашифрованный)</string>
@@ -514,13 +519,15 @@
     <!-- Call settings -->
     <string name="settings_audio_video_calls">Аудио- и видеозвонки</string>
     <string name="your_calls">Ваши звонки</string>
-    <string name="connect_calls_via_relay">Соединяться через сервер (relay)</string>
+    <string name="always_use_relay">Всегда соединяться через relay</string>
     <string name="call_on_lock_screen">Звонки на экране блокировки:</string>
     <string name="accept_call_on_lock_screen">Принимать</string>
     <string name="show_call_on_lock_screen">Показывать</string>
     <string name="no_call_on_lock_screen">Выключить</string>
     <string name="your_ice_servers">Ваши ICE серверы</string>
     <string name="webrtc_ice_servers">WebRTC ICE серверы</string>
+    <string name="relay_server_protects_ip">Relay сервер защищает Ваш IP адрес, но может отслеживать продолжительность звонка.</string>
+    <string name="relay_server_if_necessary">Relay сервер используется только при необходимости. Другая сторона может видеть Ваш IP адрес.</string>
     <!-- Call Lock Screen -->
     <string name="open_simplex_chat_to_accept_call">Откройте <xliff:g id="appNameFull">SimpleX Chat</xliff:g>\nчтобы принять звонок</string>
     <string name="allow_accepting_calls_from_lock_screen">Вы можете разрешить принимать звонки на экране блокировки через Настройки.</string>
@@ -554,7 +561,12 @@
     <string name="integrity_msg_bad_id">ошибка ID сообщения</string>
     <string name="integrity_msg_duplicate">повторное сообщение</string>
     <string name="alert_title_skipped_messages">Пропущенные сообщения</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">Это может случится, когда:\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.\n2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.\n3. Соединение компроментировано.\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">Это может случится, когда:
+\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.
+\n2. Сервер, через который Вы получаете сообщения от контакта, был обновлён и перезапущен.
+\n3. Соединение компроментировано.
+\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.
+\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</string>
     <!-- Privacy settings -->
     <string name="privacy_and_security">Конфиденциальность</string>
     <string name="your_privacy">Конфиденциальность</string>
@@ -599,17 +611,18 @@
     <string name="error_stopping_chat">Ошибка при остановке чата</string>
     <string name="error_exporting_chat_database">Ошибка при экспорте архива чата</string>
     <string name="import_database_question">Импортировать архив чата?</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Текущие данные вашего чата будет УДАЛЕНЫ и ЗАМЕНЕНЫ импортированными.\nЭто действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Текущие данные Вашего чата будет УДАЛЕНЫ и ЗАМЕНЕНЫ импортированными.
+\nЭто действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
     <string name="import_database_confirmation">Импортировать</string>
     <string name="error_deleting_database">Ошибка при удалении данных чата</string>
     <string name="error_importing_database">Ошибка при импорте архива чата</string>
     <string name="chat_database_imported">Архив чата импортирован</string>
     <string name="restart_the_app_to_use_imported_chat_database">Перезапустите приложение, чтобы использовать импортированные данные чата.</string>
     <string name="delete_chat_profile_question">Удалить профиль?</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Это действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Это действие нельзя отменить — Ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
     <string name="chat_database_deleted">Данные чата удалены</string>
     <string name="restart_the_app_to_create_a_new_chat_profile">Перезапустите приложение, чтобы создать новый профиль.</string>
-    <string name="you_must_use_the_most_recent_version_of_database">Используйте самую последнюю версию архива чата и ТОЛЬКО на одном устройстве, иначе вы можете перестать получать сообщения от некоторых контактов.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">Используйте самую последнюю версию архива чата и ТОЛЬКО на одном устройстве, иначе Вы можете перестать получать сообщения от некоторых контактов.</string>
     <string name="stop_chat_to_enable_database_actions">Остановите чат, чтобы разблокировать операции с архивом чата.</string>
     <string name="delete_files_and_media_for_all_users">Удалить файлы во всех профилях чата</string>
     <string name="delete_files_and_media_all">Удалить все файлы</string>
@@ -641,20 +654,20 @@
     <string name="confirm_new_passphrase">Подтвердите новый пароль…</string>
     <string name="update_database_passphrase">Поменять пароль</string>
     <string name="enter_correct_current_passphrase">Пожалуйста, введите правильный пароль.</string>
-    <string name="database_is_not_encrypted">База данных НЕ зашифрована. Установите пароль, чтобы защитить ваши данные.</string>
+    <string name="database_is_not_encrypted">База данных НЕ зашифрована. Установите пароль, чтобы защитить Ваши данные.</string>
     <string name="keychain_is_storing_securely">Android Keystore используется для безопасного хранения пароля - это позволяет стабильно получать уведомления в фоновом режиме.</string>
-    <string name="encrypted_with_random_passphrase">База данных зашифрована случайным паролем, вы можете его поменять.</string>
-    <string name="impossible_to_recover_passphrase"><b>Внимание</b>: вы не сможете восстановить или поменять пароль, если потеряете его.</string>
+    <string name="encrypted_with_random_passphrase">База данных зашифрована случайным паролем, Вы можете его поменять.</string>
+    <string name="impossible_to_recover_passphrase"><b>Внимание</b>: Вы не сможете восстановить или поменять пароль, если потеряете его.</string>
     <string name="keychain_allows_to_receive_ntfs">Пароль базы данных будет безопасно сохранен в Android Keystore после запуска чата или изменения пароля - это позволит стабильно получать уведомления.</string>
-    <string name="you_have_to_enter_passphrase_every_time">Пароль не сохранен на устройстве — вы будете должны ввести его при каждом запуске чата.</string>
+    <string name="you_have_to_enter_passphrase_every_time">Пароль не сохранен на устройстве — Вы будете должны ввести его при каждом запуске чата.</string>
     <string name="encrypt_database_question">Зашифровать базу данных?</string>
     <string name="change_database_passphrase_question">Поменять пароль базы данных?</string>
     <string name="database_will_be_encrypted">База данных будет зашифрована.</string>
     <string name="database_will_be_encrypted_and_passphrase_stored">База данных будет зашифрована и пароль сохранен в Keystore.</string>
     <string name="database_encryption_will_be_updated">Пароль базы данных будет изменен и сохранен в Keystore.</string>
     <string name="database_passphrase_will_be_updated">Пароль базы данных будет изменен.</string>
-    <string name="store_passphrase_securely">Пожалуйста, надежно сохраните пароль, вы НЕ сможете его поменять, если потеряете.</string>
-    <string name="store_passphrase_securely_without_recover">Пожалуйста, надежно сохраните пароль, вы НЕ сможете открыть чат, если потеряете его.</string>
+    <string name="store_passphrase_securely">Пожалуйста, надежно сохраните пароль, Вы НЕ сможете его поменять, если потеряете.</string>
+    <string name="store_passphrase_securely_without_recover">Пожалуйста, надежно сохраните пароль, Вы НЕ сможете открыть чат, если потеряете его.</string>
     <!-- DatabaseErrorView.kt -->
     <string name="wrong_passphrase">Неправильный пароль базы данных</string>
     <string name="encrypted_database">База данных зашифрована</string>
@@ -678,7 +691,7 @@
     <string name="restore_database_alert_desc">Введите предыдущий пароль после восстановления резервной копии. Это действие нельзя отменить.</string>
     <string name="restore_database_alert_confirm">Восстановить</string>
     <string name="database_restore_error">Ошибка при восстановлении базы данных</string>
-    <string name="restore_passphrase_not_found_desc">Пароль не найден в Keystore, пожалуйста, введите его вручную. Это могло произойти, если вы восстановили данные приложения с помощью инструмента резервного копирования. Если это не так, пожалуйста, свяжитесь с разработчиками.</string>
+    <string name="restore_passphrase_not_found_desc">Пароль не найден в Keystore, пожалуйста, введите его вручную. Это могло произойти, если Вы восстановили данные приложения с помощью инструмента резервного копирования. Если это не так, пожалуйста, свяжитесь с разработчиками.</string>
     <!-- ChatModel.chatRunning interactions -->
     <string name="chat_is_stopped_indication">Чат остановлен</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Вы можете запустить чат через Настройки приложения или перезапустив приложение.</string>
@@ -707,7 +720,7 @@
     <string name="alert_title_no_group">Группа не найдена!</string>
     <string name="alert_message_no_group">Эта группа больше не существует.</string>
     <string name="alert_title_cant_invite_contacts">Нельзя пригласить контакты!</string>
-    <string name="alert_title_cant_invite_contacts_descr">Вы используете инкогнито профиль для этой группы - чтобы предотвратить раскрытие вашего основного профиля, приглашать контакты не разрешено</string>
+    <string name="alert_title_cant_invite_contacts_descr">Вы используете инкогнито профиль для этой группы - чтобы предотвратить раскрытие Вашего основного профиля, приглашать контакты не разрешено</string>
     <!-- CIGroupInvitationView.kt -->
     <string name="you_sent_group_invitation">Вы отправили приглашение в группу</string>
     <string name="you_are_invited_to_group">Вы приглашены в группу</string>
@@ -721,23 +734,23 @@
     <string name="rcv_group_event_member_connected">соединен(а)</string>
     <string name="rcv_group_event_member_left">покинул(а) группу</string>
     <string name="rcv_group_event_changed_member_role">поменял(а) роль члена %s на: %s</string>
-    <string name="rcv_group_event_changed_your_role">поменял(а) вашу роль на: %s</string>
+    <string name="rcv_group_event_changed_your_role">поменял(а) Вашу роль на: %s</string>
     <string name="rcv_group_event_member_deleted">удалил(а) <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_user_deleted">удалил(а) вас из группы</string>
+    <string name="rcv_group_event_user_deleted">удалил(а) Вас из группы</string>
     <string name="rcv_group_event_group_deleted">удалил(а) группу</string>
     <string name="rcv_group_event_updated_group_profile">обновил(а) профиль группы</string>
-    <string name="rcv_group_event_invited_via_your_group_link">приглашен(а) через вашу ссылку группы</string>
-    <string name="snd_group_event_changed_member_role">вы поменяли роль члена %s на: %s</string>
-    <string name="snd_group_event_changed_role_for_yourself">вы поменяли роль себе на: %s</string>
-    <string name="snd_group_event_member_deleted">вы удалили <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="snd_group_event_user_left">вы покинули группу</string>
+    <string name="rcv_group_event_invited_via_your_group_link">приглашен(а) через Вашу ссылку группы</string>
+    <string name="snd_group_event_changed_member_role">Вы поменяли роль члена %s на: %s</string>
+    <string name="snd_group_event_changed_role_for_yourself">Вы поменяли роль себе на: %s</string>
+    <string name="snd_group_event_member_deleted">Вы удалили <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
+    <string name="snd_group_event_user_left">Вы покинули группу</string>
     <string name="snd_group_event_group_profile_updated">профиль группы обновлен</string>
     <!-- Conn event chat items -->
-    <string name="rcv_conn_event_switch_queue_phase_completed">поменял(а) адрес для вас</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">поменял(а) адрес для Вас</string>
     <string name="rcv_conn_event_switch_queue_phase_changing">смена адреса…</string>
-    <string name="snd_conn_event_switch_queue_phase_completed_for_member">вы поменяли адрес для %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">Вы поменяли адрес для %s</string>
     <string name="snd_conn_event_switch_queue_phase_changing_for_member">смена адреса для %s…</string>
-    <string name="snd_conn_event_switch_queue_phase_completed">вы поменяли адрес</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">Вы поменяли адрес</string>
     <string name="snd_conn_event_switch_queue_phase_changing">смена адреса…</string>
     <!-- GroupMemberRole -->
     <string name="group_member_role_member">член группы</string>
@@ -765,18 +778,18 @@
     <string name="select_contacts">Выберите контакты</string>
     <string name="icon_descr_contact_checked">Контакт выбран</string>
     <string name="clear_contacts_selection_button">Очистить</string>
-    <string name="num_contacts_selected">Выбрано контактов: <xliff:g id="num_contacts">%1$s</xliff:g></string>
+    <string name="num_contacts_selected">Выбрано контактов: %d</string>
     <string name="no_contacts_selected">Контакты не выбраны</string>
     <string name="invite_prohibited">Нельзя пригласить контакт!</string>
-    <string name="invite_prohibited_description">Вы пытаетесь пригласить инкогнито контакт в группу, где вы используете свой основной профиль</string>
+    <string name="invite_prohibited_description">Вы пытаетесь пригласить инкогнито контакт в группу, где Вы используете свой основной профиль</string>
     <!-- GroupChatInfoView.kt -->
     <string name="button_add_members">Пригласить членов группы</string>
     <string name="group_info_section_title_num_members">ЧЛЕНОВ ГРУППЫ: <xliff:g id="num_members">%1$s</xliff:g></string>
-    <string name="group_info_member_you">вы: <xliff:g id="group_info_you">%1$s</xliff:g></string>
+    <string name="group_info_member_you">Вы: <xliff:g id="group_info_you">%1$s</xliff:g></string>
     <string name="button_delete_group">Удалить группу</string>
     <string name="delete_group_question">Удалить группу?</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">Группа будет удалена для всех членов - это действие нельзя отменить!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">Группа будет удалена для вас - это действие нельзя отменить!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">Группа будет удалена для Вас - это действие нельзя отменить!</string>
     <string name="button_leave_group">Выйти из группы</string>
     <string name="button_edit_group_profile">Редактировать профиль группы</string>
     <string name="group_link">Ссылка группы</string>
@@ -822,7 +835,7 @@
     <string name="group_is_decentralized">Группа полностью децентрализована — она видна только членам.</string>
     <string name="group_display_name_field">Имя группы:</string>
     <string name="group_full_name_field">Полное имя:</string>
-    <string name="group_unsupported_incognito_main_profile_sent">Режим Инкогнито здесь не поддерживается - ваш основной профиль будет отправлен членам группы</string>
+    <string name="group_unsupported_incognito_main_profile_sent">Режим Инкогнито здесь не поддерживается - Ваш основной профиль будет отправлен членам группы</string>
     <string name="group_main_profile_sent">Ваш профиль чата будет отправлен членам группы</string>
     <!-- GroupProfileView.kt -->
     <string name="group_profile_is_stored_on_members_devices">Профиль группы хранится на устройствах членов, а не на серверах.</string>
@@ -844,10 +857,10 @@
     <string name="incognito">Инкогнито</string>
     <string name="incognito_random_profile">Случайный профиль</string>
     <string name="incognito_random_profile_description">Вашему контакту будет отправлен случайный профиль</string>
-    <string name="incognito_random_profile_from_contact_description">Контакту, от которого вы получили эту ссылку, будет отправлен случайный профиль</string>
-    <string name="incognito_info_protects">Режим Инкогнито защищает конфиденциальность имени и изображения вашего основного профиля — для каждого нового контакта создается новый случайный профиль.</string>
+    <string name="incognito_random_profile_from_contact_description">Контакту, от которого Вы получили эту ссылку, будет отправлен случайный профиль</string>
+    <string name="incognito_info_protects">Режим Инкогнито защищает конфиденциальность имени и изображения Вашего основного профиля — для каждого нового контакта создается новый случайный профиль.</string>
     <string name="incognito_info_allows">Это позволяет иметь много анонимных соединений без общих данных между ними в одном профиле пользователя.</string>
-    <string name="incognito_info_share">Когда вы соединены с контактом инкогнито, тот же самый инкогнито профиль будет использоваться для групп с этим контактом.</string>
+    <string name="incognito_info_share">Когда Вы соединены с контактом инкогнито, тот же самый инкогнито профиль будет использоваться для групп с этим контактом.</string>
     <string name="incognito_info_find">Чтобы найти инкогнито профиль, используемый в разговоре, нажмите на имя контакта или группы в верхней части чата.</string>
     <!-- Default themes -->
     <string name="theme_system">Системная</string>
@@ -876,23 +889,23 @@
     <string name="full_deletion">Удаление для всех</string>
     <string name="voice_messages">Голосовые сообщения</string>
     <string name="feature_enabled">включено</string>
-    <string name="feature_enabled_for_you">включено для вас</string>
+    <string name="feature_enabled_for_you">включено для Вас</string>
     <string name="feature_enabled_for_contact">включено для контакта</string>
     <string name="feature_off">выключено</string>
     <string name="feature_received_prohibited">получено, не разрешено</string>
-    <string name="allow_your_contacts_irreversibly_delete">Разрешить вашим контактам необратимо удалять отправленные сообщения.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Разрешить необратимое удаление сообщений, только если ваш контакт разрешает это вам.</string>
-    <string name="contacts_can_mark_messages_for_deletion">Контакты могут помечать сообщения для удаления; вы сможете просмотреть их.</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Разрешить вашим контактам отправлять голосовые сообщения.</string>
-    <string name="allow_voice_messages_only_if">Разрешить голосовые сообщения, только если их разрешает ваш контакт.</string>
+    <string name="allow_your_contacts_irreversibly_delete">Разрешить Вашим контактам необратимо удалять отправленные сообщения.</string>
+    <string name="allow_irreversible_message_deletion_only_if">Разрешить необратимое удаление сообщений, только если Ваш контакт разрешает это Вам.</string>
+    <string name="contacts_can_mark_messages_for_deletion">Контакты могут помечать сообщения для удаления; Вы сможете просмотреть их.</string>
+    <string name="allow_your_contacts_to_send_voice_messages">Разрешить Вашим контактам отправлять голосовые сообщения.</string>
+    <string name="allow_voice_messages_only_if">Разрешить голосовые сообщения, только если их разрешает Ваш контакт.</string>
     <string name="prohibit_sending_voice_messages">Запретить отправлять голосовые сообщений.</string>
-    <string name="both_you_and_your_contacts_can_delete">Вы и ваш контакт можете необратимо удалять отправленные сообщения.</string>
-    <string name="only_you_can_delete_messages">Только вы можете необратимо удалять сообщения (ваш контакт может помечать их на удаление).</string>
-    <string name="only_your_contact_can_delete">Только ваш контакт может необратимо удалять сообщения (вы можете помечать их на удаление).</string>
+    <string name="both_you_and_your_contacts_can_delete">Вы и Ваш контакт можете необратимо удалять отправленные сообщения.</string>
+    <string name="only_you_can_delete_messages">Только Вы можете необратимо удалять сообщения (Ваш контакт может помечать их на удаление).</string>
+    <string name="only_your_contact_can_delete">Только Ваш контакт может необратимо удалять сообщения (Вы можете помечать их на удаление).</string>
     <string name="message_deletion_prohibited">Необратимое удаление сообщений запрещено в этой группе.</string>
-    <string name="both_you_and_your_contact_can_send_voice">Вы и ваш контакт можете отправлять голосовые сообщения.</string>
-    <string name="only_you_can_send_voice">Только вы можете отправлять голосовые сообщения.</string>
-    <string name="only_your_contact_can_send_voice">Только ваш контакт может отправлять голосовые сообщения.</string>
+    <string name="both_you_and_your_contact_can_send_voice">Вы и Ваш контакт можете отправлять голосовые сообщения.</string>
+    <string name="only_you_can_send_voice">Только Вы можете отправлять голосовые сообщения.</string>
+    <string name="only_your_contact_can_send_voice">Только Ваш контакт может отправлять голосовые сообщения.</string>
     <string name="voice_prohibited_in_this_chat">Голосовые сообщения запрещены в этом чате.</string>
     <string name="allow_direct_messages">Разрешить посылать прямые сообщения членам группы.</string>
     <string name="prohibit_direct_messages">Запретить посылать прямые сообщения членам группы.</string>
@@ -935,18 +948,18 @@
     <string name="timed_messages">Исчезающие сообщения</string>
     <string name="view_security_code">Показать код безопасности</string>
     <string name="verify_security_code">Подтвердить код безопасности</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Вы и ваш контакт можете отправлять исчезающие сообщения.</string>
-    <string name="only_you_can_send_disappearing">Только вы можете отправлять исчезающие сообщения.</string>
-    <string name="only_your_contact_can_send_disappearing">Только ваш контакт может отправлять исчезающие сообщения.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Вы и Ваш контакт можете отправлять исчезающие сообщения.</string>
+    <string name="only_you_can_send_disappearing">Только Вы можете отправлять исчезающие сообщения.</string>
+    <string name="only_your_contact_can_send_disappearing">Только Ваш контакт может отправлять исчезающие сообщения.</string>
     <string name="disappearing_prohibited_in_this_chat">Исчезающие сообщения запрещены в этом чате.</string>
     <string name="allow_to_send_disappearing">Разрешить посылать исчезающие сообщения.</string>
     <string name="contact_developers">Пожалуйста, обновите приложение и свяжитесь с разработчиками.</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Разрешить вашим контактам отправлять исчезающие сообщения.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Разрешить Вашим контактам отправлять исчезающие сообщения.</string>
     <string name="failed_to_parse_chat_title">Не удалось открыть чат</string>
     <string name="failed_to_parse_chats_title">Не удалось открыть чаты</string>
     <string name="incorrect_code">Неправильный код безопасности!</string>
     <string name="scan_code">Сканировать код</string>
-    <string name="send_live_message_desc">Отправить живое сообщение — оно будет обновляться для получателей по мере того, как вы его вводите</string>
+    <string name="send_live_message_desc">Отправить живое сообщение — оно будет обновляться для получателей по мере того, как Вы его вводите</string>
     <string name="create_group_link">Создать ссылку группы</string>
     <string name="prohibit_sending_disappearing_messages">Запретить отправлять исчезающие сообщения.</string>
     <string name="disappearing_messages_are_prohibited">Исчезающие сообщения запрещены в этой группе.</string>
@@ -954,13 +967,13 @@
     <string name="ttl_d">%dд</string>
     <string name="ttl_weeks">%d нед.</string>
     <string name="ttl_days">%d дней</string>
-    <string name="to_verify_compare">Чтобы подтвердить безопасность end-to-end шифрования с вашим контактом сравните (или сканируйте) код на ваших устройствах.</string>
+    <string name="to_verify_compare">Чтобы подтвердить безопасность end-to-end шифрования с Вашим контактом сравните (или сканируйте) код на ваших устройствах.</string>
     <string name="is_verified">%s подтверждён</string>
     <string name="is_not_verified">%s не подтверждён</string>
     <string name="security_code">Код безопасности</string>
     <string name="mark_code_verified">Подтвердить</string>
     <string name="clear_verification">Сбросить подтверждение</string>
-    <string name="allow_disappearing_messages_only_if">Разрешить исчезающие сообщения, только если ваш контакт разрешает их вам.</string>
+    <string name="allow_disappearing_messages_only_if">Разрешить исчезающие сообщения, только если Ваш контакт разрешает их Вам.</string>
     <string name="prohibit_sending_disappearing">Запретить посылать исчезающие сообщения.</string>
     <string name="group_members_can_send_disappearing">Члены группы могут посылать исчезающие сообщения.</string>
     <string name="whats_new">Новые функции</string>
@@ -978,9 +991,9 @@
     <string name="v4_4_disappearing_messages_desc">Отправленные сообщения будут удалены через заданное время.</string>
     <string name="v4_3_improved_server_configuration">Улучшенная конфигурация серверов</string>
     <string name="v4_4_live_messages">\"Живые\" сообщения</string>
-    <string name="v4_4_live_messages_desc">Получатели видят их в то время как вы их набираете.</string>
+    <string name="v4_4_live_messages_desc">Получатели видят их в то время как Вы их набираете.</string>
     <string name="v4_4_verify_connection_security">Проверить безопасность соединения</string>
-    <string name="v4_4_verify_connection_security_desc">Сравните код безопасности с вашими контактами.</string>
+    <string name="v4_4_verify_connection_security_desc">Сравните код безопасности с Вашими контактами.</string>
     <string name="invalid_chat">ошибка чата</string>
     <string name="accept_feature">Принять</string>
     <string name="accept_feature_set_1_day">Установить 1 день</string>
@@ -1004,25 +1017,24 @@
     <string name="files_and_media_section">Файлы и медиа</string>
     <string name="users_delete_data_only">Только локальные данные профиля</string>
     <string name="messages_section_title">Сообщения</string>
-    <string name="smp_servers_per_user">Серверы для новых соединений вашего текущего профиля чата</string>
-    <string name="your_chat_profiles_stored_locally">Ваши профили чата хранятся локально, только на вашем устройстве</string>
+    <string name="smp_servers_per_user">Серверы для новых соединений Вашего текущего профиля чата</string>
     <string name="your_chat_profiles">Ваши профили чата</string>
     <string name="users_delete_all_chats_deleted">Все чаты и сообщения будут удалены - это нельзя отменить!</string>
     <string name="app_version_code">Сборка приложения: %s</string>
     <string name="app_version_name">Версия приложения: v%s</string>
     <string name="network_session_mode_entity_description">Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться <b>для каждого контакта и члена группы</b>.
-\n<b>Обратите внимание</b>: если у вас много контактов, потребление батареи и трафика может быть значительно выше, и некоторые соединения могут не работать.</string>
-    <string name="network_session_mode_user_description">Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться <b>для каждого профиля чата, который вы имеете в приложении</b>.</string>
+\n<b>Обратите внимание</b>: если у Вас много контактов, потребление батареи и трафика может быть значительно выше, и некоторые соединения могут не работать.</string>
+    <string name="network_session_mode_user_description">Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться <b>для каждого профиля чата, который Вы имеете в приложении</b>.</string>
     <string name="core_build_timestamp">Ядро скомпилировано: %s</string>
     <string name="core_version">Версия ядра: v%s</string>
     <string name="users_delete_question">Удалить профиль чата\?</string>
     <string name="users_delete_profile_for">Удалить профиль чата для</string>
-    <string name="messages_section_description">Эта настройка применяется к сообщениям в вашем текущем профиле чата</string>
+    <string name="messages_section_description">Эта настройка применяется к сообщениям в Вашем текущем профиле чата</string>
     <string name="network_session_mode_transport_isolation">Отдельные сессии для</string>
     <string name="update_network_session_mode_question">Обновить режим отдельных сессий\?</string>
     <string name="failed_to_create_user_duplicate_title">Имя профиля уже используется</string>
     <string name="failed_to_create_user_title">Ошибка создания профиля!</string>
-    <string name="failed_to_create_user_duplicate_desc">У вас уже есть профиль с таким именем. Пожалуйста, выберите другое имя.</string>
+    <string name="failed_to_create_user_duplicate_desc">У Вас уже есть профиль с таким именем. Пожалуйста, выберите другое имя.</string>
     <string name="failed_to_active_user_title">Ошибка выбора профиля!</string>
     <string name="v4_5_transport_isolation_descr">По профилю чата или по соединению (БЕТА)</string>
     <string name="v4_4_french_interface_descr">Благодаря пользователям – добавьте переводы через Weblate!</string>
@@ -1033,10 +1045,100 @@
     <string name="v4_5_message_draft_descr">Сохранить последний черновик, вместе с вложениями.</string>
     <string name="v4_5_private_filenames">Защищенные имена файлов</string>
     <string name="v4_5_italian_interface_descr">Благодаря пользователям – добавьте переводы через Weblate!</string>
-    <string name="v4_5_private_filenames_descr">Чтобы защитить ваш часовой пояс, файлы картинок и голосовых сообщений используют UTC.</string>
+    <string name="v4_5_private_filenames_descr">Чтобы защитить Ваш часовой пояс, файлы картинок и голосовых сообщений используют UTC.</string>
     <string name="v4_4_french_interface">Французский интерфейс</string>
     <string name="v4_5_reduced_battery_usage_descr">Дополнительные улучшения скоро!</string>
     <string name="v4_5_reduced_battery_usage">Уменьшенное потребление батареи</string>
     <string name="v4_5_transport_isolation">Отдельные транспортные сессии</string>
     <string name="moderated_description">удалено</string>
+    <string name="moderated_item_description">удалено %s</string>
+    <string name="delete_member_message__question">Удалить сообщение участника\?</string>
+    <string name="moderate_verb">Модерировать</string>
+    <string name="moderate_message_will_be_deleted_warning">Сообщение будет удалено для всех членов группы.</string>
+    <string name="moderate_message_will_be_marked_warning">Сообщение будет помечено как удаленное для всех членов группы.</string>
+    <string name="observer_cant_send_message_desc">Пожалуйста, свяжитесь с админом группы.</string>
+    <string name="observer_cant_send_message_title">Вы не можете отправлять сообщения!</string>
+    <string name="you_are_observer">только чтение сообщений</string>
+    <string name="group_member_role_observer">читатель</string>
+    <string name="initial_member_role">Роль при вступлении</string>
+    <string name="error_updating_link_for_group">Ошибка обновления ссылки группы</string>
+    <string name="language_system">Системный</string>
+    <string name="v4_6_audio_video_calls">Аудио и видео звонки</string>
+    <string name="error_saving_user_password">Ошибка при сохранении пароля пользователя</string>
+    <string name="smp_save_servers_question">Сохранить серверы\?</string>
+    <string name="should_be_at_least_one_profile">Должен быть хотя бы один профиль пользователя.</string>
+    <string name="should_be_at_least_one_visible_profile">Должен быть хотя бы один открытый профиль пользователя.</string>
+    <string name="to_reveal_profile_enter_password">Чтобы показать Ваш скрытый профиль, введите пароль в поле поиска на странице Ваши профили чата.</string>
+    <string name="user_unmute">Уведомлять</string>
+    <string name="group_welcome_title">Приветственное сообщение</string>
+    <string name="confirm_password">Подтвердить пароль</string>
+    <string name="button_add_welcome_message">Добавить приветственное сообщение</string>
+    <string name="button_welcome_message">Приветственное сообщение</string>
+    <string name="save_and_update_group_profile">Сохранить сообщение и обновить группу</string>
+    <string name="muted_when_inactive">Без звука, когда не активный!</string>
+    <string name="cant_delete_user_profile">Нельзя удалить профиль пользователя!</string>
+    <string name="enter_password_to_show">Введите пароль в поиске!</string>
+    <string name="save_profile_password">Сохранить пароль профиля</string>
+    <string name="v4_6_chinese_spanish_interface">Китайский и Испанский интерфейс</string>
+    <string name="dont_show_again">Не показывать</string>
+    <string name="user_hide">Скрыть</string>
+    <string name="v4_6_reduced_battery_usage">Уменьшенное потребление батареи</string>
+    <string name="v4_6_group_moderation">Модерация группы</string>
+    <string name="hidden_profile_password">Пароль скрытого профиля</string>
+    <string name="password_to_show">Пароль чтобы раскрыть</string>
+    <string name="v4_6_hidden_chat_profiles">Скрытые профили чата</string>
+    <string name="error_updating_user_privacy">Ошибка при обновлении конфиденциальности</string>
+    <string name="v4_6_group_welcome_message">Приветственное сообщение группы</string>
+    <string name="hide_profile">Скрыть профиль</string>
+    <string name="user_mute">Без звука</string>
+    <string name="make_profile_private">Сделайте профиль конфиденциальным!</string>
+    <string name="v4_6_reduced_battery_usage_descr">Дополнительные улучшения скоро!</string>
+    <string name="v4_6_group_moderation_descr">Теперь админы могут:
+\n- удалять сообщения членов.
+\n- приостанавливать членов (роль \"наблюдатель\")</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Защитите Ваши профили чата паролем!</string>
+    <string name="user_unhide">Раскрыть</string>
+    <string name="v4_6_audio_video_calls_descr">Поддержка bluetooth и другие улучшения.</string>
+    <string name="save_welcome_message_question">Сохранить приветственное сообщение\?</string>
+    <string name="v4_6_group_welcome_message_descr">Установить сообщение для новых членов группы!</string>
+    <string name="tap_to_activate_profile">Нажмите, чтобы сделать профиль активным.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Благодаря пользователям – добавьте переводы через Weblate!</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Вы все равно получите звонки и уведомления в профилях без звука, когда они активные.</string>
+    <string name="you_can_hide_or_mute_user_profile">Вы можете скрыть профиль или выключить уведомления - подержите, чтобы увидеть меню.</string>
+    <string name="settings_send_files_via_xftp">Отправлять видео и файлы через XFTP</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">Изображение будет принято когда Ваш контакт его загрузит.</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Файл будет принят когда Ваш контакт загрузит его.</string>
+    <string name="database_upgrade">Обновление базы данных</string>
+    <string name="confirm_database_upgrades">Подтвердить обновление базы данных</string>
+    <string name="database_downgrade">Откат базы данных</string>
+    <string name="incompatible_database_version">Несовместимая версия базы данных</string>
+    <string name="invalid_migration_confirmation">Ошибка подтверждения миграции</string>
+    <string name="upgrade_and_open_chat">Обновить и открыть чат</string>
+    <string name="show_dev_options">Показать:</string>
+    <string name="database_migrations">Миграции: %s</string>
+    <string name="mtr_error_no_down_migration">версия базы данных новее чем приложения, но нет миграции для отката: %s</string>
+    <string name="mtr_error_different">разная миграция в приложении/базе данных: %s / %s</string>
+    <string name="downgrade_and_open_chat">Откатить версию и открыть чат</string>
+    <string name="database_downgrade_warning">Предупреждение: Вы можете потерять какие то данные!</string>
+    <string name="cancel_file__question">Прекратить передачу файла\?</string>
+    <string name="file_transfer_will_be_cancelled_warning">Передача файла будет прекращена. Если она в процессе, она будет остановлена.</string>
+    <string name="developer_options">ID базы данных и опция Отдельные транспортные сессии.</string>
+    <string name="show_developer_options">Показать опции для девелоперов</string>
+    <string name="delete_chat_profile">Удалить профиль чата</string>
+    <string name="delete_profile">Удалить профиль</string>
+    <string name="profile_password">Пароль профиля</string>
+    <string name="xftp_requires_v461">v4.6.1+ необходима для приема файлов через XFTP.</string>
+    <string name="videos_limit_title">Слишком много видео!</string>
+    <string name="icon_descr_video_asked_to_receive">Запросил прием видео</string>
+    <string name="video_descr">Видео</string>
+    <string name="icon_descr_video_snd_complete">Видео отправлено</string>
+    <string name="icon_descr_waiting_for_video">Ожидание видео</string>
+    <string name="waiting_for_video">Ожидание видео</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Видео будет получено когда Ваш контакт загрузит его.</string>
+    <string name="hide_dev_options">Скрыть:</string>
+    <string name="settings_section_title_experimenta">ЭКСПЕРИМЕНТАЛЬНЫЕ</string>
+    <string name="videos_limit_desc">Только 10 видео могут быть отправлены одновременно</string>
+    <string name="unhide_profile">Раскрыть профиль</string>
+    <string name="video_will_be_received_when_contact_is_online">Видео будет получено, когда Ваш контакт будет онлайн, пожалуйста, подождите или проверьте позже!</string>
+    <string name="unhide_chat_profile">Раскрыть профиль чата</string>
 </resources>

apps/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -9,9 +9,9 @@
     <string name="accept_contact_button">接受</string>
     <string name="accept_call_on_lock_screen">接受</string>
     <string name="accept_feature">接受</string>
-    <string name="chat_item_ttl_month">1月</string>
+    <string name="chat_item_ttl_month">1个月</string>
     <string name="chat_item_ttl_week">1周</string>
-    <string name="color_primary">强化</string>
+    <string name="color_primary">色调</string>
     <string name="callstatus_accepted">已接受通话</string>
     <string name="accept">接受</string>
     <string name="network_enable_socks_info">通过 SOCKS 代理访问服务器在端口9050？允许该选项前必须开始代理。</string>
@@ -38,7 +38,7 @@
     <string name="messages_section_title">消息</string>
     <string name="delete_messages_after">在此后删除消息</string>
     <string name="settings_section_title_messages">消息</string>
-    <string name="users_add">添加资料</string>
+    <string name="users_add">添加个人资料</string>
     <string name="users_delete_all_chats_deleted">所有聊天记录和消息将被删除——这一行为无法撤销！</string>
     <string name="clear_chat_warning">所有聊天记录和消息将被删除——这一行为无法撤销！只有您的消息会被删除。</string>
     <string name="allow_to_send_voice">允许发送语音消息。</string>
@@ -67,7 +67,7 @@
     <string name="connect_via_contact_link">通过联系人链接连接？</string>
     <string name="connect_via_group_link">通过群组链接连接？</string>
     <string name="connect_via_link_or_qr">通过群组链接/二维码连接</string>
-    <string name="connect_calls_via_relay">通过中继连接</string>
+    <string name="always_use_relay">通过中继连接</string>
     <string name="allow_your_contacts_irreversibly_delete">允许您的联系人不可撤回地删除已发送消息。</string>
     <string name="chat_preferences_contact_allows">联系人允许</string>
     <string name="allow_voice_messages_only_if">仅有您的联系人许可后才允许语音消息。</string>
@@ -99,7 +99,7 @@
     <string name="app_version_title">应用程序版本</string>
     <string name="full_backup">应用程序数据备份</string>
     <string name="settings_section_title_icon">应用程序图标</string>
-    <string name="incognito_random_profile_from_contact_description">一个随机资料将被发送到收到您链接的联系人那里</string>
+    <string name="incognito_random_profile_from_contact_description">随机配置文件将发送给您从中收到此链接的联系人</string>
     <string name="app_version_name">应用程序版本：v%s</string>
     <string name="notifications_mode_off_desc">仅在运行时应用程序可以接受通知，不会启动后台服务</string>
     <string name="incognito_random_profile_description">一个随机资料将发送给您的联系人</string>
@@ -112,7 +112,7 @@
     <string name="integrity_msg_bad_hash">错误消息散列</string>
     <string name="integrity_msg_bad_id">错误消息 ID</string>
     <string name="settings_audio_video_calls">语音和视频通话</string>
-    <string name="accept_automatically">自动地</string>
+    <string name="accept_automatically">自动</string>
     <string name="turning_off_service_and_periodic">激活电池优化，关闭了后台服务和新消息的定期请求。您可以通过设置重新启用它们。</string>
     <string name="notifications_mode_service_desc">后台服务一直在运行——一旦有消息，就会显示通知。</string>
     <string name="icon_descr_audio_off">关闭音频</string>
@@ -132,7 +132,7 @@
     <string name="it_can_disabled_via_settings_notifications_still_shown"><b> 可以通过设置禁用它 </b> - 应用程序运行时仍会显示通知。</string>
     <string name="onboarding_notifications_mode_service_desc"><b> 使用更多电池 </b>！后台服务一直在运行——一旦收到消息，就会显示通知。</string>
     <string name="impossible_to_recover_passphrase"><b>请注意</b>：如果您丢失密码，您将无法恢复或者更改密码。</string>
-    <string name="call_already_ended">通话已经结束！</string>
+    <string name="call_already_ended">通话已结束！</string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>扫描二维码</b> ：与向您展示二维码的联系人联系。</string>
     <string name="alert_title_cant_invite_contacts">无法邀请联系人！</string>
     <string name="invite_prohibited">无法邀请联系人！</string>
@@ -185,20 +185,20 @@
     <string name="incognito">隐身聊天</string>
     <string name="joining_group">加入群组</string>
     <string name="join_group_incognito_button">加入隐身聊天</string>
-    <string name="settings_section_title_incognito">隐身聊天模式</string>
-    <string name="group_unsupported_incognito_main_profile_sent">这里不支持隐身聊天模式——您的主要资料将被发送给群组成员</string>
+    <string name="settings_section_title_incognito">隐身模式</string>
+    <string name="group_unsupported_incognito_main_profile_sent">此处不支持隐身模式——您的主要个人资料将发送给群组成员</string>
     <string name="tap_to_start_new_chat">点击开始一个新聊天</string>
     <string name="incognito_random_profile">您的随机资料</string>
-    <string name="description_via_contact_address_link_incognito">通过联系人地址链接隐身聊天</string>
-    <string name="description_via_group_link_incognito">通过群组链接隐身聊天</string>
+    <string name="description_via_contact_address_link_incognito">通过联系地址链接隐身</string>
+    <string name="description_via_group_link_incognito">通过群组链接隐身</string>
     <string name="description_you_shared_one_time_link_incognito">您分享了一次性链接隐身聊天</string>
     <string name="group_invitation_tap_to_join_incognito">点击以加入隐身聊天</string>
     <string name="group_main_profile_sent">您的聊天资料将被发送给群组成员</string>
-    <string name="invite_prohibited_description">您正在尝试邀请与您共享隐身聊天资料的联系人加入您使用主要资料的群组</string>
-    <string name="incognito_info_protects">隐身聊天模式可以保护您的主要资料名和头像的隐私——为每个新联系人创建一个新的随机资料。</string>
-    <string name="alert_title_cant_invite_contacts_descr">您正在为该群组使用隐身聊天资料——为防止共享您的主要资料，邀请联系人是不允许的</string>
+    <string name="invite_prohibited_description">您正在尝试邀请与您共享隐身个人资料的联系人加入您使用主要个人资料的群组</string>
+    <string name="incognito_info_protects">隐身模式可以保护你的主要个人资料名称和图像的隐私——对于每个新的联系人，都会创建一个新的随机个人资料。</string>
+    <string name="alert_title_cant_invite_contacts_descr">您正在为该群组使用隐身个人资料——为防止共享您的主要个人资料，不允许邀请联系人</string>
     <string name="your_profile_will_be_sent">您的聊天资料将被发送给您的联系人</string>
-    <string name="description_via_one_time_link_incognito">通过一次性链接隐身聊天</string>
+    <string name="description_via_one_time_link_incognito">通过一次性链接隐身</string>
     <string name="only_group_owners_can_enable_voice">只有群主可以启用语音信息。</string>
     <string name="your_privacy">您的隐私设置</string>
     <string name="privacy_and_security">隐私和安全</string>
@@ -218,7 +218,7 @@
     <string name="passphrase_is_different">数据库密码不同于保存在密钥库中的密码。</string>
     <string name="database_encryption_will_be_updated">数据库加密密码将被更新并存储在密钥库中。</string>
     <string name="database_will_be_encrypted_and_passphrase_stored">数据库将被加密，密码存储在密钥库中。</string>
-    <string name="restore_passphrase_not_found_desc">在密匙库中没有找到密码，请手动输入。如果你使用备份工具恢复了应用程序的数据，可能会发生这种情况。如果不是这种情况，请联系开发者。</string>
+    <string name="restore_passphrase_not_found_desc">在密匙库中没有找到密码，请手动输入。如果您使用备份工具恢复了应用程序的数据，可能会发生这种情况。如果不是这种情况，请联系开发者。</string>
     <string name="remove_passphrase_from_keychain">从密钥库中删除密码？</string>
     <string name="save_passphrase_in_keychain">在密钥库中保存密码</string>
     <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> 服务</string>
@@ -234,7 +234,7 @@
     <string name="clear_chat_question">清除聊天记录？</string>
     <string name="chat_with_developers">与开发者聊天</string>
     <string name="clear_contacts_selection_button">清除</string>
-    <string name="colored">有色</string>
+    <string name="colored">彩色</string>
     <string name="callstate_connected">已连接</string>
     <string name="connect_button">连接</string>
     <string name="connect_via_link_verb">连接</string>
@@ -266,7 +266,7 @@
     <string name="error_deleting_pending_contact_connection">删除待定的联系人连接错误</string>
     <string name="error_receiving_file">接收文件错误</string>
     <string name="failed_to_active_user_title">切换资料错误！</string>
-    <string name="notification_preview_mode_hidden">已隐藏</string>
+    <string name="notification_preview_mode_hidden">隐藏</string>
     <string name="edit_verb">编辑</string>
     <string name="notification_display_mode_hidden_desc">隐藏联系人和消息</string>
     <string name="icon_descr_edited">已编辑</string>
@@ -335,7 +335,7 @@
     <string name="icon_descr_contact_checked">已检查联系人</string>
     <string name="notification_preview_somebody">联系人已隐藏：</string>
     <string name="alert_title_contact_connection_pending">联系人尚未连接！</string>
-    <string name="icon_descr_context">背景图标</string>
+    <string name="icon_descr_context">上下文图标</string>
     <string name="copied">复制到剪贴板</string>
     <string name="contact_connection_pending">连接中……</string>
     <string name="create_group_link">创建群组链接</string>
@@ -373,7 +373,7 @@
     <string name="group_member_status_group_deleted">群组已删除</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">将为所有成员删除群组——此操作无法撤消！</string>
     <string name="conn_level_desc_direct">直接</string>
-    <string name="direct_messages">私聊</string>
+    <string name="direct_messages">直接信息</string>
     <string name="feature_enabled">已启用</string>
     <string name="group_members_can_send_voice">群组成员可以发送语音消息。</string>
     <string name="v4_2_group_links">群组链接</string>
@@ -441,7 +441,7 @@
     <string name="enable_automatic_deletion_question">启用自动删除消息？</string>
     <string name="section_title_for_console">用于控制台</string>
     <string name="direct_messages_are_prohibited_in_chat">此群中禁止成员之间私聊。</string>
-    <string name="disappearing_messages_are_prohibited">此群组中禁止显示限时消息。</string>
+    <string name="disappearing_messages_are_prohibited">该组禁止限时消息。</string>
     <string name="group_members_can_delete">群组成员可以不可撤回地删除已发送的消息。</string>
     <string name="group_members_can_send_dms">群组成员可以私信。</string>
     <string name="v4_4_disappearing_messages">限时消息</string>
@@ -463,7 +463,7 @@
     <string name="info_row_local_name">本地名称</string>
     <string name="invalid_message_format">无效的消息格式</string>
     <string name="invalid_data">无效数据</string>
-    <string name="live">LIVE</string>
+    <string name="live">实时</string>
     <string name="display_name_invited_to_connect">已邀请连接</string>
     <string name="invalid_connection_link">无效的连接链接</string>
     <string name="italic">斜体</string>
@@ -510,7 +510,7 @@
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">只有客户端设备存储用户配置文件、联系人、群组和使用 <b>双层端到端加密 </b> 发送的消息。</string>
     <string name="video_call_no_encryption">视频通话（非端到端加密）</string>
     <string name="onboarding_notifications_mode_periodic">定期</string>
-    <string name="onboarding_notifications_mode_title">私人通知</string>
+    <string name="onboarding_notifications_mode_title">私密通知</string>
     <string name="onboarding_notifications_mode_off">应用程序运行时</string>
     <string name="status_no_e2e_encryption">无端到端加密</string>
     <string name="show_call_on_lock_screen">显示</string>
@@ -540,7 +540,7 @@
     <string name="notifications">通知</string>
     <string name="simplex_service_notification_text">正在接收消息……</string>
     <string name="enter_passphrase_notification_desc">要接收通知，请输入数据库密码</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">为了保护您的隐私，该应用程序没有推送通知，而是一个 <b><xliff:g id="appName">SimpleX</xliff:g> 后台服务 </b>——它每天使用百分之几的电池。</string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">为了保护您的隐私，该应用程序没有推送通知，而是具有 <b><xliff:g id="appName">SimpleX</xliff:g> 后台服务 </b>——它每天使用百分之几的电池。</string>
     <string name="your_settings">您的设置</string>
     <string name="turn_off_battery_optimization">为了使用它，请 <b>禁用电池优化</b>为<xliff:g id="appName">SimpleX</xliff:g>在下一个对话框。否则通知将被禁用。</string>
     <string name="settings_notification_preview_title">通知预览</string>
@@ -549,7 +549,7 @@
     <string name="notifications_mode_off">在应用程序打开时运行</string>
     <string name="settings_notification_preview_mode_title">显示预览</string>
     <string name="periodic_notifications_desc">该应用程序会定期获取新消息——它每天会消耗百分之几的电量。该应用程序不使用推送通知——您设备中的数据不会发送到服务器。</string>
-    <string name="v4_3_irreversible_message_deletion_desc">你的联系人可以允许完全删除消息。</string>
+    <string name="v4_3_irreversible_message_deletion_desc">您的联系人可以允许完全删除消息。</string>
     <string name="v4_4_disappearing_messages_desc">已发送的消息将在设定的时间后被删除。</string>
     <string name="your_chat_database">您的聊天数据库</string>
     <string name="wrong_passphrase_title">密码错误！</string>
@@ -576,7 +576,7 @@
     <string name="update_network_settings_confirmation">更新</string>
     <string name="open_simplex_chat_to_accept_call">打开 <xliff:g id="appNameFull">SimpleX Chat</xliff:g> 来接听电话</string>
     <string name="icon_descr_video_call">视频通话</string>
-    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> 想通过该方式与您联系</string>
+    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> 想通过以下方式与您联系</string>
     <string name="icon_descr_call_rejected">拒接来电</string>
     <string name="call_connection_peer_to_peer">点对点</string>
     <string name="error_with_info">错误：%s</string>
@@ -592,12 +592,11 @@
     <string name="your_chat_profiles">您的聊天资料</string>
     <string name="icon_descr_call_missed">未接来电</string>
     <string name="icon_descr_call_pending_sent">待定来电</string>
-    <string name="your_chat_profiles_stored_locally">您的聊天资料存储在本地，只在您的设备上</string>
     <string name="connection_error_auth_desc">除非您的联系人已删除此连接或此链接已被使用，否则它可能是一个错误——请报告。
 \n如果要连接，请让您的联系人创建另一个连接链接，并检查您的网络连接是否稳定。</string>
     <string name="you_are_already_connected_to_vName_via_this_link">您已经连接到 <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>。</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">您的聊天资料将被发送
-\n给你的联系人</string>
+\n给您的联系人</string>
     <string name="users_delete_with_connections">资料和服务器连接</string>
     <string name="update_network_settings_question">更新网络设置？</string>
     <string name="only_you_can_delete_messages">只有您可以不可撤回地删除消息（您的联系人可以将它们标记为删除）。</string>
@@ -615,7 +614,7 @@
     <string name="rcv_group_event_updated_group_profile">已更新的群组资料</string>
     <string name="rcv_group_event_member_deleted">已删除 <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="snd_group_event_member_deleted">您删除了 <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="profile_will_be_sent_to_contact_sending_link">您的资料将被发送到收到您链接的联系人那里。</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">您的个人资料将发送给您收到此链接的联系人。</string>
     <string name="trying_to_connect_to_server_to_receive_messages_with_error">正在尝试连接到用于从该联系人接收消息的服务器（错误：<xliff:g id="errorMsg">%1$s</xliff:g>）。</string>
     <string name="connected_to_server_to_receive_messages_from_contact">您已连接到用于接收该联系人消息的服务器。</string>
     <string name="description_you_shared_one_time_link">您分享了一次性链接</string>
@@ -628,7 +627,7 @@
 \n<xliff:g id="appName">SimpleX</xliff:g> 服务器无法看见您的资料。</string>
     <string name="your_profile_is_stored_on_your_device">您的资料、联系人和发送的消息存储在您的设备上。</string>
     <string name="profile_is_only_shared_with_your_contacts">该资料仅与您的联系人共享。</string>
-    <string name="chat_preferences_on">在</string>
+    <string name="chat_preferences_on">开启</string>
     <string name="delete_chat_profile_action_cannot_be_undone_warning">此操作无法撤消——您的个人资料、联系人、消息和文件将不可撤回地丢失。</string>
     <string name="messages_section_description">此设置适用于您当前聊天资料中的消息</string>
     <string name="database_restore_error">恢复数据库错误</string>
@@ -644,4 +643,419 @@
     <string name="v4_5_multiple_chat_profiles">多个聊天资料</string>
     <string name="database_initialization_error_desc">数据库不能正常工作。点击了解更多</string>
     <string name="message_delivery_error_title">消息传递错误</string>
+    <string name="ttl_hour">%d 小时</string>
+    <string name="ttl_hours">%d 小时</string>
+    <string name="ttl_month">%d 月</string>
+    <string name="ttl_sec">%d 秒</string>
+    <string name="how_simplex_works"><xliff:g id="appName">SimpleX</xliff:g> 是如何工作的</string>
+    <string name="ensure_ICE_server_address_are_correct_format_and_unique">确保 WebRTC ICE 服务器地址格式正确、每行分开且不重复。</string>
+    <string name="many_people_asked_how_can_it_deliver">许多人问：<i>如果<xliff:g id="appName">SimpleX</xliff:g>没有用户标识符，它是怎样传递信息的？</i></string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">确保 SMP 服务器地址格式正确、每行分开且不重复。</string>
+    <string name="markdown_help">Markdown 帮助</string>
+    <string name="mark_code_verified">标记为已验证</string>
+    <string name="make_private_connection">建立私密连接</string>
+    <string name="group_preview_join_as">以 %s 身份加入</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">如果您收到 <xliff:g id="appName">SimpleX Chat</xliff:g> 邀请链接，您可以在浏览器中打开它：</string>
+    <string name="mark_read">标记为已读</string>
+    <string name="mark_unread">标记为未读</string>
+    <string name="markdown_in_messages">在消息中使用 Markdown</string>
+    <string name="file_with_path">文件：%s</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">成员将被移出群组——此操作无法撤消！</string>
+    <string name="v4_5_message_draft">消息草稿</string>
+    <string name="thousand_abbreviation">k</string>
+    <string name="marked_deleted_description">标记为已删除</string>
+    <string name="ttl_week">%d 星期</string>
+    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">您将停止接收来自该群组的消息。聊天记录将被保留。</string>
+    <string name="group_member_role_member">成员</string>
+    <string name="member_info_section_title_member">成员</string>
+    <string name="ttl_weeks">%d 星期</string>
+    <string name="ttl_min">%d 分钟</string>
+    <string name="ttl_months">%d 月</string>
+    <string name="network_and_servers">网络和服务器</string>
+    <string name="network_settings_title">网络设置</string>
+    <string name="moderated_description">已被管理员移除</string>
+    <string name="network_use_onion_hosts_prefer_desc">Onion 主机将在可用时使用。</string>
+    <string name="network_use_onion_hosts_no_desc">将不会使用 Onion 主机。</string>
+    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 手机：点击<b>在手机应用程序中打开</b>，然后在应用程序中点击<b>连接</b>。</string>
+    <string name="delete_message_mark_deleted_warning">消息将被标记为删除。收件人将能够揭示此消息。</string>
+    <string name="v4_5_reduced_battery_usage_descr">更多改进即将推出！</string>
+    <string name="no_contacts_selected">未选择联系人</string>
+    <string name="one_time_link">一次性邀请链接</string>
+    <string name="feature_off">关闭</string>
+    <string name="network_use_onion_hosts_required_desc">连接需要 Onion 主机。</string>
+    <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion 主机将在可用时使用。</string>
+    <string name="chat_item_ttl_none">从不</string>
+    <string name="feature_offered_item">已提供 %s</string>
+    <string name="feature_offered_item_with_param">已提供 %s：%2s</string>
+    <string name="new_in_version">%s 中的新功能</string>
+    <string name="add_contact">一次性邀请链接</string>
+    <string name="ok">好的</string>
+    <string name="no_details">没有细节</string>
+    <string name="only_stored_on_members_devices">（仅由群组成员存储）</string>
+    <string name="only_you_can_send_voice">只有您可以发送语音消息。</string>
+    <string name="delete_message_cannot_be_undone_warning">消息将被删除——此操作无法撤消！</string>
+    <string name="images_limit_desc">一次只能发送10张图片</string>
+    <string name="icon_descr_more_button">更多</string>
+    <string name="new_database_archive">新数据库存档</string>
+    <string name="old_database_archive">旧数据库存档</string>
+    <string name="new_member_role">新成员角色</string>
+    <string name="no_contacts_to_add">没有联系人可添加</string>
+    <string name="network_status">网络状态</string>
+    <string name="chat_preferences_off">关闭</string>
+    <string name="network_use_onion_hosts_no_desc_in_alert">将不会使用 Onion 主机。</string>
+    <string name="network_use_onion_hosts_required_desc_in_alert">连接需要 Onion 主机。</string>
+    <string name="no_received_app_files">没有收到或发送的文件</string>
+    <string name="sender_cancelled_file_transfer">发送人已取消文件传输。</string>
+    <string name="share_verb">分享</string>
+    <string name="send_live_message">发送实时消息</string>
+    <string name="this_text_is_available_in_settings">此文本在设置中可用</string>
+    <string name="icon_descr_received_msg_status_unread">未读</string>
+    <string name="saved_ICE_servers_will_be_removed">保存的 WebRTC ICE 服务器将被删除。</string>
+    <string name="is_verified">%s 已验证</string>
+    <string name="smp_servers_use_server_for_new_conn">用于新连接</string>
+    <string name="network_disable_socks">使用直接互联网连接？</string>
+    <string name="network_use_onion_hosts_required">必须</string>
+    <string name="save_and_notify_contact">保存并通知联系人</string>
+    <string name="save_and_notify_contacts">保存并通知联系人</string>
+    <string name="read_more_in_github">在我们的 GitHub 仓库中阅读更多内容。</string>
+    <string name="reject">拒绝</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">为了保护隐私，而不是所有其他平台使用的用户 ID，<xliff:g id="appName">SimpleX</xliff:g> 具有消息队列的标识符，每个联系人都是分开的。</string>
+    <string name="network_option_tcp_connection_timeout">TCP 连接超时</string>
+    <string name="feature_received_prohibited">收到，禁止</string>
+    <string name="accept_feature_set_1_day">设定1天</string>
+    <string name="v4_2_security_assessment_desc">SimpleX Chat 安全性由 Trail of Bits 审核。</string>
+    <string name="simplex_link_mode_browser_warning">在浏览器中打开链接可能会降低连接的隐私和安全性。SimpleX 上不受信任的链接将显示为红色。</string>
+    <string name="restore_database_alert_desc">恢复数据库备份后请输入之前的密码。 此操作无法撤消。</string>
+    <string name="contact_developers">请更新应用程序并联系开发者。</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">开源协议和代码——任何人都可以运行服务器。</string>
+    <string name="paste_button">粘贴</string>
+    <string name="network_option_ping_count">PING 次数</string>
+    <string name="prohibit_sending_voice">禁止发送语音消息。</string>
+    <string name="network_option_ping_interval">PING 间隔</string>
+    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">请检查您使用的链接是否正确，或者让您的联系人给您发送另一个链接。</string>
+    <string name="network_option_protocol_timeout">协议超时</string>
+    <string name="reject_contact_button">拒绝</string>
+    <string name="reply_verb">回复</string>
+    <string name="network_options_reset_to_defaults">重置为默认</string>
+    <string name="run_chat_section">运行聊天程序</string>
+    <string name="save_archive">保存存档</string>
+    <string name="scan_code">扫码</string>
+    <string name="scan_code_from_contacts_app">从您联系人的应用程序中扫描安全码。</string>
+    <string name="security_code">安全码</string>
+    <string name="secret">秘密</string>
+    <string name="v4_2_security_assessment">安全评估</string>
+    <string name="ntf_channel_messages">SimpleX 消息</string>
+    <string name="is_not_verified">%s 未验证</string>
+    <string name="v4_5_italian_interface_descr">感谢用户——通过 Weblate 做出贡献！</string>
+    <string name="first_platform_without_user_ids">第一个没有任何用户标识符的平台——专为隐私保护设计。</string>
+    <string name="group_is_decentralized">该小组是完全分散式的——它只对成员可见。</string>
+    <string name="image_decoding_exception_desc">图像无法解码。 请尝试不同的图像或联系开发者。</string>
+    <string name="theme">主题</string>
+    <string name="delete_files_and_media_desc">此操作无法撤消——所有接收和发送的文件和媒体都将被删除。 低分辨率图片将保留。</string>
+    <string name="member_role_will_be_changed_with_invitation">角色将更改为“%s”。 该成员将收到新的邀请。</string>
+    <string name="enable_automatic_deletion_message">此操作无法撤消——早于所选的发送和接收的消息将被删除。 这可能需要几分钟时间。</string>
+    <string name="this_QR_code_is_not_a_link">此二维码不是链接！</string>
+    <string name="switch_receiving_address_desc">此功能是实验性的！ 它仅在其他客户端安装了 4.2 版时才有效。 地址更改完成后，您应该会在对话中看到该消息——请检查您是否仍能收到来自该联系人（或群组成员）的消息。</string>
+    <string name="this_link_is_not_a_valid_connection_link">此链接不是有效的连接链接！</string>
+    <string name="to_start_a_new_chat_help_header">开始新的聊天</string>
+    <string name="to_verify_compare">要与您的联系人验证端到端加密，请比较（或扫描）您设备上的代码。</string>
+    <string name="unmute_chat">取消静音</string>
+    <string name="update_onion_hosts_settings_question">更新 .onion 主机设置？</string>
+    <string name="update_network_session_mode_question">更新传输隔离模式？</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">（从剪贴板扫描或粘贴）</string>
+    <string name="smp_server_test_secure_queue">保护队列</string>
+    <string name="reveal_verb">揭示</string>
+    <string name="la_notice_turn_on">打开</string>
+    <string name="icon_descr_sent_msg_status_send_failed">发送失败</string>
+    <string name="icon_descr_sent_msg_status_unauthorized_send">未经授权发送</string>
+    <string name="images_limit_title">太多图片！</string>
+    <string name="icon_descr_server_status_pending">待办的</string>
+    <string name="switch_receiving_address_question">切换接收地址吗？</string>
+    <string name="ask_your_contact_to_enable_voice">请让您的联系人启用发送语音消息。</string>
+    <string name="icon_descr_record_voice_message">录制语音消息</string>
+    <string name="icon_descr_send_message">发消息</string>
+    <string name="reset_verb">重置</string>
+    <string name="send_verb">发送</string>
+    <string name="send_live_message_desc">发送实时消息——它会在您键入时为收件人更新</string>
+    <string name="add_contact_or_create_group">开始新聊天</string>
+    <string name="to_share_with_your_contact">（与您的联系人分享）</string>
+    <string name="to_connect_via_link_title">通过链接连接</string>
+    <string name="set_contact_name">设置联系人姓名</string>
+    <string name="connection_you_accepted_will_be_cancelled">您接受的连接将被取消！</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">您与之共享此链接的联系人将无法连接！</string>
+    <string name="show_QR_code">显示二维码</string>
+    <string name="chat_with_the_founder">发送问题和想法</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">保护您的隐私和安全的消息传递和应用程序平台。</string>
+    <string name="strikethrough">删去</string>
+    <string name="people_can_connect_only_via_links_you_share">人们只能通过您共享的链接与您建立联系。</string>
+    <string name="next_generation_of_private_messaging">下一代私密通讯软件</string>
+    <string name="paste_the_link_you_received">粘贴收到的链接</string>
+    <string name="alert_title_skipped_messages">已跳过消息</string>
+    <string name="settings_section_title_support">支持 SIMPLEX CHAT</string>
+    <string name="send_link_previews">发送链接预览</string>
+    <string name="settings_section_title_socks">SOCKS 代理</string>
+    <string name="stop_chat_question">停止聊天程序？</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">停止聊天以便导出、导入或删除聊天数据库。在聊天停止期间，您将无法收发消息。</string>
+    <string name="restore_database">恢复数据库备份</string>
+    <string name="restore_database_alert_title">恢复数据库备份？</string>
+    <string name="button_remove_member">删除成员</string>
+    <string name="button_send_direct_message">发送私信</string>
+    <string name="receiving_via">接收通过</string>
+    <string name="sending_via">发送通过</string>
+    <string name="conn_stats_section_title_servers">服务器</string>
+    <string name="switch_receiving_address">切换接收地址</string>
+    <string name="v4_5_message_draft_descr">保留最后的消息草稿及其附件。</string>
+    <string name="v4_5_private_filenames">私密文件名</string>
+    <string name="v4_4_french_interface_descr">感谢用户——通过 Weblate 做出贡献！</string>
+    <string name="v4_5_transport_isolation">传输隔离</string>
+    <string name="paste_connection_link_below_to_connect">将您收到的链接粘贴到下面的框中以与您的联系人联系。</string>
+    <string name="share_invitation_link">分享邀请链接</string>
+    <string name="this_string_is_not_a_connection_link">此字符串不是连接链接！</string>
+    <string name="send_us_an_email">给我们发电子邮件</string>
+    <string name="smp_servers">SMP 服务器</string>
+    <string name="sending_files_not_yet_supported">尚不支持发送文件</string>
+    <string name="trying_to_connect_to_server_to_receive_messages">正在尝试连接到用于从该联系人接收消息的服务器。</string>
+    <string name="receiving_files_not_yet_supported">尚不支持接收文件</string>
+    <string name="unknown_message_format">未知消息格式</string>
+    <string name="smp_servers_test_server">测试服务器</string>
+    <string name="smp_servers_test_servers">测试服务器</string>
+    <string name="simplex_link_contact">SimpleX 联系地址</string>
+    <string name="simplex_link_invitation">SimpleX 一次性邀请</string>
+    <string name="simplex_link_group">SimpleX 群组链接</string>
+    <string name="simplex_link_mode">SimpleX 链接</string>
+    <string name="sender_may_have_deleted_the_connection_request">发送人可能已删除连接请求。</string>
+    <string name="smp_servers_preset_server">预设服务器</string>
+    <string name="image_descr_qr_code">二维码</string>
+    <string name="network_session_mode_transport_isolation">传输隔离</string>
+    <string name="share_link">分享链接</string>
+    <string name="select_contacts">选择联系人</string>
+    <string name="skip_inviting_button">跳过邀请成员</string>
+    <string name="switch_verb">转变</string>
+    <string name="prohibit_sending_voice_messages">禁止发送语音消息。</string>
+    <string name="only_your_contact_can_send_voice">只有您的联系人可以发送语音消息。</string>
+    <string name="prohibit_direct_messages">禁止直接向成员发送私信。</string>
+    <string name="protect_app_screen">保护应用程序屏幕</string>
+    <string name="settings_section_title_themes">主题</string>
+    <string name="stop_chat_to_enable_database_actions">停止聊天以启用数据库操作。</string>
+    <string name="chat_item_ttl_seconds">%s 秒</string>
+    <string name="alert_message_no_group">该群组已不存在。</string>
+    <string name="group_invitation_tap_to_join">点击加入</string>
+    <string name="stop_chat_confirmation">停止</string>
+    <string name="restart_the_app_to_use_imported_chat_database">重新启动应用程序以使用导入的聊天数据库。</string>
+    <string name="group_member_role_owner">群主</string>
+    <string name="group_member_status_removed">已删除</string>
+    <string name="role_in_group">角色</string>
+    <string name="network_option_seconds_label">秒</string>
+    <string name="network_options_revert">恢复</string>
+    <string name="reset_color">重置颜色</string>
+    <string name="save_color">保存颜色</string>
+    <string name="v4_5_reduced_battery_usage">减少电池使用量</string>
+    <string name="v4_5_private_filenames_descr">为了保护时区，图像/语音文件使用 UTC。</string>
+    <string name="use_chat">使用聊天</string>
+    <string name="read_more_in_github_with_link">在我们的 <font color="#0088ff">GitHub 存储库</font> 中阅读更多内容。</string>
+    <string name="auth_open_chat_console">打开聊天控制台</string>
+    <string name="auth_stop_chat">Stop chat</string>
+    <string name="toast_permission_denied">权限被拒绝！</string>
+    <string name="chat_help_tap_button">点击按钮</string>
+    <string name="thank_you_for_installing_simplex">感谢您安装 <xliff:g id="appNameFull">SimpleX Chat</xliff:g>！</string>
+    <string name="use_camera_button">使用相机</string>
+    <string name="smp_servers_preset_address">预设服务器地址</string>
+    <string name="smp_servers_scan_qr">扫描服务器二维码</string>
+    <string name="smp_servers_test_failed">服务器测试失败！</string>
+    <string name="smp_servers_test_some_failed">一些服务器未通过测试：</string>
+    <string name="star_on_github">在 GitHub 上加星</string>
+    <string name="save_and_notify_group_members">保存并通知群组成员</string>
+    <string name="icon_descr_speaker_off">扬声器关闭</string>
+    <string name="icon_descr_speaker_on">扬声器开启</string>
+    <string name="rcv_group_event_user_deleted">已将您移除</string>
+    <string name="updating_settings_will_reconnect_client_to_all_servers">更新设置会将客户端重新连接到所有服务器。</string>
+    <string name="theme_system">系统</string>
+    <string name="v4_4_live_messages_desc">对方会在您键入时看到更新。</string>
+    <string name="view_security_code">查看安全码</string>
+    <string name="voice_message_with_duration">语音消息 (<xliff:g id="duration">%1$s</xliff:g>)</string>
+    <string name="waiting_for_image">等待图像中</string>
+    <string name="welcome">欢迎！</string>
+    <string name="personal_welcome">欢迎 <xliff:g>%1$s</xliff:g>！</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">当您的联系人设备在线时，您将可以连接，请稍等或稍后查看！</string>
+    <string name="rate_the_app">评价此应用程序</string>
+    <string name="network_enable_socks">使用 SOCKS 代理？</string>
+    <string name="network_socks_toggle">使用 SOCKS 代理（端口 9050）</string>
+    <string name="total_files_count_and_size">%d 个文件，总大小为 %s</string>
+    <string name="you_joined_this_group">您已加入此群组</string>
+    <string name="you_are_invited_to_group">您被邀请加入群组</string>
+    <string name="chat_preferences_default">默认（%s）</string>
+    <string name="voice_prohibited_in_this_chat">此聊天中禁止语音消息。</string>
+    <string name="voice_messages_are_prohibited">语音信息在该群组中被禁用。</string>
+    <string name="verify_security_code">验证安全码</string>
+    <string name="using_simplex_chat_servers">使用 <xliff:g id="appNameFull">SimpleX Chat</xliff:g> 服务器。</string>
+    <string name="simplex_link_connection">通过 <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
+    <string name="group_invitation_item_description">邀请至群组 <xliff:g id="group_name">%1$s</xliff:g></string>
+    <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> 地址</string>
+    <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> 团队</string>
+    <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> 成员</string>
+    <string name="chat_preferences_yes">是</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">您可以将您的地址作为链接或二维码共享——任何人都可以连接到您。 如果您以后删除它，您不会丢失您的联系人。</string>
+    <string name="you_control_servers_to_receive_your_contacts_to_send">您可以控制通过哪些服务器<b>接收</b>消息，您的联系人 - 您用来向他们发送消息的服务器。</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">您的联系人可以从应用程序中扫描二维码。</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">您将在组主设备上线时连接到该群组，请稍等或稍后再检查！</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">当您启动应用或在应用程序驻留后台超过30 秒后，您将需要进行身份验证。</string>
+    <string name="archive_created_on_ts">创建于 <xliff:g id="archive_ts">%1$s</xliff:g></string>
+    <string name="you_can_connect_to_simplex_chat_founder">您可以 <font color="#0088ff"> 连接到 <xliff:g id="appNameFull"> SimpleX Chat </xliff:g> 开发者提出任何问题并接收更新 </font>。</string>
+    <string name="you_accepted_connection">您已接受连接</string>
+    <string name="your_SMP_servers">您的 SMP 服务器</string>
+    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> 已跳过消息</string>
+    <string name="ttl_s">%ds</string>
+    <string name="whats_new">更新内容</string>
+    <string name="group_preview_you_are_invited">您被邀请加入群组</string>
+    <string name="you_have_no_chats">您没有聊天记录</string>
+    <string name="icon_descr_waiting_for_image">等待图像中</string>
+    <string name="voice_message">语音消息</string>
+    <string name="voice_messages_prohibited">语音消息禁止发送！</string>
+    <string name="you_need_to_allow_to_send_voice">您需要允许您的联系人发送语音消息才能发送它们。</string>
+    <string name="scan_QR_code">扫描二维码</string>
+    <string name="you_invited_your_contact">您邀请了您的联系人</string>
+    <string name="contact_wants_to_connect_with_you">想要与您连接！</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">您的联系人需要在线才能完成连接。
+\n您可以取消此连接并删除联系人（稍后尝试使用新链接）。</string>
+    <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> 标志</string>
+    <string name="your_simplex_contact_address">您的 <xliff:g id="appName">SimpleX</xliff:g> 联系地址</string>
+    <string name="install_simplex_chat_for_terminal">为终端安装 <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
+    <string name="use_simplex_chat_servers__question">使用 <xliff:g id="appNameFull">SimpleX Chat</xliff:g> 服务器？</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">我们不会在服务器上存储您的任何联系人或消息（一旦发送）。</string>
+    <string name="webrtc_ice_servers">WebRTC ICE 服务器</string>
+    <string name="relay_server_protects_ip">中继服务器保护您的 IP 地址，但它可以观察通话的持续时间。</string>
+    <string name="relay_server_if_necessary">中继服务器仅在必要时使用。其他人可能会观察到您的IP地址。</string>
+    <string name="your_ice_servers">您的 ICE 服务器</string>
+    <string name="icon_descr_video_off">视频关闭</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">您可以通过应用设置/数据库或重启应用开始聊天。</string>
+    <string name="snd_group_event_changed_member_role">您将 %s 的角色更改为 %s</string>
+    <string name="snd_group_event_changed_role_for_yourself">您将自己的角色更改为 %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">您已更改地址</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">您可以共享链接或二维码——任何人都可以加入该群组。如果您稍后将其删除，您不会失去该组的成员。</string>
+    <string name="conn_level_desc_indirect">间接（<xliff:g id="conn_level">%1$s</xliff:g>）</string>
+    <string name="you_can_also_connect_by_clicking_the_link">您也可以通过点击链接进行连接。 如果它在浏览器中打开，请单击<b>在移动应用程序中打开</b>按钮。</string>
+    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
+    <string name="you_will_join_group">您将加入此链接指向的群组并连接到其群组成员。</string>
+    <string name="description_via_group_link">通过群组链接</string>
+    <string name="description_via_one_time_link">通过一次性链接</string>
+    <string name="description_via_contact_address_link">通过联系地址链接</string>
+    <string name="simplex_link_mode_browser">通过浏览器</string>
+    <string name="smp_servers_your_server">您的服务器</string>
+    <string name="network_use_onion_hosts_prefer">当可用时</string>
+    <string name="network_use_onion_hosts">使用 .onion 主机</string>
+    <string name="your_ICE_servers">您的 ICE 服务器</string>
+    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="section_title_welcome_message">欢迎消息</string>
+    <string name="you_control_your_chat">您的聊天由您掌控！</string>
+    <string name="you_can_use_markdown_to_format_messages__prompt">您可以使用 markdown 来编排消息格式：</string>
+    <string name="ttl_h">%dh</string>
+    <string name="ttl_days">%d 天</string>
+    <string name="ttl_w">%dw</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">您被邀请加入群组。 加入以与群组成员联系。</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">你加入了这个群组。连接到邀请组成员。</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">您更改了 %s 的地址</string>
+    <string name="snd_group_event_user_left">您已离开</string>
+    <string name="num_contacts_selected">%d 已选择联系人</string>
+    <string name="chat_preferences_you_allow">您允许</string>
+    <string name="v4_2_auto_accept_contact_requests_desc">带有可选的欢迎消息。</string>
+    <string name="ttl_m">%dm</string>
+    <string name="ttl_mth">%dmth</string>
+    <string name="waiting_for_file">等待文件中</string>
+    <string name="contact_sent_large_file">您的联系人发送的文件大于当前支持的最大大小 (&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"maxFileSize\"&gt;%1$s&lt;/xliff :g&gt;).</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">当您的连接请求被接受后，您将可以连接，请稍等或稍后检查！</string>
+    <string name="smp_servers_use_server">使用服务器</string>
+    <string name="smp_servers_your_server_address">您的服务器地址</string>
+    <string name="icon_descr_video_on">视频开启</string>
+    <string name="v4_3_voice_messages_desc">最多 40 秒，立即收到。</string>
+    <string name="v4_4_verify_connection_security">验证连接安全</string>
+    <string name="moderated_item_description">由 %s 审核</string>
+    <string name="moderate_verb">管理员移除</string>
+    <string name="moderate_message_will_be_deleted_warning">将为所有成员删除该消息。</string>
+    <string name="moderate_message_will_be_marked_warning">该消息将对所有成员标记为已被管理员移除。</string>
+    <string name="delete_member_message__question">删除成员消息？</string>
+    <string name="group_member_role_observer">观察者</string>
+    <string name="you_are_observer">您是观察者</string>
+    <string name="error_updating_link_for_group">更新群组链接错误</string>
+    <string name="observer_cant_send_message_title">您无法发送消息！</string>
+    <string name="initial_member_role">初始角色</string>
+    <string name="observer_cant_send_message_desc">请联系群组管理员。</string>
+    <string name="language_system">系统</string>
+    <string name="password_to_show">用于显示的密码</string>
+    <string name="save_profile_password">保存个人资料密码</string>
+    <string name="button_add_welcome_message">添加欢迎消息</string>
+    <string name="user_hide">隐藏</string>
+    <string name="make_profile_private">将个人资料设置为私密！</string>
+    <string name="user_mute">静音</string>
+    <string name="save_and_update_group_profile">保存并更新组配置文件</string>
+    <string name="dont_show_again">不再显示</string>
+    <string name="muted_when_inactive">不活跃时静音！</string>
+    <string name="v4_6_audio_video_calls">语音和视频通话</string>
+    <string name="v4_6_chinese_spanish_interface">中文和西班牙文界面</string>
+    <string name="v4_6_reduced_battery_usage">进一步减少电池使用</string>
+    <string name="v4_6_reduced_battery_usage_descr">更多改进即将推出！</string>
+    <string name="v4_6_group_moderation_descr">现在管理员可以：
+\n- 删除成员的消息。
+\n- 禁用成员（“观察员”角色）</string>
+    <string name="v4_6_hidden_chat_profiles_descr">使用密码保护您的聊天资料！</string>
+    <string name="confirm_password">确认密码</string>
+    <string name="error_updating_user_privacy">更新用户隐私错误</string>
+    <string name="cant_delete_user_profile">无法删除用户资料！</string>
+    <string name="error_saving_user_password">保存用户密码错误</string>
+    <string name="enter_password_to_show">在搜索中输入密码</string>
+    <string name="v4_6_group_welcome_message">群组欢迎消息</string>
+    <string name="v4_6_group_moderation">群组管理员移除</string>
+    <string name="hidden_profile_password">隐藏的个人资料密码</string>
+    <string name="v4_6_hidden_chat_profiles">隐藏的聊天资料</string>
+    <string name="hide_profile">隐藏个人资料</string>
+    <string name="smp_save_servers_question">保存服务器？</string>
+    <string name="to_reveal_profile_enter_password">要显示您的隐藏的个人资料，请在您的聊天个人资料页面的搜索字段中输入完整密码。</string>
+    <string name="save_welcome_message_question">保存欢迎信息？</string>
+    <string name="tap_to_activate_profile">点击以激活个人资料。</string>
+    <string name="should_be_at_least_one_profile">应该至少有一个用户资料。</string>
+    <string name="user_unhide">取消隐藏</string>
+    <string name="v4_6_group_welcome_message_descr">设置向新成员显示的消息！</string>
+    <string name="v4_6_audio_video_calls_descr">支持蓝牙和其他改进。</string>
+    <string name="v4_6_chinese_spanish_interface_descr">感谢用户——通过 Weblate 做出贡献！</string>
+    <string name="should_be_at_least_one_visible_profile">应该至少有一个可见的用户资料。</string>
+    <string name="user_unmute">解除静音</string>
+    <string name="button_welcome_message">欢迎信息</string>
+    <string name="you_will_still_receive_calls_and_ntfs">当静音配置文件处于活动状态时，您仍会收到来自静音配置文件的电话和通知。</string>
+    <string name="you_can_hide_or_mute_user_profile">您可以隐藏或静音用户配置文件——长按以显示菜单。</string>
+    <string name="group_welcome_title">欢迎信息</string>
+    <string name="settings_send_files_via_xftp">通过 XFTP 发送视频和文件</string>
+    <string name="confirm_database_upgrades">确认数据库升级</string>
+    <string name="settings_section_title_experimenta">实验性</string>
+    <string name="database_upgrade">数据库升级</string>
+    <string name="mtr_error_different">应用程序/数据库中的不同迁移：%s / %s</string>
+    <string name="developer_options">数据库 ID 和传输隔离选项。</string>
+    <string name="database_downgrade">数据库降级</string>
+    <string name="mtr_error_no_down_migration">数据库版本比应用程序更新，但无法降级迁移：%s</string>
+    <string name="downgrade_and_open_chat">降级并打开聊天</string>
+    <string name="hide_dev_options">隐藏：</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">文件将在您的联系人完成上传后收到。</string>
+    <string name="incompatible_database_version">数据库版本不兼容</string>
+    <string name="database_migrations">迁移：%s</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">图片将在您的联系人完成上传后收到。</string>
+    <string name="show_developer_options">显示开发者选项</string>
+    <string name="xftp_requires_v461">通过 XFTP 接收需要 v4.6.1 以上版本。</string>
+    <string name="upgrade_and_open_chat">升级并打开聊天</string>
+    <string name="database_downgrade_warning">警告：您可能会丢失部分数据！</string>
+    <string name="invalid_migration_confirmation">迁移确认无效</string>
+    <string name="show_dev_options">显示：</string>
+    <string name="delete_profile">删除个人资料</string>
+    <string name="profile_password">个人资料密码</string>
+    <string name="unhide_chat_profile">取消隐藏聊天资料</string>
+    <string name="cancel_file__question">取消文件传输？</string>
+    <string name="delete_chat_profile">删除聊天资料</string>
+    <string name="unhide_profile">取消隐藏个人资料</string>
+    <string name="file_transfer_will_be_cancelled_warning">文件传输将被取消。文件传输将被终止如果它正在进行中。</string>
+    <string name="videos_limit_desc">同一时间只能发送10个视频</string>
+    <string name="videos_limit_title">过多视频！</string>
+    <string name="video_descr">视频</string>
+    <string name="icon_descr_waiting_for_video">等待视频中</string>
+    <string name="video_will_be_received_when_contact_is_online">视频将在您的联系人在线时收到，请稍等或稍后查看！</string>
+    <string name="waiting_for_video">等待视频中</string>
+    <string name="icon_descr_video_snd_complete">视频已发送</string>
+    <string name="icon_descr_video_asked_to_receive">要求接收视频</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">视频将在您的联系人完成上传后收到。</string>
 </resources>

apps/android/app/src/main/res/values/colors.xml

@@ -2,4 +2,6 @@
 <resources>
   <color name="black">#FF000000</color>
   <color name="white">#FFFFFFFF</color>
+  <color name="highOrLowLight">#8b8786</color>
+  <color name="window_background_dark">#121212</color>
 </resources>

apps/android/app/src/main/res/values/strings.xml

@@ -22,6 +22,7 @@
   <!-- Item Content - ChatModel.kt -->
   <string name="deleted_description">deleted</string>
   <string name="marked_deleted_description">marked deleted</string>
+  <string name="moderated_item_description">moderated by %s</string>
   <string name="sending_files_not_yet_supported">sending files is not supported yet</string>
   <string name="receiving_files_not_yet_supported">receiving files is not supported yet</string>
   <string name="sender_you_pronoun">you</string>
@@ -102,6 +103,7 @@
   <string name="smp_server_test_delete_queue">Delete queue</string>
   <string name="smp_server_test_disconnect">Disconnect</string>
   <string name="error_deleting_user">Error deleting user profile</string>
+  <string name="error_updating_user_privacy">Error updating user privacy</string>
 
   <!-- background service notice - SimpleXAPI.kt -->
   <string name="icon_descr_instant_notifications">Instant notifications</string>
@@ -182,9 +184,15 @@
   <string name="reveal_verb">Reveal</string>
   <string name="hide_verb">Hide</string>
   <string name="allow_verb">Allow</string>
+  <string name="moderate_verb">Moderate</string>
   <string name="delete_message__question">Delete message?</string>
   <string name="delete_message_cannot_be_undone_warning">Message will be deleted - this cannot be undone!</string>
   <string name="delete_message_mark_deleted_warning">Message will be marked for deletion. The recipient(s) will be able to reveal this message.</string>
+  <string name="delete_member_message__question">Delete member message?</string>
+  <string name="moderate_message_will_be_deleted_warning">The message will be deleted for all members.</string>
+  <string name="moderate_message_will_be_marked_warning">The message will be marked as moderated for all members.</string>
+  <string name="cancel_file__question">Cancel file transfer?</string>
+  <string name="file_transfer_will_be_cancelled_warning">File transfer will be cancelled. If it\'s in progress it will be stoppped.</string>
   <string name="for_me_only">Delete for me</string>
   <string name="for_everybody">For everyone</string>
 
@@ -219,9 +227,14 @@
   <string name="icon_descr_cancel_image_preview">Cancel image preview</string>
   <string name="icon_descr_cancel_file_preview">Cancel file preview</string>
   <string name="images_limit_title">Too many images!</string>
+  <string name="videos_limit_title">Too many videos!</string>
   <string name="images_limit_desc">Only 10 images can be sent at the same time</string>
+  <string name="videos_limit_desc">Only 10 videos can be sent at the same time</string>
   <string name="image_decoding_exception_title">Decoding error</string>
   <string name="image_decoding_exception_desc">The image cannot be decoded. Please, try a different image or contact developers.</string>
+  <string name="you_are_observer">you are observer</string>
+  <string name="observer_cant_send_message_title">You can\'t send messages!</string>
+  <string name="observer_cant_send_message_desc">Please contact group admin.</string>
 
   <!-- Images - chat.simplex.app.views.chat.item.CIImageView.kt -->
   <string name="image_descr">Image</string>
@@ -229,15 +242,26 @@
   <string name="icon_descr_asked_to_receive">Asked to receive the image</string>
   <string name="icon_descr_image_snd_complete">Image sent</string>
   <string name="waiting_for_image">Waiting for image</string>
+  <string name="image_will_be_received_when_contact_completes_uploading">Image will be received when your contact completes uploading it.</string>
   <string name="image_will_be_received_when_contact_is_online">Image will be received when your contact is online, please wait or check later!</string>
   <string name="image_saved">Image saved to Gallery</string>
 
+  <!-- Videos - chat.simplex.app.views.chat.item.CIVideoView.kt -->
+  <string name="video_descr">Video</string>
+  <string name="icon_descr_waiting_for_video">Waiting for video</string>
+  <string name="icon_descr_video_asked_to_receive">Asked to receive the video</string>
+  <string name="icon_descr_video_snd_complete">Video sent</string>
+  <string name="waiting_for_video">Waiting for video</string>
+  <string name="video_will_be_received_when_contact_completes_uploading">Video will be received when your contact completes uploading it.</string>
+  <string name="video_will_be_received_when_contact_is_online">Video will be received when your contact is online, please wait or check later!</string>
+
   <!-- Files - CIFileView.kt -->
   <string name="icon_descr_file">File</string>
   <string name="large_file">Large file!</string>
   <string name="contact_sent_large_file">Your contact sent a file that is larger than currently supported maximum size (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
   <string name="maximum_supported_file_size">Currently maximum supported file size is <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
   <string name="waiting_for_file">Waiting for file</string>
+  <string name="file_will_be_received_when_contact_completes_uploading">File will be received when your contact completes uploading it.</string>
   <string name="file_will_be_received_when_contact_is_online">File will be received when your contact is online, please wait or check later!</string>
   <string name="file_saved">File saved</string>
   <string name="file_not_found">File not found</string>
@@ -451,6 +475,7 @@
   <string name="smp_servers_check_address">Check server address and try again.</string>
   <string name="smp_servers_delete_server">Delete server</string>
   <string name="smp_servers_per_user">The servers for new connections of your current chat profile</string>
+  <string name="smp_save_servers_question">Save servers?</string>
   <string name="install_simplex_chat_for_terminal">Install <xliff:g id="appNameFull">SimpleX Chat</xliff:g> for terminal</string>
   <string name="star_on_github">Star on GitHub</string>
   <string name="contribute">Contribute</string>
@@ -499,6 +524,10 @@
   <string name="core_version">Core version: v%s</string>
   <string name="core_build_timestamp">Core built at: %s</string>
   <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+  <string name="show_dev_options">Show:</string>
+  <string name="hide_dev_options">Hide:</string>
+  <string name="show_developer_options">Show developer options</string>
+  <string name="developer_options">Database IDs and Transport isolation option.</string>
 
   <!-- Address Items - UserAddressView.kt -->
   <string name="create_address">Create address</string>
@@ -527,6 +556,16 @@
   <string name="save_and_notify_group_members">Save and notify group members</string>
   <string name="exit_without_saving">Exit without saving</string>
 
+
+  <!-- HiddenProfileView.kt -->
+  <string name="hide_profile">Hide profile</string>
+  <string name="password_to_show">Password to show</string>
+  <string name="save_profile_password">Save profile password</string>
+  <string name="hidden_profile_password">Hidden profile password</string>
+  <string name="confirm_password">Confirm password</string>
+  <string name="to_reveal_profile_enter_password">To reveal your hidden profile, enter a full password into a search field in "Your chat profiles" page.</string>
+  <string name="error_saving_user_password">Error saving user password</string>
+
   <!-- Welcome Prompts - WelcomeView.kt -->
   <string name="you_control_your_chat">You control your chat!</string>
   <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">The messaging and application platform protecting your privacy and security.</string>
@@ -623,13 +662,15 @@
   <!-- Call settings -->
   <string name="settings_audio_video_calls">Audio &amp; video calls</string>
   <string name="your_calls">Your calls</string>
-  <string name="connect_calls_via_relay">Connect via relay</string>
+  <string name="always_use_relay">Always use relay</string>
   <string name="call_on_lock_screen">Calls on lock screen:</string>
   <string name="accept_call_on_lock_screen">Accept</string>
   <string name="show_call_on_lock_screen">Show</string>
   <string name="no_call_on_lock_screen">Disable</string>
   <string name="your_ice_servers">Your ICE servers</string>
   <string name="webrtc_ice_servers">WebRTC ICE servers</string>
+  <string name="relay_server_protects_ip">Relay server protects your IP address, but it can observe the duration of the call.</string>
+  <string name="relay_server_if_necessary">Relay server is only used if necessary. Another party can observe your IP address.</string>
 
   <!-- Call Lock Screen -->
   <string name="open_simplex_chat_to_accept_call">Open <xliff:g id="appNameFull">SimpleX Chat</xliff:g> to accept call</string>
@@ -688,11 +729,15 @@
   <string name="settings_developer_tools">Developer tools</string>
   <string name="settings_experimental_features">Experimental features</string>
   <string name="settings_section_title_socks">SOCKS PROXY</string>
+  <string name="settings_section_title_language" translatable="false">LANGUAGE</string>
   <string name="settings_section_title_icon">APP ICON</string>
   <string name="settings_section_title_themes">THEMES</string>
   <string name="settings_section_title_messages">MESSAGES</string>
   <string name="settings_section_title_calls">CALLS</string>
   <string name="settings_section_title_incognito">Incognito mode</string>
+  <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
+  <string name="settings_send_files_via_xftp">Send videos and files via XFTP</string>
+  <string name="xftp_requires_v461">v4.6.1+ is required to receive via XFTP.</string>
 
   <!-- DatabaseView.kt -->
   <string name="your_chat_database">Your chat database</string>
@@ -800,6 +845,17 @@
   <string name="restore_database_alert_confirm">Restore</string>
   <string name="database_restore_error">Restore database error</string>
   <string name="restore_passphrase_not_found_desc">Passphrase not found in Keystore, please enter it manually. This may have happened if you restored the app\'s data using a backup tool. If it\'s not the case, please, contact developers.</string>
+  <string name="database_upgrade">Database upgrade</string>
+  <string name="database_downgrade">Database downgrade</string>
+  <string name="incompatible_database_version">Incompatible database version</string>
+  <string name="confirm_database_upgrades">Confirm database upgrades</string>
+  <string name="invalid_migration_confirmation">Invalid migration confirmation</string>
+  <string name="upgrade_and_open_chat">Upgrade and open chat</string>
+  <string name="downgrade_and_open_chat">Downgrade and open chat</string>
+  <string name="mtr_error_no_down_migration">database version is newer than the app, but no down migration for: %s</string>
+  <string name="mtr_error_different">different migration in the app/database: %s / %s</string>
+  <string name="database_migrations">Migrations: %s</string>
+  <string name="database_downgrade_warning">Warning: you may lose some data!</string>
 
   <!-- ChatModel.chatRunning interactions -->
   <string name="chat_is_stopped_indication">Chat is stopped</string>
@@ -868,6 +924,7 @@
   <string name="snd_conn_event_switch_queue_phase_changing">changing address…</string>
 
   <!-- GroupMemberRole -->
+  <string name="group_member_role_observer">observer</string>
   <string name="group_member_role_member">member</string>
   <string name="group_member_role_admin">admin</string>
   <string name="group_member_role_owner">owner</string>
@@ -890,13 +947,14 @@
   <!-- AddGroupMembersView.kt -->
   <string name="no_contacts_to_add">No contacts to add</string>
   <string name="new_member_role">New member role</string>
+  <string name="initial_member_role">Initial role</string>
   <string name="icon_descr_expand_role">Expand role selection</string>
   <string name="invite_to_group_button">Invite to group</string>
   <string name="skip_inviting_button">Skip inviting members</string>
   <string name="select_contacts">Select contacts</string>
   <string name="icon_descr_contact_checked">Contact checked</string>
   <string name="clear_contacts_selection_button">Clear</string>
-  <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> contact(s) selected</string>
+  <string name="num_contacts_selected">%d contact(s) selected</string>
   <string name="no_contacts_selected">No contacts selected</string>
   <string name="invite_prohibited">Can\'t invite contact!</string>
   <string name="invite_prohibited_description">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</string>
@@ -911,6 +969,8 @@
   <string name="delete_group_for_self_cannot_undo_warning">Group will be deleted for you - this cannot be undone!</string>
   <string name="button_leave_group">Leave group</string>
   <string name="button_edit_group_profile">Edit group profile</string>
+  <string name="button_add_welcome_message">Add welcome message</string>
+  <string name="button_welcome_message">Welcome message</string>
   <string name="group_link">Group link</string>
   <string name="create_group_link">Create group link</string>
   <string name="button_create_group_link">Create link</string>
@@ -919,6 +979,7 @@
   <string name="you_can_share_group_link_anybody_will_be_able_to_connect">You can share a link or a QR code - anybody will be able to join the group. You won\'t lose members of the group if you later delete it.</string>
   <string name="all_group_members_will_remain_connected">All group members will remain connected.</string>
   <string name="error_creating_link_for_group">Error creating group link</string>
+  <string name="error_updating_link_for_group">Error updating group link</string>
   <string name="error_deleting_link_for_group">Error deleting group link</string>
   <string name="only_group_owners_can_change_prefs">Only group owners can change group preferences.</string>
 
@@ -947,6 +1008,11 @@
   <string name="conn_level_desc_direct">direct</string>
   <string name="conn_level_desc_indirect">indirect (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
 
+  <!-- GroupWelcomeView.kt -->
+  <string name="group_welcome_title">Welcome message</string>
+  <string name="save_welcome_message_question">Save welcome message?</string>
+  <string name="save_and_update_group_profile">Save and update group profile</string>
+
   <!-- ConnectionStats -->
   <string name="conn_stats_section_title_servers">SERVERS</string>
   <string name="receiving_via">Receiving via</string>
@@ -983,13 +1049,31 @@
   <string name="update_network_settings_confirmation">Update</string>
 
   <!-- UserProfilesView.kt -->
-  <string name="your_chat_profiles_stored_locally">Your chat profiles are stored locally, only on your device</string>
   <string name="users_add">Add profile</string>
   <string name="users_delete_question">Delete chat profile?</string>
   <string name="users_delete_all_chats_deleted">All chats and messages will be deleted - this cannot be undone!</string>
   <string name="users_delete_profile_for">Delete chat profile for</string>
   <string name="users_delete_with_connections">Profile and server connections</string>
   <string name="users_delete_data_only">Local profile data only</string>
+  <string name="user_hide">Hide</string>
+  <string name="user_unhide">Unhide</string>
+  <string name="user_mute">Mute</string>
+  <string name="user_unmute">Unmute</string>
+  <string name="enter_password_to_show">Enter password in search</string>
+  <string name="tap_to_activate_profile">Tap to activate profile.</string>
+  <string name="cant_delete_user_profile">Can\'t delete user profile!</string>
+  <string name="should_be_at_least_one_visible_profile">There should be at least one visible user profile.</string>
+  <string name="should_be_at_least_one_profile">There should be at least one user profile.</string>
+  <string name="make_profile_private">Make profile private!</string>
+  <string name="you_can_hide_or_mute_user_profile">You can hide or mute a user profile - hold it for the menu.</string>
+  <string name="dont_show_again">Don\'t show again</string>
+  <string name="muted_when_inactive">Muted when inactive!</string>
+  <string name="you_will_still_receive_calls_and_ntfs">You will still receive calls and notifications from muted profiles when they are active.</string>
+  <string name="delete_profile">Delete profile</string>
+  <string name="delete_chat_profile">Delete chat profile</string>
+  <string name="unhide_profile">Unhide profile</string>
+  <string name="unhide_chat_profile">Unhide chat profile</string>
+  <string name="profile_password">Profile password</string>
 
   <!-- Incognito mode -->
   <string name="incognito">Incognito</string>
@@ -1007,6 +1091,9 @@
   <string name="theme_light">Light</string>
   <string name="theme_dark">Dark</string>
 
+  <!-- Languages -->
+  <string name="language_system">System</string>
+
   <!-- Appearance.kt -->
   <string name="theme">Theme</string>
   <string name="save_color">Save color</string>
@@ -1133,4 +1220,16 @@
   <string name="v4_5_reduced_battery_usage_descr">More improvements are coming soon!</string>
   <string name="v4_5_italian_interface">Italian interface</string>
   <string name="v4_5_italian_interface_descr">Thanks to the users – contribute via Weblate!</string>
+  <string name="v4_6_hidden_chat_profiles">Hidden chat profiles</string>
+  <string name="v4_6_hidden_chat_profiles_descr">Protect your chat profiles with a password!</string>
+  <string name="v4_6_audio_video_calls">Audio and video calls</string>
+  <string name="v4_6_audio_video_calls_descr">Support bluetooth and other improvements.</string>
+  <string name="v4_6_group_moderation">Group moderation</string>
+  <string name="v4_6_group_moderation_descr">Now admins can:\n- delete members\' messages.\n- disable members (\"observer\" role)</string>
+  <string name="v4_6_group_welcome_message">Group welcome message</string>
+  <string name="v4_6_group_welcome_message_descr">Set the message shown to new members!</string>
+  <string name="v4_6_reduced_battery_usage">Further reduced battery usage</string>
+  <string name="v4_6_reduced_battery_usage_descr">More improvements are coming soon!</string>
+  <string name="v4_6_chinese_spanish_interface">Chinese and Spanish interface</string>
+  <string name="v4_6_chinese_spanish_interface_descr">Thanks to the users – contribute via Weblate!</string>
 </resources>

apps/android/app/src/main/res/xml/locales_config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+  <locale android:name="en"/>
+  <locale android:name="ru"/>
+  <locale android:name="de"/>
+  <locale android:name="fr"/>
+  <locale android:name="it"/>
+  <locale android:name="nl"/>
+  <locale android:name="cs"/>
+  <locale android:name="zh-CN"/>
+</locale-config>

apps/android/build.gradle

@@ -8,6 +8,7 @@ buildscript {
         compose_version = localProperties['compose_version'] ?: '1.2.0-beta02'
         kotlin_version = localProperties['kotlin_version'] ?: '1.6.21'
         gradle_plugin_version = localProperties['gradle_plugin_version'] ?: '7.2.0'
+        abi_filter = localProperties['abi_filter'] ?: 'arm64-v8a'
 
         // Name that will be shown for debug build. By default it is from strings
         app_name = localProperties['app_name'] ?: "@string/app_name"

apps/ios/Shared/Assets.xcassets/icon-transparent.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "60.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

apps/ios/Shared/ContentView.swift

@@ -6,14 +6,18 @@
 //
 
 import SwiftUI
+import Intents
 import SimpleXChat
 
 struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
+    @Environment(\.colorScheme) var colorScheme
     @Binding var doAuthenticate: Bool
     @Binding var userAuthorized: Bool?
+    @Binding var canConnectCall: Bool
+    @Binding var lastSuccessfulUnlock: TimeInterval?
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -23,41 +27,64 @@ struct ContentView: View {
 
     var body: some View {
         ZStack {
-            if prefPerformLA && userAuthorized != true {
-                Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
-            } else if let status = chatModel.chatDbStatus, status != .ok {
-                DatabaseErrorView(status: status)
-            } else if !chatModel.v3DBMigration.startChat {
-                MigrateToAppGroupView()
-            } else if let step = chatModel.onboardingStage  {
-                if case .onboardingComplete = step,
-                   chatModel.currentUser != nil {
-                    mainView().privacySensitive(protectScreen)
-                } else {
-                    OnboardingView(onboarding: step)
-                }
+            contentView()
+            if chatModel.showCallView, let call = chatModel.activeCall {
+                callView(call)
             }
         }
         .onAppear {
-            if doAuthenticate { runAuthenticate() }
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
         }
-        .onChange(of: doAuthenticate) { _ in if doAuthenticate { runAuthenticate() } }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
     }
 
+    @ViewBuilder private func contentView() -> some View {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
+            DatabaseErrorView(status: status)
+        } else if !chatModel.v3DBMigration.startChat {
+            MigrateToAppGroupView()
+        } else if let step = chatModel.onboardingStage {
+            if case .onboardingComplete = step,
+               chatModel.currentUser != nil {
+                mainView()
+            } else {
+                OnboardingView(onboarding: step)
+            }
+        }
+    }
+
+    @ViewBuilder private func callView(_ call: Call) -> some View {
+        if CallController.useCallKit() {
+            ActiveCallView(call: call, canConnectCall: Binding.constant(true))
+                .onDisappear {
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
+                }
+        } else {
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
+            if prefPerformLA && userAuthorized != true {
+                Rectangle()
+                    .fill(colorScheme == .dark ? .black : .white)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                lockButton()
+            }
+        }
+    }
+
+    private func lockButton() -> some View {
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
+    }
+
     private func mainView() -> some View {
         ZStack(alignment: .top) {
-            ChatListView()
+            ChatListView().privacySensitive(protectScreen)
             .onAppear {
-                NtfManager.shared.requestAuthorization(
-                    onDeny: {
-                        if (!notificationAlertShown) {
-                            notificationAlertShown = true
-                            alertManager.showAlert(notificationAlert())
-                        }
-                    },
-                    onAuthorized: { notificationAlertShown = false }
-                )
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
                 if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
@@ -74,11 +101,42 @@ struct ContentView: View {
             .sheet(isPresented: $showWhatsNew) {
                 WhatsNewView()
             }
-            if chatModel.showCallView, let call = chatModel.activeCall {
-                ActiveCallView(call: call)
-            }
             IncomingCallView()
         }
+        .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
+        .onContinueUserActivity("INStartAudioCallIntent", perform: processUserActivity)
+        .onContinueUserActivity("INStartVideoCallIntent", perform: processUserActivity)
+    }
+
+    private func processUserActivity(_ activity: NSUserActivity) {
+        let intent = activity.interaction?.intent
+        if let intent = intent as? INStartCallIntent {
+            callToRecentContact(intent.contacts, intent.callCapability == .videoCall ? .video : .audio)
+        } else if let intent = intent as? INStartAudioCallIntent {
+            callToRecentContact(intent.contacts, .audio)
+        } else if let intent = intent as? INStartVideoCallIntent {
+            callToRecentContact(intent.contacts, .video)
+        }
+    }
+
+    private func callToRecentContact(_ contacts: [INPerson]?, _ mediaType: CallMediaType) {
+        logger.debug("callToRecentContact")
+        if let contactId = contacts?.first?.personHandle?.value,
+           let chat = chatModel.getChat(contactId),
+           case let .direct(contact) = chat.chatInfo {
+            logger.debug("callToRecentContact: schedule call")
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                CallController.shared.startCall(contact, mediaType)
+            }
+        }
+    }
+
+    private func initAuthenticate() {
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
+        }
     }
 
     private func runAuthenticate() {
@@ -98,16 +156,31 @@ struct ContentView: View {
             switch (laResult) {
             case .success:
                 userAuthorized = true
+                canConnectCall = true
+                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
             case .failed:
                 break
             case .unavailable:
                 userAuthorized = true
                 prefPerformLA = false
+                canConnectCall = true
                 AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
 
+    func requestNtfAuthorization() {
+        NtfManager.shared.requestAuthorization(
+            onDeny: {
+                if (!notificationAlertShown) {
+                    notificationAlertShown = true
+                    alertManager.showAlert(notificationAlert())
+                }
+            },
+            onAuthorized: { notificationAlertShown = false }
+        )
+    }
+
     func laNoticeAlert() -> Alert {
         Alert(
             title: Text("SimpleX Lock"),

apps/ios/Shared/MediaEncryption.playground/Contents.swift

@@ -0,0 +1,78 @@
+import UIKit
+import SimpleXChat
+
+hs_init(0, nil)
+
+let totalBytes = 20
+let ivTagBytes = 28
+var base: UnsafeMutableRawPointer = malloc(totalBytes)
+
+let assume = base.assumingMemoryBound(to: UInt8.self)
+assume[0] = 0 // key frame
+for i in 1..<totalBytes {
+    assume[i] = UInt8(i)
+}
+let unencrypted = NSData(bytesNoCopy: base, length: totalBytes)
+let aesKey = "PI-bV-FTgRqZM_lsDH9T21a0yRVMsvLFmvilJ9Ssk3g="
+
+if var key: [CChar] = aesKey.cString(using: .utf8),
+   let pointer: UnsafeMutableRawPointer = malloc(unencrypted.count + ivTagBytes) {
+    debugPrint("AesKey \(aesKey), cString \(key)")
+    memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
+    let source_ = Data(bytes: pointer, count: unencrypted.count)
+    //let raw: UInt8 = (unencrypted[0] as UInt8) | ((unencrypted[1] as UInt8) << 8) | ((unencrypted[2] as UInt8) << 16)
+    let isKeyFrame = unencrypted[0] & 1 == 0
+    debugPrint("Is key frame \(isKeyFrame)")
+    let clearTextBytesSize = isKeyFrame ? 10 : 3
+    for i in 0..<48 {
+        debugPrint("Before \(i)  \(unencrypted[i])")
+    }
+    if let res = chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + ivTagBytes - clearTextBytesSize)) {
+        printError("encrypt", res)
+    }
+    for i in 0..<48 {
+        debugPrint("After \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+    }
+    let res_ = Data(bytes: pointer, count: unencrypted.count + ivTagBytes)
+    print(source_ == res_)
+
+
+
+//    let encryptedBytes = [1,   1,   2,   3,   4,   5,   6,   7,   8,   9,
+//                     250, 245, 192, 217, 164, 251,  23,  40,  36, 214,
+//                      84,  55, 114, 237, 153, 113, 182, 123, 214, 189,
+//                      35, 196, 148, 164, 235, 195, 122, 157, 141, 235,
+//                       5,  92,  44,  35,  37, 244,  90, 254]
+//    var base1: UnsafeMutableRawPointer = malloc(totalBytes + ivTagBytes)
+//
+//    let assume1 = base1.assumingMemoryBound(to: UInt8.self)
+//    for i in 0..<(totalBytes + ivTagBytes) {
+//        assume1[i] = UInt8(encryptedBytes[i])
+//    }
+//    let encrypted = NSData(bytesNoCopy: base1, length: totalBytes + ivTagBytes)
+//    memcpy(pointer, (encrypted as NSData).bytes, encrypted.count)
+//    for i in 0..<48 {
+//        debugPrint("Before decrypt \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+//    }
+
+
+    if let res = chat_decrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + ivTagBytes - clearTextBytesSize)) {
+        printError("decrypt", res)
+    }
+
+
+    let decrypted_ = Data(bytes: pointer, count: unencrypted.count)
+    for i in 0..<48 {
+        debugPrint("After decrypt \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+    }
+    print(source_ == decrypted_)
+}
+
+func printError(_ op: String, _ res: UnsafeMutablePointer<CChar>) {
+    let err = fromCString(res)
+    if err == "" {
+        print("\(op) ok")
+    } else {
+        print("\(op) error: \(err)")
+    }
+}

apps/ios/Shared/MediaEncryption.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' buildActiveScheme='true' importAppTypes='true'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

apps/ios/Shared/MediaEncryption.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Encryption.playground">
+   </FileRef>
+</Workspace>

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -40,7 +40,8 @@ class AudioRecorder {
                 AVEncoderBitRateKey: 12000,
                 AVNumberOfChannelsKey: 1
             ]
-            audioRecorder = try AVAudioRecorder(url: getAppFilePath(fileName), settings: settings)
+            let url = getAppFilePath(fileName)
+            audioRecorder = try AVAudioRecorder(url: url, settings: settings)
             audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
 
             await MainActor.run {
@@ -102,7 +103,8 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     }
 
     func start(fileName: String) {
-        audioPlayer = try? AVAudioPlayer(contentsOf: getAppFilePath(fileName))
+        let url = getAppFilePath(fileName)
+        audioPlayer = try? AVAudioPlayer(contentsOf: url)
         audioPlayer?.delegate = self
         audioPlayer?.prepareToPlay()
         audioPlayer?.play()

apps/ios/Shared/Model/ChatModel.swift

@@ -9,7 +9,6 @@
 import Foundation
 import Combine
 import SwiftUI
-import WebKit
 import SimpleXChat
 
 final class ChatModel: ObservableObject {
@@ -34,8 +33,6 @@ final class ChatModel: ObservableObject {
     // items in the terminal view
     @Published var terminalItems: [TerminalItem] = []
     @Published var userAddress: UserContactLink?
-    @Published var userSMPServers: [ServerCfg]?
-    @Published var presetSMPServers: [String]?
     @Published var chatItemTTL: ChatItemTTL = .none
     @Published var appOpenUrl: URL?
     @Published var deviceToken: DeviceToken?
@@ -56,19 +53,43 @@ final class ChatModel: ObservableObject {
     // currently showing QR code
     @Published var connReqInv: String?
     // audio recording and playback
-    @Published var stopPreviousRecPlay: Bool = false // value is not taken into account, only the fact it switches
+    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
-    var callWebView: WKWebView?
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
-    var filesToDelete: [String] = []
+    var filesToDelete: Set<URL> = []
 
     static let shared = ChatModel()
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
+    func getUser(_ userId: Int64) -> User? {
+        currentUser?.userId == userId
+        ? currentUser
+        : users.first { $0.user.userId == userId }?.user
+    }
+
+    func getUserIndex(_ user: User) -> Int? {
+        users.firstIndex { $0.user.userId == user.userId }
+    }
+
+    func updateUser(_ user: User) {
+        if let i = getUserIndex(user) {
+            users[i].user = user
+        }
+        if currentUser?.userId == user.userId {
+            currentUser = user
+        }
+    }
+
+    func removeUser(_ user: User) {
+        if let i = getUserIndex(user), users[i].user.userId != currentUser?.userId {
+            users.remove(at: i)
+        }
+    }
+
     func hasChat(_ id: String) -> Bool {
         chats.first(where: { $0.id == id }) != nil
     }
@@ -358,7 +379,7 @@ final class ChatModel: ObservableObject {
             markChatItemsRead(cInfo)
         }
     }
-   
+
     func markChatUnread(_ cInfo: ChatInfo, unreadChat: Bool = true) {
         _updateChat(cInfo.id) { chat in
             chat.chatStats.unreadChat = unreadChat
@@ -545,6 +566,25 @@ final class Chat: ObservableObject, Identifiable {
         self.chatStats = chatStats
     }
 
+    var userCanSend: Bool {
+        switch chatInfo {
+        case .direct: return true
+        case let .group(groupInfo):
+            let m = groupInfo.membership
+            return m.memberActive && m.memberRole >= .member
+        default: return false
+        }
+    }
+
+    var userIsObserver: Bool {
+        switch chatInfo {
+        case let .group(groupInfo):
+            let m = groupInfo.membership
+            return m.memberActive && m.memberRole == .observer
+        default: return false
+        }
+    }
+
     var id: ChatId { get { chatInfo.id } }
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }

apps/ios/Shared/Model/ImageUtils.swift

@@ -9,6 +9,7 @@
 import Foundation
 import SimpleXChat
 import SwiftUI
+import AVKit
 
 func getLoadedFilePath(_ file: CIFile?) -> String? {
     if let fileName = getLoadedFileName(file) {
@@ -42,6 +43,17 @@ func getLoadedImage(_ file: CIFile?) -> UIImage? {
     return nil
 }
 
+func getLoadedVideo(_ file: CIFile?) -> URL? {
+    let loadedFilePath = getLoadedFilePath(file)
+    if loadedFilePath != nil, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
+        if FileManager.default.fileExists(atPath: filePath.path) {
+            return filePath
+        }
+    }
+    return nil
+}
+
 func saveAnimImage(_ image: UIImage) -> String? {
     let fileName = generateNewFileName("IMG", "gif")
     guard let imageData = image.imageData else { return nil }
@@ -164,6 +176,20 @@ func saveFileFromURL(_ url: URL) -> String? {
     return savedFile
 }
 
+func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
+    let savedFile: String?
+    do {
+        let fileName = uniqueCombine(url.lastPathComponent)
+        try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
+        ChatModel.shared.filesToDelete.remove(url)
+        savedFile = fileName
+    } catch {
+        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
+        savedFile = nil
+    }
+    return savedFile
+}
+
 func generateNewFileName(_ prefix: String, _ ext: String) -> String {
     uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }
@@ -204,6 +230,18 @@ private func dropPrefix(_ s: String, _ prefix: String) -> String {
     s.hasPrefix(prefix) ? String(s.dropFirst(prefix.count)) : s
 }
 
+extension AVAsset {
+    func generatePreview() -> (UIImage, Int)? {
+        let generator = AVAssetImageGenerator(asset: self)
+        generator.appliesPreferredTrackTransform = true
+        var actualTime = CMTimeMake(value: 0, timescale: 0)
+        if let image = try? generator.copyCGImage(at: CMTimeMakeWithSeconds(0.0, preferredTimescale: 1), actualTime: &actualTime) {
+            return (UIImage(cgImage: image), Int(duration.seconds))
+        }
+        return nil
+    }
+}
+
 extension UIImage {
     func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
         if let cgImage = cgImage {

apps/ios/Shared/Model/NtfManager.swift

@@ -39,7 +39,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
         if let userId = content.userInfo["userId"] as? Int64,
            userId != chatModel.currentUser?.userId {
-           changeActiveUser(userId)
+            changeActiveUser(userId, viewPwd: nil)
         }
         if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
             let chatId = content.userInfo["chatId"] as? String {
@@ -87,13 +87,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
             switch content.categoryIdentifier {
             case ntfCategoryMessageReceived:
                 let recent = recentInTheSameChat(content)
-                if model.chatId == nil {
+                let userId = content.userInfo["userId"] as? Int64
+                if let userId = userId, let user = model.getUser(userId), !user.showNotifications {
+                    // ... inactive user with disabled notifications
+                    return []
+                } else if model.chatId == nil {
                     // in the chat list...
-                    if model.currentUser?.userId == (content.userInfo["userId"] as? Int64) {
-                        // ... of the current user
+                    if model.currentUser?.userId == userId {
+                        // ... of the active user
                         return recent ? [] : [.sound, .list]
                     } else {
-                        // ... of different user
+                        // ... of inactive user
                         return recent ? [.banner] : [.sound, .banner, .list]
                     }
                 } else if model.chatId == content.targetContentIdentifier {

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -132,21 +132,56 @@ func apiCreateActiveUser(_ p: Profile) throws -> User {
 }
 
 func listUsers() throws -> [UserInfo] {
-    let r = chatSendCmdSync(.listUsers)
+    return try listUsersResponse(chatSendCmdSync(.listUsers))
+}
+
+func listUsersAsync() async throws -> [UserInfo] {
+    return try listUsersResponse(await chatSendCmd(.listUsers))
+}
+
+private func listUsersResponse(_ r: ChatResponse) throws -> [UserInfo] {
     if case let .usersList(users) = r {
         return users.sorted { $0.user.chatViewName.compare($1.user.chatViewName) == .orderedAscending }
     }
     throw r
 }
 
-func apiSetActiveUser(_ userId: Int64) throws -> User {
-    let r = chatSendCmdSync(.apiSetActiveUser(userId: userId))
+func apiSetActiveUser(_ userId: Int64, viewPwd: String?) throws -> User {
+    let r = chatSendCmdSync(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
     if case let .activeUser(user) = r { return user }
     throw r
 }
 
-func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool) throws {
-    let r = chatSendCmdSync(.apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues))
+func apiSetActiveUserAsync(_ userId: Int64, viewPwd: String?) async throws -> User {
+    let r = await chatSendCmd(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
+    if case let .activeUser(user) = r { return user }
+    throw r
+}
+
+func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
+    try await setUserPrivacy_(.apiHideUser(userId: userId, viewPwd: viewPwd))
+}
+
+func apiUnhideUser(_ userId: Int64, viewPwd: String) async throws -> User {
+    try await setUserPrivacy_(.apiUnhideUser(userId: userId, viewPwd: viewPwd))
+}
+
+func apiMuteUser(_ userId: Int64) async throws -> User {
+    try await setUserPrivacy_(.apiMuteUser(userId: userId))
+}
+
+func apiUnmuteUser(_ userId: Int64) async throws -> User {
+    try await setUserPrivacy_(.apiUnmuteUser(userId: userId))
+}
+
+func setUserPrivacy_(_ cmd: ChatCommand) async throws -> User {
+    let r = await chatSendCmd(cmd)
+    if case let .userPrivacy(_, updatedUser) = r { return updatedUser }
+    throw r
+}
+
+func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) async throws {
+    let r = await chatSendCmd(.apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: viewPwd))
     if case .cmdOk = r { return }
     throw r
 }
@@ -180,12 +215,24 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
     logger.error("apiSuspendChat error: \(String(describing: r))")
 }
 
+func apiSetTempFolder(tempFolder: String) throws {
+    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiSetFilesFolder(filesFolder: String) throws {
     let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder))
     if case .cmdOk = r { return }
     throw r
 }
 
+func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
+    let r = chatSendCmdSync(.apiSetXFTPConfig(config: cfg))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiSetIncognito(incognito: Bool) throws {
     let r = chatSendCmdSync(.setIncognito(incognito: incognito))
     if case .cmdOk = r { return }
@@ -209,8 +256,16 @@ func apiStorageEncryption(currentKey: String = "", newKey: String = "") async th
 }
 
 func apiGetChats() throws -> [ChatData] {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiGetChats: no current user") }
-    let r = chatSendCmdSync(.apiGetChats(userId: userId))
+    let userId = try currentUserId("apiGetChats")
+    return try apiChatsResponse(chatSendCmdSync(.apiGetChats(userId: userId)))
+}
+
+func apiGetChatsAsync() async throws -> [ChatData] {
+    let userId = try currentUserId("apiGetChats")
+    return try apiChatsResponse(await chatSendCmd(.apiGetChats(userId: userId)))
+}
+
+private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
     if case let .apiChats(_, chats) = r { return chats }
     throw r
 }
@@ -288,6 +343,12 @@ func apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteM
     throw r
 }
 
+func apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64) async throws -> (ChatItem, ChatItem?) {
+    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, groupMemberId: groupMemberId, itemId: itemId), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
+    throw r
+}
+
 func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
     let r = chatSendCmdSync(.apiGetNtfToken)
     switch r {
@@ -330,22 +391,22 @@ func apiDeleteToken(token: DeviceToken) async throws {
     try await sendCommandOkResp(.apiDeleteToken(token: token))
 }
 
-func getUserSMPServers() throws -> ([ServerCfg], [String]) {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("getUserSMPServers: no current user") }
-    let r = chatSendCmdSync(.apiGetUserSMPServers(userId: userId))
-    if case let .userSMPServers(_, smpServers, presetServers) = r { return (smpServers, presetServers) }
+func getUserProtoServers(_ serverProtocol: ServerProtocol) throws -> UserProtoServers {
+    let userId = try currentUserId("getUserProtoServers")
+    let r = chatSendCmdSync(.apiGetUserProtoServers(userId: userId, serverProtocol: serverProtocol))
+    if case let .userProtoServers(_, servers) = r { return servers }
     throw r
 }
 
-func setUserSMPServers(smpServers: [ServerCfg]) async throws {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("setUserSMPServers: no current user") }
-    try await sendCommandOkResp(.apiSetUserSMPServers(userId: userId, smpServers: smpServers))
+func setUserProtoServers(_ serverProtocol: ServerProtocol, servers: [ServerCfg]) async throws {
+    let userId = try currentUserId("setUserProtoServers")
+    try await sendCommandOkResp(.apiSetUserProtoServers(userId: userId, serverProtocol: serverProtocol, servers: servers))
 }
 
-func testSMPServer(smpServer: String) async throws -> Result<(), SMPTestFailure> {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("testSMPServer: no current user") }
-    let r = await chatSendCmd(.testSMPServer(userId: userId, smpServer: smpServer))
-    if case let .smpTestResult(_, testFailure) = r {
+func testProtoServer(server: String) async throws -> Result<(), ProtocolTestFailure> {
+    let userId = try currentUserId("testProtoServer")
+    let r = await chatSendCmd(.apiTestProtoServer(userId: userId, server: server))
+    if case let .serverTestResult(_, _, testFailure) = r {
         if let t = testFailure {
             return .failure(t)
         }
@@ -355,14 +416,22 @@ func testSMPServer(smpServer: String) async throws -> Result<(), SMPTestFailure>
 }
 
 func getChatItemTTL() throws -> ChatItemTTL {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("getChatItemTTL: no current user") }
-    let r = chatSendCmdSync(.apiGetChatItemTTL(userId: userId))
+    let userId = try currentUserId("getChatItemTTL")
+    return try chatItemTTLResponse(chatSendCmdSync(.apiGetChatItemTTL(userId: userId)))
+}
+
+func getChatItemTTLAsync() async throws -> ChatItemTTL {
+    let userId = try currentUserId("getChatItemTTLAsync")
+    return try chatItemTTLResponse(await chatSendCmd(.apiGetChatItemTTL(userId: userId)))
+}
+
+private func chatItemTTLResponse(_ r: ChatResponse) throws -> ChatItemTTL {
     if case let .chatItemTTL(_, chatItemTTL) = r { return ChatItemTTL(chatItemTTL) }
     throw r
 }
 
 func setChatItemTTL(_ chatItemTTL: ChatItemTTL) async throws {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("setChatItemTTL: no current user") }
+    let userId = try currentUserId("setChatItemTTL")
     try await sendCommandOkResp(.apiSetChatItemTTL(userId: userId, seconds: chatItemTTL.seconds))
 }
 
@@ -533,14 +602,14 @@ func clearChat(_ chat: Chat) async {
 }
 
 func apiListContacts() throws -> [Contact] {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiListContacts: no current user") }
+    let userId = try currentUserId("apiListContacts")
     let r = chatSendCmdSync(.apiListContacts(userId: userId))
     if case let .contactsList(_, contacts) = r { return contacts }
     throw r
 }
 
 func apiUpdateProfile(profile: Profile) async throws -> Profile? {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiUpdateProfile: no current user") }
+    let userId = try currentUserId("apiUpdateProfile")
     let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
     case .userProfileNoChange: return nil
@@ -568,22 +637,30 @@ func apiSetConnectionAlias(connId: Int64, localAlias: String) async throws -> Pe
 }
 
 func apiCreateUserAddress() async throws -> String {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiCreateUserAddress: no current user") }
+    let userId = try currentUserId("apiCreateUserAddress")
     let r = await chatSendCmd(.apiCreateMyAddress(userId: userId))
     if case let .userContactLinkCreated(_, connReq) = r { return connReq }
     throw r
 }
 
 func apiDeleteUserAddress() async throws {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiDeleteUserAddress: no current user") }
+    let userId = try currentUserId("apiDeleteUserAddress")
     let r = await chatSendCmd(.apiDeleteMyAddress(userId: userId))
     if case .userContactLinkDeleted = r { return }
     throw r
 }
 
 func apiGetUserAddress() throws -> UserContactLink? {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiGetUserAddress: no current user") }
-    let r = chatSendCmdSync(.apiShowMyAddress(userId: userId))
+    let userId = try currentUserId("apiGetUserAddress")
+    return try userAddressResponse(chatSendCmdSync(.apiShowMyAddress(userId: userId)))
+}
+
+func apiGetUserAddressAsync() async throws -> UserContactLink? {
+    let userId = try currentUserId("apiGetUserAddressAsync")
+    return try userAddressResponse(await chatSendCmd(.apiShowMyAddress(userId: userId)))
+}
+
+private func userAddressResponse(_ r: ChatResponse) throws -> UserContactLink? {
     switch r {
     case let .userContactLink(_, contactLink): return contactLink
     case .chatCmdError(_, chatError: .errorStore(storeError: .userContactLinkNotFound)): return nil
@@ -592,7 +669,7 @@ func apiGetUserAddress() throws -> UserContactLink? {
 }
 
 func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContactLink? {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("userAddressAutoAccept: no current user") }
+    let userId = try currentUserId("userAddressAutoAccept")
     let r = await chatSendCmd(.apiAddressAutoAccept(userId: userId, autoAccept: autoAccept))
     switch r {
     case let .userContactLinkUpdated(_, contactLink): return contactLink
@@ -665,6 +742,23 @@ func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {
     return nil
 }
 
+func cancelFile(user: User, fileId: Int64) async {
+    if let chatItem = await apiCancelFile(fileId: fileId) {
+        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
+    }
+}
+
+func apiCancelFile(fileId: Int64) async -> AChatItem? {
+    let r = await chatSendCmd(.cancelFile(fileId: fileId))
+    switch r {
+    case let .sndFileCancelled(_, chatItem, _, _) : return chatItem
+    case let .rcvFileCancelled(_, chatItem, _) : return chatItem
+    default:
+        logger.error("apiCancelFile error: \(String(describing: r))")
+        return nil
+    }
+}
+
 func networkErrorAlert(_ r: ChatResponse) -> Bool {
     let am = AlertManager.shared
     switch r {
@@ -787,7 +881,7 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
 }
 
 func apiNewGroup(_ p: GroupProfile) throws -> GroupInfo {
-    guard let userId = ChatModel.shared.currentUser?.userId else { throw RuntimeError("apiNewGroup: no current user") }
+    let userId = try currentUserId("apiNewGroup")
     let r = chatSendCmdSync(.apiNewGroup(userId: userId, groupProfile: p))
     if case let .groupCreated(_, groupInfo) = r { return groupInfo }
     throw r
@@ -868,9 +962,15 @@ func apiUpdateGroup(_ groupId: Int64, _ groupProfile: GroupProfile) async throws
     throw r
 }
 
-func apiCreateGroupLink(_ groupId: Int64) async throws -> String {
-    let r = await chatSendCmd(.apiCreateGroupLink(groupId: groupId))
-    if case let .groupLinkCreated(_, _, connReq) = r { return connReq }
+func apiCreateGroupLink(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (String, GroupMemberRole) {
+    let r = await chatSendCmd(.apiCreateGroupLink(groupId: groupId, memberRole: memberRole))
+    if case let .groupLinkCreated(_, _, connReq, memberRole) = r { return (connReq, memberRole) }
+    throw r
+}
+
+func apiGroupLinkMemberRole(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (String, GroupMemberRole) {
+    let r = await chatSendCmd(.apiGroupLinkMemberRole(groupId: groupId, memberRole: memberRole))
+    if case let .groupLink(_, _, connReq, memberRole) = r { return (connReq, memberRole) }
     throw r
 }
 
@@ -880,11 +980,11 @@ func apiDeleteGroupLink(_ groupId: Int64) async throws {
     throw r
 }
 
-func apiGetGroupLink(_ groupId: Int64) throws -> String? {
+func apiGetGroupLink(_ groupId: Int64) throws -> (String, GroupMemberRole)? {
     let r = chatSendCmdSync(.apiGetGroupLink(groupId: groupId))
     switch r {
-    case let .groupLink(_, _, connReq):
-        return connReq
+    case let .groupLink(_, _, connReq, memberRole):
+        return (connReq, memberRole)
     case .chatCmdError(_, chatError: .errorStore(storeError: .groupLinkNotFound)):
         return nil
     default: throw r
@@ -893,33 +993,42 @@ func apiGetGroupLink(_ groupId: Int64) throws -> String? {
 
 func apiGetVersion() throws -> CoreVersionInfo {
     let r = chatSendCmdSync(.showVersion)
-    if case let .versionInfo(info) = r { return info }
+    if case let .versionInfo(info, _, _) = r { return info }
     throw r
 }
 
-func initializeChat(start: Bool, dbKey: String? = nil) throws {
+private func currentUserId(_ funcName: String) throws -> Int64 {
+    if let userId = ChatModel.shared.currentUser?.userId {
+        return userId
+    }
+    throw RuntimeError("\(funcName): no current user")
+}
+
+func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool = true, confirmMigrations: MigrationConfirmation? = nil) throws {
     logger.debug("initializeChat")
     let m = ChatModel.shared
-    (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey)
+    (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey, confirmMigrations: confirmMigrations)
     if  m.chatDbStatus != .ok { return }
     // If we migrated successfully means previous re-encryption process on database level finished successfully too
     if encryptionStartedDefault.get() {
         encryptionStartedDefault.set(false)
     }
+    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try setXFTPConfig(getXFTPCfg())
     try apiSetIncognito(incognito: incognitoGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
         m.onboardingStage = .step1_SimpleXInfo
     } else if start {
-        try startChat()
+        try startChat(refreshInvitations: refreshInvitations)
     } else {
         m.chatRunning = false
     }
 }
 
-func startChat() throws {
+func startChat(refreshInvitations: Bool = true) throws {
     logger.debug("startChat")
     let m = ChatModel.shared
     try setNetworkConfig(getNetCfg())
@@ -928,7 +1037,9 @@ func startChat() throws {
     if justStarted {
         try getUserChatData()
         NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
-        try refreshCallInvitations()
+        if (refreshInvitations) {
+            try refreshCallInvitations()
+        }
         (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
         if let token = m.deviceToken {
             registerToken(token: token)
@@ -944,30 +1055,58 @@ func startChat() throws {
     chatLastStartGroupDefault.set(Date.now)
 }
 
-func changeActiveUser(_ userId: Int64) {
+func changeActiveUser(_ userId: Int64, viewPwd: String?) {
     do {
-        try changeActiveUser_(userId)
+        try changeActiveUser_(userId, viewPwd: viewPwd)
     } catch let error {
         logger.error("Unable to set active user: \(responseError(error))")
     }
 }
 
-func changeActiveUser_(_ userId: Int64) throws {
+private func changeActiveUser_(_ userId: Int64, viewPwd: String?) throws {
     let m = ChatModel.shared
-    m.currentUser = try apiSetActiveUser(userId)
+    m.currentUser = try apiSetActiveUser(userId, viewPwd: viewPwd)
     m.users = try listUsers()
     try getUserChatData()
 }
 
+func changeActiveUserAsync_(_ userId: Int64, viewPwd: String?) async throws {
+    let currentUser = try await apiSetActiveUserAsync(userId, viewPwd: viewPwd)
+    let users = try await listUsersAsync()
+    await MainActor.run {
+        let m = ChatModel.shared
+        m.currentUser = currentUser
+        m.users = users
+    }
+    try await getUserChatDataAsync()
+    await MainActor.run {
+        if var (_, invitation) = ChatModel.shared.callInvitations.first(where: { _, inv in inv.user.userId == userId }) {
+            invitation.user = currentUser
+            activateCall(invitation)
+        }
+    }
+}
+
 func getUserChatData() throws {
     let m = ChatModel.shared
     m.userAddress = try apiGetUserAddress()
-    (m.userSMPServers, m.presetSMPServers) = try getUserSMPServers()
     m.chatItemTTL = try getChatItemTTL()
     let chats = try apiGetChats()
     m.chats = chats.map { Chat.init($0) }
 }
 
+private func getUserChatDataAsync() async throws {
+    let userAddress = try await apiGetUserAddressAsync()
+    let chatItemTTL = try await getChatItemTTLAsync()
+    let chats = try await apiGetChatsAsync()
+    await MainActor.run {
+        let m = ChatModel.shared
+        m.userAddress = userAddress
+        m.chatItemTTL = chatItemTTL
+        m.chats = chats.map { Chat.init($0) }
+    }
+}
+
 class ChatReceiver {
     private var receiveLoop: Task<Void, Never>?
     private var receiveMessages = true
@@ -1036,18 +1175,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(contact.activeConn.id)
             }
         case let .receivedContactRequest(user, contactRequest):
-            if !active(user) { return }
-
-            let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
-            if m.hasChat(contactRequest.id) {
-                m.updateChatInfo(cInfo)
-            } else {
-                m.addChat(Chat(
-                    chatInfo: cInfo,
-                    chatItems: []
-                ))
-                NtfManager.shared.notifyContactRequest(user, contactRequest)
+            if active(user) {
+                let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
+                if m.hasChat(contactRequest.id) {
+                    m.updateChatInfo(cInfo)
+                } else {
+                    m.addChat(Chat(
+                        chatInfo: cInfo,
+                        chatItems: []
+                    ))
+                }
             }
+            NtfManager.shared.notifyContactRequest(user, contactRequest)
         case let .contactUpdated(user, toContact):
             if active(user) && m.hasChat(toContact.id) {
                 let cInfo = ChatInfo.direct(contact: toContact)
@@ -1180,10 +1319,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
             if active(user) {
                 m.updateGroup(toGroup)
             }
+        case let .memberRole(user, groupInfo, _, _, _, _):
+            if active(user) {
+                m.updateGroup(groupInfo)
+            }
         case let .rcvFileStart(user, aChatItem):
             chatItemSimpleUpdate(user, aChatItem)
         case let .rcvFileComplete(user, aChatItem):
             chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileSndCancelled(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+            chatItemSimpleUpdate(user, aChatItem)
         case let .sndFileStart(user, aChatItem, _):
             chatItemSimpleUpdate(user, aChatItem)
         case let .sndFileComplete(user, aChatItem, _):
@@ -1195,22 +1342,21 @@ func processReceivedMsg(_ res: ChatResponse) async {
                let fileName = cItem.file?.filePath {
                 removeFile(fileName)
             }
+        case let .sndFileRcvCancelled(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .sndFileCompleteXFTP(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+            let cItem = aChatItem.chatItem
+            let mc = cItem.content.msgContent
+            if case .file = mc,
+               let fileName = cItem.file?.filePath {
+                removeFile(fileName)
+            }
         case let .callInvitation(invitation):
             m.callInvitations[invitation.contact.id] = invitation
             activateCall(invitation)
-
-// This will be called from notification service extension
-//            CXProvider.reportNewIncomingVoIPPushPayload([
-//                "displayName": contact.displayName,
-//                "contactId": contact.id,
-//                "uuid": invitation.callkitUUID
-//            ]) { error in
-//                if let error = error {
-//                    logger.error("reportNewIncomingVoIPPushPayload error \(error.localizedDescription)")
-//                } else {
-//                    logger.debug("reportNewIncomingVoIPPushPayload success for \(contact.id)")
-//                }
-//            }
         case let .callOffer(_, contact, callType, offer, sharedKey, _):
             withCall(contact) { call in
                 call.callState = .offerReceived
@@ -1224,7 +1370,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                     offer: offer.rtcSession,
                     iceCandidates: offer.rtcIceCandidates,
                     media: callType.media, aesKey: sharedKey,
-                    useWorker: true,
                     iceServers: iceServers,
                     relay: useRelay
                 )
@@ -1244,7 +1389,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
             }
             withCall(contact) { call in
                 m.callCommand = .end
-//                CallController.shared.reportCallRemoteEnded(call: call)
+                CallController.shared.reportCallRemoteEnded(call: call)
             }
         case .chatSuspended:
             chatSuspended()
@@ -1295,18 +1440,25 @@ func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
 
 func refreshCallInvitations() throws {
     let m = ChatModel.shared
-    let callInvitations = try apiGetCallInvitations()
-    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
+    let callInvitations = try justRefreshCallInvitations()
     if let (chatId, ntfAction) = m.ntfCallInvitationAction,
        let invitation = m.callInvitations.removeValue(forKey: chatId) {
         m.ntfCallInvitationAction = nil
         CallController.shared.callAction(invitation: invitation, action: ntfAction)
-    } else if let invitation = callInvitations.last {
+    } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
         activateCall(invitation)
     }
 }
 
+func justRefreshCallInvitations() throws -> [RcvCallInvitation] {
+    let m = ChatModel.shared
+    let callInvitations = try apiGetCallInvitations()
+    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
+    return callInvitations
+}
+
 func activateCall(_ callInvitation: RcvCallInvitation) {
+    if !callInvitation.user.showNotifications { return }
     let m = ChatModel.shared
     CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
         if let error = error {

apps/ios/Shared/Model/SuspendChat.swift

@@ -81,3 +81,24 @@ func activateChat(appState: AppState = .active) {
         if ChatModel.ok { apiActivateChat() }
     }
 }
+
+func initChatAndMigrate(refreshInvitations: Bool = true) {
+    let m = ChatModel.shared
+    if (!m.chatInitialized) {
+        do {
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
+        } catch let error {
+            fatalError("Failed to start or load chats: \(responseError(error))")
+        }
+    }
+}
+
+func startChatAndActivate() {
+    if ChatModel.shared.chatRunning == true {
+        ChatReceiver.shared.start()
+    }
+    if .active != appStateGroupDefault.get()  {
+        activateChat()
+    }
+}