version 1.5.1

Translations update from Weblate

.github/workflows/post-pr.yml

@@ -31,7 +31,7 @@ jobs:
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
-    runs-on: macos-latest
+    runs-on: buildjet-4vcpu-ubuntu-2204
     strategy:
       fail-fast: false
       matrix:

.github/workflows/tests.yml

@@ -1,9 +1,9 @@
 name: Test
 
 on:
-  pull_request: {}
+  pull_request: { }
   push:
-    branches: [main, develop]
+    branches: [ main, develop ]
 
 # Enrich gradle.properties for CI/CD
 env:
@@ -13,7 +13,10 @@ env:
 jobs:
   tests:
     name: Runs all tests
-    runs-on: macos-latest # for the emulator
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    strategy:
+      matrix:
+        api-level: [28]
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
@@ -36,46 +39,79 @@ jobs:
           httpPort: 8080
           disableRateLimiting: true
           public_baseurl: "http://10.0.2.2:8080/"
+
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: true # Is set to false in the doc https://github.com/ReactiveCircus/android-emulator-runner
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
       - name: Run all the codecoverage tests at once
-        id: tests
         uses: reactivecircus/android-emulator-runner@v2
-        continue-on-error: true
+        # continue-on-error: true
         with:
-          api-level: 28
+          api-level: ${{ matrix.api-level }}
           arch: x86
           profile: Nexus 5X
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          emulator-build: 7425822
+          # emulator-build: 7425822
-          script: | 
-            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-# NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves stes.tests.outcome = 'failure'
-      - name: Run all the codecoverage tests at once (retry if emulator failed)
-        uses: reactivecircus/android-emulator-runner@v2
-        if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
-        with:
-          api-level: 28
-          arch: x86
-          profile: Nexus 5X
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          emulator-build: 7425822
           script: |
             ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
             ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+      # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure'
-        if: always() # we may have failed a previous step and retried, that's OK
+      ### - name: Run all the codecoverage tests at once (retry if emulator failed)
+      ###   uses: reactivecircus/android-emulator-runner@v2
+      ###   if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
+      ###   with:
+      ###     api-level: 28
+      ###     arch: x86
+      ###     profile: Nexus 5X
+      ###     force-avd-creation: false
+      ###     emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+      ###     disable-animations: true
+      ###     emulator-build: 7425822
+      ###     script: |
+      ###       ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
+
+      - name: Upload Integration Test Report Log
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: integration-test-error-results
+          path: |
+            */build/outputs/androidTest-results/connected/
+            */build/reports/androidTests/connected/
+
+      # we may have failed a previous step and retried, that's OK
+      - name: Publish results to Sonar
         env:
           GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+        if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
+        run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
 
       - name: Format unit test results
         if: always()

.github/workflows/triage-labelled.yml

@@ -142,32 +142,6 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_threads_issues:
-    name: A-Threads to Thread board
-    runs-on: ubuntu-latest
-    # Skip in forks
-    if: >
-      github.repository == 'vector-im/element-android' &&
-      contains(github.event.issue.labels.*.name, 'A-Threads')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PN_kwDOAM0swc0rRA"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
   move_message_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest

.github/workflows/triage-priority-bugs.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Android App Team
-          column: P1
+          column: Important Issues & Topics (P1)
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:

CHANGES.md

@@ -1,3 +1,114 @@
+Changes in Element v1.5.1 (2022-09-28)
+======================================
+
+Security ⚠️
+----------
+
+This update provides important security fixes, update now.
+Ref: CVE-2022-39246 CVE-2022-39248
+
+Changes in Element v1.5.0 (2022-09-23)
+======================================
+
+Features ✨
+----------
+ - Deferred DMs - Enable and move the feature to labs settings ([#7180](https://github.com/vector-im/element-android/issues/7180))
+
+Bugfixes 🐛
+----------
+ - Fix text margin in QR code view when no display name is set ([#5424](https://github.com/vector-im/element-android/issues/5424))
+ - [App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position ([#6776](https://github.com/vector-im/element-android/issues/6776))
+ - Fixed problem when room list's scroll did jump after rooms placeholders were replaced with rooms summary items ([#7079](https://github.com/vector-im/element-android/issues/7079))
+ - Fixes crash when quickly double clicking FABs in the new app layout ([#7102](https://github.com/vector-im/element-android/issues/7102))
+ - Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape) ([#7103](https://github.com/vector-im/element-android/issues/7103))
+ - [App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so ([#7122](https://github.com/vector-im/element-android/issues/7122))
+ - Fix empty verification bottom sheet. ([#7130](https://github.com/vector-im/element-android/issues/7130))
+ - [New Layout] Fixes new chat dialog not getting dismissed after selecting its actions ([#7132](https://github.com/vector-im/element-android/issues/7132))
+ - Fixes Room List not getting updated when fragment is not in focus ([#7186](https://github.com/vector-im/element-android/issues/7186))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Add a spinner when sending the first message ([#6970](https://github.com/vector-im/element-android/issues/6970))
+ - [Device Manager] Filter Other Sessions ([#7045](https://github.com/vector-im/element-android/issues/7045))
+ - [Device management] Session details screen ([#7077](https://github.com/vector-im/element-android/issues/7077))
+ - Create DM room only on first message - Fix glitch in the room list ([#7121](https://github.com/vector-im/element-android/issues/7121))
+ - Create DM room only on first message - Handle the local rooms within the new AppLayout ([#7153](https://github.com/vector-im/element-android/issues/7153))
+
+Other changes
+-------------
+ - [Modules] Lifts the application variants to the app module ([#6779](https://github.com/vector-im/element-android/issues/6779))
+ - Ensure that we do not expect all the Event fields when requesting `rooms/{roomId}/hierarchy` endpoint. ([#7035](https://github.com/vector-im/element-android/issues/7035))
+ - Move some GitHub actions to buildjet runners, and remove the second attempt to run integration tests. ([#7108](https://github.com/vector-im/element-android/issues/7108))
+ - Exclude legacy android support annotation library ([#7140](https://github.com/vector-im/element-android/issues/7140))
+ - Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages ([#7142](https://github.com/vector-im/element-android/issues/7142))
+ - Fixing build cache misses when compiling the vector module ([#7157](https://github.com/vector-im/element-android/issues/7157))
+
+Changes in Element v1.4.36 (2022-09-10)
+=======================================
+
+New App Layout can be enabled in the Labs settings. Please give it a try!
+
+Features ✨
+----------
+ - Adds New App Layout into Labs ([#7038](https://github.com/vector-im/element-android/issues/7038))
+ - Try to detect devices that lack Opus encoder support, use bundled libopus library for those. ([#7010](https://github.com/vector-im/element-android/issues/7010))
+ - Suggest @room when @channel, @everyone, or @here is typed in composer ([#6529](https://github.com/vector-im/element-android/issues/6529))
+
+Bugfixes 🐛
+----------
+ - Fix long incremental sync. ([#6917](https://github.com/vector-im/element-android/issues/6917))
+ - Fix push with FCM ([#7068](https://github.com/vector-im/element-android/issues/7068))
+ - FTUE - Fixes optional email registration step always being mandatory ([#6969](https://github.com/vector-im/element-android/issues/6969))
+ - Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings ([#6844](https://github.com/vector-im/element-android/issues/6844))
+ - Fix low occurrence crashes. ([#6967](https://github.com/vector-im/element-android/issues/6967))
+ - Fix crash when opening an unknown room ([#6978](https://github.com/vector-im/element-android/issues/6978))
+ - Fix crash on PIN code settings screen. ([#6979](https://github.com/vector-im/element-android/issues/6979))
+ - Fix autoplayed animated stickers ([#6982](https://github.com/vector-im/element-android/issues/6982))
+ - Catch race condition crash in voice recording ([#6989](https://github.com/vector-im/element-android/issues/6989))
+ - Fix invite to room when in a space buttons not working. ([#7054](https://github.com/vector-im/element-android/issues/7054))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Create the DM and navigate to the new room after sending an event ([#5525](https://github.com/vector-im/element-android/issues/5525))
+ - [App Layout] New empty states for home screen ([#6835](https://github.com/vector-im/element-android/issues/6835))
+ - [App Layout] Bottom navigation tabs are removed for new home screen ([#6565](https://github.com/vector-im/element-android/issues/6565))
+ - [App Layout] fixed space switching dialog measured with wrong height sometimes ([#6750](https://github.com/vector-im/element-android/issues/6750))
+ - [App Layout] Fabs doesn't go off screen anymore ([#6765](https://github.com/vector-im/element-android/issues/6765))
+ - [New Layout] Adds back navigation through spaces ([#6877](https://github.com/vector-im/element-android/issues/6877))
+ - [App Layout] new room invites screen ([#6889](https://github.com/vector-im/element-android/issues/6889))
+ - [App Layout] - Invites now show empty screen after you reject last invite ([#6876](https://github.com/vector-im/element-android/issues/6876))
+ - [App Layout] - space switcher now has empty state ([#6754](https://github.com/vector-im/element-android/issues/6754))
+ - [App Layout] - Improves Developer Mode Debug Button UX and adds it to New App Layout ([#6871](https://github.com/vector-im/element-android/issues/6871))
+ - [New Layout] Changes space sheet to accordion-style with expandable subspaces ([#6907](https://github.com/vector-im/element-android/issues/6907))
+ - [New Layout] Adds space invites ([#6924](https://github.com/vector-im/element-android/issues/6924))
+ - [App Layout] fixed invites count badge bottom margin on a home screen ([#6947](https://github.com/vector-im/element-android/issues/6947))
+ - [New Layout] Improves talkback accessibility ([#7016](https://github.com/vector-im/element-android/issues/7016))
+ - [New Layout] Changes space icon in fab and in release notes screen ([#7039](https://github.com/vector-im/element-android/issues/7039))
+ - [New Layout] Adds header to spaces bottom sheet ([#7040](https://github.com/vector-im/element-android/issues/7040))
+ - [App Layout] New App Layout is enabled by default (Edit: has to be enabled in Labs) ([#6958](https://github.com/vector-im/element-android/issues/6958))
+ - [App Layout] Obsolete settings are not shown when App Layout flag is enabled ([#6646](https://github.com/vector-im/element-android/issues/6646))
+ - [Devices Management] Session overview screen ([#6961](https://github.com/vector-im/element-android/issues/6961))
+ - [Devices Management] Refactor some code to improve testability ([#7043](https://github.com/vector-im/element-android/issues/7043))
+ - [Device Manager] Current Session Section ([#6902](https://github.com/vector-im/element-android/issues/6902))
+ - [Device Manager] Other Sessions Section ([#6945](https://github.com/vector-im/element-android/issues/6945))
+ - [Device Manager] Render Security Recommendations ([#6964](https://github.com/vector-im/element-android/issues/6964))
+
+Improved Documentation 📚
+------------------------
+ - Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor. ([#6727](https://github.com/vector-im/element-android/issues/6727))
+
+Other changes
+-------------
+ - Increase sticker size ([#6982](https://github.com/vector-im/element-android/issues/6982))
+ - Focus input field when editing homeserver address to speed up login and registration. ([#6926](https://github.com/vector-im/element-android/issues/6926))
+ - Log basic Http information in production. ([#6925](https://github.com/vector-im/element-android/issues/6925))
+ - Converts the vector module to a library with a parent vector-app application module ([#6407](https://github.com/vector-im/element-android/issues/6407))
+ - Creates a dedicated strings module ([#3955](https://github.com/vector-im/element-android/issues/3955))
+ - Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members. ([#6894](https://github.com/vector-im/element-android/issues/6894))
+ - Small refactor of UnifiedPushHelper ([#6936](https://github.com/vector-im/element-android/issues/6936))
+ - CI: only run sonarqube task when token is known ([#7057](https://github.com/vector-im/element-android/issues/7057))
+
+
 Changes in Element v1.4.34 (2022-08-23)
 =======================================
 

build.gradle

@@ -29,7 +29,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.2.2"
-        classpath 'org.owasp:dependency-check-gradle:7.1.2'
+        classpath 'org.owasp:dependency-check-gradle:7.2.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
@@ -45,7 +45,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
 
     // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.12.0"
+    id 'com.autonomousapps.dependency-analysis' version "1.13.1"
 }
 
 // https://github.com/jeremylong/DependencyCheck

changelog.d/3955.misc

@@ -1 +0,0 @@
-Creates a dedicated strings module

changelog.d/5525.wip

@@ -1 +0,0 @@
-Create DM room only on first message - Create the DM and navigate to the new room after sending an event

changelog.d/6407.misc

@@ -1 +0,0 @@
-Converts the vector module to a library with a parent vector-app application module

changelog.d/6565.wip

@@ -1 +0,0 @@
-[App Layout] Bottom navigation tabs are removed for new home screen

changelog.d/6750.wip

@@ -1 +0,0 @@
-[App Layout] fixed space switching dialog measured with wrong height sometimes

changelog.d/6754.bugfix

@@ -1 +0,0 @@
-[App Layout] - space switcher now has empty state

changelog.d/6765.wip

@@ -1 +0,0 @@
-[App Layout] Fabs doesn't go off screen anymore

changelog.d/6835.feature

@@ -1 +0,0 @@
-[App Layout] New empty states for home screen

changelog.d/6844.bugfix

@@ -1 +0,0 @@
-Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings

changelog.d/6871.feature

@@ -1 +0,0 @@
-Improves Developer Mode Debug Button UX and adds it to New App Layout

changelog.d/6877.wip

@@ -1 +0,0 @@
-[New Layout] Adds back navigation through spaces

changelog.d/6889.wip

@@ -1 +0,0 @@
-[App Layout] new room invites screen

changelog.d/6894.misc

@@ -1 +0,0 @@
-Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members.

changelog.d/6902.wip

@@ -1 +0,0 @@
-[Device Manager] Current Session Section

changelog.d/6907.wip

@@ -1 +0,0 @@
-[New Layout] Changes space sheet to accordion-style with expandable subspaces

changelog.d/6917.bugfix

@@ -1 +0,0 @@
-Fix long incremental sync.

changelog.d/6924.wip

@@ -1 +0,0 @@
-[New Layout] Adds space invites

changelog.d/6925.misc

@@ -1 +0,0 @@
-Log basic Http information in production.

changelog.d/6926.misc

@@ -1 +0,0 @@
-Focus input field when editing homeserver address to speed up login and registration.

changelog.d/6945.wip

@@ -1 +0,0 @@
-[Device Manager] Other Sessions Section

changelog.d/6947.wip

@@ -1 +0,0 @@
-[App Layout] fixed invites count badge bottom margin on a home screen

changelog.d/6958.feature

@@ -1 +0,0 @@
-[App Layout] New App Layout is enabled by default

changelog.d/6964.wip

@@ -1 +0,0 @@
-[Device Manager] Render Security Recommendations

changelog.d/6967.bugfix

@@ -1 +0,0 @@
-Fix low occurrence crashes.

changelog.d/6969.bugfix

@@ -1 +0,0 @@
-FTUE - Fixes optional email registration step always being mandatory

changelog.d/6978.bugfix

@@ -1 +0,0 @@
-Fix crash when opening an unknown room

changelog.d/6979.bugfix

@@ -1 +0,0 @@
-Fix crash on PIN code settings screen.

changelog.d/6982.bugfix

@@ -1,2 +0,0 @@
-Fix autoplayed animated stickers
-Increase sticker size

changelog.d/6989.bugfix

@@ -1 +0,0 @@
-Catch race condition crash in voice recording

changelog.d/7010.feature

@@ -1 +0,0 @@
-Try to detect devices that lack Opus encoder support, use bundled libopus library for those.

changelog.d/7016.wip

@@ -1 +0,0 @@
-[New Layout] Improves talkback accessibility

coverage.gradle

@@ -81,11 +81,11 @@ task generateCoverageReport(type: JacocoReport) {
 task unitTestsWithCoverage(type: GradleBuild) {
     // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
     startParameter.projectProperties.coverage = [enableTestCoverage: false]
-    tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
+    tasks = ['testDebugUnitTest']
 }
 
 task instrumentationTestsWithCoverage(type: GradleBuild) {
     startParameter.projectProperties.coverage = [enableTestCoverage: true]
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }

dependencies.gradle

@@ -15,14 +15,14 @@ def gradle = "7.1.3"
 def kotlin = "1.6.21"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.42"
-def appDistribution = "16.0.0-beta03"
+def appDistribution = "16.0.0-beta04"
 def retrofit = "2.9.0"
 def arrow = "0.8.2"
 def markwon = "4.6.2"
 def moshi = "1.13.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.162.0"
+def flipper = "0.164.0"
 def epoxy = "4.6.2"
 def mavericks = "2.7.0"
 def glide = "4.13.2"
@@ -86,7 +86,7 @@ ext.libs = [
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber
-                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.54"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.55"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",

dependencies_groups.gradle

@@ -69,8 +69,6 @@ ext.groups = [
                         'com.gabrielittner.threetenbp',
                         'com.getkeepsafe.relinker',
                         'com.github.bumptech.glide',
-                        'com.github.filippudak',
-                        'com.github.filippudak.progresspieview',
                         'com.github.javaparser',
                         'com.github.piasy',
                         'com.github.shyiko.klob',

docs/nightly_build.md

@@ -47,7 +47,7 @@ git checkout develop
 mv towncrier.toml towncrier.toml.bak
 sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
 rm towncrier.toml.bak
-yes n | towncrier --version nightly
+yes n | towncrier build --version nightly
 ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
 ```
 

docs/unifiedpush.md

@@ -18,7 +18,7 @@ The recently started UnifiedPush project is an Android protocol and library for
 
 The *F-Droid* and *Gplay* flavors of Element Android support UnifiedPush, so the user can use any distributor installed on their devices. This would make it possible to have push notifications without depending on Google services or libraries. Currently, the main distributors are [ntfy](https://ntfy.sh) which does not require any setup (like manual registration) to use the public server and [NextPush](https://github.com/UP-NextPush/android), available as a nextcloud application.
 
-The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor.
+The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor. A [FCM Rewrite Proxy](https://unifiedpush.org/developers/embedded_fcm/#fcm-rewrite-proxy) is not required for Element Android's implementation of the FCM distributor - it will work with an existing Matrix push provider, such as [Sygnal](https://github.com/matrix-org/sygnal).
 
 The *F-Droid* variant does not use this library to avoid any proprietary blob. It will use a polling service if the user has not installed any distributor.
 

fastlane/metadata/android/cs-CZ/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/de-DE/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/en-US/changelogs/40104360.txt

@@ -0,0 +1,3 @@
+New App Layout can be enabled in the Labs settings. Please give it a try!
+Fix issues about missing notification, and long incremental sync.
+Full changelog: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/en-US/changelogs/40105000.txt

@@ -0,0 +1,2 @@
+Main changes in this version: New App Layout and Deferred DM enabled by default. 
+Full changelog: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/et/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/fa/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/fr-FR/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104100.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Görgetés a hangüzenetben. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104110.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104120.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104130.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104140.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A figyelmen kívül hagyott felhasználók kezelésének javítása. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104160.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A titkosított üzenetek jobb kezelése. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104180.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104190.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104200.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104220.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104230.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104240.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104250.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104260.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: UnifiedPush használata, és lehetővé teszi a felhasználó számára, hogy FCM nélkül tolja.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104270.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104280.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104300.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104310.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104320.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/id/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/it-IT/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/lt/full_description.txt

@@ -0,0 +1,42 @@
+Element yra ir saugaus žinučių siuntimo, ir produktyvaus komandinio bendradarbiavimo programėlė, puikiai tinkanti grupiniams pokalbiams dirbant nuotoliniu būdu. Ši pokalbių programa naudoja visapusį šifravimą, kad užtikrintų galingas vaizdo konferencijas, dalijimąsi failais ir balso skambučius.
+
+<b>Element funkcijos turi:</b>
+- Išplėstinės bendravimo internetu priemonės
+- Visiškai užšifruotos žinutės, kad būtų galima saugiau bendrauti su įmone, net ir su nuotoliniais darbuotojais
+- Decentralizuoti pokalbiai, pagrįsti atvirojo kodo sistema Matrix
+- Saugus dalijimasis failais su šifruotais duomenimis valdant projektus
+- Vaizdo pokalbiai su IP balso perdavimu ir ekrano bendrinimu
+- Lengva integracija su mėgstamiausiomis internetinėmis bendradarbiavimo priemonėmis, projektų valdymo įrankiais, VoIP paslaugomis ir kitomis komandinių pokalbių programomis
+
+Element visiškai skiriasi nuo kitų žinučių siuntimo ir bendradarbiavimo programėlių. Ji veikia Matrix - atvirame tinkle, skirtame saugiam žinučių siuntimui ir decentralizuotam bendravimui. Jame galima savarankiškai talpinti duomenis ir žinutes savo serveryje, kad naudotojai galėtų maksimaliai valdyti ir kontroliuoti savo duomenis ir žinutes.
+
+<b>Privatumas ir šifruotos žinutės</b>
+Element apsaugo jus nuo nepageidaujamų reklamų, duomenų gavybos ir uždarų sodų. Jis taip pat apsaugo visus jūsų duomenis, "vienas su vienu" vaizdo ir balso ryšį, naudodamas visapusį šifravimą ir kryžmiškai pasirašytą įrenginių patvirtinimą.
+
+Element suteikia galimybę kontroliuoti savo privatumą ir kartu saugiai bendrauti su visais, esančiais Matrix tinkle, arba kitais verslo bendradarbiavimo įrankiais integruojantis su tokiomis programėlėmis kaip Slack.
+
+<b>Element gali būti savarankiškai talpinamas</b>
+Kad galėtumėte geriau kontroliuoti savo slaptus duomenis ir pokalbius, Element gali būti savarankiškai talpinamas arba galite pasirinkti bet kurį Matrix pagrindu veikiantį serverį - atvirojo kodo decentralizuoto bendravimo standartu. Element suteikia privatumą, saugumo atititikimą ir integracijos lankstumą.
+
+<b>Jūsų duomenys priklauso jums</b>
+Jūs nusprendžiate, kur laikyti savo duomenis ir žinutes. Be duomenų gavybos ar trečiųjų šalių prieigos rizikos.
+
+Element suteikia jums kontrolę įvairiais būdais:
+1. Gaukite nemokamą paskyrą viešajame serveryje matrix.org, kurį talpina Matrix kūrėjai, arba rinkitės iš tūkstančių viešųjų serverių, kurių talpinimą teikia savanoriai
+2. Savarankiškai talpinkite savo paskyrą, naudodami serverį savo IT infrastruktūroje
+3. Užsisakykite paskyrą nuosavame serveryje tiesiog užsisakydami "Element Matrix Services" talpinimo paslaugą
+
+<b>Atviras žinučių siuntimas ir bendradarbiavimas</b>
+Galite bendrauti su bet kuriuo Matrix tinklo nariu, nesvarbu, ar jis naudojasi Element, kita Matrix programėle, ar net jei naudoja kitą žinučių siuntimo programėlę.
+
+<b>Super saugus</b>
+Tikras visapusis šifravimas (žinutes gali iššifruoti tik pokalbio dalyviai) ir kryžminiu parašu patvirtintas įrenginių patvirtinimas.
+
+<b>Pilnas bendravimas ir integracija</b>
+Žinučių siuntimas, balso ir vaizdo skambučiai, failų ir ekrano bendrinimas ir daugybė integracijų, robotų ir valdiklių. Kurkite kambarius, bendruomenes, palaikykite ryšį ir atlikite darbus.
+
+<b>Tęskite darbą ten, kur baigėte</b>
+Palaikykite ryšį, kad ir kur būtumėte, naudodami visiškai sinchronizuotą žinučių istoriją visuose įrenginiuose ir internete adresu https://app.element.io
+
+<b>Atviras kodas</b>
+Element Android yra atvirojo kodo projektas, kurį talpina GitHub. Praneškite apie klaidas ir (arba) prisidėkite prie jo kūrimo adresu https://github.com/vector-im/element-android

fastlane/metadata/android/lt/short_description.txt

@@ -0,0 +1 @@
+Grupiniai pokalbiai - šifruotos žinutės ir vaizdo skambučiai

fastlane/metadata/android/lt/title.txt

@@ -0,0 +1 @@
+Element - Saugūs pokalbiai

fastlane/metadata/android/nl-NL/changelogs/40104180.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104190.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104200.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104220.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104230.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104240.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104250.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104270.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104280.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104320.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/nl-NL/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/pl-PL/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Rozmaite poprawki błędów i usprawnienia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/pt-BR/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/sk/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/uk/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/zh-TW/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases

gradle.properties

@@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true
 
 # Android Settings
 android.enableJetifier=true

library/jsonviewer/build.gradle

@@ -55,8 +55,9 @@ dependencies {
 
     implementation libs.airbnb.mavericks
     // Span utils
-    implementation 'me.gujun.android:span:1.7'
+    implementation('me.gujun.android:span:1.7') {
-
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid

library/ui-strings/build.gradle

@@ -20,3 +20,7 @@ android {
         jvmTarget = "11"
     }
 }
+
+tasks.withType( com.likethesalad.android.templates.common.tasks.BaseTask) {
+    it.outputs.cacheIf { true }
+}

library/ui-strings/src/main/res/values-ar/strings.xml

@@ -320,7 +320,7 @@
     <string name="settings_theme">السمة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
-    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="device_manager_session_details_session_id">معرّف الجهاز</string>
     <string name="encryption_information_device_key">مفتاح الجهاز</string>
     <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
     <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>

library/ui-strings/src/main/res/values-bg/strings.xml

@@ -396,7 +396,7 @@
     <string name="settings_theme">Тема</string>
     <string name="encryption_information_decryption_error">Грешка при разшифроване</string>
     <string name="encryption_information_device_name">Публично име</string>
-    <string name="encryption_information_device_id">Сесийно ID</string>
+    <string name="device_manager_session_details_session_id">Сесийно ID</string>
     <string name="encryption_information_device_key">Ключ на устройство</string>
     <string name="encryption_export_e2e_room_keys">Експортирай E2E ключове за стая</string>
     <string name="encryption_export_room_keys">Експортиране на ключове за стая</string>

library/ui-strings/src/main/res/values-bn-rBD/strings.xml

@@ -789,7 +789,7 @@
     <string name="encryption_export_room_keys">রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
     <string name="settings_theme">থিম</string>

library/ui-strings/src/main/res/values-bn-rIN/strings.xml

@@ -693,7 +693,7 @@
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
 
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
 
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>

library/ui-strings/src/main/res/values-ca/strings.xml

@@ -448,7 +448,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Error al desxifrar</string>
     <string name="encryption_information_device_name">Nom públic</string>
-    <string name="encryption_information_device_id">ID de sessió</string>
+    <string name="device_manager_session_details_session_id">ID de sessió</string>
     <string name="encryption_information_device_key">Clau de sessió</string>
     <string name="encryption_export_e2e_room_keys">Exporta les claus de la sala E2E</string>
     <string name="encryption_export_room_keys">Exporta les claus de la sala</string>
@@ -1470,7 +1470,7 @@
         <item quantity="one">%d sessió activa</item>
         <item quantity="other">%d sessions actives</item>
     </plurals>
-    <string name="settings_active_sessions_verified_device_desc">Aquesta sessió és de confiança per a xats segurs ja que l\'has verificada tu:</string>
+    <string name="settings_active_sessions_verified_device_desc">Aquesta sessió és de confiança per a missatges segurs ja que l\'has verificada tu:</string>
     <string name="settings_active_sessions_signout_device">Desconnecta aquesta sessió</string>
     <string name="settings_active_sessions_manage">Gestió de sessions</string>
     <string name="settings_active_sessions_show_all">Veure totes les sessions</string>
@@ -1844,7 +1844,7 @@
     <string name="choose_locale_other_locales_title">Altres idiomes disponibles</string>
     <string name="choose_locale_current_locale_title">Idioma actual</string>
     <string name="delete_event_dialog_reason_hint">Motiu de l\'eliminació</string>
-    <string name="verification_profile_device_verified_because">Aquesta sessió és de confiança per a xats segurs ja que %1$s (%2$s) l\'ha verificat:</string>
+    <string name="verification_profile_device_verified_because">Aquesta sessió és de confiança per a missatges segurs ja que %1$s (%2$s) l\'ha verificat:</string>
     <string name="bootstrap_progress_compute_curve_key">Obtenint clau de corba</string>
     <string name="create_room_dm_failure">No s\'ha pogut crear el xat. Comprova els usuaris que vols convidar i torna-ho a provar.</string>
     <string name="cross_signing_verify_by_text">Verifica manualment mitjançant text</string>
@@ -2225,7 +2225,7 @@
     <string name="ftue_auth_carousel_control_body">Tria on es desen les teves converses, et dona control i independència. Connectat a través de Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Comunicació segura i independent que t\'ofereix el mateix nivell de privadesa que una conversa cara a cara a casa teva.</string>
     <string name="ftue_auth_carousel_workplace_title">Missatgeria pel teu equip.</string>
-    <string name="ftue_auth_carousel_encrypted_title">Missatgeria segura.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Missatges segurs.</string>
     <string name="ftue_auth_carousel_secure_title">Ets propietari de les teves converses.</string>
     <string name="ftue_auth_carousel_control_title">Tu tens el control.</string>
     <string name="call_tile_voice_call_has_ended">Trucada finalitzada • %1$s</string>
@@ -2602,8 +2602,8 @@
     <string name="all_chats">Tots els xats</string>
     <string name="home_layout_preferences">Preferències de disseny</string>
     <string name="explore_rooms">Explora sales</string>
-    <string name="settings_sessions_other_description">Per estar més segur, verifica les teves sessions i tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
+    <string name="device_manager_sessions_other_description">Per estar més segur, verifica les teves sessions i tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
-    <string name="settings_sessions_other_title">Altres sessions</string>
+    <string name="device_manager_sessions_other_title">Altres sessions</string>
     <string name="settings_sessions_list">Sessions</string>
     <string name="a11y_open_spaces">Obre la llista d\'espais</string>
     <string name="a11y_create_message">Crea un nou xat o sala</string>
@@ -2619,4 +2619,59 @@
     <string name="device_manager_settings_active_sessions_show_all">Mostra totes les sessions (V2, WIP)</string>
     <string name="create_room">Crea sala</string>
     <string name="start_chat">Inicia xat</string>
-</resources>
+    <string name="device_manager_other_sessions_description_verified">Verificada · Última activitat %1$s</string>
+    <string name="device_manager_other_sessions_description_unverified">No verificada · Última activitat %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Veure-ho tot (%1$d)</string>
+    <string name="device_manager_view_details">Veure detalls</string>
+    <string name="device_manager_verify_session">Verifica sessió</string>
+    <string name="device_manager_verification_status_unverified">Sessió no verificada</string>
+    <string name="device_manager_verification_status_verified">Sessió verificada</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipus de dispositiu desconegut</string>
+    <string name="a11y_device_manager_device_type_desktop">Ordinador</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mòbil</string>
+    <string name="timeline_error_room_not_found">Aquesta sala no s\'ha trobat.
+\nTorna-ho a provar més tard.%s</string>
+    <string name="invites_title">Invitacions</string>
+    <string name="home_empty_no_rooms_title">${app_name}
+\nHola, %s.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Nova visualització!</string>
+    <string name="onboarding_new_app_layout_button_try">Prova-ho</string>
+    <string name="onboarding_new_app_layout_spaces_title">Entra a espais</string>
+    <string name="home_empty_no_rooms_message">L\'aplicació de xats segurs tot en un. Per a equips, amics i organitzacions. Crea un xat o uneix-te a una sala existent per començar.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Pensa en tancar sessió de les sessions antigues (%1$d dia o més) que ja no utilitzis.</item>
+        <item quantity="other">Pensa en tancar sessió de les sessions antigues (%1$d dies o més) que ja no utilitzis.</item>
+    </plurals>
+    <string name="onboarding_new_app_layout_feedback_message">Prem la part superior dreta per veure l\'opció d\'enviar comentaris.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Envia comentaris</string>
+    <string name="home_empty_no_unreads_message">Aquí es mostraran els teus missatges no llegits, quan en tinguis.</string>
+    <string name="home_empty_no_unreads_title">Sense novetats.</string>
+    <string name="device_manager_unverified_sessions_description">Verifica les sessions o tanca\'n la sessió si no estan verificades.</string>
+    <string name="onboarding_new_app_layout_welcome_message">Per simplificar ${app_name}, les pestanyes ara son opcionals. Gestiona-les mitjançant el menú de la part superior dreta.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nsembla una mica buit.</string>
+    <string name="device_manager_inactive_sessions_title">Sessions inactives</string>
+    <string name="device_manager_unverified_sessions_title">Sessions no verificades</string>
+    <string name="device_manager_header_section_security_recommendations_description">Millora la seguretat del teu compte seguint aquestes recomanacions.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Recomanacions de seguretat</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Actiu fa %1$d dia (%2$s)</item>
+        <item quantity="other">Actiu fa més de %1$d dies (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Aquí és on apareixeran les teves sol·licituds i invitacions.</string>
+    <string name="invites_empty_title">Res de nou.</string>
+    <string name="onboarding_new_app_layout_spaces_message">Accedeix als teus espais (part inferior dreta) més ràpid i fàcilment.</string>
+    <string name="home_empty_space_no_rooms_message">Els espais són una nova manera d\'agrupar sales i gent. Afegeix una sala o crea\'n una de nova mitjançant el botó de la part inferior dreta.</string>
+    <string name="space_list_empty_message">Els espais són una nova manera d\'agrupar sales i gent. Crea\'n un per començar.</string>
+    <string name="space_list_empty_title">Cap espai, encara.</string>
+    <string name="a11y_collapse_space_children">Amaga els continguts de %s</string>
+    <string name="a11y_expand_space_children">Mostra el contingut de %s</string>
+    <string name="change_space">Canvia espai</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifica les teves sessions per obtenir missatges segurs millorats o tanca les sessions que no reconeguis o ja no utilitzis.</string>
+    <string name="device_manager_filter_option_unverified_description">No llest per a missatges segurs</string>
+    <string name="device_manager_filter_option_verified_description">Llest per a missatges segurs</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Aquesta sessió està llesta per a missatges segurs.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">La teva sessió actual està llesta per a missatges segurs.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifica la teva sessió actual obtenir missatges segurs millorats.</string>
+</resources>

library/ui-strings/src/main/res/values-cs/strings.xml

@@ -635,7 +635,7 @@
     <string name="settings_theme">Motiv vzhledu</string>
     <string name="encryption_information_decryption_error">Chyba dešifrování</string>
     <string name="encryption_information_device_name">Veřejné jméno</string>
-    <string name="encryption_information_device_id">ID relace</string>
+    <string name="device_manager_session_details_session_id">ID relace</string>
     <string name="encryption_information_device_key">Klíč relace</string>
     <string name="encryption_export_e2e_room_keys">Export E2E klíčů místností</string>
     <string name="encryption_export_room_keys">Export klíčů místností</string>
@@ -2651,8 +2651,8 @@
     <string name="a11y_open_settings">Otevřít nastavení</string>
     <string name="all_chats">Všechny konverzace</string>
     <string name="device_manager_settings_active_sessions_show_all">Zobrazit všechny relace (V2, WIP)</string>
-    <string name="settings_sessions_other_description">V zájmu co nejlepšího zabezpečení ověřujte své relace a odhlašujte se ze všech relací, které již nepoznáváte nebo nepoužíváte.</string>
+    <string name="device_manager_sessions_other_description">V zájmu co nejlepšího zabezpečení ověřujte své relace a odhlašujte se ze všech relací, které již nepoznáváte nebo nepoužíváte.</string>
-    <string name="settings_sessions_other_title">Ostatní relace</string>
+    <string name="device_manager_sessions_other_title">Ostatní relace</string>
     <string name="settings_sessions_list">Relace</string>
     <string name="a11y_open_spaces">Seznam otevřených prostorů</string>
     <string name="a11y_create_message">Vytvořit novou konverzaci nebo místnost</string>
@@ -2669,4 +2669,55 @@
     <string name="explore_rooms">Prozkoumat místnosti</string>
     <string name="create_room">Vytvořit místnost</string>
     <string name="start_chat">Zahájit konverzaci</string>
+    <string name="device_manager_other_sessions_description_unverified">Neověřeno · Poslední aktivita %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Ověřeno · Poslední aktivita %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Zobrazit všechny (%1$d)</string>
+    <string name="device_manager_view_details">Zobrazit podrobnosti</string>
+    <string name="device_manager_verify_session">Ověřit relaci</string>
+    <string name="device_manager_verification_status_unverified">Neověřená relace</string>
+    <string name="device_manager_verification_status_verified">Ověřená relace</string>
+    <string name="a11y_device_manager_device_type_unknown">Neznámý typ zařízení</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="timeline_error_room_not_found">Je nám líto, tato místnost nebyla nalezena.
+\nZkuste to prosím později.%s</string>
+    <string name="invites_title">Pozvánky</string>
+    <string name="onboarding_new_app_layout_button_try">Vyzkoušejte to</string>
+    <string name="onboarding_new_app_layout_feedback_message">Klepnutím vpravo nahoře zobrazíte možnost zpětné vazby.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Poskytněte zpětnou vazbu</string>
+    <string name="onboarding_new_app_layout_spaces_message">Přístup k vašim prostorům (vpravo dole) je rychlejší a snazší než kdykoli předtím.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Přístup do prostorů</string>
+    <string name="onboarding_new_app_layout_welcome_message">Pro zjednodušení aplikace ${app_name} jsou nyní karty nepovinné. Spravujte je pomocí nabídky vpravo nahoře.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Vítejte v novém zobrazení!</string>
+    <string name="home_empty_no_unreads_message">Zde se zobrazí nepřečtené zprávy, pokud nějaké máte.</string>
+    <string name="home_empty_no_unreads_title">Nic k nahlášení.</string>
+    <string name="home_empty_no_rooms_message">Univerzální zabezpečená chatovací aplikace pro týmy, přátele a organizace. Vytvořte si chat nebo se připojte k existující místnosti a začněte.</string>
+    <string name="home_empty_no_rooms_title">Vítejte v aplikaci ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Prostory představují nový způsob seskupování místností a osob. Pomocí tlačítka vpravo dole můžete přidat stávající místnost nebo vytvořit novou.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nvypadá trochu prázdně.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Zvažte odhlášení ze starých relací (%1$d den nebo více), které již nepoužíváte.</item>
+        <item quantity="few">Zvažte odhlášení ze starých relací (%1$d dny nebo více), které již nepoužíváte.</item>
+        <item quantity="other">Zvažte odhlášení ze starých relací (%1$d dnů nebo více), které již nepoužíváte.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Neaktivní relace</string>
+    <string name="device_manager_unverified_sessions_description">Ověřte nebo se odhlaste z neověřených relací.</string>
+    <string name="device_manager_unverified_sessions_title">Neověřené relace</string>
+    <string name="device_manager_header_section_security_recommendations_description">Zlepšete zabezpečení svého účtu dodržováním těchto doporučení.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Bezpečnostní doporučení</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Neaktivní po dobu %1$d+ dne (%2$s)</item>
+        <item quantity="few">Neaktivní po dobu %1$d+ dnů (%2$s)</item>
+        <item quantity="other">Neaktivní po dobu %1$d+ dnů (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Zde se budou nacházet vaše nové žádosti a pozvánky.</string>
+    <string name="invites_empty_title">Nic nového.</string>
+    <string name="space_list_empty_message">Prostory představují nový způsob seskupování místností a osob. Vytvořte si prostor a začněte.</string>
+    <string name="space_list_empty_title">Zatím žádné prostory.</string>
+    <string name="a11y_collapse_space_children">Sbalit podprostory %s</string>
+    <string name="a11y_expand_space_children">Rozbalit podprostory %s</string>
+    <string name="change_space">Změnit prostor</string>
 </resources>

library/ui-strings/src/main/res/values-de/strings.xml

@@ -20,7 +20,7 @@
     <string name="notice_placed_voice_call">%s hat einen Sprachanruf getätigt.</string>
     <string name="notice_answered_call">%s hat den Anruf angenommen.</string>
     <string name="notice_ended_call">%s hat den Anruf beendet.</string>
-    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Chatverlauf sichtbar gemacht für %2$s</string>
+    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Nachrichtenverlauf sichtbar gemacht für %2$s</string>
     <string name="notice_room_visibility_invited">alle Mitglieder, ab Einladung.</string>
     <string name="notice_room_visibility_joined">alle Mitglieder, ab Beitritt.</string>
     <string name="notice_room_visibility_shared">alle Mitglieder.</string>
@@ -265,11 +265,11 @@
     <string name="rooms_header">Räume</string>
     <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
-    <string name="send_bug_report_include_screenshot">Screenshot übermitteln</string>
+    <string name="send_bug_report_include_screenshot">Bildschirmfoto übermitteln</string>
     <string name="send_bug_report">Problem melden</string>
     <string name="send_bug_report_description">Bitte beschreibe das Problem. Was hast du genau gemacht\? Was sollte passieren\? Was ist tatsächlich passiert\?</string>
     <string name="send_bug_report_placeholder">Problembeschreibung</string>
-    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle des Clients zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und der Screenshot, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, die nachfolgenden Haken entsprechend entfernen:</string>
+    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle des Clients zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und das Bildschirmfoto, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, die nachfolgenden Haken entsprechend entfernen:</string>
     <string name="send_bug_report_alert_message">Du scheinst dein Telefon frustriert zu schütteln. Möchtest du das Fenster zum Senden eines Fehlerberichts öffnen\?</string>
     <string name="send_bug_report_sent">Dein Fehlerbericht wurde erfolgreich übermittelt</string>
     <string name="send_bug_report_failed">Der Fehlerbericht konnte nicht übermittelt werden (%s)</string>
@@ -418,7 +418,7 @@
     <string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
-    <string name="encryption_information_device_id">Sitzungs-ID</string>
+    <string name="device_manager_session_details_session_id">Sitzungs-ID</string>
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_export_e2e_room_keys">Ende-zu-Ende-Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys">Raumschlüssel exportieren</string>
@@ -834,9 +834,9 @@
 \nSitzungsname: %1$s
 \nZuletzt gesehen: %2$s
 \nWenn du nicht mit einer anderen Sitzung angemeldet bist, ignoriere diese Anfrage.</string>
-    <string name="your_unverified_device_requesting_with_info">Eine unverifizierte Sitzung fordert Verschlüsselungs-Schlüssel an. 
+    <string name="your_unverified_device_requesting_with_info">Eine nicht verifizierte Sitzung fordert Verschlüsselungs-Schlüssel an.
-\nSitzungsname: %1$s 
+\nSitzungsname: %1$s
-\nZuletzt gesehen: %2$s 
+\nZuletzt gesehen: %2$s
 \nWenn du nicht eine andere Sitzung angemeldet hast, ignoriere diese Anfrage.</string>
     <string name="share_without_verifying_short_label">Teilen</string>
     <string name="ignore_request_short_label">Ignorieren</string>
@@ -908,7 +908,7 @@
     <string name="edited_suffix">(bearbeitet)</string>
     <string name="message_edits">Nachrichtenbearbeitung</string>
     <string name="no_message_edits_found">Keine Änderungen gefunden</string>
-    <string name="room_filtering_filter_hint">Gespräche filtern…</string>
+    <string name="room_filtering_filter_hint">Konversationen filtern …</string>
     <string name="room_filtering_footer_create_new_direct_message">Sende eine neue Direktnachricht</string>
     <string name="room_filtering_footer_open_room_directory">Das Raumverzeichnis anzeigen</string>
     <string name="link_copied_to_clipboard">Link in die Zwischenablage kopiert</string>
@@ -994,7 +994,7 @@
     <string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gib den Verifizierungscode ein, den sie enthält.</string>
     <string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
     <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
-    <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Homeservers akzeptiert hast.</string>
+    <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Heimservers akzeptiert hast.</string>
     <string name="room_widget_permission_webview_shared_info_title">Bei Benutzung könnten Cookies gesetzt werden und es könnten Daten mit %s geteilt werden:</string>
     <string name="room_widget_permission_shared_info_title">Bei Benutzung könnten Daten mit %s geteilt werden:</string>
     <string name="settings_discovery_no_msisdn">Optionen zum Finden werden erscheinen, sobald du eine Telefonnummer hinzugefügt hast.</string>
@@ -1409,8 +1409,8 @@
     <string name="bootstrap_migration_use_recovery_key">nutze deinen Schlüsselbackup-Wiederherstellungsschlüssel</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Wenn du dein Schlüsselbackup-Passwort nicht weißt, kannst du %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Schlüsselbackup-Wiederherstellungsschlüssel</string>
-    <string name="settings_security_prevent_screenshots_title">Screenshots innerhalb der Anwendung verhindern</string>
+    <string name="settings_security_prevent_screenshots_title">Bildschirmfotos der Anwendung verhindern</string>
-    <string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt das FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
+    <string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
     <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
     <string name="use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing-fähigen Matrix-Client</string>
     <string name="app_desktop_web">${app_name} Web
@@ -1426,7 +1426,7 @@
     <string name="enter_secret_storage_input_key">Wähle deinen Wiederherstellungsschlüssel, gib ihn ein oder füge ihn aus der Zwischenablage ein</string>
     <string name="failed_to_access_secure_storage">Konnte nicht auf gesicherten Speicher zugreifen</string>
     <string name="unencrypted">Unverschlüsselt</string>
-    <string name="encrypted_unverified">Verschlüsselt von einem unbekannten Gerät</string>
+    <string name="encrypted_unverified">Verschlüsselt von einem nicht verifiziertem Gerät</string>
     <string name="review_logins">Überprüfe, wo du angemeldet bist</string>
     <string name="verify_other_sessions">Verifiziere alle deine Sitzungen, um sicherzustellen, dass dein Konto und deine Nachrichten sicher sind</string>
     <string name="verify_this_session">Bestätige neue Anmeldung zu deinem Konto: %1$s</string>
@@ -1461,7 +1461,7 @@
     <string name="action_dismiss">Ablehnen</string>
     <string name="dialog_title_success">Erfolg</string>
     <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
-\nBitte den Administrator deines Homeservers, einen TURN-Server zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
+\nBitte den Administrator deines Heimservers, einen TURN-Server zu konfigurieren, damit Anrufe zuverlässig funktionieren.</string>
     <string name="call_select_sound_device">Audiogerät auswählen</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Lautsprecher</string>
@@ -1744,13 +1744,13 @@
     <string name="room_member_open_or_create_dm">Direktnachricht</string>
     <string name="send_bug_report_include_key_share_history">Verlauf der Anfragen von Schlüsselfreigaben senden</string>
     <string name="no_more_results">Keine weiteren Ergebnisse</string>
-    <string name="start_chatting">Starte die Diskussion</string>
+    <string name="start_chatting">Beginne ein Gespräch</string>
     <string name="settings_discovery_consent_action_give_consent">Autorisieren</string>
     <string name="settings_discovery_consent_action_revoke">Meine Zustimmung widerrufen</string>
     <string name="settings_discovery_consent_notice_on">Du hast zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzern entdeckt zu werden.</string>
     <string name="settings_discovery_consent_title">E-Mails und Telefonnummern senden</string>
     <string name="direct_room_user_list_suggestions_title">Vorschläge</string>
-    <string name="direct_room_user_list_known_title">Bekannte Nutzer</string>
+    <string name="direct_room_user_list_known_title">Bekannte Personen</string>
     <string name="qr_code">QR-Code</string>
     <string name="add_by_qr_code">Hinzufügen via QR-Code</string>
     <string name="permissions_denied_add_contact">Gib die Erlaubnis, um auf die Kamera zu zugreifen.</string>
@@ -1794,7 +1794,7 @@
     <string name="create_room_alias_invalid">Manche Zeichen sind nicht zulässig</string>
     <string name="create_room_alias_empty">Bitte gib eine Raumadresse an</string>
     <string name="create_room_alias_already_in_use">Diese Adresse ist bereits vergeben</string>
-    <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Homeservers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
+    <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Heimservers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
     <string name="create_room_disable_federation_title">Begrenze Zugang zu diesem Raum (für immer!) auf Mitglieder von %s</string>
     <string name="attachment_viewer_item_x_of_y">%1$d von %2$d</string>
     <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du direkt beitreten\?</string>
@@ -1845,7 +1845,7 @@
     <string name="login_social_sso">Einmalanmeldung</string>
     <string name="login_social_signin_with">Anmelden mit %s</string>
     <string name="login_social_signup_with">Registrieren mit %s</string>
-    <string name="login_social_continue_with">Mit %s weitermachen</string>
+    <string name="login_social_continue_with">Weiter mit %s</string>
     <string name="settings_show_emoji_keyboard_summary">Knopf zum Nachrichteneditor hinzufügen, der die Emoji-Tastatur öffnet</string>
     <string name="settings_show_emoji_keyboard">Emoji-Tastatur anzeigen</string>
     <string name="settings_chat_effects_description">Nutze /confetti oder sende Nachrichten mit ❄️ oder 🎉</string>
@@ -2188,7 +2188,7 @@
     <string name="settings_developer_mode_show_info_on_screen_summary">Hilfreiche Informationen zur Fehlersuche anzeigen</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Debug-Info anzeigen</string>
     <string name="does_not_look_like_valid_email">Das schaut nicht nach einer gültigen E-Mail-Adresse aus</string>
-    <string name="user_directory_search_hint_2">Nach Name, ID oder E-Mail suchen</string>
+    <string name="user_directory_search_hint_2">Mittels Name, ID oder E-Mail-Adresse suchen</string>
     <string name="create_new_space">Neuen Space erstellen</string>
     <string name="room_settings_space_access_title">Zugriff</string>
     <string name="room_settings_access_rules_pref_dialog_title">Wer hat Zugriff\?</string>
@@ -2587,8 +2587,8 @@
     <string name="room_list_filter_people">Personen</string>
     <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Konversation einzuladen</string>
     <string name="device_manager_settings_active_sessions_show_all">Alle Sitzungen anzeigen (V2, in Arbeit)</string>
-    <string name="settings_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
+    <string name="device_manager_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
-    <string name="settings_sessions_other_title">Andere Sitzungen</string>
+    <string name="device_manager_sessions_other_title">Andere Sitzungen</string>
     <string name="settings_sessions_list">Sitzungen</string>
     <string name="a11y_open_spaces">Space-Liste öffnen</string>
     <string name="a11y_create_message">Beginne ein Gespräch oder erstelle einen Raum</string>
@@ -2614,4 +2614,29 @@
     <string name="ftue_auth_choose_server_ems_cta">Kontakt aufnehmen</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) ist ein robuster und zuverlässiger Hosting-Dienst für schnelle und sichere Echtzeitkommunikation. Erfahre mehr unter <a href="${ftue_ems_url}">element.io/ems</a></string>
     <string name="ftue_auth_choose_server_ems_title">Willst du deinen eigenen Server betreiben\?</string>
-</resources>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="timeline_error_room_not_found">Entschuldigung, dieser Raum wurde nicht gefunden.
+\nBitte versuche es später erneut.%s</string>
+    <string name="invites_title">Einladungen</string>
+    <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Letzte Aktivität %1$s</string>
+    <string name="device_manager_verification_status_unverified">Nicht verifizierte Sitzung</string>
+    <string name="device_manager_unverified_sessions_title">Nicht verifizierte Sitzung</string>
+    <string name="device_manager_header_section_security_recommendations_description">Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Sicherheitsempfehlungen</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inaktiv seit %1$d+ Tag (%2$s)</item>
+        <item quantity="other">Inaktiv seit %1$d+ Tagen (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_verified">Verifiziert · Letzte Aktivität %1$s</string>
+    <string name="device_manager_verification_status_verified">Verifizierte Sitzung</string>
+    <string name="a11y_device_manager_device_type_unknown">Unbekannter Gerätetyp</string>
+    <string name="invites_empty_title">Nichts Neues.</string>
+    <string name="space_list_empty_message">Spaces sind eine neue Art, Räume und Personen zu organisieren. Erstelle einen Space, um zu beginnen.</string>
+    <string name="space_list_empty_title">Noch keine Spaces.</string>
+    <string name="home_empty_no_unreads_message">Hier werden deine ungelesenen Nachrichten erscheinen, wenn du welche hast.</string>
+    <string name="home_empty_no_unreads_title">Es gibt nichts Neues.</string>
+    <string name="all_chats">Alle Unterhaltungen</string>
+    <string name="change_space">Space wechseln</string>
+    <string name="start_chat">Unterhaltung beginnen</string>
+</resources>