Merge branch 'develop' into feature/fga/live_location_sharing_setup

2026-03-24 10:17:24 +01:00
parent 7581d0ecf2 9912fdcac3
commit f9f09b12f8
632 changed files with 4530 additions and 3107 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,12 @@
-<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- 
+
+Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request.
+
+Are you adding a new feature? Keep in mind that it needs to be added to [the iOS client](https://github.com/element-hq/element-x-ios) too, unless it's related to an Android OS only behaviour.
+
+**IMPORTANT:** if you are adding new screens or modifying existing ones, this needs acceptance from the product and design teams before being merged. For this, it's better to start with a [feature request issue](https://github.com/element-hq/element-x-android/issues/new?template=enhancement.yml) describing the change you want to make and the motivation behind it instead of directly creating a pull request. This will allow the product and design teams to give feedback on the change before you start working on it, and avoid you doing work that might end up being rejected.
+
+-->
 
 ## Content

--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -10,7 +10,15 @@
    "string:app_name",
    "gradle",
  ],
+  "minimumReleaseAge": "7 days",
  "packageRules": [
+    {
+      "matchPackageNames": [
+        "org.matrix.rustcomponents:sdk-android",
+        "/^io.element.android/",
+      ],
+      "minimumReleaseAge": null,
+    },
    {
      "groupName": "kotlin",
      "matchPackageNames": [
@@ -37,4 +45,3 @@
    },
  ],
 }
-
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -50,7 +50,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
      - name: Clone submodules
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -15,7 +15,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
      - name: Clone submodules
--- a/.github/workflows/fork-pr-notice.yml
+++ b/.github/workflows/fork-pr-notice.yml
@@ -12,6 +12,9 @@ permissions: {}
 jobs:
  welcome:
    runs-on: ubuntu-latest
+    permissions:
+      # Require to comment the PR.
+      pull-requests: write
    name: Welcome comment
    # Only display it if base repo (upstream) is different from HEAD repo (possibly a fork)
    if: github.event.pull_request.base.repo.full_name != github.event.pull_request.head.repo.full_name
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -98,7 +98,7 @@ jobs:
        run: curl -fsSL "https://get.maestro.mobile.dev" | bash
      - name: Run Maestro tests in emulator
        id: maestro_test
-        uses: reactivecircus/android-emulator-runner@5d6e86df22ab11632167a1a6b0c9ab0dc3469586 # v2.36.0
+        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
        continue-on-error: true
        env:
          MAESTRO_USERNAME: maestroelement
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -54,6 +54,9 @@ jobs:
  close-if-fork-develop:
    name: Forbid develop branch fork contributions
    runs-on: ubuntu-latest
+    permissions:
+      # Require to comment and close the PR.
+      pull-requests: write
    if: >
      github.event.action == 'opened' &&
      github.event.pull_request.head.ref == 'develop' &&
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -37,7 +37,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -100,7 +100,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -141,7 +141,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -175,7 +175,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -220,7 +220,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -261,7 +261,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -302,7 +302,7 @@ jobs:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -14,6 +14,9 @@ env:

 jobs:
  record:
+    permissions:
+      # Need write permissions on PRs to remove the label "Record-Screenshots"
+      pull-requests: write
    name: Record screenshots on branch ${{ github.event.pull_request.head.ref || github.ref_name }}
    runs-on: ubuntu-latest
    if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Record-Screenshots'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -75,7 +75,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -54,7 +54,7 @@ jobs:
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Build debug code and test fixtures
-        run: ./gradlew assembleDebug createFullJarDebugTestFixtures :app:createFullJarGplayDebugTestFixtures $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew assembleGplayDebug createFullJarDebugTestFixtures :app:createFullJarGplayDebugTestFixtures $CI_GRADLE_ARG_PROPERTIES
      - name: 🔊 Publish results to Sonar
        env:
          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -55,7 +55,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        with:
          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -73,7 +73,7 @@ jobs:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}

      - name: ⚙️ Check coverage for debug variant (includes unit & screenshot tests)
-        run: ./gradlew testDebugUnitTest :tests:uitests:verifyPaparazziDebug :app:koverXmlReportGplayDebug :app:koverHtmlReportGplayDebug :app:koverVerifyAll $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew testDebugUnitTest :tests:uitests:verifyPaparazziDebug :koverXmlReportMerged :koverHtmlReportMerged :koverVerifyAll $CI_GRADLE_ARG_PROPERTIES

      - name: 🚫 Upload kover failed coverage reports
        if: failure()
@@ -112,5 +112,5 @@ jobs:
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: app/build/reports/kover/reportGplayDebug.xml
+          files: build/reports/kover/reportMerged.xml
          verbose: true
--- a/.maestro/tests/account/verifySession.yaml
+++ b/.maestro/tests/account/verifySession.yaml
@@ -1,10 +1,10 @@
 appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
-    visible: "Enter recovery key"
+    visible: "Use recovery key"
    timeout: 30000
 - takeScreenshot: build/maestro/150-Verify
- tapOn: "Enter recovery key"
+- tapOn: "Use recovery key"
 - tapOn:
    id: "verification-recovery_key"
 - inputText: ${MAESTRO_RECOVERY_KEY}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,6 +10,7 @@
  * [I want to add new strings to the project](#i-want-to-add-new-strings-to-the-project)
  * [I want to help translating Element](#i-want-to-help-translating-element)
  * [Element X Android Gallery](#element-x-android-gallery)
+* [I want to add a new feature to Element X Android](#i-want-to-add-a-new-feature-to-element-x-android)
 * [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
  * [Kotlin](#kotlin)
  * [Changelog](#changelog)
@@ -76,6 +77,14 @@ Once added to Localazy, translations can be checked screen per screen using our

 Localazy syncs occur every Monday and the screenshots on this page are generated every Tuesday, so you'll have to wait to see your change appearing on Element X Android Gallery.

+## I want to add a new feature to Element X Android
+
+Thank you for contributing to the project! Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
+
+Also, please keep in mind that any feature added to Element X Android needs to be added to [the iOS client](https://github.com/element-hq/element-x-ios) too, unless it's related to an Android OS only behaviour.
+
+**IMPORTANT:** if you are adding new screens or modifying existing ones, this needs acceptance from the product and design teams before being merged. For this, it's better to start with a [feature request issue](https://github.com/element-hq/element-x-android/issues/new?template=enhancement.yml) describing the change you want to make and the motivation behind it instead of directly creating a pull request. This will allow the product and design teams to give feedback on the change before you start working on it, and avoid you doing work that might end up being rejected.
+
 ## I want to submit a PR to fix an issue

 Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
@@ -184,7 +193,7 @@ internal fun PinIconPreview() = ElementPreview {
 }
 ```

-This will allow to preview the composable in both light and dark mode in Android Studio. This will also automatically add UI tests. The GitHub action [Record screenshots](https://github.com/element-hq/element-x-android/actions/workflows/recordScreenshots.yml) has to be run to record the new screenshots. The PR reviewer can trigger this for you if you're not part of the core team. 
+This will allow to preview the composable in both light and dark mode in Android Studio. This will also automatically add UI tests. The GitHub action [Record screenshots](https://github.com/element-hq/element-x-android/actions/workflows/recordScreenshots.yml) has to be run to record the new screenshots. The PR reviewer can trigger this for you if you're not part of the core team.

 ### Authors

--- a/annotations/build.gradle.kts
+++ b/annotations/build.gradle.kts
@@ -6,6 +6,5 @@
 * Please see LICENSE files in the repository root for full details.
 */
 plugins {
-    alias(libs.plugins.kotlin.jvm)
-    id("com.android.lint")
+    id("io.element.jvm-library")
 }
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,10 +21,8 @@ import extension.allFeaturesImpl
 import extension.allLibrariesImpl
 import extension.allServicesImpl
 import extension.buildConfigFieldStr
-import extension.koverDependencies
 import extension.locales
 import extension.setupDependencyInjection
-import extension.setupKover
 import extension.testCommonDependencies
 import java.util.Locale

@@ -40,8 +38,6 @@ plugins {
    // alias(libs.plugins.gms.google.services)
 }

-setupKover()
-
 android {
    namespace = "io.element.android.x"

@@ -295,8 +291,6 @@ dependencies {
    testCommonDependencies(libs)
    testImplementation(projects.libraries.matrix.test)
    testImplementation(projects.services.toolbox.test)
-
-    koverDependencies()
 }

 tasks.withType<GenerateBuildConfig>().configureEach {
--- a/app/common-proguard-rules.pro
+++ b/app/common-proguard-rules.pro
@@ -74,3 +74,6 @@

 # Keep Metro classes
 -keep,allowoptimization,allowshrinking class dev.zacsweers.metro.** { *; }
+
+# Rustls Platform Verifier
+-keep, includedescriptorclasses class org.rustls.platformverifier.** { *; }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,20 +118,6 @@
                <data android:host="mobile.element.io" />
                <data android:path="/element/" />
            </intent-filter>
-            <!--
-              matrix.to links
-              Note: On Android 12 and higher clicking a web link (that is not an Android App Link) always shows content in a web browser
-              https://developer.android.com/training/app-links#web-links
-            -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="matrix.to" />
-            </intent-filter>
            <!--
              matrix: links
            -->
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -76,6 +76,9 @@ allprojects {
        filter {
            exclude { element -> element.file.path.contains(generatedPath) }
            exclude("io/element/android/tests/konsist/failures/**")
+
+            // This file comes from another project and we want to keep it as close to the original as possible
+            exclude("**/SafeChildrenTransitionScope.kt")
        }
    }
    // Dependency check
--- a/docs/_developer_onboarding.md
+++ b/docs/_developer_onboarding.md
@@ -11,6 +11,7 @@
  * [Rust SDK](#rust-sdk)
    * [Matrix Rust Component Kotlin](#matrix-rust-component-kotlin)
    * [Building the SDK locally](#building-the-sdk-locally)
+    * [rustls and platform verifier](#rustls-and-platform-verifier)
  * [The Android project](#the-android-project)
  * [Application](#application)
    * [Jetpack Compose](#jetpack-compose)
@@ -160,6 +161,19 @@ Troubleshooting:

 You can switch back to using the published version of the SDK by deleting `libraries/rustsdk/matrix-rust-sdk.aar`.

+#### rustls and platform verifier
+
+The SDK uses [rustls](https://github.com/rustls/rustls) for TLS, which is a pure Rust implementation of TLS. In turn, this means we have to add the
+`rustls-platform-verifier` library to our project, which provides platform-specific TLS certificate verification for rustls. This library uses the Android NDK's
+`TrustManager` to verify TLS certificates on Android.
+
+Though it's meant to be used through convoluted way of downloading the dependency, locating it in the
+cargo folder and using that path as a local maven repo as described [here](https://github.com/rustls/rustls-platform-verifier#android), we have
+added a script (`tools/sdk/update-rustls`) to download, unpack and add this AAR file locally to the `:libraries:matrix:impl` module instead.
+
+When should we run this script? Whenever we update the `rustls` dependency in the Rust SDK, we should check if the version of `rustls-platform-verifier`
+has changed as well, and if so, run this script to update the AAR file in our project. The SDK team should ping us when this happens.
+
 ### The Android project

 The project should compile out of the box.
--- a/features/analytics/api/src/main/res/values-ru/translations.xml
+++ b/features/analytics/api/src/main/res/values-ru/translations.xml
@@ -3,5 +3,5 @@
  <string name="screen_analytics_settings_help_us_improve">"Предоставьте разработчикам анонимные данные об использовании, чтобы помочь им выявлять проблемы эффективнее."</string>
  <string name="screen_analytics_settings_read_terms">"Вы можете ознакомиться со всеми нашими условиями %1$s."</string>
  <string name="screen_analytics_settings_read_terms_content_link">"здесь"</string>
-  <string name="screen_analytics_settings_share_data">"Отправлять аналитические данные"</string>
+  <string name="screen_analytics_settings_share_data">"Отправлять аналитику"</string>
 </resources>
--- a/features/analytics/api/src/main/res/values-uz/translations.xml
+++ b/features/analytics/api/src/main/res/values-uz/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_analytics_settings_help_us_improve">"Muammolarni aniqlashda yordam berish uchun anonim foydalanish maʼlumotlarini baham koʻring."</string>
-  <string name="screen_analytics_settings_read_terms">"Siz bizning barcha shartlarimizni o\'qishingiz mumkin%1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"Bu yerga"</string>
+  <string name="screen_analytics_settings_read_terms">"Barcha shartlar bilan %1$s tanishib chiqishingiz mumkin."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"bu yerda"</string>
  <string name="screen_analytics_settings_share_data">"Analitik ma\'lumotlarni ulashish"</string>
 </resources>
--- a/features/analytics/impl/src/main/res/values-uz/translations.xml
+++ b/features/analytics/impl/src/main/res/values-uz/translations.xml
@@ -2,9 +2,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_analytics_prompt_data_usage">"Biz hech qanday shaxsiy ma\'lumotlarni yozmaymiz yoki profilga kiritmaymiz"</string>
  <string name="screen_analytics_prompt_help_us_improve">"Muammolarni aniqlashda yordam berish uchun anonim foydalanish maʼlumotlarini baham koʻring."</string>
-  <string name="screen_analytics_prompt_read_terms">"Siz bizning barcha shartlarimizni o\'qishingiz mumkin%1$s."</string>
-  <string name="screen_analytics_prompt_read_terms_content_link">"Bu yerga"</string>
+  <string name="screen_analytics_prompt_read_terms">"Barcha shartlar bilan %1$s tanishib chiqishingiz mumkin."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"bu yerda"</string>
  <string name="screen_analytics_prompt_settings">"Buni istalgan vaqtda oʻchirib qoʻyishingiz mumkin"</string>
  <string name="screen_analytics_prompt_third_party_sharing">"Biz sizning ma\'lumotlaringizni uchinchi tomonlar bilan baham ko\'rmaymiz"</string>
-  <string name="screen_analytics_prompt_title">"Yaxshilashga yordam bering%1$s"</string>
+  <string name="screen_analytics_prompt_title">"%1$sʼni yaxshilashga yordam bering"</string>
 </resources>
--- a/features/announcement/impl/src/main/res/values-da/translations.xml
+++ b/features/announcement/impl/src/main/res/values-da/translations.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Se grupper, du har oprettet eller tilmeldt dig"</string>
-  <string name="screen_space_announcement_item2">"Acceptere eller afvise invitationer til grupper"</string>
-  <string name="screen_space_announcement_item3">"Finde alle rum, du kan deltage i, i dine grupper"</string>
-  <string name="screen_space_announcement_item4">"Deltage i offentlige grupper"</string>
-  <string name="screen_space_announcement_item5">"Forlade de grupper, du har tilsluttet dig"</string>
-  <string name="screen_space_announcement_notice">"Filtrering, oprettelse og administration af grupper kommer snart."</string>
-  <string name="screen_space_announcement_subtitle">"Velkommen til betaversionen af Grupper! Med denne første version kan du:"</string>
-  <string name="screen_space_announcement_title">"Introduktion til Grupper"</string>
+  <string name="screen_space_announcement_item1">"Se klynger, du har oprettet eller tilmeldt dig"</string>
+  <string name="screen_space_announcement_item2">"Acceptere eller afvise invitationer til klynger"</string>
+  <string name="screen_space_announcement_item3">"Finde alle rum, du kan deltage i, i dine klynger"</string>
+  <string name="screen_space_announcement_item4">"Deltage i offentlige klynger"</string>
+  <string name="screen_space_announcement_item5">"Forlade de klynger, du har tilsluttet dig"</string>
+  <string name="screen_space_announcement_notice">"Filtrering, oprettelse og administration af klynger kommer snart."</string>
+  <string name="screen_space_announcement_subtitle">"Velkommen til betaversionen af Klynger! Med denne første version kan du:"</string>
+  <string name="screen_space_announcement_title">"Introduktion til Klynger"</string>
 </resources>
--- a/features/announcement/impl/src/main/res/values-ko/translations.xml
+++ b/features/announcement/impl/src/main/res/values-ko/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_announcement_item1">"직접 만들거나 참여 중인 스페이스 보기"</string>
+  <string name="screen_space_announcement_item2">"스페이스 초대 수락 또는 거절"</string>
+  <string name="screen_space_announcement_item3">"참여 가능한 스페이스 내 모든 방 탐색"</string>
+  <string name="screen_space_announcement_item4">"공개 스페이스 참여"</string>
+  <string name="screen_space_announcement_item5">"참여 중인 스페이스 나가기"</string>
+  <string name="screen_space_announcement_notice">"스페이스 필터링, 생성 및 관리 기능이 곧 추가될 예정입니다."</string>
+  <string name="screen_space_announcement_subtitle">"스페이스 베타 버전에 오신 것을 환영합니다! 이번 첫 번째 버전에서는 다음과 같은 기능을 이용하실 수 있습니다.:"</string>
+  <string name="screen_space_announcement_title">"스페이스 소개"</string>
+</resources>
--- a/features/announcement/impl/src/main/res/values-ru/translations.xml
+++ b/features/announcement/impl/src/main/res/values-ru/translations.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Просмотреть пространства, которые вы создали или к которым присоединились"</string>
+  <string name="screen_space_announcement_item1">"Просматривать пространства, которые вы создали или к которым присоединились"</string>
  <string name="screen_space_announcement_item2">"Принимать или отклонять приглашения в пространства"</string>
-  <string name="screen_space_announcement_item3">"Найти все комнаты, к которым можно присоединиться в ваших пространствах"</string>
+  <string name="screen_space_announcement_item3">"Находить все комнаты, к которым можно присоединиться в ваших пространствах"</string>
  <string name="screen_space_announcement_item4">"Присоединяться к публичным пространствам"</string>
-  <string name="screen_space_announcement_item5">"Покинуть все пространства, к которым вы присоединились"</string>
-  <string name="screen_space_announcement_notice">"Работа с пространствами скоро станет доступна"</string>
-  <string name="screen_space_announcement_subtitle">"Добро пожаловать в бета-версию пространств! В этой первой версии вы сможете:"</string>
+  <string name="screen_space_announcement_item5">"Покидать все пространства, к которым вы присоединились"</string>
+  <string name="screen_space_announcement_notice">"Фильтровать, создавать пространства и управлять ими можно будет позже."</string>
+  <string name="screen_space_announcement_subtitle">"Добро пожаловать в бета-версию пространств! Сейчас вы сможете:"</string>
  <string name="screen_space_announcement_title">"Представляем пространства"</string>
 </resources>
--- a/features/announcement/impl/src/main/res/values-uk/translations.xml
+++ b/features/announcement/impl/src/main/res/values-uk/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_announcement_item3">"Знаходьте у своїх просторах кімнати, до яких можна приєднатися"</string>
+  <string name="screen_space_announcement_notice">"Фільтрування, створення та керування просторами стане доступним найближчим часом."</string>
+  <string name="screen_space_announcement_subtitle">"Ласкаво просимо до бета-версії Просторів! У цій першій версії ви можете:"</string>
+  <string name="screen_space_announcement_title">"Представляємо Простори"</string>
+</resources>
--- a/features/call/impl/src/main/res/values-bg/translations.xml
+++ b/features/call/impl/src/main/res/values-bg/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Текущ разговор"</string>
+  <string name="call_foreground_service_message_android">"Докоснете, за да се върнете към разговора"</string>
+  <string name="call_foreground_service_title_android">"☎️ Разговор в ход"</string>
+</resources>
--- a/features/call/impl/src/main/res/values-ru/translations.xml
+++ b/features/call/impl/src/main/res/values-ru/translations.xml
@@ -3,6 +3,6 @@
  <string name="call_foreground_service_channel_title_android">"Текущий вызов"</string>
  <string name="call_foreground_service_message_android">"Коснитесь, чтобы вернуться к вызову"</string>
  <string name="call_foreground_service_title_android">"☎️ Идёт вызов"</string>
-  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Функция Element Call не поддерживает использование аудиоустройств Bluetooth в данной версии Android. Пожалуйста, выберите другое аудиоустройство."</string>
-  <string name="screen_incoming_call_subtitle_android">"Входящий вызов Element"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call не поддерживает использование устройств Bluetooth в данной версии Android. Пожалуйста, выберите другое устройство."</string>
+  <string name="screen_incoming_call_subtitle_android">"Входящий вызов Element Call"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-da/translations.xml
+++ b/features/createroom/impl/src/main/res/values-da/translations.xml
@@ -3,10 +3,10 @@
  <string name="screen_create_room_action_create_room">"Nyt rum"</string>
  <string name="screen_create_room_add_people_title">"Invitér andre"</string>
  <string name="screen_create_room_error_creating_room">"Der opstod en fejl ved oprettelsen af rummet"</string>
-  <string name="screen_create_room_error_creating_space">"Gruppen kunne ikke oprettes på grund af en ukendt fejl. Prøv igen senere."</string>
+  <string name="screen_create_room_error_creating_space">"Klyngen kunne ikke oprettes på grund af en ukendt fejl. Prøv igen senere."</string>
  <string name="screen_create_room_name_placeholder">"Tilføj navn…"</string>
  <string name="screen_create_room_new_room_title">"Nyt rum"</string>
-  <string name="screen_create_room_new_space_title">"Ny gruppe"</string>
+  <string name="screen_create_room_new_space_title">"Ny klynge"</string>
  <string name="screen_create_room_private_option_description">"Kun inviterede personer kan deltage."</string>
  <string name="screen_create_room_private_option_title">"Privat"</string>
  <string name="screen_create_room_public_option_description">"Alle kan finde dette rum.
@@ -27,7 +27,10 @@ Du kan ændre dette når som helst i rummets indstillinger."</string>
  <string name="screen_create_room_room_address_section_footer">"Hvis dette rum skal være synligt i det offentlige register, skal du bruge en adresse."</string>
  <string name="screen_create_room_room_address_section_title">"Adresse"</string>
  <string name="screen_create_room_room_visibility_section_title">"Rummets synlighed"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(ingen klynge)"</string>
  <string name="screen_create_room_space_selection_no_space_option">"Tilføj ikke til et mellemrum"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Ingen klynge valgt"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Tilføj til klynge"</string>
  <string name="screen_create_room_topic_label">"Emne (valgfrit)"</string>
  <string name="screen_create_room_topic_placeholder">"Tilføj beskrivelse…"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-hr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hr/translations.xml
@@ -3,6 +3,7 @@
  <string name="screen_create_room_action_create_room">"Nova soba"</string>
  <string name="screen_create_room_add_people_title">"Pozovi osobe"</string>
  <string name="screen_create_room_error_creating_room">"Došlo je do pogreške prilikom stvaranja sobe"</string>
+  <string name="screen_create_room_new_room_title">"Nova soba"</string>
  <string name="screen_create_room_private_option_description">"Samo pozvane osobe mogu pristupiti ovoj sobi. Sve su poruke sveobuhvatno šifrirane."</string>
  <string name="screen_create_room_public_option_description">"Svatko može pronaći ovu sobu.
 To možete u svakom trenutku promijeniti u postavkama sobe."</string>
--- a/features/createroom/impl/src/main/res/values-in/translations.xml
+++ b/features/createroom/impl/src/main/res/values-in/translations.xml
@@ -6,7 +6,7 @@
  <string name="screen_create_room_private_option_description">"Hanya orang-orang yang diundang dapat mengakses ruangan ini. Semua pesan terenkripsi secara ujung ke ujung."</string>
  <string name="screen_create_room_public_option_description">"Siapa pun dapat mencari ruangan ini.
 Anda dapat mengubah ini kapan pun dalam pengaturan ruangan."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Siapa pun dapat meminta untuk bergabung dengan ijin administrator atau moderator"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Minta untuk bergabung"</string>
  <string name="screen_create_room_room_access_section_public_option_description">"Siapa pun dapat bergabung dengan ruangan ini"</string>
  <string name="screen_create_room_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
--- a/features/createroom/impl/src/main/res/values-ko/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ko/translations.xml
@@ -3,13 +3,34 @@
  <string name="screen_create_room_action_create_room">"새 방"</string>
  <string name="screen_create_room_add_people_title">"사람 초대하기"</string>
  <string name="screen_create_room_error_creating_room">"방을 생성하던 중 오류가 발생했어요"</string>
-  <string name="screen_create_room_private_option_description">"초대받은 사람만 이 방에 액세스할 수 있습니다. 모든 메시지는 종단 간 암호화됩니다."</string>
+  <string name="screen_create_room_error_creating_space">"알 수 없는 오류로 인해 스페이스를 생성할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+  <string name="screen_create_room_name_placeholder">"이름 추가…"</string>
+  <string name="screen_create_room_new_room_title">"새 방"</string>
+  <string name="screen_create_room_new_space_title">"새 스페이스"</string>
+  <string name="screen_create_room_private_option_description">"초대된 사람만 참여할 수 있습니다."</string>
+  <string name="screen_create_room_private_option_title">"비공개"</string>
  <string name="screen_create_room_public_option_description">"누구나 이 방을 찾을 수 있습니다.
 방 설정에서 언제든지 변경할 수 있습니다."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"누구나 방에 참여 요청을 할 수 있지만, 관리자나 운영자가 요청을 수락해야 합니다."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"참가 요청"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"누구나 이 방에 참여할 수 있습니다."</string>
-  <string name="screen_create_room_room_address_section_footer">"이 방이 공개 방 디렉토리에 표시되려면 방 주소가 필요합니다."</string>
+  <string name="screen_create_room_public_option_short_description">"누구나 참여할 수 있습니다."</string>
+  <string name="screen_create_room_public_option_title">"공개"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"누구나 참여를 요청할 수 있지만, 관리자나 중재자가 요청을 승인해야 합니다."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"참여 요청 허용"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s의 멤버는 누구나 참여할 수 있지만, 그 외의 사람은 액세스 요청을 해야 합니다."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"참여 요청하기"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"초대받은 사람만 참여할 수 있습니다."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"비공개"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"누구나 참여할 수 있습니다."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"공개"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"%1$s의 멤버는 누구나 참여할 수 있습니다."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"표준"</string>
+  <string name="screen_create_room_room_access_section_title">"액세스 권한이 있는 사용자"</string>
+  <string name="screen_create_room_room_address_section_footer">"공개 디렉터리에 표시하려면 주소가 필요합니다."</string>
+  <string name="screen_create_room_room_address_section_title">"주소"</string>
  <string name="screen_create_room_room_visibility_section_title">"방 표시 여부"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(스페이스 없음)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"스페이스에 추가하지 않음"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"홈"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"스페이스에 추가"</string>
  <string name="screen_create_room_topic_label">"주제 (선택)"</string>
+  <string name="screen_create_room_topic_placeholder">"설명 추가…"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ru/translations.xml
@@ -4,27 +4,32 @@
  <string name="screen_create_room_add_people_title">"Пригласить в комнату"</string>
  <string name="screen_create_room_error_creating_room">"Произошла ошибка при создании комнаты"</string>
  <string name="screen_create_room_error_creating_space">"Не удалось создать это пространство из-за неизвестной ошибки. Попробуйте позже."</string>
-  <string name="screen_create_room_name_placeholder">"Добавьте имя…"</string>
+  <string name="screen_create_room_name_placeholder">"Добавить имя…"</string>
  <string name="screen_create_room_new_room_title">"Новая комната"</string>
  <string name="screen_create_room_new_space_title">"Новое пространство"</string>
  <string name="screen_create_room_private_option_description">"Присоединиться могут только приглашенные."</string>
+  <string name="screen_create_room_private_option_title">"Приватный"</string>
  <string name="screen_create_room_public_option_description">"Любой желающий может найти эту комнату.
 Вы можете изменить это в любое время в настройках комнаты."</string>
-  <string name="screen_create_room_public_option_short_description">"Присоединиться может любой."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор или модератор должен будет принять запрос."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Разрешить запрос на присоединение"</string>
-  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Любой из %1$s может присоединиться, а всем остальным нужно запросить доступ."</string>
-  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Подать заявку на вступление"</string>
-  <string name="screen_create_room_room_access_section_private_option_description">"Присоединиться могут только приглашенные."</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Присоединиться может любой желающий."</string>
-  <string name="screen_create_room_room_access_section_restricted_option_description">"Любой в %1$s может присоединиться."</string>
+  <string name="screen_create_room_public_option_short_description">"Кто угодно может присоединиться."</string>
+  <string name="screen_create_room_public_option_title">"Публичный"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Кто угодно может подать заявку, но администратор или модератор должен будет принять запрос."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Разрешить запросы на присоединение"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Кто угодно в %1$s может присоединиться, а всем остальным нужно запросить доступ."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Запросы на присоединение"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Присоединиться можно только по приглашениям."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Приватный"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Кто угодно может присоедниться."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Публичный"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Кто угодно в %1$s может присоединиться."</string>
  <string name="screen_create_room_room_access_section_restricted_option_title">"Стандарт"</string>
  <string name="screen_create_room_room_access_section_title">"Кто имеет доступ"</string>
-  <string name="screen_create_room_room_address_section_footer">"Вам понадобится адрес комнаты, чтобы сделать ее видимой в каталоге."</string>
+  <string name="screen_create_room_room_address_section_footer">"Необходимо задать адрес комнаты, чтобы опубликовать ее в каталог комнат."</string>
  <string name="screen_create_room_room_address_section_title">"Адрес"</string>
  <string name="screen_create_room_room_visibility_section_title">"Видимость комнаты"</string>
  <string name="screen_create_room_space_selection_no_space_description">"(нет пространства)"</string>
-  <string name="screen_create_room_space_selection_no_space_title">"Главная"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Не добавлять в пространство"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Пространство не выбрано"</string>
  <string name="screen_create_room_space_selection_sheet_title">"Добавить в пространство"</string>
  <string name="screen_create_room_topic_label">"Тема (необязательно)"</string>
  <string name="screen_create_room_topic_placeholder">"Добавить описание…"</string>
--- a/features/createroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uk/translations.xml
@@ -3,14 +3,24 @@
  <string name="screen_create_room_action_create_room">"Нова кімната"</string>
  <string name="screen_create_room_add_people_title">"Запросити людей"</string>
  <string name="screen_create_room_error_creating_room">"Під час створення кімнати сталася помилка"</string>
-  <string name="screen_create_room_private_option_description">"Лише запрошені люди мають доступ до цієї кімнати. Усі повідомлення захищені наскрізним шифруванням."</string>
+  <string name="screen_create_room_name_placeholder">"Додати назву…"</string>
+  <string name="screen_create_room_new_room_title">"Нова кімната"</string>
+  <string name="screen_create_room_new_space_title">"Новий простір"</string>
+  <string name="screen_create_room_private_option_description">"Можуть приєднатися лише запрошені люди."</string>
  <string name="screen_create_room_public_option_description">"Будь-хто може знайти цю кімнату. 
 Ви можете змінити це в будь-який час у налаштуваннях кімнати."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Будь-хто може попросити приєднатися до кімнати, але адміністратор або модератор повинен буде прийняти запит"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Запросити приєднатися"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Будь-хто може приєднатися до цієї кімнати"</string>
-  <string name="screen_create_room_room_address_section_footer">"Щоб цю кімнату було видно в каталозі загальнодоступних кімнат, вам знадобиться її адреса."</string>
-  <string name="screen_create_room_room_address_section_title">"Адреса кімнати"</string>
+  <string name="screen_create_room_public_option_short_description">"Приєднатися може будь-хто."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Будь-хто може подати запит на приєднання, але адміністратор або модератор повинен схвалити запит."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Дозволити запит на приєднання"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Приєднатися можуть лише запрошені особи."</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Приєднатися може будь-хто."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Приєднатися може будь-хто з %1$s."</string>
+  <string name="screen_create_room_room_access_section_title">"Хто має доступ"</string>
+  <string name="screen_create_room_room_address_section_footer">"Вам знадобиться адреса, щоб зробити її видимою в загальнодоступному каталозі."</string>
+  <string name="screen_create_room_room_address_section_title">"Адреса"</string>
  <string name="screen_create_room_room_visibility_section_title">"Видимість кімнати"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Головна"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Додати до простору"</string>
  <string name="screen_create_room_topic_label">"Тема (необов\'язково)"</string>
+  <string name="screen_create_room_topic_placeholder">"Додати опис…"</string>
 </resources>
--- a/features/deactivation/impl/src/main/res/values-ru/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ru/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Вы уверены, что хотите отключить свою учётную запись? Данное действие не может быть отменено."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Вы уверены, что хотите отключить свою учётную запись? Данное действие необратимо."</string>
  <string name="screen_deactivate_account_delete_all_messages">"Удалить все мои сообщения"</string>
-  <string name="screen_deactivate_account_delete_all_messages_notice">"Предупреждение: будущие пользователи могут увидеть незавершенные разговоры."</string>
-  <string name="screen_deactivate_account_description">"Отключение вашей учетной записи %1$s и означает следующее:"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Внимание: в будущем пользователи могут видеть неполные переписки."</string>
+  <string name="screen_deactivate_account_description">"Деактивация вашего аккаунта %1$s и означает следующее:"</string>
  <string name="screen_deactivate_account_description_bold_part">"необратимо"</string>
-  <string name="screen_deactivate_account_list_item_1">"Ваша учётная запись будет %1$s (вы не сможете войти в неё снова, и ваш ID не может быть использован повторно)."</string>
-  <string name="screen_deactivate_account_list_item_1_bold_part">"отключена навсегда"</string>
+  <string name="screen_deactivate_account_list_item_1">"Ваша учётная запись будет %1$s (вы не сможете войти в неё снова, и другие пользователи не смогут использовать ваше имя пользователя)."</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Отключить навсегда"</string>
  <string name="screen_deactivate_account_list_item_2">"Вы будете удалены из всех чатов."</string>
-  <string name="screen_deactivate_account_list_item_3">"Данные вашей учётной записи будут удалены с нашего сервера идентификации."</string>
+  <string name="screen_deactivate_account_list_item_3">"Данные Вашего аккаунта будут удалены с нашего сервера идентификации."</string>
  <string name="screen_deactivate_account_list_item_4">"Ваши сообщения по-прежнему будут видны зарегистрированным пользователям, но не будут доступны новым или незарегистрированным пользователям, если вы решите удалить их."</string>
  <string name="screen_deactivate_account_title">"Отключить учётную запись"</string>
 </resources>
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt
@@ -30,7 +30,7 @@ class ChooseSelfVerificationModePresenter(
    @Composable
    override fun present(): ChooseSelfVerificationModeState {
        val hasDevicesToVerifyAgainst by encryptionService.hasDevicesToVerifyAgainst.collectAsState()
-        val canEnterRecoveryKey by encryptionService.recoveryStateStateFlow
+        val canUseRecoveryKey by encryptionService.recoveryStateStateFlow
            .mapState { recoveryState ->
                when (recoveryState) {
                    RecoveryState.WAITING_FOR_SYNC,
@@ -44,14 +44,14 @@ class ChooseSelfVerificationModePresenter(
        val buttonsState by remember {
            derivedStateOf {
                val canUseAnotherDevice = hasDevicesToVerifyAgainst.dataOrNull()
-                val canEnterRecoveryKey = canEnterRecoveryKey.dataOrNull()
-                if (canUseAnotherDevice == null || canEnterRecoveryKey == null) {
+                val canUseRecoveryKey = canUseRecoveryKey.dataOrNull()
+                if (canUseAnotherDevice == null || canUseRecoveryKey == null) {
                    AsyncData.Loading()
                } else {
                    AsyncData.Success(
                        ChooseSelfVerificationModeState.ButtonsState(
                            canUseAnotherDevice = canUseAnotherDevice,
-                            canEnterRecoveryKey = canEnterRecoveryKey,
+                            canUseRecoveryKey = canUseRecoveryKey,
                        )
                    )
                }
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt
@@ -18,6 +18,6 @@ data class ChooseSelfVerificationModeState(
 ) {
    data class ButtonsState(
        val canUseAnotherDevice: Boolean,
-        val canEnterRecoveryKey: Boolean,
+        val canUseRecoveryKey: Boolean,
    )
 }
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt
@@ -17,22 +17,22 @@ class ChooseSelfVerificationModeStateProvider :
    override val values = sequenceOf(
        aChooseSelfVerificationModeState(
            buttonsState = AsyncData.Success(
-                aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = true),
+                aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = true),
            ),
        ),
        aChooseSelfVerificationModeState(
            buttonsState = AsyncData.Success(
-                aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = false),
+                aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = false),
            ),
        ),
        aChooseSelfVerificationModeState(
            buttonsState = AsyncData.Success(
-                aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = true),
+                aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = true),
            ),
        ),
        aChooseSelfVerificationModeState(
            buttonsState = AsyncData.Success(
-                aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = false),
+                aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = false),
            ),
        ),
        aChooseSelfVerificationModeState(
@@ -51,8 +51,8 @@ fun aChooseSelfVerificationModeState(

 fun aButtonsState(
    canUseAnotherDevice: Boolean = true,
-    canEnterRecoveryKey: Boolean = true,
+    canUseRecoveryKey: Boolean = true,
 ) = ChooseSelfVerificationModeState.ButtonsState(
    canUseAnotherDevice = canUseAnotherDevice,
-    canEnterRecoveryKey = canEnterRecoveryKey,
+    canUseRecoveryKey = canUseRecoveryKey,
 )
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt
@@ -122,10 +122,10 @@ private fun ChooseSelfVerificationModeButtons(
                        onClick = onUseAnotherDevice,
                    )
                }
-                if (state.buttonsState.data.canEnterRecoveryKey) {
+                if (state.buttonsState.data.canUseRecoveryKey) {
                    Button(
                        modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.screen_session_verification_enter_recovery_key),
+                        text = stringResource(R.string.screen_identity_confirmation_use_recovery_key),
                        onClick = onUseRecoveryKey,
                    )
                }
--- a/features/ftue/impl/src/main/res/values-be/translations.xml
+++ b/features/ftue/impl/src/main/res/values-be/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Чаканне на іншай прыладзе…"</string>
  <string name="screen_notification_optin_subtitle">"Вы можаце змяніць налады пазней."</string>
  <string name="screen_notification_optin_title">"Дазвольце апавяшчэнні і ніколі не прапускайце іх"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Увядзіце ключ аднаўлення"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-bg/translations.xml
+++ b/features/ftue/impl/src/main/res/values-bg/translations.xml
@@ -9,5 +9,4 @@
  <string name="screen_identity_use_another_device">"Използване на друго устройство"</string>
  <string name="screen_notification_optin_subtitle">"Можете да промените настройките си по-късно."</string>
  <string name="screen_notification_optin_title">"Разрешете известията и никога не пропускайте съобщение"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Въвеждане на ключ за възстановяване"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-cs/translations.xml
+++ b/features/ftue/impl/src/main/res/values-cs/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Čekání na jiném zařízení…"</string>
  <string name="screen_notification_optin_subtitle">"Nastavení můžete později změnit."</string>
  <string name="screen_notification_optin_title">"Povolte oznámení a nezmeškejte žádnou zprávu"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Zadejte klíč pro obnovení"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-cy/translations.xml
+++ b/features/ftue/impl/src/main/res/values-cy/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Yn aros ar ddyfais arall…"</string>
  <string name="screen_notification_optin_subtitle">"Gallwch newid eich gosodiadau yn nes ymlaen."</string>
  <string name="screen_notification_optin_title">"Caniatáu hysbysiadau a pheidio byth â cholli neges"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Rhowch eich allwedd adfer"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-da/translations.xml
+++ b/features/ftue/impl/src/main/res/values-da/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Venter på en anden enhed…"</string>
  <string name="screen_notification_optin_subtitle">"Du kan ændre dine indstillinger senere."</string>
  <string name="screen_notification_optin_title">"Tillad notifikationer, og gå aldrig glip af en besked"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Indtast gendannelsesnøgle"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-de/translations.xml
+++ b/features/ftue/impl/src/main/res/values-de/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Bitte warten bis das andere Gerät bereit ist."</string>
  <string name="screen_notification_optin_subtitle">"Du kannst deine Einstellungen später ändern."</string>
  <string name="screen_notification_optin_title">"Erlaube Benachrichtigungen und verpasse keine Nachricht"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Wiederherstellungsschlüssel eingeben"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-el/translations.xml
+++ b/features/ftue/impl/src/main/res/values-el/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"Δεν μπορείς να επιβεβαιώσεις;"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Δημιουργία νέου κλειδιού ανάκτησης"</string>
-  <string name="screen_identity_confirmation_subtitle">"Επαλήθευσε αυτήν τη συσκευή για να ρυθμίσεις την ασφαλή επικοινωνία."</string>
-  <string name="screen_identity_confirmation_title">"Επιβεβαίωσε ότι είσαι εσύ"</string>
+  <string name="screen_identity_confirmation_subtitle">"Επιλέξτε τον τρόπο επαλήθευσης για να ρυθμίσετε την ασφαλή ανταλλαγή μηνυμάτων."</string>
+  <string name="screen_identity_confirmation_title">"Επιβεβαιώστε την ψηφιακή σας ταυτότητα"</string>
  <string name="screen_identity_confirmation_use_another_device">"Χρήση άλλης συσκευής"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Χρήση κλειδιού ανάκτησης"</string>
  <string name="screen_identity_confirmed_subtitle">"Τώρα μπορείς να διαβάζεις ή να στέλνεις μηνύματα με ασφάλεια και επίσης μπορεί να εμπιστευτεί αυτήν τη συσκευή οποιοσδήποτε με τον οποίο συνομιλείς."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Αναμονή σε άλλη συσκευή…"</string>
  <string name="screen_notification_optin_subtitle">"Μπορείς να αλλάξεις τις ρυθμίσεις σου αργότερα."</string>
  <string name="screen_notification_optin_title">"Επέτρεψε τις ειδοποιήσεις και μην χάσεις ούτε ένα μήνυμα"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Εισαγωγή κλειδιού ανάκτησης"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-es/translations.xml
+++ b/features/ftue/impl/src/main/res/values-es/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Esperando en otro dispositivo…"</string>
  <string name="screen_notification_optin_subtitle">"Puedes cambiar la configuración más tarde."</string>
  <string name="screen_notification_optin_title">"Activa las notificaciones y nunca te pierdas un mensaje"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Introduce la clave de recuperación"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-et/translations.xml
+++ b/features/ftue/impl/src/main/res/values-et/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Ootame teise seadme järgi…"</string>
  <string name="screen_notification_optin_subtitle">"Sa võid seadistusi hiljem alati muuta."</string>
  <string name="screen_notification_optin_title">"Luba teavitused ja kunagi ei jää sul sõnumid märkamata"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Sisesta taastevõti"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-eu/translations.xml
+++ b/features/ftue/impl/src/main/res/values-eu/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Beste gailuaren zain…"</string>
  <string name="screen_notification_optin_subtitle">"Geroago alda ditzakezu ezarpenak."</string>
  <string name="screen_notification_optin_title">"Baimendu jakinarazpenak eta ez galdu inoiz mezurik"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Sartu berreskuratze-gakoa"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-fa/translations.xml
+++ b/features/ftue/impl/src/main/res/values-fa/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"منتظر افزارهٔ دیگر…"</string>
  <string name="screen_notification_optin_subtitle">"می‌توانید بعداً تنظیماتتان را تغییر دهید."</string>
  <string name="screen_notification_optin_title">"اجازه به آگاهی‌ها و از دست ندادن پیام‌ها"</string>
-  <string name="screen_session_verification_enter_recovery_key">"ورود کلید بازیابی"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-fi/translations.xml
+++ b/features/ftue/impl/src/main/res/values-fi/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"Etkö voi vahvistaa?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Luo uusi palautusavain"</string>
-  <string name="screen_identity_confirmation_subtitle">"Vahvista tämä laite suojattua viestintää varten."</string>
-  <string name="screen_identity_confirmation_title">"Vahvista identiteettisi"</string>
+  <string name="screen_identity_confirmation_subtitle">"Valitse vahvistustapa suojatun viestinnän määrittämiseksi."</string>
+  <string name="screen_identity_confirmation_title">"Vahvista digitaalinen identiteettisi"</string>
  <string name="screen_identity_confirmation_use_another_device">"Käytä toista laitetta"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Käytä palautusavainta"</string>
  <string name="screen_identity_confirmed_subtitle">"Nyt voit lukea ja lähettää viestejä turvallisesti, ja kaikki, joiden kanssa keskustelet, voivat myös luottaa tähän laitteeseen."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Odotetaan toista laitetta…"</string>
  <string name="screen_notification_optin_subtitle">"Voit muuttaa asetuksia myöhemmin."</string>
  <string name="screen_notification_optin_title">"Salli ilmoitukset ja älä koskaan missaa viestejä"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Anna palautusavain"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-fr/translations.xml
+++ b/features/ftue/impl/src/main/res/values-fr/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"Confirmation impossible ?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Créer une nouvelle clé de récupération"</string>
-  <string name="screen_identity_confirmation_subtitle">"Vérifier cette session pour configurer votre messagerie sécurisée."</string>
-  <string name="screen_identity_confirmation_title">"Confirmez votre identité"</string>
+  <string name="screen_identity_confirmation_subtitle">"Choisissez comment vérifier afin de configurer votre messagerie sécurisée."</string>
+  <string name="screen_identity_confirmation_title">"Confirmez votre identité numérique"</string>
  <string name="screen_identity_confirmation_use_another_device">"Utiliser une autre session"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Utiliser la clé de récupération"</string>
  <string name="screen_identity_confirmed_subtitle">"Vous pouvez désormais lire ou envoyer des messages en toute sécurité, et toute personne avec qui vous discutez peut également faire confiance à cette session."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"En attente d’une autre session…"</string>
  <string name="screen_notification_optin_subtitle">"Vous pourrez modifier vos paramètres ultérieurement."</string>
  <string name="screen_notification_optin_title">"Autorisez les notifications et ne manquez aucun message"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Utiliser la clé de récupération"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-hr/translations.xml
+++ b/features/ftue/impl/src/main/res/values-hr/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Čekanje na drugi uređaj…"</string>
  <string name="screen_notification_optin_subtitle">"Postavke možete promijeniti poslije."</string>
  <string name="screen_notification_optin_title">"Omogućite obavijesti i nikada ne propustite poruku"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Unesi ključ za oporavak"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-hu/translations.xml
+++ b/features/ftue/impl/src/main/res/values-hu/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"Nem tudja megerősíteni?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Új helyreállítási kulcs létrehozása"</string>
-  <string name="screen_identity_confirmation_subtitle">"A biztonságos üzenetkezelés beállításához ellenőrizze ezt az eszközt."</string>
-  <string name="screen_identity_confirmation_title">"Erősítse meg, hogy Ön az"</string>
+  <string name="screen_identity_confirmation_subtitle">"Válassza ki az ellenőrzés módját a biztonságos üzenetküldés beállításához."</string>
+  <string name="screen_identity_confirmation_title">"Erősítse meg digitális személyazonosságát"</string>
  <string name="screen_identity_confirmation_use_another_device">"Másik eszköz használata"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Helyreállítási kulcs használata"</string>
  <string name="screen_identity_confirmed_subtitle">"Mostantól biztonságosan olvashat vagy küldhet üzeneteket, és bármelyik csevegőpartnere megbízhat ebben az eszközben."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Várakozás a másik eszközre…"</string>
  <string name="screen_notification_optin_subtitle">"A beállításokat később is módosíthatja."</string>
  <string name="screen_notification_optin_title">"Értesítések engedélyezése, hogy soha ne maradjon le egyetlen üzenetről sem"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Adja meg a helyreállítási kulcsot"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-in/translations.xml
+++ b/features/ftue/impl/src/main/res/values-in/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Menunggu di perangkat lain…"</string>
  <string name="screen_notification_optin_subtitle">"Anda dapat mengubah pengaturan Anda nanti."</string>
  <string name="screen_notification_optin_title">"Izinkan pemberitahuan dan jangan pernah melewatkan pesan"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Masukkan kunci pemulihan"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-it/translations.xml
+++ b/features/ftue/impl/src/main/res/values-it/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"In attesa sull\'altro dispositivo…"</string>
  <string name="screen_notification_optin_subtitle">"Potrai modificare le tue impostazioni in seguito."</string>
  <string name="screen_notification_optin_title">"Consenti le notifiche e non perdere mai un messaggio"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Inserisci la chiave di recupero"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-ka/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ka/translations.xml
@@ -8,5 +8,4 @@
  <string name="screen_identity_waiting_on_other_device">"ველოდებით სხვა მოწყობილობას…"</string>
  <string name="screen_notification_optin_subtitle">"თქვენ შეგიძლიათ შეცვალოთ თქვენი პარამეტრები მოგვიანებით."</string>
  <string name="screen_notification_optin_title">"ყველა შეტყობინებაზე შეტყობინებების მიღება"</string>
-  <string name="screen_session_verification_enter_recovery_key">"შეიყვანეთ აღდგენის გასაღები"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-ko/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ko/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"확인할 수 없나요?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"새로운 복구 키 만들기"</string>
-  <string name="screen_identity_confirmation_subtitle">"보안 메시징을 설정하려면 이 장치를 확인하세요."</string>
-  <string name="screen_identity_confirmation_title">"본인 확인"</string>
+  <string name="screen_identity_confirmation_subtitle">"보안 메시징 설정을 위해 인증 방법을 선택해 주세요."</string>
+  <string name="screen_identity_confirmation_title">"디지털 신원 확인"</string>
  <string name="screen_identity_confirmation_use_another_device">"다른 기기 사용"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"복구 키 사용"</string>
  <string name="screen_identity_confirmed_subtitle">"이제 메시지를 안전하게 읽거나 보낼 수 있으며, 채팅 상대도 이 기기를 신뢰할 수 있습니다."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"다른 기기에서 대기 중…"</string>
  <string name="screen_notification_optin_subtitle">"나중에 설정을 변경할 수 있습니다."</string>
  <string name="screen_notification_optin_title">"알림을 허용하고 메시지를 놓치지 마세요."</string>
-  <string name="screen_session_verification_enter_recovery_key">"복구 키를 입력하세요"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-nb/translations.xml
+++ b/features/ftue/impl/src/main/res/values-nb/translations.xml
@@ -3,7 +3,7 @@
  <string name="screen_identity_confirmation_cannot_confirm">"Kan du ikke bekrefte?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Opprett en ny gjenopprettingsnøkkel"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifiser denne enheten for å sette opp sikker meldingsutveksling."</string>
-  <string name="screen_identity_confirmation_title">"Bekreft identiteten din"</string>
+  <string name="screen_identity_confirmation_title">"Bekreft din digitale identitet"</string>
  <string name="screen_identity_confirmation_use_another_device">"Bruk en annen enhet"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Bruk gjenopprettingsnøkkel"</string>
  <string name="screen_identity_confirmed_subtitle">"Nå kan du lese eller sende meldinger på en sikker måte, og alle du chatter med kan også stole på denne enheten."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Venter på en annen enhet…"</string>
  <string name="screen_notification_optin_subtitle">"Du kan endre innstillingene dine senere."</string>
  <string name="screen_notification_optin_title">"Tillat varslinger og gå aldri glipp av en melding"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Skriv inn gjenopprettingsnøkkel"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-nl/translations.xml
+++ b/features/ftue/impl/src/main/res/values-nl/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Wachten op ander apparaat…"</string>
  <string name="screen_notification_optin_subtitle">"Je kunt je instellingen later wijzigen."</string>
  <string name="screen_notification_optin_title">"Sta meldingen toe en mis nooit meer een bericht"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Voer herstelsleutel in"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-pl/translations.xml
+++ b/features/ftue/impl/src/main/res/values-pl/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Oczekiwanie na inne urządzenie…"</string>
  <string name="screen_notification_optin_subtitle">"Możesz zmienić ustawienia później."</string>
  <string name="screen_notification_optin_title">"Zezwól na powiadomienia i nie przegap żadnej wiadomości"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Wprowadź klucz przywracania"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Aguardando o outro dispositivo…"</string>
  <string name="screen_notification_optin_subtitle">"Você pode alterar suas configurações mais tarde."</string>
  <string name="screen_notification_optin_title">"Permita as notificações e nunca perca uma mensagem"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Digitar chave de recuperação"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-pt/translations.xml
+++ b/features/ftue/impl/src/main/res/values-pt/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"A aguardar por outros dispositivos…"</string>
  <string name="screen_notification_optin_subtitle">"Podes alterar as tuas definições mais tarde."</string>
  <string name="screen_notification_optin_title">"Permite as notificações e nunca percas uma mensagem"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Insere a chave de recuperação"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-ro/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ro/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Se așteaptă celălalt dispozitiv…"</string>
  <string name="screen_notification_optin_subtitle">"Puteți modifica setările mai târziu."</string>
  <string name="screen_notification_optin_title">"Permiteți notificările și nu pierdeți niciodată un mesaj"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Introduceți cheia de recuperare"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-ru/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ru/translations.xml
@@ -3,14 +3,13 @@
  <string name="screen_identity_confirmation_cannot_confirm">"Не можете подтвердить?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Создайте новый ключ восстановления"</string>
  <string name="screen_identity_confirmation_subtitle">"Подтвердите это устройство, чтобы настроить безопасный обмен сообщениями."</string>
-  <string name="screen_identity_confirmation_title">"Подтвердите, что это вы"</string>
+  <string name="screen_identity_confirmation_title">"Подтвердите личность"</string>
  <string name="screen_identity_confirmation_use_another_device">"Использовать другое устройство"</string>
-  <string name="screen_identity_confirmation_use_recovery_key">"Используйте recovery key"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Использовать ключ восстановления"</string>
  <string name="screen_identity_confirmed_subtitle">"Теперь вы можете безопасно читать и отправлять сообщения, и все, с кем вы общаетесь в чате, также могут доверять этому устройству."</string>
  <string name="screen_identity_confirmed_title">"Устройство проверено"</string>
  <string name="screen_identity_use_another_device">"Использовать другое устройство"</string>
-  <string name="screen_identity_waiting_on_other_device">"Ожидание на другом устройстве…"</string>
+  <string name="screen_identity_waiting_on_other_device">"Ожидание другого устройства…"</string>
  <string name="screen_notification_optin_subtitle">"Вы можете изменить настройки позже."</string>
-  <string name="screen_notification_optin_title">"Разрешите отправку уведомлений и ни одно сообщение не будет пропущено"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Введите ключ восстановления"</string>
+  <string name="screen_notification_optin_title">"Разрешите отправку уведомлений"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-sk/translations.xml
+++ b/features/ftue/impl/src/main/res/values-sk/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Čaká sa na druhom zariadení…"</string>
  <string name="screen_notification_optin_subtitle">"Svoje nastavenia môžete neskôr zmeniť."</string>
  <string name="screen_notification_optin_title">"Povoľte oznámenia a nikdy nezmeškajte žiadnu správu"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Zadajte kľúč na obnovenie"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-sv/translations.xml
+++ b/features/ftue/impl/src/main/res/values-sv/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Väntar på annan enhet …"</string>
  <string name="screen_notification_optin_subtitle">"Du kan ändra dina inställningar senare."</string>
  <string name="screen_notification_optin_title">"Tillåt aviseringar och missa aldrig ett meddelande"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Ange återställningsnyckel"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-tr/translations.xml
+++ b/features/ftue/impl/src/main/res/values-tr/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Diğer cihazda bekleniyor…"</string>
  <string name="screen_notification_optin_subtitle">"Ayarlarınızı daha sonra değiştirebilirsiniz."</string>
  <string name="screen_notification_optin_title">"Bildirimlere izin verin ve hiçbir mesajı kaçırmayın"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Kurtarma anahtarını girin"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-uk/translations.xml
+++ b/features/ftue/impl/src/main/res/values-uk/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Чекає на інше пристрій…"</string>
  <string name="screen_notification_optin_subtitle">"Ви можете змінити свої налаштування пізніше."</string>
  <string name="screen_notification_optin_title">"Дозволити сповіщення і ніколи не пропускати повідомлення"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Введіть ключ відновлення"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-ur/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ur/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"دوسرے آلہ پر منتظر…"</string>
  <string name="screen_notification_optin_subtitle">"آپ بعد میں اپنی ترتیبات تبدیل کر سکتے ہیں۔"</string>
  <string name="screen_notification_optin_title">"اطلاعات کی اجازت دیں اور کبھی بھی کسی پیغام سے محروم نہ ہوں۔"</string>
-  <string name="screen_session_verification_enter_recovery_key">"بازیابی کلید درج کریں"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-uz/translations.xml
+++ b/features/ftue/impl/src/main/res/values-uz/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Boshqa qurilmada kutilmoqda…"</string>
  <string name="screen_notification_optin_subtitle">"Sozlamalaringizni keyinroq o\'zgartirishingiz mumkin."</string>
  <string name="screen_notification_optin_title">"Bildirishnomalarga ruxsat bering va hech qachon xabarni o\'tkazib yubormang"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Tiklash kalitini kiriting"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"正在等待其他裝置…"</string>
  <string name="screen_notification_optin_subtitle">"您稍後仍可變更設定。"</string>
  <string name="screen_notification_optin_title">"允許通知，永遠不會錯誤任何訊息"</string>
-  <string name="screen_session_verification_enter_recovery_key">"輸入復原金鑰"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values-zh/translations.xml
+++ b/features/ftue/impl/src/main/res/values-zh/translations.xml
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"正在等待其他设备……"</string>
  <string name="screen_notification_optin_subtitle">"您可以稍后更改设置。"</string>
  <string name="screen_notification_optin_title">"允许通知，绝不错过任何消息"</string>
-  <string name="screen_session_verification_enter_recovery_key">"输入恢复密钥"</string>
 </resources>
--- a/features/ftue/impl/src/main/res/values/localazy.xml
+++ b/features/ftue/impl/src/main/res/values/localazy.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_cannot_confirm">"Can\'t confirm?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Create a new recovery key"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verify this device to set up secure messaging."</string>
-  <string name="screen_identity_confirmation_title">"Confirm your identity"</string>
+  <string name="screen_identity_confirmation_subtitle">"Choose how to verify to set up secure messaging."</string>
+  <string name="screen_identity_confirmation_title">"Confirm your digital identity"</string>
  <string name="screen_identity_confirmation_use_another_device">"Use another device"</string>
  <string name="screen_identity_confirmation_use_recovery_key">"Use recovery key"</string>
  <string name="screen_identity_confirmed_subtitle">"Now you can read or send messages securely, and anyone you chat with can also trust this device."</string>
@@ -12,5 +12,4 @@
  <string name="screen_identity_waiting_on_other_device">"Waiting on other device…"</string>
  <string name="screen_notification_optin_subtitle">"You can change your settings later."</string>
  <string name="screen_notification_optin_title">"Allow notifications and never miss a message"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Enter recovery key"</string>
 </resources>
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt
@@ -47,7 +47,7 @@ class ChooseSessionVerificationModePresenterTest {
            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
                ChooseSelfVerificationModeState.ButtonsState(
                    canUseAnotherDevice = false,
-                    canEnterRecoveryKey = false,
+                    canUseRecoveryKey = false,
                )
            )
        }
@@ -66,7 +66,7 @@ class ChooseSessionVerificationModePresenterTest {
            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
                ChooseSelfVerificationModeState.ButtonsState(
                    canUseAnotherDevice = false,
-                    canEnterRecoveryKey = false,
+                    canUseRecoveryKey = false,
                )
            )
        }
@@ -85,7 +85,7 @@ class ChooseSessionVerificationModePresenterTest {
            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
                ChooseSelfVerificationModeState.ButtonsState(
                    canUseAnotherDevice = true,
-                    canEnterRecoveryKey = false,
+                    canUseRecoveryKey = false,
                )
            )
        }
@@ -104,7 +104,7 @@ class ChooseSessionVerificationModePresenterTest {
            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
                ChooseSelfVerificationModeState.ButtonsState(
                    canUseAnotherDevice = false,
-                    canEnterRecoveryKey = true,
+                    canUseRecoveryKey = true,
                )
            )
        }
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt
@@ -57,10 +57,10 @@ class ChooseSessionVerificationModeViewTest {
    fun `clicking on enter recovery key calls the callback`() {
        ensureCalledOnce { callback ->
            rule.setChooseSelfVerificationModeView(
-                aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canEnterRecoveryKey = true))),
+                aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseRecoveryKey = true))),
                onEnterRecoveryKey = callback,
            )
-            rule.clickOn(R.string.screen_session_verification_enter_recovery_key)
+            rule.clickOn(R.string.screen_identity_confirmation_use_recovery_key)
        }
    }

--- a/features/home/impl/src/main/res/values-da/translations.xml
+++ b/features/home/impl/src/main/res/values-da/translations.xml
@@ -15,7 +15,7 @@
  <string name="full_screen_intent_banner_message">"For at sikre, at du aldrig går glip af et vigtigt opkald, skal du ændre dine indstillinger til at tillade underretninger i fuld skærm, når din telefon er låst."</string>
  <string name="full_screen_intent_banner_title">"Gør din opkaldsoplevelse bedre"</string>
  <string name="screen_home_tab_chats">"Samtaler"</string>
-  <string name="screen_home_tab_spaces">"Grupper"</string>
+  <string name="screen_home_tab_spaces">"Klynger"</string>
  <string name="screen_invites_decline_chat_message">"Er du sikker på, at du vil afvise invitationen til at deltage i %1$s?"</string>
  <string name="screen_invites_decline_chat_title">"Afvis invitation"</string>
  <string name="screen_invites_decline_direct_chat_message">"Er du sikker på, at du vil afvise denne private samtale med %1$s?"</string>
@@ -50,7 +50,7 @@ Du har ingen ulæste beskeder!"</string>
  <string name="screen_roomlist_mark_as_read">"Marker som læst"</string>
  <string name="screen_roomlist_mark_as_unread">"Marker som ulæst"</string>
  <string name="screen_roomlist_tombstoned_room_description">"Dette rum er blevet opgraderet"</string>
-  <string name="screen_roomlist_your_spaces">"Dine grupper"</string>
+  <string name="screen_roomlist_your_spaces">"Dine klynger"</string>
  <string name="session_verification_banner_message">"Det ser ud til, at du bruger en ny enhed. Bekræft med en anden enhed for at få adgang til dine krypterede meddelelser."</string>
  <string name="session_verification_banner_title">"Bekræft, at det er dig"</string>
 </resources>
--- a/features/home/impl/src/main/res/values-el/translations.xml
+++ b/features/home/impl/src/main/res/values-el/translations.xml
@@ -5,9 +5,9 @@
  <string name="banner_battery_optimization_title_android">"Δεν φτάνουν οι ειδοποιήσεις;"</string>
  <string name="banner_new_sound_message">"Το ping ειδοποιήσεών σας έχει ενημερωθεί—είναι πιο σαφές, πιο γρήγορο και λιγότερο ενοχλητικό."</string>
  <string name="banner_new_sound_title">"Ανανεώσαμε τους ήχους σας"</string>
-  <string name="banner_set_up_recovery_content">"Δημιούργησε ένα νέο κλειδί ανάκτησης που μπορεί να χρησιμοποιηθεί για την επαναφορά του ιστορικού των κρυπτογραφημένων μηνυμάτων σου σε περίπτωση που χάσεις την πρόσβαση στις συσκευές σου."</string>
-  <string name="banner_set_up_recovery_submit">"Ρύθμιση ανάκτησης"</string>
-  <string name="banner_set_up_recovery_title">"Ρύθμιση ανάκτησης"</string>
+  <string name="banner_set_up_recovery_content">"Οι συνομιλίες σας αποθηκεύονται αυτόματα με κρυπτογράφηση από άκρο σε άκρο. Για να επαναφέρετε αυτό το αντίγραφο ασφαλείας και να διατηρήσετε την ψηφιακή σας ταυτότητα όταν χάσετε την πρόσβαση σε όλες τις συσκευές σας, θα χρειαστείτε το κλειδί ανάκτησης. "</string>
+  <string name="banner_set_up_recovery_submit">"Λήψη κλειδιού ανάκτησης"</string>
+  <string name="banner_set_up_recovery_title">"Δημιουργήστε αντίγραφα ασφαλείας των συνομιλιών σας"</string>
  <string name="confirm_recovery_key_banner_message">"Επιβεβαίωσε το κλειδί ανάκτησης για να διατηρήσεις την πρόσβαση στο χώρο αποθήκευσης κλειδιών και στο ιστορικό μηνυμάτων."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Εισήγαγε το κλειδί ανάκτησης"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Ξέχασες το κλειδί ανάκτησης;"</string>
--- a/features/home/impl/src/main/res/values-fi/translations.xml
+++ b/features/home/impl/src/main/res/values-fi/translations.xml
@@ -5,9 +5,9 @@
  <string name="banner_battery_optimization_title_android">"Eikö ilmoitukset tule perille?"</string>
  <string name="banner_new_sound_message">"Ilmoitusääni on päivitetty — selkeämpi, nopeampi ja vähemmän häiritsevä."</string>
  <string name="banner_new_sound_title">"Olemme päivittäneet äänesi"</string>
-  <string name="banner_set_up_recovery_content">"Palauta kryptografinen identiteettisi ja viestihistoriasi palautusavaimella, mikäli menetät pääsyn kaikkiin laitteisiisi."</string>
-  <string name="banner_set_up_recovery_submit">"Ota palautus käyttöön"</string>
-  <string name="banner_set_up_recovery_title">"Ota palautus käyttöön tilisi suojaamiseksi"</string>
+  <string name="banner_set_up_recovery_content">"Keskustelusi varmuuskopioidaan automaattisesti päästä päähän -salauksella. Jotta voit palauttaa tämän varmuuskopion ja säilyttää digitaalisen identiteettisi, kun menetät pääsyn kaikkiin laitteisiisi, tarvitset palautusavaimesi."</string>
+  <string name="banner_set_up_recovery_submit">"Hanki palautusavain"</string>
+  <string name="banner_set_up_recovery_title">"Varmuuskopioi keskustelusi"</string>
  <string name="confirm_recovery_key_banner_message">"Vahvista palautusavaimesi, jotta pääset edelleen käyttämään avainten säilytystä ja viestihistoriaa."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Anna palautusavaimesi"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Unohditko palautusavaimesi?"</string>
--- a/features/home/impl/src/main/res/values-fr/translations.xml
+++ b/features/home/impl/src/main/res/values-fr/translations.xml
@@ -5,9 +5,9 @@
  <string name="banner_battery_optimization_title_android">"Ils vous manque des notifications?"</string>
  <string name="banner_new_sound_message">"Le son des notifications a été modifié: plus clair, plus court et moins perturbateur."</string>
  <string name="banner_new_sound_title">"Nous avons rafraîchi les sons"</string>
-  <string name="banner_set_up_recovery_content">"Générez une nouvelle clé de récupération qui peut être utilisée pour restaurer l’historique de vos messages chiffrés au cas où vous perdriez l’accès à vos appareils."</string>
-  <string name="banner_set_up_recovery_submit">"Configurer la sauvegarde"</string>
-  <string name="banner_set_up_recovery_title">"Configurer la récupération"</string>
+  <string name="banner_set_up_recovery_content">"Vos discussions sont automatiquement sauvegardées grâce à un chiffrement de bout en bout. Pour restaurer cette sauvegarde et conserver votre identité numérique en cas de perte d’accès à tous vos appareils, vous aurez besoin de votre clé de récupération."</string>
+  <string name="banner_set_up_recovery_submit">"Obtenir une clé de récupération"</string>
+  <string name="banner_set_up_recovery_title">"Sauvegarder vos discussions"</string>
  <string name="confirm_recovery_key_banner_message">"Confirmez votre clé de récupération pour conserver l’accès à votre stockage de clés et à l’historique des messages."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Saisissez votre clé de récupération"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Clé de récupération oubliée ?"</string>
--- a/features/home/impl/src/main/res/values-hu/translations.xml
+++ b/features/home/impl/src/main/res/values-hu/translations.xml
@@ -5,9 +5,9 @@
  <string name="banner_battery_optimization_title_android">"Nem érkeznek meg az értesítések?"</string>
  <string name="banner_new_sound_message">"Értesítési hangja frissült – tisztább, gyorsabb és kevésbé zavaró lett."</string>
  <string name="banner_new_sound_title">"Frissítettük a hangokat"</string>
-  <string name="banner_set_up_recovery_content">"Hozzon létre egy új helyreállítási kulcsot, amellyel visszaállíthatja a titkosított üzenetek előzményeit, ha elveszíti az eszközökhöz való hozzáférést."</string>
-  <string name="banner_set_up_recovery_submit">"Helyreállítás beállítása"</string>
-  <string name="banner_set_up_recovery_title">"Helyreállítás beállítása a fiókja védelméhez"</string>
+  <string name="banner_set_up_recovery_content">"A csevegései automatikusan mentve vannak, végpontok közti titkosítással Ahhoz, hogy az eszközei elvesztése esetén helyre tudja állítani a biztonsági mentést és megtartsa a digitális személyazonosságát, egy helyreállítási kulcsra van szüksége."</string>
+  <string name="banner_set_up_recovery_submit">"Helyreállítási kulcs beszerzése"</string>
+  <string name="banner_set_up_recovery_title">"Csevegések biztonsági mentése"</string>
  <string name="confirm_recovery_key_banner_message">"Erősítse meg a helyreállítási kulcsát, hogy továbbra is hozzáférjen a kulcstárolójához és az üzenetelőzményekhez."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Adja meg a helyreállítási kulcsot"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Elfelejtette a helyreállítási kulcsot?"</string>
--- a/features/home/impl/src/main/res/values-in/translations.xml
+++ b/features/home/impl/src/main/res/values-in/translations.xml
@@ -13,6 +13,7 @@
  <string name="full_screen_intent_banner_message">"Untuk memastikan Anda tidak melewatkan panggilan penting, silakan ubah pengaturan Anda untuk memperbolehkan notifikasi layar penuh ketika ponsel Anda terkunci."</string>
  <string name="full_screen_intent_banner_title">"Tingkatkan pengalaman panggilan Anda"</string>
  <string name="screen_home_tab_chats">"Semua Obrolan"</string>
+  <string name="screen_home_tab_spaces">"Space"</string>
  <string name="screen_invites_decline_chat_message">"Apakah Anda yakin ingin menolak undangan untuk bergabung ke %1$s?"</string>
  <string name="screen_invites_decline_chat_title">"Tolak undangan"</string>
  <string name="screen_invites_decline_direct_chat_message">"Apakah Anda yakin ingin menolak obrolan pribadi dengan %1$s?"</string>
@@ -32,6 +33,7 @@ Untuk sementara, Anda dapat membatalkan pilihan saringan untuk melihat percakapa
  <string name="screen_roomlist_filter_invites">"Undangan"</string>
  <string name="screen_roomlist_filter_invites_empty_state_title">"Anda tidak memiliki undangan yang tertunda."</string>
  <string name="screen_roomlist_filter_low_priority">"Prioritas Rendah"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Anda belum memiliki chat prioritas rendah."</string>
  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Anda dapat membatalkan pilihan saringan untuk melihat percakapan Anda yang lain"</string>
  <string name="screen_roomlist_filter_mixed_empty_state_title">"Anda tidak memiliki percakapan untuk pemilihan ini"</string>
  <string name="screen_roomlist_filter_people">"Orang"</string>
--- a/features/home/impl/src/main/res/values-ko/translations.xml
+++ b/features/home/impl/src/main/res/values-ko/translations.xml
@@ -3,9 +3,11 @@
  <string name="banner_battery_optimization_content_android">"이 앱의 배터리 최적화를 비활성화하여 모든 알림이 정상적으로 수신되도록 합니다."</string>
  <string name="banner_battery_optimization_submit_android">"최적화 비활성화"</string>
  <string name="banner_battery_optimization_title_android">"알림이 도착하지 않나요?"</string>
-  <string name="banner_set_up_recovery_content">"기존의 모든 기기를 분실한 경우 복구 키를 사용하여 암호화된 ID 및 메시지 기록을 복구할 수 있습니다."</string>
-  <string name="banner_set_up_recovery_submit">"복구 설정"</string>
-  <string name="banner_set_up_recovery_title">"계정을 보호하기 위해 복구를 설정하세요"</string>
+  <string name="banner_new_sound_message">"알림음이 업데이트되었습니다. 더욱 명확하고 빠르면서도, 방해는 최소화하도록 개선되었습니다."</string>
+  <string name="banner_new_sound_title">"앱 알림음이 새롭게 바뀌었습니다."</string>
+  <string name="banner_set_up_recovery_content">"대화 내용은 종단간 암호화 기술로 자동 백업됩니다. 모든 기기를 사용할 수 없는 상황에서 백업을 복구하고 디지털 신원을 유지하려면 복구 키가 반드시 필요합니다."</string>
+  <string name="banner_set_up_recovery_submit">"복구 키 가져오기"</string>
+  <string name="banner_set_up_recovery_title">"대화 백업하기"</string>
  <string name="confirm_recovery_key_banner_message">"키 저장소 및 메시지 기록에 대한 액세스를 유지하려면 복구 키를 확인하세요."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"복구 키를 입력하세요"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"복구 키를 잊으셨나요?"</string>
@@ -48,6 +50,7 @@
  <string name="screen_roomlist_mark_as_read">"읽음으로 표시"</string>
  <string name="screen_roomlist_mark_as_unread">"읽지 않음으로 표시"</string>
  <string name="screen_roomlist_tombstoned_room_description">"이 방이 업그레이드되었습니다"</string>
+  <string name="screen_roomlist_your_spaces">"내 스페이스"</string>
  <string name="session_verification_banner_message">"새 장치를 사용 중인 것 같습니다. 다른 디바이스로 인증하여 암호화된 메시지에 액세스하세요."</string>
  <string name="session_verification_banner_title">"본인인지 확인하세요"</string>
 </resources>
--- a/features/home/impl/src/main/res/values-nb/translations.xml
+++ b/features/home/impl/src/main/res/values-nb/translations.xml
@@ -6,7 +6,7 @@
  <string name="banner_new_sound_message">"Varslingssignalet ditt er oppdatert – tydeligere, raskere og mindre forstyrrende."</string>
  <string name="banner_new_sound_title">"Vi har oppdatert lydene dine"</string>
  <string name="banner_set_up_recovery_content">"Gjenopprett din kryptografiske identitet og meldingshistorikk med en gjenopprettingsnøkkel hvis du har mistet alle dine brukte enheter."</string>
-  <string name="banner_set_up_recovery_submit">"Konfigurer gjenoppretting"</string>
+  <string name="banner_set_up_recovery_submit">"Hent gjenopprettingsnøkkel"</string>
  <string name="banner_set_up_recovery_title">"Konfigurer gjenoppretting for å beskytte kontoen din"</string>
  <string name="confirm_recovery_key_banner_message">"Verifiser gjenopprettingsnøkkelen for å opprettholde tilgangen til nøkkellageret og meldingshistorikken."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Skriv inn gjenopprettingsnøkkelen din"</string>
--- a/features/home/impl/src/main/res/values-ru/translations.xml
+++ b/features/home/impl/src/main/res/values-ru/translations.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="banner_battery_optimization_content_android">"Выключите оптимизацию расхода батареи, чтобы убедиться, что все уведомления будут поступать."</string>
+  <string name="banner_battery_optimization_content_android">"Выключите оптимизацию расхода батареи, чтобы гарантировать получение всех уведомлений."</string>
  <string name="banner_battery_optimization_submit_android">"Выключить оптимизацию"</string>
-  <string name="banner_battery_optimization_title_android">"Уведомления не поступают?"</string>
+  <string name="banner_battery_optimization_title_android">"Уведомления не приходят?"</string>
  <string name="banner_new_sound_message">"Ваши уведомления были обновлены — теперь они понятнее, быстрее и менее отвлекающие."</string>
  <string name="banner_new_sound_title">"Мы обновили ваши звуки"</string>
  <string name="banner_set_up_recovery_content">"Создайте новый ключ восстановления, который можно использовать для восстановления зашифрованной истории сообщений в случае потери доступа к своим устройствам."</string>
-  <string name="banner_set_up_recovery_submit">"Настроить восстановление"</string>
-  <string name="banner_set_up_recovery_title">"Для защиты вашего аккаунта рекомендуется настроить восстановление"</string>
+  <string name="banner_set_up_recovery_submit">"Получить ключ восстановления"</string>
+  <string name="banner_set_up_recovery_title">"Сделайте резервную копию своих чатов."</string>
  <string name="confirm_recovery_key_banner_message">"Подтвердите ключ восстановления, чтобы сохранить доступ к хранилищу ключей и истории сообщений."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Введите ключ восстановления"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Забыли ключ восстановления?"</string>
  <string name="confirm_recovery_key_banner_title">"Хранилище ключей не синхронизировано"</string>
  <string name="full_screen_intent_banner_message">"Чтобы больше не пропускать важные звонки, разрешите приложению показывать полноэкранные уведомления на заблокированном экране телефона."</string>
  <string name="full_screen_intent_banner_title">"Улучшите качество звонков"</string>
-  <string name="screen_home_tab_chats">"Все чаты"</string>
+  <string name="screen_home_tab_chats">"Чаты"</string>
  <string name="screen_home_tab_spaces">"Пространства"</string>
  <string name="screen_invites_decline_chat_message">"Вы уверены, что хотите отклонить приглашение в %1$s?"</string>
  <string name="screen_invites_decline_chat_title">"Отклонить приглашение"</string>
  <string name="screen_invites_decline_direct_chat_message">"Вы уверены, что хотите отказаться от личного общения с %1$s?"</string>
  <string name="screen_invites_decline_direct_chat_title">"Отклонить чат"</string>
  <string name="screen_invites_empty_list">"Нет приглашений"</string>
-  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил вас"</string>
-  <string name="screen_migration_message">"Это одноразовый процесс, спасибо, что подождали."</string>
-  <string name="screen_migration_title">"Настройка учетной записи."</string>
-  <string name="screen_roomlist_a11y_create_message">"Создайте новую беседу или комнату"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) вас"</string>
+  <string name="screen_migration_message">"Это единоразовая процедура, спасибо, что подождали."</string>
+  <string name="screen_migration_title">"Настройка Вашего аккаунта."</string>
+  <string name="screen_roomlist_a11y_create_message">"Создать новую беседу или комнату"</string>
  <string name="screen_roomlist_clear_filters">"Очистить фильтры"</string>
-  <string name="screen_roomlist_empty_message">"Начните переписку с отправки сообщения."</string>
-  <string name="screen_roomlist_empty_title">"Пока нет доступных чатов."</string>
-  <string name="screen_roomlist_filter_favourites">"Избранное"</string>
+  <string name="screen_roomlist_empty_message">"Начните переписку, отправив сообщение."</string>
+  <string name="screen_roomlist_empty_title">"Пока нет чатов."</string>
+  <string name="screen_roomlist_filter_favourites">"Избранные"</string>
  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Добавить чат в избранное можно в настройках чата.
 На данный момент вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
  <string name="screen_roomlist_filter_favourites_empty_state_title">"У вас пока нет избранных чатов"</string>
  <string name="screen_roomlist_filter_invites">"Приглашения"</string>
-  <string name="screen_roomlist_filter_invites_empty_state_title">"У вас нет отложенных приглашений."</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"У вас нет приглашений."</string>
  <string name="screen_roomlist_filter_low_priority">"Низкий приоритет"</string>
  <string name="screen_roomlist_filter_low_priority_empty_state_title">"У вас пока нет чатов с низким приоритетом."</string>
  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
-  <string name="screen_roomlist_filter_mixed_empty_state_title">"У вас нет чатов для этой подборки"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"У вас нет чатов, соответствующих фильтрам"</string>
  <string name="screen_roomlist_filter_people">"Пользователи"</string>
  <string name="screen_roomlist_filter_people_empty_state_title">"У вас пока нет личных сообщений"</string>
  <string name="screen_roomlist_filter_rooms">"Комнаты"</string>
  <string name="screen_roomlist_filter_rooms_empty_state_title">"Вас пока нет ни в одной комнате"</string>
-  <string name="screen_roomlist_filter_unreads">"Непрочитанные"</string>
+  <string name="screen_roomlist_filter_unreads">"Новые"</string>
  <string name="screen_roomlist_filter_unreads_empty_state_title">"Поздравляем!
-Все сообщения прочитаны!"</string>
+У вас нет непрочитанных сообщений!"</string>
  <string name="screen_roomlist_knock_event_sent_description">"Запрос на присоединение отправлен"</string>
-  <string name="screen_roomlist_main_space_title">"Все чаты"</string>
+  <string name="screen_roomlist_main_space_title">"Чаты"</string>
  <string name="screen_roomlist_mark_as_read">"Пометить как прочитанное"</string>
  <string name="screen_roomlist_mark_as_unread">"Отметить как непрочитанное"</string>
-  <string name="screen_roomlist_tombstoned_room_description">"Эта комната была обновлена"</string>
+  <string name="screen_roomlist_tombstoned_room_description">"Уровень комнаты был повышен"</string>
  <string name="screen_roomlist_your_spaces">"Ваши пространства"</string>
-  <string name="session_verification_banner_message">"Похоже, вы используете новое устройство. Чтобы получить доступ к зашифрованным сообщениям пройдите подтверждение с другим устройством."</string>
-  <string name="session_verification_banner_title">"Подтвердите, что это вы"</string>
+  <string name="session_verification_banner_message">"Похоже, вы используете новое устройство. Подтвердите его, чтобы получить доступ к зашифрованным сообщениям."</string>
+  <string name="session_verification_banner_title">"Подтвердите личность"</string>
 </resources>
--- a/features/home/impl/src/main/res/values-uk/translations.xml
+++ b/features/home/impl/src/main/res/values-uk/translations.xml
@@ -3,6 +3,8 @@
  <string name="banner_battery_optimization_content_android">"Вимкніть оптимізацію акумулятора для цього застосунку, щоб надходили всі сповіщення."</string>
  <string name="banner_battery_optimization_submit_android">"Вимкнути оптимізацію"</string>
  <string name="banner_battery_optimization_title_android">"Не надходять сповіщення?"</string>
+  <string name="banner_new_sound_message">"Ваш сигнал сповіщень оновлено — він став чіткішим, швидшим і не таким надокучливим."</string>
+  <string name="banner_new_sound_title">"Ми оновили ваші звуки"</string>
  <string name="banner_set_up_recovery_content">"Відновіть свою криптографічну ідентичність та історію повідомлень за допомогою ключа відновлення, якщо ви втратили всі наявні пристрої."</string>
  <string name="banner_set_up_recovery_submit">"Налаштувати відновлення"</string>
  <string name="banner_set_up_recovery_title">"Налаштуйте відновлення для захисту свого облікового запису"</string>
@@ -48,6 +50,7 @@
  <string name="screen_roomlist_mark_as_read">"Позначити прочитаним"</string>
  <string name="screen_roomlist_mark_as_unread">"Позначити непрочитаним"</string>
  <string name="screen_roomlist_tombstoned_room_description">"Цю кімнату оновлено"</string>
+  <string name="screen_roomlist_your_spaces">"Ваші простори"</string>
  <string name="session_verification_banner_message">"Схоже, ви використовуєте новий пристрій. Щоб отримати доступ до зашифрованих повідомлень, підтвердьте особу за допомогою іншого пристрою."</string>
  <string name="session_verification_banner_title">"Підтвердьте, що це ви"</string>
 </resources>
--- a/features/home/impl/src/main/res/values/localazy.xml
+++ b/features/home/impl/src/main/res/values/localazy.xml
@@ -5,9 +5,9 @@
  <string name="banner_battery_optimization_title_android">"Notifications not arriving?"</string>
  <string name="banner_new_sound_message">"Your notification ping has been updated—clearer, quicker, and less disruptive."</string>
  <string name="banner_new_sound_title">"We’ve refreshed your sounds"</string>
-  <string name="banner_set_up_recovery_content">"Recover your cryptographic identity and message history with a recovery key if you have lost all your existing devices."</string>
-  <string name="banner_set_up_recovery_submit">"Set up recovery"</string>
-  <string name="banner_set_up_recovery_title">"Set up recovery to protect your account"</string>
+  <string name="banner_set_up_recovery_content">"Your chats are automatically backed up with end-to-end encryption. To restore this backup and retain your digital identity when you lose access to all your devices, you will need your recovery key."</string>
+  <string name="banner_set_up_recovery_submit">"Get recovery key"</string>
+  <string name="banner_set_up_recovery_title">"Back up your chats"</string>
  <string name="confirm_recovery_key_banner_message">"Confirm your recovery key to maintain access to your key storage and message history."</string>
  <string name="confirm_recovery_key_banner_primary_button_title">"Enter your recovery key"</string>
  <string name="confirm_recovery_key_banner_secondary_button_title">"Forgot your recovery key?"</string>
--- a/features/invite/impl/src/main/res/values-ru/translations.xml
+++ b/features/invite/impl/src/main/res/values-ru/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_decline_and_block_block_user_option_description">"Вы не увидите сообщений или приглашений в комнату от этого пользователя"</string>
  <string name="screen_decline_and_block_block_user_option_title">"Заблокировать пользователя"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Сообщите об этой комнате своему поставщику учетной записи."</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Пожаловаться на эту комнату серверу Вашего аккаунта."</string>
  <string name="screen_decline_and_block_report_user_reason_placeholder">"Опишите причину жалобы…"</string>
  <string name="screen_decline_and_block_title">"Отклонить и заблокировать"</string>
  <string name="screen_invites_decline_chat_message">"Вы уверены, что хотите отклонить приглашение в %1$s?"</string>
@@ -10,9 +10,9 @@
  <string name="screen_invites_decline_direct_chat_message">"Вы уверены, что хотите отказаться от личного общения с %1$s?"</string>
  <string name="screen_invites_decline_direct_chat_title">"Отклонить чат"</string>
  <string name="screen_invites_empty_list">"Нет приглашений"</string>
-  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил вас"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) вас"</string>
  <string name="screen_join_room_decline_and_block_alert_confirmation">"Да, отклонить и заблокировать"</string>
-  <string name="screen_join_room_decline_and_block_alert_message">"Вы действительно хотите отклонить приглашение в эту комнате? Это также предотвратит %1$s возможность связываться с вами или приглашать вас в комнаты."</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Вы действительно хотите отклонить приглашение в комнату? Также %1$s больше не сможет связаться с вами или приглашать в комнаты."</string>
  <string name="screen_join_room_decline_and_block_alert_title">"Отклонить приглашение и заблокировать"</string>
  <string name="screen_join_room_decline_and_block_button_title">"Отклонить и заблокировать"</string>
 </resources>
--- a/features/invitepeople/impl/src/main/res/values-ru/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-ru/translations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_invite_users_already_a_member">"Уже зарегистрирован"</string>
-  <string name="screen_invite_users_already_invited">"Уже приглашены"</string>
+  <string name="screen_invite_users_already_a_member">"Уже участник"</string>
+  <string name="screen_invite_users_already_invited">"Уже приглашен(а)"</string>
 </resources>
--- a/features/joinroom/impl/src/main/res/values-da/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-da/translations.xml
@@ -17,7 +17,7 @@
  <string name="screen_join_room_invite_required_message">"Du har brug for en invitation for at deltage"</string>
  <string name="screen_join_room_invited_by">"Inviteret af"</string>
  <string name="screen_join_room_join_action">"Deltag"</string>
-  <string name="screen_join_room_join_restricted_message">"Du skal muligvis være inviteret eller være medlem af en gruppe for at deltage."</string>
+  <string name="screen_join_room_join_restricted_message">"Du skal muligvis være inviteret eller være medlem af en klynge for at kunne deltage."</string>
  <string name="screen_join_room_knock_action">"Send anmodning om at deltage"</string>
  <string name="screen_join_room_knock_message_characters_count">"Tilladte tegn %1$d af %2$d"</string>
  <string name="screen_join_room_knock_message_description">"Besked (valgfrit)"</string>
@@ -25,8 +25,8 @@
  <string name="screen_join_room_knock_sent_title">"Anmodning om at deltage sendt"</string>
  <string name="screen_join_room_loading_alert_message">"Vi kunne ikke forhåndsvise rummet. Dette kan skyldes netværks- eller serverproblemer."</string>
  <string name="screen_join_room_loading_alert_title">"Vi kunne ikke forhåndsvise rummet"</string>
-  <string name="screen_join_room_space_not_supported_description">"%1$s understøtter ikke grupper endnu. Du kan få adgang til grupper på nettet."</string>
-  <string name="screen_join_room_space_not_supported_title">"Grupper er ikke understøttet endnu"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s understøtter ikke klynger endnu. Du kan få adgang til klynger på nettet."</string>
+  <string name="screen_join_room_space_not_supported_title">"Klynger er ikke understøttet endnu"</string>
  <string name="screen_join_room_subtitle_knock">"Klik på knappen nedenfor, og en rumadministrator vil blive underrettet. Du kan deltage i samtalen, når din anmodning er godkendt."</string>
  <string name="screen_join_room_subtitle_no_preview">"Du skal være medlem af dette rum for at kunne se meddelelseshistorikken."</string>
  <string name="screen_join_room_title_knock">"Vil du deltage i dette rum?"</string>
--- a/features/joinroom/impl/src/main/res/values-in/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-in/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"Anda dicekal dari ruangan ini oleh %1$s."</string>
-  <string name="screen_join_room_ban_message">"Anda dicekal dari ruangan ini"</string>
+  <string name="screen_join_room_ban_by_message">"Anda telah diban oleh %1$s."</string>
+  <string name="screen_join_room_ban_message">"Anda telah diblokir."</string>
  <string name="screen_join_room_ban_reason">"Alasan: %1$s."</string>
  <string name="screen_join_room_cancel_knock_action">"Batalkan permintaan"</string>
  <string name="screen_join_room_cancel_knock_alert_confirmation">"Ya, batalkan"</string>
@@ -13,11 +13,12 @@
  <string name="screen_join_room_decline_and_block_button_title">"Tolak dan blokir"</string>
  <string name="screen_join_room_fail_message">"Bergabung dalam ruangan gagal."</string>
  <string name="screen_join_room_fail_reason">"Ruangan ini hanya untuk undangan atau mungkin ada pembatasan akses pada tingkat space."</string>
-  <string name="screen_join_room_forget_action">"Lupakan ruangan ini"</string>
+  <string name="screen_join_room_forget_action">"Lupa"</string>
  <string name="screen_join_room_invite_required_message">"Anda memerlukan undangan untuk bergabung dalam ruangan ini"</string>
  <string name="screen_join_room_join_action">"Gabung"</string>
  <string name="screen_join_room_join_restricted_message">"Anda mungkin perlu diundang atau menjadi anggota space untuk bergabung."</string>
  <string name="screen_join_room_knock_action">"Ketuk untuk bergabung"</string>
+  <string name="screen_join_room_knock_message_characters_count">"Karakter yang diizinkan%1$d dari%2$d"</string>
  <string name="screen_join_room_knock_message_description">"Pesan (opsional)"</string>
  <string name="screen_join_room_knock_sent_description">"Anda akan menerima undangan untuk bergabung dengan ruangan jika permintaan Anda diterima."</string>
  <string name="screen_join_room_knock_sent_title">"Permintaan untuk bergabung dikirim"</string>
--- a/features/joinroom/impl/src/main/res/values-ko/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-ko/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"%1$s 에 의해 이 방에서 퇴장당했습니다."</string>
-  <string name="screen_join_room_ban_message">"당신은 이 방에서 차단되었습니다"</string>
+  <string name="screen_join_room_ban_by_message">"%1$s님에 의해 차단되었습니다."</string>
+  <string name="screen_join_room_ban_message">"당신은 차단되었습니다"</string>
  <string name="screen_join_room_ban_reason">"이유: %1$s."</string>
  <string name="screen_join_room_cancel_knock_action">"요청 취소"</string>
  <string name="screen_join_room_cancel_knock_alert_confirmation">"네, 취소합니다"</string>
@@ -12,9 +12,10 @@
  <string name="screen_join_room_decline_and_block_alert_title">"초대 거부 및 차단"</string>
  <string name="screen_join_room_decline_and_block_button_title">"거부 및 차단"</string>
  <string name="screen_join_room_fail_message">"방에 참여하는데 실패했습니다."</string>
-  <string name="screen_join_room_fail_reason">"이 방은 초대 전용이거나 스페이스 수준에서 액세스 제한이 있을 수 있습니다."</string>
-  <string name="screen_join_room_forget_action">"이 방 지우기"</string>
-  <string name="screen_join_room_invite_required_message">"이 방에 참여하려면 초대장이 필요합니다."</string>
+  <string name="screen_join_room_fail_reason">"초대가 필요하거나 참여 조건에 제한이 있을 수 있습니다."</string>
+  <string name="screen_join_room_forget_action">"지우기"</string>
+  <string name="screen_join_room_invite_required_message">"참여하려면 초대가 필요합니다."</string>
+  <string name="screen_join_room_invited_by">"초대자"</string>
  <string name="screen_join_room_join_action">"참가하기"</string>
  <string name="screen_join_room_join_restricted_message">"참여하려면 초대 또는 스페이스의 회원이어야 할 수 있습니다."</string>
  <string name="screen_join_room_knock_action">"가입 요청 보내기"</string>
--- a/features/joinroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-ru/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"Вы были заблокированы в комнате %1$s."</string>
+  <string name="screen_join_room_ban_by_message">"%1$s заблокировал(а) вас в комнате."</string>
  <string name="screen_join_room_ban_message">"Вы были заблокированы в комнате"</string>
  <string name="screen_join_room_ban_reason">"Причина: %1$s."</string>
  <string name="screen_join_room_cancel_knock_action">"Отменить запрос"</string>
@@ -8,7 +8,7 @@
  <string name="screen_join_room_cancel_knock_alert_description">"Вы действительно хотите отменить заявку на вступление в эту комнату?"</string>
  <string name="screen_join_room_cancel_knock_alert_title">"Отменить запрос на присоединение"</string>
  <string name="screen_join_room_decline_and_block_alert_confirmation">"Да, отклонить и заблокировать"</string>
-  <string name="screen_join_room_decline_and_block_alert_message">"Вы действительно хотите отклонить приглашение в эту комнате? Это также предотвратит %1$s возможность связываться с вами или приглашать вас в комнаты."</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Вы действительно хотите отклонить приглашение в комнату? Также %1$s больше не сможет связаться с вами или приглашать в комнаты."</string>
  <string name="screen_join_room_decline_and_block_alert_title">"Отклонить приглашение и заблокировать"</string>
  <string name="screen_join_room_decline_and_block_button_title">"Отклонить и заблокировать"</string>
  <string name="screen_join_room_fail_message">"Не удалось присоединиться к комнате."</string>
@@ -21,14 +21,14 @@
  <string name="screen_join_room_knock_action">"Отправить запрос на присоединение"</string>
  <string name="screen_join_room_knock_message_characters_count">"Разрешенные символы %1$d %2$d"</string>
  <string name="screen_join_room_knock_message_description">"Сообщение (опционально)"</string>
-  <string name="screen_join_room_knock_sent_description">"Вы получите приглашение присоединиться к комнате, как только ваш запрос будет принят."</string>
+  <string name="screen_join_room_knock_sent_description">"Вы получите приглашение, как только ваш запрос будет принят."</string>
  <string name="screen_join_room_knock_sent_title">"Запрос на присоединение отправлен"</string>
-  <string name="screen_join_room_loading_alert_message">"Не удалось отобразить предварительный просмотр комнаты. Это может быть связано с проблемами сети или сервера."</string>
-  <string name="screen_join_room_loading_alert_title">"Мы не смогли отобразить предварительный просмотр этой комнаты"</string>
+  <string name="screen_join_room_loading_alert_message">"Не удалось отобразить предпросмотр комнаты. Это может быть связано с проблемами сети или сервера."</string>
+  <string name="screen_join_room_loading_alert_title">"Не удалось показать предпросмотр комнаты"</string>
  <string name="screen_join_room_space_not_supported_description">"%1$s еще не поддерживает пространства. Вы можете получить к ним доступ в веб-версии."</string>
  <string name="screen_join_room_space_not_supported_title">"Пространства пока не поддерживаются"</string>
  <string name="screen_join_room_subtitle_knock">"Нажмите кнопку ниже и администратор комнаты получит уведомление. После одобрения вы сможете присоединиться к обсуждению."</string>
  <string name="screen_join_room_subtitle_no_preview">"Вы должны быть участником этой комнаты, чтобы просмотреть историю сообщений."</string>
  <string name="screen_join_room_title_knock">"Хотите присоединиться к этой комнате?"</string>
-  <string name="screen_join_room_title_no_preview">"Предварительный просмотр недоступен"</string>
+  <string name="screen_join_room_title_no_preview">"Предпросмотр недоступен"</string>
 </resources>
--- a/features/joinroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-uk/translations.xml
@@ -11,10 +11,10 @@
  <string name="screen_join_room_decline_and_block_alert_message">"Ви впевнені, що хочете відхилити запрошення приєднатися до цієї кімнати? Це також завадить %1$s зв\'язатися з вами або запрошувати вас в кімнати."</string>
  <string name="screen_join_room_decline_and_block_alert_title">"Відхилити запрошення та заблокувати"</string>
  <string name="screen_join_room_decline_and_block_button_title">"Відхилити та заблокувати"</string>
-  <string name="screen_join_room_fail_message">"Не вдалося приєднатися до кімнати."</string>
-  <string name="screen_join_room_fail_reason">"Ця кімната доступна лише за запрошенням або на рівні простору можуть бути обмеження доступу."</string>
-  <string name="screen_join_room_forget_action">"Забути цю кімнату"</string>
-  <string name="screen_join_room_invite_required_message">"Вам потрібне запрошення, щоб приєднатися до цієї кімнати"</string>
+  <string name="screen_join_room_fail_message">"Не вдалося приєднатися"</string>
+  <string name="screen_join_room_fail_reason">"Вам потрібно отримати запрошення, щоб приєднатися, інакше доступ може бути обмежений."</string>
+  <string name="screen_join_room_forget_action">"Забути"</string>
+  <string name="screen_join_room_invite_required_message">"Вам потрібне запрошення, щоб приєднатися"</string>
  <string name="screen_join_room_join_action">"Доєднатися"</string>
  <string name="screen_join_room_join_restricted_message">"Можливо, вам знадобиться отримати запрошення або стати учасником простору, щоб приєднатися."</string>
  <string name="screen_join_room_knock_action">"Постукати, щоб приєднатися"</string>
--- a/features/knockrequests/impl/src/main/res/values-ru/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-ru/translations.xml
@@ -3,22 +3,22 @@
  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"Да, принять все"</string>
  <string name="screen_knock_requests_list_accept_all_alert_description">"Вы действительно хотите принять все заявки на присоединение?"</string>
  <string name="screen_knock_requests_list_accept_all_alert_title">"Принять все запросы"</string>
-  <string name="screen_knock_requests_list_accept_all_button_title">"Принять всё"</string>
-  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Мы не смогли принять все запросы. Хотите попробовать еще раз?"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Принять все"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Мы не смогли принять все запросы. Попробовать еще раз?"</string>
  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Не удалось принять все запросы"</string>
  <string name="screen_knock_requests_list_accept_all_loading_title">"Принять все заявки на присоединение"</string>
  <string name="screen_knock_requests_list_accept_failed_alert_description">"Мы не смогли принять этот запрос. Хотите попробовать еще раз?"</string>
  <string name="screen_knock_requests_list_accept_failed_alert_title">"Не удалось принять запрос"</string>
  <string name="screen_knock_requests_list_accept_loading_title">"Принятие заявки на присоединение"</string>
  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Да, отклонить и запретить"</string>
-  <string name="screen_knock_requests_list_ban_alert_description">"Вы уверены, что хотите отклонить и запретить %1$s? Этот пользователь больше не сможет запросить доступ к этой комнате."</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Вы уверены, что хотите отклонить и запретить %1$s? Этот пользователь больше не сможет запрашивать доступ к этой комнате."</string>
  <string name="screen_knock_requests_list_ban_alert_title">"Отклонить и запретить доступ"</string>
  <string name="screen_knock_requests_list_ban_loading_title">"Отклонение и запрет доступа"</string>
  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Да, отклонить"</string>
-  <string name="screen_knock_requests_list_decline_alert_description">"Вы уверены, что хотите отклонить %1$s запрос на присоединение к этой комнате?"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"Вы уверены, что хотите отклонить запрос %1$s на присоединение к этой комнате?"</string>
  <string name="screen_knock_requests_list_decline_alert_title">"Отклонить доступ"</string>
  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Отклонить и запретить"</string>
-  <string name="screen_knock_requests_list_decline_failed_alert_description">"Мы не смогли отклонить этот запрос. Хотите попробовать еще раз?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Мы не смогли отклонить этот запрос. Попробовать еще раз?"</string>
  <string name="screen_knock_requests_list_decline_failed_alert_title">"Не удалось отклонить запрос"</string>
  <string name="screen_knock_requests_list_decline_loading_title">"Отклонение заявки на присоединение"</string>
  <string name="screen_knock_requests_list_empty_state_description">"Вы сможете увидеть запрос, когда кто-то попросит присоединиться к комнате."</string>
@@ -33,5 +33,5 @@
  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Показать все"</string>
  <string name="screen_room_single_knock_request_accept_button_title">"Разрешить"</string>
  <string name="screen_room_single_knock_request_title">"%1$s хочет присоединиться к этой комнате"</string>
-  <string name="screen_room_single_knock_request_view_button_title">"Просмотр"</string>
+  <string name="screen_room_single_knock_request_view_button_title">"Просмотреть"</string>
 </resources>
--- a/features/leaveroom/api/src/main/res/values-in/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-in/translations.xml
@@ -3,5 +3,8 @@
  <string name="leave_conversation_alert_subtitle">"Apakah Anda yakin ingin keluar dari percakapan ini? Percakapan ini tidak umum dan Anda tidak akan dapat bergabung lagi tanpa undangan."</string>
  <string name="leave_room_alert_empty_subtitle">"Apakah Anda yakin ingin meninggalkan ruangan ini? Anda adalah orang satu-satunya di sini. Jika Anda pergi, tidak akan ada yang bisa bergabung di masa depan, termasuk Anda."</string>
  <string name="leave_room_alert_private_subtitle">"Apakah Anda yakin ingin meninggalkan ruangan ini? Ruangan ini tidak umum dan Anda tidak akan dapat bergabung kembali tanpa undangan."</string>
+  <string name="leave_room_alert_select_new_owner_action">"Pilih Pemilik"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"Anda adalah satu-satunya pemilik ruangan ini. Anda perlu mentransfer kepemilikan kepada orang lain sebelum Anda meninggalkan ruangan."</string>
+  <string name="leave_room_alert_select_new_owner_title">"Pindahkan kepemilikan"</string>
  <string name="leave_room_alert_subtitle">"Apakah Anda yakin ingin meninggalkan ruangan?"</string>
 </resources>
--- a/features/leaveroom/api/src/main/res/values-ru/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-ru/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="leave_conversation_alert_subtitle">"Вы уверены, что хотите покинуть беседу? Эта беседа не является общедоступной, и Вы не сможете присоединиться к ней без приглашения."</string>
-  <string name="leave_room_alert_empty_subtitle">"Вы уверены, что хотите покинуть эту комнату? Вы здесь единственный человек. Если вы уйдете, никто не сможет присоединиться в будущем, включая вас."</string>
+  <string name="leave_conversation_alert_subtitle">"Вы уверены, что хотите покинуть беседу? Эта беседа не является общедоступной, и вы не сможете присоединиться к ней без приглашения."</string>
+  <string name="leave_room_alert_empty_subtitle">"Вы уверены, что хотите покинуть эту комнату? Здесь есть только вы. Если вы покинете комнату, никто не сможет присоединиться к ней в будущем, включая вас."</string>
  <string name="leave_room_alert_private_subtitle">"Вы уверены, что хотите покинуть эту комнату? Эта комната не является общедоступной, и Вы не сможете присоединиться к ней без приглашения."</string>
  <string name="leave_room_alert_select_new_owner_action">"Назначить владельцев"</string>
  <string name="leave_room_alert_select_new_owner_subtitle">"Вы единственный владелец этой комнаты. Перед тем, как её покинуть, необходимо передать владение кому-нибудь другому."</string>
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
@@ -196,6 +196,7 @@ class LinkNewDeviceFlowNode(
            is ErrorType.ConnectionInsecure -> ErrorScreenType.InsecureChannelDetected
            is ErrorType.Expired -> ErrorScreenType.Expired
            is ErrorType.OtherDeviceAlreadySignedIn -> ErrorScreenType.UnknownError
+            is ErrorType.UnsupportedQrCodeType -> ErrorScreenType.UnknownError
        }
        // It is OK to push on backstack, since when user leaves the error screen, a new root will be set,
        // or the whole flow will be popped.
--- a/features/linknewdevice/impl/src/main/res/values-ko/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-ko/translations.xml
@@ -1,16 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_link_new_device_desktop_scanning_title">"QR 코드를 스캔하세요"</string>
+  <string name="screen_link_new_device_desktop_step1">"노트북이나 데스크톱 컴퓨터에서 %1$s을(를) 여세요."</string>
  <string name="screen_link_new_device_desktop_step3">"이 기기로 QR 코드를 스캔하세요."</string>
  <string name="screen_link_new_device_desktop_submit">"스캔 준비 완료"</string>
+  <string name="screen_link_new_device_desktop_title">"QR 코드를 확인하려면 데스크톱 컴퓨터에서 %1$s을(를) 여세요."</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"숫자가 일치하지 않습니다"</string>
+  <string name="screen_link_new_device_enter_number_notice">"2자리 코드를 입력하세요"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"이 절차를 통해 다른 기기와의 연결이 안전한지 확인합니다."</string>
+  <string name="screen_link_new_device_enter_number_title">"다른 기기에 표시된 번호를 입력하세요"</string>
  <string name="screen_link_new_device_error_app_not_supported_subtitle">"귀하의 계정 제공자는 지원하지 않습니다 %1$s ."</string>
  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s 지원되지 않습니다"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"사용 중인 계정 서비스 제공업체에서 QR 코드를 통한 새 기기 로그인을 지원하지 않습니다."</string>
  <string name="screen_link_new_device_error_not_supported_title">"QR 코드는 지원되지 않습니다"</string>
  <string name="screen_link_new_device_error_request_cancelled_subtitle">"다른 기기에서 로그인이 취소되었습니다."</string>
  <string name="screen_link_new_device_error_request_cancelled_title">"로그인 요청이 취소되었습니다"</string>
  <string name="screen_link_new_device_error_request_timeout_subtitle">"로그인이 만료되었습니다. 다시 시도해 주세요."</string>
  <string name="screen_link_new_device_error_request_timeout_title">"로그인 시간이 초과되었습니다."</string>
+  <string name="screen_link_new_device_mobile_step1">"다른 기기에서 %1$s을(를) 여세요."</string>
  <string name="screen_link_new_device_mobile_step2">"선택 %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“QR 코드로 로그인”"</string>
+  <string name="screen_link_new_device_mobile_step3">"다른 기기로 여기에 표시된 QR 코드를 스캔하세요."</string>
+  <string name="screen_link_new_device_mobile_title">"다른 기기에서 %1$s을(를) 여세요."</string>
+  <string name="screen_link_new_device_root_desktop_computer">"데스크톱 컴퓨터"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"QR 코드 불러오는 중…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"모바일 기기"</string>
+  <string name="screen_link_new_device_root_title">"어떤 종류의 기기를 연결하시겠습니까?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"다시 시도해 주세요. 입력하신 2자리 숫자가 정확한지 확인하시기 바랍니다. 이후에도 숫자가 일치하지 않으면 계정 서비스 제공업체에 문의하세요."</string>
+  <string name="screen_link_new_device_wrong_number_title">"숫자가 일치하지 않습니다"</string>
  <string name="screen_qr_code_login_connection_note_secure_state_description">"새 장치에 안전하게 연결할 수 없습니다. 기존 장치는 여전히 안전하므로 걱정할 필요가 없습니다."</string>
  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"이제 어떻게 해야 할까?"</string>
  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"네트워크 문제로 인해 로그인에 실패한 경우 QR 코드로 다시 로그인해 보세요."</string>
@@ -21,6 +38,8 @@
  <string name="screen_qr_code_login_error_cancelled_title">"로그인 요청이 취소되었습니다"</string>
  <string name="screen_qr_code_login_error_declined_subtitle">"다른 기기에서 로그인이 거부되었습니다."</string>
  <string name="screen_qr_code_login_error_declined_title">"로그인 거부됨"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"더 이상 수행할 작업이 없습니다."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"다른 기기에서 이미 로그인되어 있습니다."</string>
  <string name="screen_qr_code_login_error_expired_subtitle">"로그인이 만료되었습니다. 다시 시도해 주세요."</string>
  <string name="screen_qr_code_login_error_expired_title">"로그인 시간이 초과되었습니다."</string>
  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"다른 기기에서는 QR 코드로 %s 에 로그인할 수 없습니다.
--- a/Show More
+++ b/Show More